Move pkg_radd config to a more obvious name; make sure settings.conf gets

cleaned out on upgrade, and stick a warning in UPGRADING so nobody
(hopefully) gets surprised when pkg_radd starts downloading from
mirror-master again.

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index e02de5b..269c411 100644 (file)
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -1560,3 +1560,4 @@ TO_REMOVE+=/usr/share/man/man4/i386/ndis.4.gz
 TO_REMOVE+=/usr/sbin/ndiscvt
 TO_REMOVE+=/usr/share/man/cat8/ndiscvt.8.gz
 TO_REMOVE+=/usr/share/man/man8/ndiscvt.8.gz
+TO_REMOVE+=/etc/settings.conf

diff --git a/UPDATING b/UPDATING
index 31ed81a..d8e4073 100644 (file)
--- a/UPDATING
+++ b/UPDATING
@@ -11,6 +11,18 @@
 # $DragonFly: src/UPDATING,v 1.26 2008/09/15 20:03:36 thomas Exp $
 
 +-----------------------------------------------------------------------+
++         UPGRADING DRAGONFLY FROM 2.8 to later versions
++-----------------------------------------------------------------------+
+
+pkg_radd settings
+=================
+
+The config file for pkg_radd has moved from /etc/settings.conf to 
+/etc/pkg_radd.conf.  Save the contents of settings.conf before upgrading
+if this is needed.  This warning only applies if /etc/settings.conf 
+exists.  pkg_radd will continue to work with defaults.
+
++-----------------------------------------------------------------------+
 +         20100924
 +         UPGRADING DRAGONFLY FROM 2.6 to 2.8 or HEAD
 +-----------------------------------------------------------------------+

diff --git a/etc/pkg_radd.conf b/etc/pkg_radd.conf
new file mode 100644 (file)
index 0000000..e9682b6
--- /dev/null
+++ b/etc/pkg_radd.conf
@@ -0,0 +1,9 @@
+# This config file controls where pkg_radd looks for pkgsrc binaries.
+# The example here is the default.  
+# Consult the dragonflybsd.org website for a list of mirrors.
+# The path should lead to a directory containing the architectures, 
+# like 'i386' and x86_64.  The correct arch and DragonFly version is 
+# automatically appended to the path by pkg_radd.
+#
+# BINPKG_BASE=http://mirror-master.dragonflybsd.org/packages
+#

diff --git a/usr.bin/pkg_radd/pkg_radd.sh b/usr.bin/pkg_radd/pkg_radd.sh
index c004f5d..10d903c 100644 (file)
--- a/usr.bin/pkg_radd/pkg_radd.sh
+++ b/usr.bin/pkg_radd/pkg_radd.sh
@@ -31,7 +31,7 @@
 
 osver=`uname -r | awk -F - '{ print $1; }'`
 cpuver=`uname -p | awk -F - '{ print $1; }'`
-[ -f /etc/settings.conf ] && . /etc/settings.conf
+[ -f /etc/pkg_radd.conf ] && . /etc/pkg_radd.conf
 : ${BINPKG_BASE:=http://mirror-master.dragonflybsd.org/packages}
 : ${BINPKG_SITES:=$BINPKG_BASE/$cpuver/DragonFly-$osver/stable}
 : ${PKG_PATH:=$BINPKG_SITES/All}