From b460bd6543b45fb8b8b8d85d781e3ddbfe80bf61 Mon Sep 17 00:00:00 2001 From: Edwin Groothuis Date: Mon, 14 Nov 2005 10:56:29 +0000 Subject: Remove explicit checks for /usr/bin/bzip2. This has been part of the base OS since 4.4. --- archivers/dact/Makefile | 3 --- archivers/libcomprex/Makefile | 4 ---- archivers/rpm/Makefile | 3 --- devel/py-tables/Makefile | 4 ---- games/xqf/Makefile | 3 --- graphics/gtksee/Makefile | 4 ---- net/serveez/Makefile | 3 --- security/amavis-perl/Makefile | 3 --- sysutils/dolly/Makefile | 4 ---- sysutils/stowES/Makefile | 3 --- x11-wm/wmakerconf/Makefile | 3 --- 11 files changed, 37 deletions(-) diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile index a25a8a3c6567..034793b76cb5 100644 --- a/archivers/dact/Makefile +++ b/archivers/dact/Makefile @@ -17,9 +17,6 @@ COMMENT= Dynamic Adaptive Compression Tool LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \ lzo.1:${PORTSDIR}/archivers/lzo -.if !exists(/usr/bin/bzip2) -LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 -.endif USE_GETOPT_LONG= yes USE_GMAKE= yes diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile index ae7de1960b8d..cbf7c44040b6 100644 --- a/archivers/libcomprex/Makefile +++ b/archivers/libcomprex/Makefile @@ -18,10 +18,6 @@ COMMENT= Transparently handles automatic compression and decompression of files #LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl -.if !exists(/usr/bin/bzip2) -LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 -.endif - USE_LIBLTDL= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_LIBTOOL_VER= 15 diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile index b4ca34d6b339..588127042b2f 100644 --- a/archivers/rpm/Makefile +++ b/archivers/rpm/Makefile @@ -15,9 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The Red Hat Package Manager LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt -.if !exists(/usr/bin/bzip2) -LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 -.endif CONFLICTS= rpm-4.* diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile index 55afbd722d04..fc57693eb519 100644 --- a/devel/py-tables/Makefile +++ b/devel/py-tables/Makefile @@ -29,10 +29,6 @@ USE_PYDISTUTILS= yes PLIST_FILES= bin/nctoh5 bin/ptdump bin/ptrepack -.if !exists(/usr/bin/bzip2) -LIB_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 -.endif - post-patch: @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/setup.py diff --git a/games/xqf/Makefile b/games/xqf/Makefile index 871c94d09125..cd39ed977c02 100644 --- a/games/xqf/Makefile +++ b/games/xqf/Makefile @@ -50,9 +50,6 @@ CONFIGURE_ARGS+= --disable-geoip .if !defined(WITHOUT_BZIP2) CONFIGURE_ARGS+= --enable-bzip2 -.if !exists(/usr/bin/bzip2) -RUN_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 -.endif .endif post-install: diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile index abe5039d7345..8fe681c03205 100644 --- a/graphics/gtksee/Makefile +++ b/graphics/gtksee/Makefile @@ -16,10 +16,6 @@ COMMENT= Image viewer LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff -RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip -.if !exists(/usr/bin/bzip2) -RUN_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 -.endif USE_GNOME= gtk12 gnometarget USE_REINPLACE= yes diff --git a/net/serveez/Makefile b/net/serveez/Makefile index 2e3636b138a0..4da12a502ff7 100644 --- a/net/serveez/Makefile +++ b/net/serveez/Makefile @@ -17,9 +17,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A server framework LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile -.if !exists(/usr/bin/bzip2) -LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 -.endif GUILE_CONFIG?= ${LOCALBASE}/bin/guile-config diff --git a/security/amavis-perl/Makefile b/security/amavis-perl/Makefile index e042247595ed..008087add9b1 100644 --- a/security/amavis-perl/Makefile +++ b/security/amavis-perl/Makefile @@ -33,9 +33,6 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha \ .if !defined(WITHOUT_AMAVIS_VSCAN) BUILD_DEPENDS+= ${LOCALBASE}/bin/uvscan:${PORTSDIR}/security/vscan .endif -.if !exists(/usr/bin/bzip2) -BUILD_DEPENDS+= bunzip2:${PORTSDIR}/archivers/bzip2 -.endif RUN_DEPENDS= ${BUILD_DEPENDS} GNU_CONFIGURE= yes diff --git a/sysutils/dolly/Makefile b/sysutils/dolly/Makefile index 9eb717e2e74c..c02c7371a333 100644 --- a/sysutils/dolly/Makefile +++ b/sysutils/dolly/Makefile @@ -42,10 +42,6 @@ do-install: # Correctly depend upon bzip2 if necessary .ifdef(WITH_BZIP2) -. if !exists(/usr/bin/bzip2) -RUN_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 -. endif - EXTRA_PATCHES+= ${FILESDIR}/extra-bzip2-patch-dolly.c .endif diff --git a/sysutils/stowES/Makefile b/sysutils/stowES/Makefile index 20edcc73695f..b455affc6113 100644 --- a/sysutils/stowES/Makefile +++ b/sysutils/stowES/Makefile @@ -16,9 +16,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= stow Enhancement Script RUN_DEPENDS= stow:${PORTSDIR}/sysutils/stow -.if !exists(/usr/bin/bzip2) -RUN_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 -.endif USE_PERL5= yes USE_GMAKE= yes diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile index ab61f466deeb..59132a7efbcb 100644 --- a/x11-wm/wmakerconf/Makefile +++ b/x11-wm/wmakerconf/Makefile @@ -16,9 +16,6 @@ COMMENT= A configuration tool for Window Maker LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker RUN_DEPENDS= rpm:${PORTSDIR}/archivers/rpm -.if !exists(/usr/bin/bzip2) -RUN_DEPENDS+= bunzip2:${PORTSDIR}/archivers/bzip2 -.endif USE_X_PREFIX= yes USE_GNOME= gnomehier gnometarget gtk20 -- cgit v1.2.3