From owner-freebsd-bugs@FreeBSD.ORG Sat Jan 9 17:30:04 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A53AD1065670 for ; Sat, 9 Jan 2010 17:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 816338FC19 for ; Sat, 9 Jan 2010 17:30:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o09HU4eD051025 for ; Sat, 9 Jan 2010 17:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o09HU4nS051018; Sat, 9 Jan 2010 17:30:04 GMT (envelope-from gnats) Resent-Date: Sat, 9 Jan 2010 17:30:04 GMT Resent-Message-Id: <201001091730.o09HU4nS051018@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Scot Hetzel Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35B08106566B for ; Sat, 9 Jan 2010 17:25:53 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 0A5228FC12 for ; Sat, 9 Jan 2010 17:25:53 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o09HPqZe068616 for ; Sat, 9 Jan 2010 17:25:52 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o09HPqCG068597; Sat, 9 Jan 2010 17:25:52 GMT (envelope-from nobody) Message-Id: <201001091725.o09HPqCG068597@www.freebsd.org> Date: Sat, 9 Jan 2010 17:25:52 GMT From: Scot Hetzel To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: bin/142529: [patch] make delete-old removes BIND files when the BIND port is installed using WITH_REPLACE_BASE X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2010 17:30:04 -0000 >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: