Date: Fri, 31 Dec 2010 21:20:00 +1030 (CST) From: Jarrod Sayers <jarrod@downtools.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/153578: [patch] textproc/docproj-nojadetex: JadeTeX included when PACKAGE_BUILDING defined Message-ID: <201012311050.oBVAo0Z9009298@burbank.downtools.com.au> Resent-Message-ID: <201012311120.oBVBKAKr022358@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 153578 >Category: ports >Synopsis: [patch] textproc/docproj-nojadetex: JadeTeX included when PACKAGE_BUILDING defined >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Dec 31 11:20:09 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Jarrod Sayers >Release: FreeBSD 8.1-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD burbank.downtools.com.au 8.1-RELEASE-p2 FreeBSD 8.1-RELEASE-p2 #7: Sat Dec 18 19:18:08 CST 2010 root@burbank.downtools.com.au:/usr/obj/usr/src/sys/BURBANK i386 >Description: When PACKAGE_BUILDING is defined on this slave port, as is seen within a Tinderbox build, the master port defines WITH_JADETEX which includes JadeTeX yet the -nojadetex package name suffix is retained which is quite misleading. >How-To-Repeat: Confirm JadeTeX is included when PACKAGE_BUILDING is defined: bender# cd /usr/ports/textproc/docproj-nojadetex bender# make all-depends-list | grep jadetex bender# make all-depends-list PACKAGE_BUILDING=YES | grep jadetex /usr/ports/print/jadetex bender# >Fix: The below patch prevents packaging of the slave port when PACKAGE_BUILDING is defined, without breaking textproc/docproj-jadetex. Replacing the IGNORE line with WITH_JADETEX defined as NO will permit the building of the -nojadetex package correctly, which may actually be the desired behavior. bender# cd /usr/ports/textproc/docproj-nojadetex bender# make all-depends-list | grep jadetex bender# make all-depends-list PACKAGE_BUILDING=YES | grep jadetex bender# make package ===> Patching for docproj-nojadetex-1.17_4 ===> Configuring for docproj-nojadetex-1.17_4 ===> Installing for docproj-nojadetex-1.17_4 ^C bender# make package PACKAGE_BUILDING=YES ===> docproj-nojadetex-1.17_4 package requires inclusion of JadeTeX. *** Error code 1 Stop in /usr/ports/textproc/docproj-nojadetex. bender# A downloadable diff can be found at: http://www.downtools.com.au/~jarrod/FreeBSD/textproc-docproj-package_building.diff --- textproc-docproj-package_building.diff begins here --- --- ports/textproc/docproj/Makefile.orig 2010-12-28 08:49:39.000000000 +1030 +++ ports/textproc/docproj/Makefile 2010-12-31 20:06:57.000000000 +1030 @@ -55,8 +55,12 @@ WITH_JADETEX?= .if defined(PACKAGE_BUILDING) +.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-nojadetex" +IGNORE= package requires inclusion of JadeTeX +.else WITH_JADETEX= yes .endif +.endif .if empty(WITH_JADETEX) IGNORE= user must set WITH_JADETEX variable to 'yes' or 'no' --- textproc-docproj-package_building.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012311050.oBVAo0Z9009298>