aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2003-03-09 09:09:51 +0800
committermarcus <marcus@FreeBSD.org>2003-03-09 09:09:51 +0800
commit9309c4f76e5b92ca156479dc33b52e06ac45e984 (patch)
treec413b91fb01c92e41b6325fe11fedeca122920de
parentbaed7d1f94a22d62dbc5d13832364151d228f0ba (diff)
downloadfreebsd-ports-gnome-9309c4f76e5b92ca156479dc33b52e06ac45e984.tar.gz
freebsd-ports-gnome-9309c4f76e5b92ca156479dc33b52e06ac45e984.tar.zst
freebsd-ports-gnome-9309c4f76e5b92ca156479dc33b52e06ac45e984.zip
Replace the bzip dependency with bzip2. This will allow GNOME 2 to show up
on release CDs. Approved by: portmgr (kris)
-rw-r--r--archivers/file-roller/Makefile10
-rw-r--r--archivers/fileroller/Makefile10
2 files changed, 12 insertions, 8 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index b4c4a887b5ec..7286fe22b180 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fileroller
PORTVERSION= 2.2.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -15,13 +16,14 @@ DISTNAME= file-roller-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= An archive manager for zip files, tar, etc.
+COMMENT= An archive manager for zip files, tar, etc
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
-RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip \
- lha:${PORTSDIR}/archivers/lha \
+RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha \
lzop:${PORTSDIR}/archivers/lzop
-
+.if !exists(/usr/bin/bzip2)
+RUN_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
+.endif
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index b4c4a887b5ec..7286fe22b180 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fileroller
PORTVERSION= 2.2.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -15,13 +16,14 @@ DISTNAME= file-roller-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= An archive manager for zip files, tar, etc.
+COMMENT= An archive manager for zip files, tar, etc
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
-RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip \
- lha:${PORTSDIR}/archivers/lha \
+RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha \
lzop:${PORTSDIR}/archivers/lzop
-
+.if !exists(/usr/bin/bzip2)
+RUN_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
+.endif
USE_X_PREFIX= yes
USE_GMAKE= yes