From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 11 07:50:02 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA84516A4CE for ; Wed, 11 May 2005 07:50:02 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8324843D55 for ; Wed, 11 May 2005 07:50:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4B7o22s029525 for ; Wed, 11 May 2005 07:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4B7o2VW029524; Wed, 11 May 2005 07:50:02 GMT (envelope-from gnats) Resent-Date: Wed, 11 May 2005 07:50:02 GMT Resent-Message-Id: <200505110750.j4B7o2VW029524@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, vd@datamax.bg Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7D7E16A4CE for ; Wed, 11 May 2005 07:49:16 +0000 (GMT) Received: from jengal.datamax.bg (jengal.datamax.bg [82.103.104.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07D2B43D6A for ; Wed, 11 May 2005 07:49:16 +0000 (GMT) (envelope-from vd@datamax.bg) Received: from sinanica.bg.datamax (sinanica.bg.datamax [192.168.10.1]) by jengal.datamax.bg (Postfix) with QMQP id 2224487C8 for ; Wed, 11 May 2005 10:49:15 +0300 (EEST) Received: (nullmailer pid 1042 invoked by uid 1004); Wed, 11 May 2005 07:49:15 -0000 Message-Id: <20050511074915.GA917@sinanica.bg.datamax> Date: Wed, 11 May 2005 10:49:15 +0300 From: Vasil Dimov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80880: add-plist-info and add-plist-post targets in bsd.port.mk X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: vd@datamax.bg List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 May 2005 07:50:02 -0000 >Number: 80880 >Category: ports >Synopsis: add-plist-info and add-plist-post targets in bsd.port.mk >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 11 07:50:01 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Vasil Dimov >Release: FreeBSD 5.4-STABLE i386 >Organization: DataMax >Environment: System: FreeBSD sinanica.bg.datamax 5.4-STABLE FreeBSD 5.4-STABLE #6: Tue May 10 12:46:25 EEST 2005 root@sinanica.bg.datamax:/usr/obj/usr/src/sys/SINANICA-SMP i386 >Description: add-plist-info and add-plist-post targets in bsd.port.mk should be surrounded by .if !target(...) ... .endif like the others laying around - add-plist-docs and generate-plist This will avoid warnings from ports that redefine these targets like devel/mingw32-binutils and should'n break anything. >How-To-Repeat: >Fix: --- bsd.port.mk.patch begins here --- --- bsd.port.mk.orig Tue May 10 17:15:42 2005 +++ bsd.port.mk Wed May 11 09:05:11 2005 @@ -4819,6 +4819,7 @@ .endif .endif +.if !target(add-plist-info) add-plist-info: # Process GNU INFO files at package install/deinstall time .if defined(INFO) @@ -4837,14 +4838,17 @@ .endif .endif .endif +.endif # If we're installing into a non-standard PREFIX, we need to remove that directory at # deinstall-time +.if !target(add-plist-post) add-plist-post: .if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} .else @${DO_NADA} +.endif .endif .if !target(install-rc-script) --- bsd.port.mk.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: