Date: Sat, 9 Jan 2010 17:25:52 GMT From: Scot Hetzel <swhetzel@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: bin/142529: [patch] make delete-old removes BIND files when the BIND port is installed using WITH_REPLACE_BASE Message-ID: <201001091725.o09HPqCG068597@www.freebsd.org> Resent-Message-ID: <201001091730.o09HU4nS051018@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142529
>Category: bin
>Synopsis: [patch] make delete-old removes BIND files when the BIND port is installed using WITH_REPLACE_BASE
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 09 17:30:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Scot Hetzel
>Release: 8.0-Stable
>Organization:
>Environment:
FreeBSD dv8t01 8.0-STABLE FreeBSD 8.0-STABLE #10 r201599M: Tue Jan 5 14:29:56 CST 2010 swhetzel@dv8t01:/usr/obj/usr/src/8-stable/sys/GENERIC amd64
>Description:
When the BIND ports are installed using the WITH_REPLACE_BASE option, they overwrite bind installed by the FreeBSD sources. Then when 'make delete-old' is used, it removes the files installed by the BIND ports
>How-To-Repeat:
echo "WITH_REPLACE_BASE" > /etc/make.conf
cd /usr/ports/dns/bind9
make install
cd /usr/src
make delete-old
The files installed by the BIND port are now removed.
>Fix:
The attached patch fixes this problem by only allowing to delete the BIND files when WITH_REPLACE_BASE or WITH_REPLACE_BASE_BIND are not defined.
Patch attached with submission follows:
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc (revision 201599)
+++ tools/build/mk/OptionalObsoleteFiles.inc (working copy)
@@ -35,6 +35,7 @@
# to be filled in
#.endif
+.if ${MK_REPLACE_BASE_BIND} == no
.if ${MK_BIND} == no
OLD_FILES+=usr/bin/dig
OLD_FILES+=usr/bin/host
@@ -231,6 +232,7 @@
#.if ${MK_BIND_NAMED} == no || ${MK_BIND} == no
# to be filled in and removed above
#.endif
+.endif
.if ${MK_BLUETOOTH} == no
OLD_FILES+=usr/bin/bthost
Index: share/mk/bsd.own.mk
===================================================================
--- share/mk/bsd.own.mk (revision 201599)
+++ share/mk/bsd.own.mk (working copy)
@@ -409,7 +409,8 @@
BIND_XML \
GNU_CPIO \
HESIOD \
- IDEA
+ IDEA \
+ REPLACE_BASE_BIND
.if defined(WITH_${var}) && defined(WITHOUT_${var})
.error WITH_${var} and WITHOUT_${var} can't both be set.
.endif
@@ -435,6 +436,14 @@
MK_BIND:= no
.endif
+.if defined(WITH_REPLACE_BASE)
+MK_REPLACE_BASE_BIND:= yes
+.endif
+
+.if ${MK_REPLACE_BASE_BIND} == "yes"
+MK_BIND:= no
+.endif
+
.if ${MK_BIND} == "no"
MK_BIND_DNSSEC:= no
MK_BIND_ETC:= no
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001091725.o09HPqCG068597>