From 0c95bff93bf6b1b0e17311ea14e17036f31a59e8 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Wed, 10 Dec 2014 13:05:57 -0800
Subject: [PATCH] pkg - Adjust pkg-bootstrap-force

* Adjust the pkg-bootstrap-force target to also remove
  "/usr/local/etc/pkg.conf".  Older pkg.conf files (e.g. 3.5 or earlier,
  possibly 3.6 or earlier) can interfere with newer pkg bootstraps.
---
 etc/Makefile.usr | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/etc/Makefile.usr b/etc/Makefile.usr
index 295b596dd7..e9442eb3a2 100644
--- a/etc/Makefile.usr
+++ b/etc/Makefile.usr
@@ -198,7 +198,11 @@ dports-replace:
 	rm -f ${DPTBALL}
 .endif
 
+# NOTE: In force mode we also have to remove any old pkg.conf
+#	which might interfere with the newer pkg bootstrap.
+#
 pkg-bootstrap-force:
+	@rm -f /usr/local/etc/pkg.conf
 	@fetch -o ${PKGBALL} ${PKGBOOT}
 	@tar -xJf ${PKGBALL} -C ${.CURDIR}/local
 	@rm -f ${PKGBALL}
-- 
2.41.0