diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2006-09-15 07:13:23 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2006-09-15 07:13:23 +0000 |
| commit | e47df16d7d6340a9aa32b07ce08c0a4c9eae2ff3 (patch) | |
| tree | fed81f4bae95f1ec178cb205c46e38c23f0ac951 /ports-mgmt | |
| parent | 3f6d652468df218fb7d3dee2135605e402d6f5a0 (diff) | |
| download | ports-e47df16d7d6340a9aa32b07ce08c0a4c9eae2ff3.tar.gz ports-e47df16d7d6340a9aa32b07ce08c0a4c9eae2ff3.zip | |
Update to ports/Mk/bsd.port.mk 1.541.
Notes
Notes:
svn path=/head/; revision=173097
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.port.mk | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/ports-mgmt/portmk/Mk/bsd.port.mk b/ports-mgmt/portmk/Mk/bsd.port.mk index 3d1bd20e0c40..a8d7ce98e67c 100644 --- a/ports-mgmt/portmk/Mk/bsd.port.mk +++ b/ports-mgmt/portmk/Mk/bsd.port.mk @@ -72,6 +72,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # PKGNAMEPREFIX - Prefix to specify that port is language-specific, etc. # Optional. # PKGNAMESUFFIX - Suffix to specify compilation options. Optional. +# PKGVERSION - Always defined as +# ${PORTVERSION}. +# Do not define this in your Makefile. # UNIQUENAME - A name for your port that is globally unique. By default, # this is set to ${LATEST_LINK} when LATEST_LINK is set, # and to ${PKGNAMEPREFIX}${PORTNAME} otherwise. @@ -426,6 +429,12 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # or http://www.FreeBSD.org/gnome/docs/porting.html # for more details. ## +# USE_LUA - If set, this port uses the Lua library and related +# components. See bsd.lua.mk for more details. +## +# USE_WX - If set, this port uses the WxWidgets library and related +# components. See bsd.wx.mk for more details. +## # USE_KDEBASE_VER # - Set to 3 to use the KDE windowing system. # Implies inclusion of bsd.kde.mk. @@ -1295,8 +1304,11 @@ _SUF2= ,${PORTEPOCH} # check for old, crufty, makefile types, part 2. The "else" case # should have been handled in part 1, above. +.if !defined(PKGVERSION) +PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} +.endif .if !defined(PKGNAME) -PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} +PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} .endif DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} @@ -1544,6 +1556,14 @@ PERL= ${LOCALBASE}/bin/perl .endif .endif +.if defined(WANT_LUA) || defined(USE_LUA) || defined(USE_LUA_NOT) +.if exists(${DEVELPORTSDIR}/Mk/bsd.lua.mk) +.include "${DEVELPORTSDIR}/Mk/bsd.lua.mk" +.else +.include "${PORTSDIR}/Mk/bsd.lua.mk" +.endif +.endif + .if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT) .if exists(${DEVELPORTSDIR}/Mk/bsd.wx.mk) .include "${DEVELPORTSDIR}/Mk/bsd.wx.mk" @@ -2105,6 +2125,14 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif .endif +.if defined(WANT_LUA) || defined(USE_LUA) || defined(USE_LUA_NOT) +.if exists(${DEVELPORTSDIR}/Mk/bsd.lua.mk) +.include "${DEVELPORTSDIR}/Mk/bsd.lua.mk" +.else +.include "${PORTSDIR}/Mk/bsd.lua.mk" +.endif +.endif + .if defined(USE_WX) || defined(USE_WX_NOT) .if exists(${DEVELPORTSDIR}/Mk/bsd.wx.mk) .include "${DEVELPORTSDIR}/Mk/bsd.wx.mk" @@ -2137,6 +2165,7 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif .endif + .if exists(${PORTSDIR}/../Makefile.inc) .include "${PORTSDIR}/../Makefile.inc" USE_SUBMAKE= yes @@ -5317,7 +5346,7 @@ missing: @for dir in $$(${ALL-DEPENDS-LIST}); do \ THISORIGIN=$$(${ECHO_CMD} $$dir | ${SED} 's,${PORTSDIR}/,,'); \ installed=$$(${PKG_INFO} -qO $${THISORIGIN}); \ - if [ -z $$installed ]; then \ + if [ -z "$$installed" ]; then \ ${ECHO_CMD} $$THISORIGIN; \ fi \ done |