Date: Sun, 10 Mar 2013 19:37:34 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/176825: [bsd.pbi.mk] Fix bsd.pbi.mk being included twice causing errors Message-ID: <201303110037.r2B0bcRT068534@freefall.freebsd.org> Resent-Message-ID: <201303110040.r2B0e0iQ068592@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176825
>Category: ports
>Synopsis: [bsd.pbi.mk] Fix bsd.pbi.mk being included twice causing errors
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 11 00:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Bryan Drewery
>Release: FreeBSD 8.3-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
If a port incorrectly includes bsd.port.pre.mk and bsd.port.mk, the bsd.pbi.mk file is included and processed twice.
"/home/bryan/freebsd/ports/Mk/bsd.pbi.mk", line 22: warning: duplicate script for target "check-pbimanager" ignored
"/home/bryan/freebsd/ports/Mk/bsd.pbi.mk", line 47: warning: duplicate script for target "pbi-generate" ignored
"/home/bryan/freebsd/ports/Mk/bsd.pbi.mk", line 48: warning: duplicate script for target "pbi-generate" ignored
"/home/bryan/freebsd/ports/Mk/bsd.pbi.mk", line 49: warning: duplicate script for target "pbi-generate" ignored
"/home/bryan/freebsd/ports/Mk/bsd.pbi.mk", line 52: warning: duplicate script for target "clean-pbi" ignored
"/home/bryan/freebsd/ports/Mk/bsd.pbi.mk", line 53: warning: duplicate script for target "clean-pbi" ignored
>How-To-Repeat:
Include both bsd.port.pre.mk and bsd.port.mk, or even bsd.port.mk twice, run make describe.
>Fix:
--- bsd.pbi.mk.include.twice.txt begins here ---
# svn status
M bsd.pbi.mk
Index: bsd.pbi.mk
===================================================================
--- bsd.pbi.mk (revision 313830)
+++ bsd.pbi.mk (working copy)
@@ -2,6 +2,9 @@
#
# Creates a PBI file from a port with just 'make pbi'
#
+.if !defined(_INCLUDE_PBI_MK)
+
+_INCLUDE_PBI_MK= yes
PBI_MAINTAINER= kmoore@FreeBSD.org
_PBIMAKEPORT= pbi_makeport
@@ -49,3 +52,5 @@
clean-pbi:
@${ECHO_MSG} "===> Cleaning PBI for ${PORTNAME}"
@${RM} -rf ${_PBIDIR}
+
+.endif
--- bsd.pbi.mk.include.twice.txt ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303110037.r2B0bcRT068534>