diff options
| author | linimon <linimon@FreeBSD.org> | 2006-09-15 06:57:07 +0000 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2006-09-15 06:57:07 +0000 |
| commit | 4d6c64033b7a35790d8d87c9b0717d01531b441e (patch) | |
| tree | 5b036d092abf3da84f6ca6dd7f6c00ed6063cbef /Mk/bsd.port.mk | |
| parent | 7a02d5f1a3ba25d29cd92b3d868d14c08fdabd15 (diff) | |
| download | FreeBSD-ports-4d6c64033b7a35790d8d87c9b0717d01531b441e.zip FreeBSD-ports-4d6c64033b7a35790d8d87c9b0717d01531b441e.tar.gz | |
* Add PKGVERSION to bsd.port.mk [1]
* Add bsd.lua.mk to support for lua-based ports [2]
* Remove DESTDIR from bsd.scons.mk [3]
* Add some quotes in 'missing' target to improve handling of duplicate
origins [4]
PR: 98565 [1], 101612 [2], 101952 [3], 102100 [4]
Submitted by: ahze [1], alepulver [2], alexbl [3], shaun [4]
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index f0cf7ab..126bf44 100644 --- a/Mk/bsd.port.mk +++ b/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} @@ -1495,6 +1507,10 @@ PERL= ${LOCALBASE}/bin/perl .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif +.if defined(WANT_LUA) || defined(USE_LUA) || defined(USE_LUA_NOT) +.include "${PORTSDIR}/Mk/bsd.lua.mk" +.endif + .if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT) .include "${PORTSDIR}/Mk/bsd.wx.mk" .endif @@ -1997,6 +2013,10 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .include "${PORTSDIR}/Mk/bsd.tcl.mk" .endif +.if defined(USE_LUA) || defined(USE_LUA_NOT) +.include "${PORTSDIR}/Mk/bsd.lua.mk" +.endif + .if defined(USE_WX) || defined(USE_WX_NOT) .include "${PORTSDIR}/Mk/bsd.wx.mk" .endif @@ -5190,7 +5210,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 |
