Don't remove /etc/settings.conf via 'make upgrade' and rename it instead.

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 71fcfbe..88d330d 100644 (file)
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -1586,4 +1586,3 @@ 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/etc/Makefile b/etc/Makefile
index a1846a5..6302994 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,6 +1,5 @@
 #      from: @(#)Makefile      5.11 (Berkeley) 5/21/91
 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $
-# $DragonFly: src/etc/Makefile,v 1.217 2008/10/03 10:27:42 swildner Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=        sendmail
@@ -226,6 +225,9 @@ upgrade_etc:        preupgrade remove-obsolete-files
        rm -rf ${DESTDIR}/boot/modules.old/modules.old
 .endif
 .endif
+.if exists(${DESTDIR}/etc/settings.conf)
+       mv ${DESTDIR}/etc/settings.conf ${DESTDIR}/etc/pkg_radd.conf
+.endif
        for ext in a so.0; do \
                f=${DESTDIR}/usr/lib/libpthread.$$ext; \
                dest=$$(readlink "$$f"); \