diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2001-08-15 20:33:16 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2001-08-15 20:33:16 +0000 |
| commit | 329c977502884c573478573703d4fdc1cf47cc3c (patch) | |
| tree | da7218515b0cf9493f15d3656391a819ed46faac /devel | |
| parent | Update to 4154. (diff) | |
Conditionalize bzip2 dependencies.
Notes
Notes:
svn path=/head/; revision=46297
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gnome-vfs/Makefile | 6 | ||||
| -rw-r--r-- | devel/gnome-vfs1/Makefile | 6 | ||||
| -rw-r--r-- | devel/gnomevfs/Makefile | 6 | ||||
| -rw-r--r-- | devel/gnomevfs2/Makefile | 6 | ||||
| -rw-r--r-- | devel/tcl-memchan/Makefile | 10 |
5 files changed, 20 insertions, 14 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index b685b77e470a..40048717a24f 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -14,8 +14,10 @@ DISTNAME= gnome-vfs-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf \ - bz2.1:${PORTSDIR}/archivers/bzip2 +LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf +.if !exists(/usr/bin/bzip2) +LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 +.endif USE_GMAKE= yes USE_X_PREFIX= yes diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile index b685b77e470a..40048717a24f 100644 --- a/devel/gnome-vfs1/Makefile +++ b/devel/gnome-vfs1/Makefile @@ -14,8 +14,10 @@ DISTNAME= gnome-vfs-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf \ - bz2.1:${PORTSDIR}/archivers/bzip2 +LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf +.if !exists(/usr/bin/bzip2) +LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 +.endif USE_GMAKE= yes USE_X_PREFIX= yes diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile index b685b77e470a..40048717a24f 100644 --- a/devel/gnomevfs/Makefile +++ b/devel/gnomevfs/Makefile @@ -14,8 +14,10 @@ DISTNAME= gnome-vfs-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf \ - bz2.1:${PORTSDIR}/archivers/bzip2 +LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf +.if !exists(/usr/bin/bzip2) +LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 +.endif USE_GMAKE= yes USE_X_PREFIX= yes diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index b685b77e470a..40048717a24f 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -14,8 +14,10 @@ DISTNAME= gnome-vfs-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf \ - bz2.1:${PORTSDIR}/archivers/bzip2 +LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf +.if !exists(/usr/bin/bzip2) +LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 +.endif USE_GMAKE= yes USE_X_PREFIX= yes diff --git a/devel/tcl-memchan/Makefile b/devel/tcl-memchan/Makefile index c2f0207f689e..4fc59895ebfa 100644 --- a/devel/tcl-memchan/Makefile +++ b/devel/tcl-memchan/Makefile @@ -15,15 +15,15 @@ DISTNAME= memchan${PORTVERSION} MAINTAINER= mi@aldan.algebra.com BUILD_DEPENDS= tclsh${TCLV}:${PORTSDIR}/lang/tcl${TCLVND} +.if !exists(/usr/bin/bzip2) +LIB_DEPENDS= bz2.1:${PORTSDIR}/archivers/bzip2 +.endif +USE_BZIP2= yes USE_OPENSSL= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix -# Bzip2 library is also needed, but it requested implicitly below. -# Also, the current Bzip2 port only builds the static version :( -# bz2:${PORTSDIR}/archivers/bzip2 - GNU_CONFIGURE= yes PLIST_SUB+= TCLV=${TCLV} TCLVND=${TCLVND} CONFIGURE_ARGS= --with-tcl-include-dir=${PREFIX}/include/tcl${TCLV} \ @@ -31,8 +31,6 @@ CONFIGURE_ARGS= --with-tcl-include-dir=${PREFIX}/include/tcl${TCLV} \ #ALL_TARGET= library -USE_BZIP2= yes - TCLV?= 8.3 TCLVND= ${TCLV:S/.//} DDIR= ${PREFIX}/lib/tcl${TCLV}/Trf |