(This goes to all the maintainers of ports with an archivers/xz
dependency.)
The xz utils and lzma library have been imported into base for
9.0-CURRENT and 8.0-STABLE. The patch below makes the dependency
on the archivers/xz port conditional on OSVERSION.
I have not bumped PORTREVISION. (People might update the ports
right now, but base only later, so incrementing PORTREVISION doesn't
really help, I think.)
Please check and comment. I intend to commit this soon.
Index: archivers/deco/Makefile
===
RCS file: /home/pcvs/ports/archivers/deco/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- archivers/deco/Makefile 14 Apr 2010 06:17:26 - 1.15
+++ archivers/deco/Makefile 19 May 2010 17:27:43 -
@@ -20,7 +20,6 @@
arj:${PORTSDIR}/archivers/arj \
cabextract:${PORTSDIR}/archivers/cabextract \
dpkg:${PORTSDIR}/archivers/dpkg \
- lzma:${PORTSDIR}/archivers/xz \
lzop:${PORTSDIR}/archivers/lzop \
7z:${PORTSDIR}/archivers/p7zip \
rpm:${PORTSDIR}/archivers/rpm \
@@ -48,4 +47,10 @@
.endfor
@cd ${WRKDIR}/${PORTNAME}-archive-1.5.1/ && ${CP} -pPR * ${DATADIR}
-.include
+.include
+
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 90 && ${OSVERSION} < 900012)
+RUN_DEPENDS+= lzma:${PORTSDIR}/archivers/xz
+.endif
+
+.include
Index: archivers/gtar/Makefile
===
RCS file: /home/pcvs/ports/archivers/gtar/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- archivers/gtar/Makefile 29 Mar 2010 17:36:25 - 1.69
+++ archivers/gtar/Makefile 19 May 2010 17:27:43 -
@@ -16,7 +16,7 @@
COMMENT= GNU version of the traditional tape archiver
# only force dependencies for compressors that have a single-letter option
-RUN_DEPENDS= xz:${PORTSDIR}/archivers/xz
+#RUN_DEPENDS= # see below
INFO= tar
@@ -50,4 +50,10 @@
regression-test: build
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
-.include
+.include
+
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 90 && ${OSVERSION} < 900012)
+RUN_DEPENDS+= xz:${PORTSDIR}/archivers/xz
+.endif
+
+.include
Index: archivers/libarchive/Makefile
===
RCS file: /home/pcvs/ports/archivers/libarchive/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- archivers/libarchive/Makefile 22 Mar 2010 02:43:11 - 1.60
+++ archivers/libarchive/Makefile 19 May 2010 17:27:43 -
@@ -13,8 +13,6 @@
MAINTAINER=gle...@freebsd.org
COMMENT= Library to create and read several streaming archive formats
-LIB_DEPENDS= lzma.0:${PORTSDIR}/archivers/xz
-
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= libxml2
@@ -55,4 +53,10 @@
check:
(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check)
-.include
+.include
+
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 90 && ${OSVERSION} < 900012)
+LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/xz
+.endif
+
+.include
Index: archivers/py-liblzma/Makefile
===
RCS file: /home/pcvs/ports/archivers/py-liblzma/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- archivers/py-liblzma/Makefile 16 Oct 2009 14:00:34 - 1.4
+++ archivers/py-liblzma/Makefile 19 May 2010 17:27:43 -
@@ -16,11 +16,16 @@
COMMENT= Python binding for the LZMA compression library
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
-LIB_DEPENDS= lzma.0:${PORTSDIR}/archivers/xz
USE_BZIP2= yes
USE_PYTHON=2.6+
USE_PYDISTUTILS=yes
PYDISTUTILS_PKGNAME= py${PORTNAME}
-.include
+.include
+
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 90 && ${OSVERSION} < 900012)
+LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/xz
+.endif
+
+.include
Index: archivers/rpm5/Makefile
===
RCS file: /home/pcvs/ports/archivers/rpm5/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- archivers/rpm5/Makefile 28 Mar 2010 06:30:32 - 1.30
+++ archivers/rpm5/Makefile 19 May 2010 17:27:43 -
@@ -22,7 +22,6 @@
neon.28:${PORTSDIR}/www/neon28 \
magic:${PORTSDIR}/sysutils/file \
xar:${PORTSDIR}/archivers/xar \
- lzma:${PORTSDIR}/archivers/xz \
pcre.0:${PORTSDIR}/devel/pcre
BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
.if !defined(NOPORTDOCS)
@@ -118,6 +117,10 @@
.include
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 90 && ${OSVERSION} < 900012)
+LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz
+.endif
+
.if ${ARCH} == "amd64"
CFLAGS+= -fPIC
.endif
Index: archivers/xz/Makefile
===
R
