diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2010-05-21 16:22:40 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2010-05-21 16:22:40 +0000 |
| commit | 832fb3aa956c05d3a28db280c9b40364e33a2de8 (patch) | |
| tree | d738db061ce0cdc4644f32ae1e15dcf9266e9ab0 /sysutils | |
| parent | - Update to 1.5 (diff) | |
The xz utils and lzma library have been imported into base, so make
the dependency on the archivers/xz port conditional on OSVERSION.
Approved by: MAINTAINER
Notes
Notes:
svn path=/head/; revision=254737
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/kdf/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/kfloppy/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/sweeper/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/warden/Makefile | 11 |
4 files changed, 11 insertions, 6 deletions
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index d5fafbfcb9cb..0c69fb6321cd 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -37,7 +37,7 @@ OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.options.mk> -.if ${OSVERSION} < 900012 +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/xz .endif diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile index d5fafbfcb9cb..0c69fb6321cd 100644 --- a/sysutils/kfloppy/Makefile +++ b/sysutils/kfloppy/Makefile @@ -37,7 +37,7 @@ OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.options.mk> -.if ${OSVERSION} < 900012 +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/xz .endif diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile index d5fafbfcb9cb..0c69fb6321cd 100644 --- a/sysutils/sweeper/Makefile +++ b/sysutils/sweeper/Makefile @@ -37,7 +37,7 @@ OPTIONS= PRINTER_APPLET "Install printer system tray utility" off .include <bsd.port.options.mk> -.if ${OSVERSION} < 900012 +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/xz .endif diff --git a/sysutils/warden/Makefile b/sysutils/warden/Makefile index 9415fb604e65..29cec80af777 100644 --- a/sysutils/warden/Makefile +++ b/sysutils/warden/Makefile @@ -14,8 +14,7 @@ MASTER_SITES= ftp://ftp.pcbsd.org/pub/software/ \ MAINTAINER= kmoore@freebsd.org COMMENT= PC-BSD's Jail Management Utility -RUN_DEPENDS= pbreg:${PORTSDIR}/sysutils/pbreg \ - xz:${PORTSDIR}/archivers/xz +RUN_DEPENDS= pbreg:${PORTSDIR}/sysutils/pbreg WRKSRC= ${WRKDIR}/warden @@ -42,4 +41,10 @@ do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${QMAKE} -unix CONFIG+="configure" ${QMAKE_PRO} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) +RUN_DEPENDS+= xz:${PORTSDIR}/archivers/xz +.endif + +.include <bsd.port.post.mk> |