From owner-freebsd-ports@FreeBSD.ORG Wed May 19 17:42:50 2010 Return-Path: Delivered-To: freebsd-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E648B106566C for ; Wed, 19 May 2010 17:42:49 +0000 (UTC) (envelope-from naddy@mips.inka.de) Received: from mail-in-04.arcor-online.net (mail-in-04.arcor-online.net [151.189.21.44]) by mx1.freebsd.org (Postfix) with ESMTP id 6C8A78FC0C for ; Wed, 19 May 2010 17:42:49 +0000 (UTC) Received: from mail-in-17-z2.arcor-online.net (mail-in-17-z2.arcor-online.net [151.189.8.34]) by mx.arcor.de (Postfix) with ESMTP id 178A4AA299; Wed, 19 May 2010 19:42:48 +0200 (CEST) Received: from mail-in-12.arcor-online.net (mail-in-12.arcor-online.net [151.189.21.52]) by mail-in-17-z2.arcor-online.net (Postfix) with ESMTP id 056A045D618; Wed, 19 May 2010 19:42:48 +0200 (CEST) Received: from lorvorc.mips.inka.de (dslb-094-218-176-182.pools.arcor-ip.net [94.218.176.182]) by mail-in-12.arcor-online.net (Postfix) with ESMTPS id E1F4C2679C; Wed, 19 May 2010 19:42:45 +0200 (CEST) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-12.arcor-online.net E1F4C2679C Received: from lorvorc.mips.inka.de (localhost [127.0.0.1]) by lorvorc.mips.inka.de (8.14.4/8.14.3) with ESMTP id o4JHgiFu018358; Wed, 19 May 2010 19:42:44 +0200 (CEST) (envelope-from naddy@lorvorc.mips.inka.de) Received: (from naddy@localhost) by lorvorc.mips.inka.de (8.14.4/8.14.4/Submit) id o4JHgiFA018357; Wed, 19 May 2010 19:42:44 +0200 (CEST) (envelope-from naddy) Date: Wed, 19 May 2010 19:42:44 +0200 From: Christian Weisgerber To: kevlo@FreeBSD.org, glewis@FreeBSD.org, naylor.b.david@gmail.com, afb@rpm5.org, darcsis@gmail.com, hrs@FreeBSD.org, kde@FreeBSD.org, kmoore@FreeBSD.org Message-ID: <20100519174244.GA18151@lorvorc.mips.inka.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i Cc: freebsd-ports@FreeBSD.org Subject: Catch up with xz import X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-ports@FreeBSD.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 May 2010 17:42:50 -0000 (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 +.include + +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${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 -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 +.include + +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${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 -0000 1.60 +++ archivers/libarchive/Makefile 19 May 2010 17:27:43 -0000 @@ -13,8 +13,6 @@ MAINTAINER= glewis@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} >= 900000 && ${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 -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 +.include + +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${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 -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 +.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 +.include + +.if ${OSVERSION} >= 900012 || (${OSVERSION} < 900000 && ${OSVERSION} >= 800505) +IGNORE= is already in the base system +.endif + +.include 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@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@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 +.include + +.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 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 -.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@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 +.include + +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) +RUN_DEPENDS+= xz:${PORTSDIR}/archivers/xz +.endif + +.include 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 -.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 -.if ${OSVERSION} < 900012 +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/xz .endif -- Christian "naddy" Weisgerber naddy@mips.inka.de