Date: Sat, 8 Mar 2008 14:52:10 +0800 From: "Denise H. G." <darcsis@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/121488: [patch] bsd.port.mk: introducing BR_DEPENDS Message-ID: <47d2379f.1dba720a.44f7.ffffe298@mx.google.com> Resent-Message-ID: <200803080700.m28702Je095627@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121488 >Category: ports >Synopsis: [patch] bsd.port.mk: introducing BR_DEPENDS >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: Sat Mar 08 07:00:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Denise H. G. >Release: FreeBSD 7.0-STABLE amd64 >Organization: >Environment: System: FreeBSD pluton.xbsd.name 7.0-STABLE FreeBSD 7.0-STABLE #0: Fri Mar 7 14:53:14 CST 2008 dhg@pluton.xbsd.name:/opt/obj/usr/src/sys/mibsd-SMP-ULE amd64 >Description: Introducing BR_DEPENDS into bsd.port.mk, with inspiration from http://wiki.freebsd.org/PortsToDo#head-abeb693aff3ce6bb77d5ddcf7a22ea34b1e81546 >How-To-Repeat: >Fix: --- bsd.port.mk.diff begins here --- --- bsd.port.mk.old 2008-03-08 14:46:07.000000000 +0800 +++ bsd.port.mk 2008-03-08 14:47:33.000000000 +0800 @@ -252,6 +252,10 @@ # into "dir" to do a "make all install" if it's not # found. If the third field ("target") exists, it will # be used instead of ${DEPENDS_TARGET}. +# BR_DEPENDS - A list of "path:dir[:target]" tuples of other ports this +# package depends to build and run. Use this variable if +# BUILD_DEPENDS and RUN_DEPENDS are identical or share +# common dependencies. # BUILD_DEPENDS - A list of "path:dir[:target]" tuples of other ports this # package depends to build (between the "extract" and # "build" stages, inclusive). The test done to @@ -1899,8 +1903,7 @@ . elif ${USE_BISON:L} == "run" RUN_DEPENDS+= ${_BISON_DEPENDS} . elif ${USE_BISON:L} == "both" -BUILD_DEPENDS+= ${_BISON_DEPENDS} -RUN_DEPENDS+= ${_BISON_DEPENDS} +BR_DEPENDS+= ${_BISON_DEPENDS} . else IGNORE= uses unknown USE_BISON construct . endif @@ -2005,8 +2008,7 @@ . if defined(USE_LINUX) RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-xorg-libs . else -BUILD_DEPENDS+= ${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT} -RUN_DEPENDS+= ${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT} +BR_DEPENDS+= ${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT} . endif .endif @@ -2044,11 +2046,9 @@ # Set up the cdrtools. .if defined(USE_CDRTOOLS) .if exists(${DOCSDIR}/cdrtools-cjk/README) || defined(WITH_CJK) || ${USE_CDRTOOLS:L} == "cjk" -BUILD_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk -RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk +BR_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk .else -BUILD_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools -RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools +BR_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools .endif .endif @@ -4731,6 +4731,11 @@ .if !target(depends) depends: extract-depends patch-depends lib-depends fetch-depends build-depends run-depends +.if defined(BR_DEPENDS) +BUILD_DEPENDS+= ${BR_DEPENDS} +RUN_DEPENDS+= ${BR_DEPENDS} +.endif + .if defined(ALWAYS_BUILD_DEPENDS) _DEPEND_ALWAYS= 1 .else --- bsd.port.mk.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?47d2379f.1dba720a.44f7.ffffe298>