Date: Tue, 07 Aug 2001 17:47:26 +0900
From: "Akinori MUSHA" <knu@iDaemons.org>
To: portmgr@FreeBSD.org, ports@FreeBSD.org, nakai@FreeBSD.org, dr@domix.de, demon@FreeBSD.org, gnome@FreeBSD.org, mi@aldan.algebra.com, sobomax@FreeBSD.org, ijliao@FreeBSD.org, andreas@FreeBSD.org, roman@xpert.com, greg@hewgill.com, jedgar@FreeBSD.org, jmz@FreeBSD.org, samy@goldmoon.org, dirk@FreeBSD.org, kanou@mil.allnet.ne.jp
Subject: Introducing USE_BZIP2{CMD,LIB,RUN} and BZIP2BASE
Message-ID: <86bslsjly9.wl@archon.local.idaemons.org>
next in thread | raw e-mail | index | archive | help
Hello, maintainers and portmgr's,
Now that bzip2 is part of our base on 4-STABLE and 5-CURRENT, I'd like
to commit the attached changes to introduce the following variables
and get rid of unneeded dependencies on archivers/bzip2 from the ports
that depend on bzip2:
USE_BZIP2CMD - Says that the port uses the bzip2 command for building.
USE_BZIP2LIB - Says that the port uses the bzip2 shared library for
building and running.
USE_BZIP2RUN - Says that the port uses the bzip2 command for running.
BZIP2BASE - Prefix where bzip2 is installed.
And USE_BZIP2 is changed to imply USE_BZIP2CMD.
Any objections?
--
/
/__ __ Akinori.org / MUSHA.org
/ ) ) ) ) / FreeBSD.org / Ruby-lang.org
Akinori MUSHA aka / (_ / ( (__( @ iDaemons.org / and.or.jp
"Freeze this moment a little bit longer, make each impression
a little bit stronger.. Experience slips away -- Time stand still"
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.376
diff -u -u -r1.376 bsd.port.mk
--- bsd.port.mk 2001/08/03 11:35:35 1.376
+++ bsd.port.mk 2001/08/07 08:45:04
@@ -130,7 +130,12 @@
# defined.
#
# USE_BZIP2 - Says that the port tarballs use bzip2, not gzip, for
-# compression.
+# compression. Implies USE_BZIP2CMD.
+# USE_BZIP2CMD - Says that the port uses the bzip2 command for building.
+# USE_BZIP2LIB - Says that the port uses the bzip2 shared library for
+# building and running.
+# USE_BZIP2RUN - Says that the port uses the bzip2 command for running.
+# BZIP2BASE - Prefix where bzip2 is installed.
# USE_ZIP - Says that the port distfile uses zip, not tar w/[bg]zip
# for compression.
# USE_NEWGCC - Says that the port requirest the latest gcc, either in
@@ -773,9 +778,24 @@
MANCOMPRESSED?= no
.endif
-.if defined(USE_BZIP2) && !exists(/usr/bin/bzip2)
+.if defined(USE_BZIP2)
+USE_BZIP2CMD= yes
+.endif
+.if exists(/usr/bin/bzip2)
+BZIP2BASE= /usr
+.else
+BZIP2BASE= ${LOCALBASE}
+.if defined(USE_BZIP2CMD)
BUILD_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
.endif
+.if defined(USE_BZIP2LIB)
+LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
+.endif
+.if defined(USE_BZIP2RUN)
+RUN_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
+.endif
+.endif
+
.if defined(USE_ZIP)
BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
.endif
Index: archivers/rpm/Makefile
===================================================================
RCS file: /home/ncvs/ports/archivers/rpm/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- archivers/rpm/Makefile 2001/03/20 21:29:25 1.35
+++ archivers/rpm/Makefile 2001/08/07 08:30:41
@@ -14,10 +14,10 @@
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= bz2.1:${PORTSDIR}/archivers/bzip2 \
- intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
popt.0:${PORTSDIR}/devel/popt
+USE_BZIP2LIB= yes
USE_GMAKE= yes
USE_AUTOMAKE= yes
USE_LIBTOOL= yes
Index: x11-wm/wmakerconf/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/wmakerconf/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- x11-wm/wmakerconf/Makefile 2001/05/15 18:15:41 1.28
+++ x11-wm/wmakerconf/Makefile 2001/08/07 08:30:26
@@ -12,8 +12,7 @@
MAINTAINER= dr@domix.de
-RUN_DEPENDS= rpm:${PORTSDIR}/archivers/rpm \
- bunzip2:${PORTSDIR}/archivers/bzip2
+RUN_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
@@ -21,6 +20,7 @@
wraster.4:${PORTSDIR}/x11-wm/windowmaker
USE_BZIP2= yes
+USE_BZIP2RUN= yes
USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
Index: x11-fm/xnc/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-fm/xnc/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- x11-fm/xnc/Makefile 2001/07/29 04:35:01 1.17
+++ x11-fm/xnc/Makefile 2001/08/07 08:30:09
@@ -19,8 +19,8 @@
# rpm:${PORTSDIR}/archivers/rpm \
# rar:${PORTSDIR}/archivers/rar \
# unarj:${PORTSDIR}/archivers/unarj \
-# lha:${PORTSDIR}/archivers/lha \
-# bzip2:${PORTSDIR}/archivers/bzip2
+# lha:${PORTSDIR}/archivers/lha
+#USE_BZIP2RUN= yes
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.4:${PORTSDIR}/graphics/png
Index: devel/gnomevfs/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gnomevfs/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- devel/gnomevfs/Makefile 2001/06/01 20:08:35 1.20
+++ devel/gnomevfs/Makefile 2001/08/07 08:29:50
@@ -14,9 +14,9 @@
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
+USE_BZIP2LIB= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOMELIBS= yes
Index: devel/tcl-memchan/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/tcl-memchan/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- devel/tcl-memchan/Makefile 2001/01/03 09:27:13 1.3
+++ devel/tcl-memchan/Makefile 2001/08/07 08:31:26
@@ -16,22 +16,18 @@
BUILD_DEPENDS= tclsh${TCLV}:${PORTSDIR}/lang/tcl${TCLVND}
+USE_BZIP2= yes
+USE_BZIP2LIB= 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} \
--with-tcl-lib-dir=${PREFIX}/lib/tcl${TCLV}
#ALL_TARGET= library
-
-USE_BZIP2= yes
TCLV?= 8.3
TCLVND= ${TCLV:S/.//}
Index: games/asc/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/asc/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- games/asc/Makefile 2001/07/09 11:26:01 1.7
+++ games/asc/Makefile 2001/08/07 08:28:39
@@ -16,13 +16,13 @@
LIB_DEPENDS= SDL-1.1.3:${PORTSDIR}/devel/sdl12 \
SDL_image.10:${PORTSDIR}/graphics/sdl_image \
- bz2.1:${PORTSDIR}/archivers/bzip2 \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-beta
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
+USE_BZIP2LIB= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \
Index: net/librsync/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/librsync/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- net/librsync/Makefile 2001/03/19 17:25:46 1.2
+++ net/librsync/Makefile 2001/08/07 08:28:16
@@ -14,9 +14,9 @@
MAINTAINER= ijliao@FreeBSD.org
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
- bz2.1:${PORTSDIR}/archivers/bzip2
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
+USE_BZIP2LIB= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
Index: print/apsfilter/Makefile
===================================================================
RCS file: /home/ncvs/ports/print/apsfilter/Makefile,v
retrieving revision 1.85
diff -u -r1.85 Makefile
--- print/apsfilter/Makefile 2001/06/05 11:38:33 1.85
+++ print/apsfilter/Makefile 2001/08/07 08:27:56
@@ -44,7 +44,7 @@
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript6
.endif
# all needed decompression utilities
-RUN_DEPENDS+= bunzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2RUN= yes
RUN_DEPENDS+= melt:${PORTSDIR}/archivers/freeze
# all needed "xxx to ps" filter utilities
RUN_DEPENDS+= a2ps:${PORTSDIR}/print/a2ps-letter
Index: security/amavis-perl/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/amavis-perl/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- security/amavis-perl/Makefile 2001/01/16 19:08:34 1.3
+++ security/amavis-perl/Makefile 2001/08/07 08:27:18
@@ -13,7 +13,6 @@
MAINTAINER= roman@xpert.com
BUILD_DEPENDS= ${LOCALBASE}/bin/uvscan:${PORTSDIR}/security/vscan \
- ${LOCALBASE}/bin/bunzip2:${PORTSDIR}/archivers/bzip2 \
${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha \
${LOCALBASE}/bin/unarj:${PORTSDIR}/archivers/unarj \
${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
@@ -30,6 +29,9 @@
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog
RUN_DEPENDS= ${BUILD_DEPENDS}
+
+USE_BZIP2CMD= yes
+USE_BZIP2RUN= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-qmail --disable-postfix --disable-exim --with-virusdir=/var/spool/quarantine --enable-relay
Index: security/zebedee/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/zebedee/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- security/zebedee/Makefile 2001/07/04 21:31:26 1.9
+++ security/zebedee/Makefile 2001/08/07 08:08:15
@@ -13,8 +13,7 @@
MAINTAINER= greg@hewgill.com
-LIB_DEPENDS= bz2.1:${PORTSDIR}/archivers/bzip2
-
+USE_BZIP2LIB= yes
USE_OPENSSL= YES
USE_PERL5= yes
Index: sysutils/stowES/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/stowES/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sysutils/stowES/Makefile 2001/07/20 07:03:27 1.2
+++ sysutils/stowES/Makefile 2001/08/07 08:08:06
@@ -15,15 +15,11 @@
RUN_DEPENDS= stow:${PORTSDIR}/sysutils/stow
-.include <bsd.port.pre.mk>
+USE_BZIP2RUN= yes
-.if ${OSVERSION} < 500021
-RUN_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
-.endif
-
GNU_CONFIGURE= yes
USE_GMAKE= yes
MAN1= stowES.1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: textproc/code2html/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/code2html/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- textproc/code2html/Makefile 2001/05/17 12:24:36 1.14
+++ textproc/code2html/Makefile 2001/08/07 08:26:31
@@ -14,7 +14,7 @@
MAINTAINER= jedgar@FreeBSD.org
-RUN_DEPENDS= bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2RUN= yes
NO_BUILD= yes
@@ -22,7 +22,7 @@
do-configure:
@${MV} ${WRKSRC}/code2html ${WRKSRC}/code2html.orig
- @${SED} -e 's|/usr/bin/bzip2|${PREFIX}/bin/bzip2|' \
+ @${SED} -e 's|/usr/bin/bzip2|${BZIP2BASE}/bin/bzip2|' \
-e 's|/bin/gzip|/usr/bin/gzip|' \
-e 's|/etc/code|${PREFIX}/etc/code|' \
< ${WRKSRC}/code2html.orig > ${WRKSRC}/code2html
Index: textproc/ispell/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/ispell/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- textproc/ispell/Makefile 2001/08/01 12:00:36 1.61
+++ textproc/ispell/Makefile 2001/08/07 08:25:36
@@ -68,7 +68,7 @@
EXTRACT_ONLY+= ${BRDISTFILE}
.endif
.if defined(ISPELL_DENEU)
-BUILD_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2CMD= yes
DENEUDISTFILE= igerman98-20001109.tar.bz2
MASTER_SITES+= http://www.suse.de/~bjacke/igerman98/dict/ \
ftp://student.physik.uni-dortmund.de/pub/users/jacke/ispell/
Index: graphics/ImageMagick/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.111
diff -u -r1.111 Makefile
--- graphics/ImageMagick/Makefile 2001/07/12 10:10:28 1.111
+++ graphics/ImageMagick/Makefile 2001/08/07 08:07:27
@@ -30,8 +30,7 @@
MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
-LIB_DEPENDS= bz2.1:${PORTSDIR}/archivers/bzip2 \
- fpx.1:${PORTSDIR}/graphics/libfpx \
+LIB_DEPENDS= fpx.1:${PORTSDIR}/graphics/libfpx \
jbig.1:${PORTSDIR}/graphics/jbigkit \
jpeg.9:${PORTSDIR}/graphics/jpeg \
lcms.1:${PORTSDIR}/graphics/lcms \
@@ -40,6 +39,7 @@
freetype.7:${PORTSDIR}/print/freetype2 \
xml2.5:${PORTSDIR}/textproc/libxml2
+USE_BZIP2LIB= yes
USE_PERL5= yes
USE_LIBTOOL= yes
USE_AUTOCONF= yes
Index: graphics/enfle/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/enfle/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- graphics/enfle/Makefile 2001/03/10 10:16:58 1.23
+++ graphics/enfle/Makefile 2001/08/07 08:07:17
@@ -18,10 +18,10 @@
jpeg.9:${PORTSDIR}/graphics/jpeg \
mng.1:${PORTSDIR}/graphics/libmng \
ungif.5:${PORTSDIR}/graphics/libungif \
- arc.1:${PORTSDIR}/archivers/libarc \
- bz2.1:${PORTSDIR}/archivers/bzip2
+ arc.1:${PORTSDIR}/archivers/libarc
USE_BZIP2= yes
+USE_BZIP2LIB= yes
USE_X_PREFIX= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --enable-all-plugins \
Index: graphics/gtksee/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/gtksee/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- graphics/gtksee/Makefile 2000/10/12 22:10:14 1.23
+++ graphics/gtksee/Makefile 2001/08/07 08:24:46
@@ -17,9 +17,9 @@
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip \
- bzip2:${PORTSDIR}/archivers/bzip2
+RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip
+USE_BZIP2RUN= yes
USE_GTK= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
Index: graphics/autotrace/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/autotrace/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- graphics/autotrace/Makefile 2001/07/12 10:10:29 1.2
+++ graphics/autotrace/Makefile 2001/08/07 08:06:54
@@ -20,11 +20,11 @@
freetype.7:${PORTSDIR}/print/freetype2 \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.4:${PORTSDIR}/graphics/png \
- bz2.1:${PORTSDIR}/archivers/bzip2 \
ming.2:${PORTSDIR}/graphics/ming \
wmf.1:${PORTSDIR}/graphics/libwmf \
Magick.5:${PORTSDIR}/graphics/ImageMagick
+USE_BZIP2LIB= yes
USE_AUTOCONF= yes
GNU_CONFIGURE= yes
USE_AUTOMAKE= yes
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86bslsjly9.wl>