[kde-freebsd] Catch up with xz import

Christian Weisgerber naddy at FreeBSD.org
Wed May 19 19:42:44 CEST 2010


(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 -0000	1.15
+++ archivers/deco/Makefile	19 May 2010 17:27:43 -0000
@@ -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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
+RUN_DEPENDS+=	lzma:${PORTSDIR}/archivers/xz
+.endif
+
+.include <bsd.port.post.mk>
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 -0000	1.69
+++ archivers/gtar/Makefile	19 May 2010 17:27:43 -0000
@@ -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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
+RUN_DEPENDS+=	xz:${PORTSDIR}/archivers/xz
+.endif
+
+.include <bsd.port.post.mk>
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 -0000	1.60
+++ archivers/libarchive/Makefile	19 May 2010 17:27:43 -0000
@@ -13,8 +13,6 @@
 MAINTAINER=	glewis at 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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
+LIB_DEPENDS+=	lzma.0:${PORTSDIR}/archivers/xz
+.endif
+
+.include <bsd.port.post.mk>
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 -0000	1.4
+++ archivers/py-liblzma/Makefile	19 May 2010 17:27:43 -0000
@@ -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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
+LIB_DEPENDS+=	lzma.0:${PORTSDIR}/archivers/xz
+.endif
+
+.include <bsd.port.post.mk>
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 -0000	1.30
+++ archivers/rpm5/Makefile	19 May 2010 17:27:43 -0000
@@ -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 <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
+LIB_DEPENDS+=	lzma:${PORTSDIR}/archivers/xz
+.endif
+
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
 .endif
Index: archivers/xz/Makefile
===================================================================
RCS file: /home/pcvs/ports/archivers/xz/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- archivers/xz/Makefile	1 Oct 2009 21:49:43 -0000	1.12
+++ archivers/xz/Makefile	19 May 2010 17:27:43 -0000
@@ -53,4 +53,10 @@
 regression-test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 900012 || (${OSVERSION} < 900000 && ${OSVERSION} >= 800505)
+IGNORE=	is already in the base system
+.endif
+
+.include <bsd.port.post.mk>
Index: audio/gnormalize/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/gnormalize/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- audio/gnormalize/Makefile	28 Mar 2010 06:31:01 -0000	1.11
+++ audio/gnormalize/Makefile	19 May 2010 17:27:44 -0000
@@ -14,7 +14,6 @@
 MAINTAINER=	darcsis at gmail.com
 COMMENT=	An alternative for replaygain
 
-BUILD_DEPENDS+=	lzma:${PORTSDIR}/archivers/xz
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 		wavegain:${PORTSDIR}/audio/wavegain
 
@@ -80,6 +79,10 @@
 RUN_DEPENDS+=	mppenc:${PORTSDIR}/audio/musepack
 .endif
 
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
+BUILD_DEPENDS+=	lzma:${PORTSDIR}/archivers/xz
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,^PREFIX=.*,PREFIX=${PREFIX},; \
 		s,^MANDIR=.*,MANDIR=${MANPREFIX}/man,; \
Index: japanese/font-ume/Makefile
===================================================================
RCS file: /home/pcvs/ports/japanese/font-ume/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- japanese/font-ume/Makefile	25 Apr 2010 13:52:12 -0000	1.10
+++ japanese/font-ume/Makefile	19 May 2010 17:27:44 -0000
@@ -16,11 +16,9 @@
 MAINTAINER=	hrs at FreeBSD.org
 COMMENT=	Ume Japanese TrueType fonts
 
-EXTRACT_DEPENDS=	xz:${PORTSDIR}/archivers/xz
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 NO_BUILD=	yes
-EXTRACT_CMD=	${LOCALBASE}/bin/xz
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
@@ -57,4 +55,13 @@
 	${LOCALBASE}/bin/fc-cache -s -f -v ${LOCALBASE}/${X_FONTSDIR}/TTF
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
+EXTRACT_DEPENDS+=	xz:${PORTSDIR}/archivers/xz
+EXTRACT_CMD=	${LOCALBASE}/bin/xz
+.else
+EXTRACT_CMD=	/usr/bin/xz
+.endif
+
+.include <bsd.port.post.mk>
Index: misc/kdeutils4/Makefile
===================================================================
RCS file: /home/pcvs/ports/misc/kdeutils4/Makefile,v
retrieving revision 1.141
diff -u -r1.141 Makefile
--- misc/kdeutils4/Makefile	11 May 2010 14:20:55 -0000	1.141
+++ misc/kdeutils4/Makefile	19 May 2010 17:27:44 -0000
@@ -37,7 +37,7 @@
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 900012
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
 LIB_DEPENDS+=	lzma.0:${PORTSDIR}/archivers/xz
 .endif
 
Index: sysutils/warden/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/warden/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sysutils/warden/Makefile	6 Apr 2010 14:26:25 -0000	1.1
+++ sysutils/warden/Makefile	19 May 2010 17:27:44 -0000
@@ -14,8 +14,7 @@
 MAINTAINER=	kmoore at freebsd.org
 COMMENT=	PC-BSD's Jail Management Utility
 
-RUN_DEPENDS=	pbreg:${PORTSDIR}/sysutils/pbreg \
-		xz:${PORTSDIR}/archivers/xz
+RUN_DEPENDS=	pbreg:${PORTSDIR}/sysutils/pbreg
 
 WRKSRC=		${WRKDIR}/warden
 
@@ -42,4 +41,10 @@
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} -unix CONFIG+="configure" ${QMAKE_PRO}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
+RUN_DEPENDS+=	xz:${PORTSDIR}/archivers/xz
+.endif
+
+.include <bsd.port.post.mk>
Index: x11/kdebase4-runtime/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/kdebase4-runtime/Makefile,v
retrieving revision 1.234
diff -u -r1.234 Makefile
--- x11/kdebase4-runtime/Makefile	11 May 2010 14:21:00 -0000	1.234
+++ x11/kdebase4-runtime/Makefile	19 May 2010 17:27:44 -0000
@@ -40,7 +40,7 @@
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 900012
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
 LIB_DEPENDS+=	lzma.0:${PORTSDIR}/archivers/xz
 .endif
 
Index: x11/kdelibs4/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/kdelibs4/Makefile,v
retrieving revision 1.251
diff -u -r1.251 Makefile
--- x11/kdelibs4/Makefile	11 May 2010 14:21:03 -0000	1.251
+++ x11/kdelibs4/Makefile	19 May 2010 17:27:44 -0000
@@ -82,7 +82,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 900012
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
 LIB_DEPENDS+=	lzma.0:${PORTSDIR}/archivers/xz
 .endif
 
-- 
Christian "naddy" Weisgerber                          naddy at mips.inka.de


More information about the kde-freebsd mailing list