aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteve <steve@FreeBSD.org>2001-12-25 07:20:43 +0800
committersteve <steve@FreeBSD.org>2001-12-25 07:20:43 +0800
commit826846787008085dcf5bc580a639421366817bcc (patch)
tree27fe6c9e7cd2f9b42860a30b99d55a5862a2bc1f
parentf1cda888ed84df0c352c17eebbc7146881a26b4f (diff)
downloadfreebsd-ports-gnome-826846787008085dcf5bc580a639421366817bcc.tar.gz
freebsd-ports-gnome-826846787008085dcf5bc580a639421366817bcc.tar.zst
freebsd-ports-gnome-826846787008085dcf5bc580a639421366817bcc.zip
Allow this to build on bento again where /usr/bin/bzip2 exists on bento
but not on gohan*.
-rw-r--r--security/zebedee/Makefile2
-rw-r--r--security/zebedee/files/patch-aa6
2 files changed, 4 insertions, 4 deletions
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 1af415c9c3b3..a01cf6496407 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.winton.org.uk/zebedee/ \
MAINTAINER= greg@hewgill.com
-.if !exists(/usr/bin/bzip2)
+.if defined(${BATCH}) || !exists(/usr/bin/bzip2)
LIB_DEPENDS= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
diff --git a/security/zebedee/files/patch-aa b/security/zebedee/files/patch-aa
index c6c009b753f5..153ee3d6d433 100644
--- a/security/zebedee/files/patch-aa
+++ b/security/zebedee/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig Wed Jul 4 17:16:33 2001
-+++ Makefile Wed Jul 4 17:16:54 2001
+--- Makefile.orig Fri Apr 13 12:41:22 2001
++++ Makefile Mon Dec 24 17:17:48 2001
@@ -3,7 +3,7 @@
#
# $Id: Makefile,v 1.2 2001/04/13 17:41:21 ndwinton Exp $
@@ -52,7 +52,7 @@
-BZINC = -I../bzip2-1.0.1
-BZLIB = ../bzip2-1.0.1/libbz2.a
+BZINC = -I${LOCALBASE}/include
-+BZLIB = ${LOCALBASE}/lib/libbz2.a
++BZLIB = -L${LOCALBASE}/lib -lbz2
#
# Tools needed for Perl "POD"-format documentation conversion.