diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2007-10-17 10:13:01 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2007-10-17 10:13:01 +0000 |
| commit | dbd39ca660cafa3d1f2acebf05c86bf17a035ff8 (patch) | |
| tree | 5d14b5c3a50461b8a6096fcc383dc2181cb624b7 /ports-mgmt | |
| parent | 74313458803db4f95050b550b038051b82c96b67 (diff) | |
| download | ports-dbd39ca660cafa3d1f2acebf05c86bf17a035ff8.tar.gz ports-dbd39ca660cafa3d1f2acebf05c86bf17a035ff8.zip | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/instant-tinderbox/Makefile | 4 | ||||
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.port.mk | 26 |
2 files changed, 26 insertions, 4 deletions
diff --git a/ports-mgmt/instant-tinderbox/Makefile b/ports-mgmt/instant-tinderbox/Makefile index b0e4e967ce2c..d1c74ba3dfbd 100644 --- a/ports-mgmt/instant-tinderbox/Makefile +++ b/ports-mgmt/instant-tinderbox/Makefile @@ -7,7 +7,7 @@ PORTNAME= instant-tinderbox PORTVERSION= 1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= ports-mgmt DISTFILES= @@ -48,7 +48,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GHOSTSCRIPT=yes -USE_BISON= yes +USE_BISON= build USE_FREETYPE= yes USE_GL= yes USE_XPM= yes diff --git a/ports-mgmt/portmk/Mk/bsd.port.mk b/ports-mgmt/portmk/Mk/bsd.port.mk index c3b9574cdd11..5fa34b6df8d5 100644 --- a/ports-mgmt/portmk/Mk/bsd.port.mk +++ b/ports-mgmt/portmk/Mk/bsd.port.mk @@ -361,7 +361,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # - If set, this port uses the GNU version of the ghostscript # software instead of the GPL version, which is used otherwise. ## -# USE_BISON - If set, this port uses bison for building. +# USE_BISON - Implies that the port uses bison in one way or another: +# 'yes' (backwards compatibility) - use bison for building +# new features: 'build', 'run', 'both', implying build, +# runtime, and both build/run dependencies ## # USE_IMAKE - If set, this port uses imake. Implies USE_X_PREFIX. # XMKMF - Set to path of `xmkmf' if not in $PATH @@ -2039,7 +2042,26 @@ RUN_DEPENDS+= ${_GL_${_component}_RUN_DEPENDS} .endif .if defined(USE_BISON) -BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison +_BISON_DEPENDS= bison:${PORTSDIR}/devel/bison + +# XXX: backwards compatibility +. if ${USE_BISON:L} == "yes" +BUILD_DEPENDS+= ${_BISON_DEPENDS} +pre-everything:: + @${ECHO_MSG} "WARNING: USE_BISON=yes deprecated, use build/run/both" +. endif + +. if ${USE_BISON:L} == "build" +BUILD_DEPENDS+= ${_BISON_DEPENDS} +. elif ${USE_BISON:L} == "run" +RUN_DEPENDS+= ${_BISON_DEPENDS} +. elif ${USE_BISON:L} == "both" +BUILD_DEPENDS+= ${_BISON_DEPENDS} +RUN_DEPENDS+= ${_BISON_DEPENDS} +. else +IGNORE= uses unknown USE_BISON construct +. endif + .endif .if !defined(_PERL_REFACTORING_COMPLETE) |