Index: ports/archivers/xz/Makefile =================================================================== RCS file: /home/pcvs/ports/archivers/xz/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- ports/archivers/xz/Makefile 1 Oct 2009 21:49:43 -0000 1.12 +++ ports/archivers/xz/Makefile 18 May 2010 13:34:18 -0000 @@ -7,7 +7,7 @@ PORTNAME= xz PORTVERSION= 4.999.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers MASTER_SITES= http://tukaani.org/xz/ DISTNAME= ${PORTNAME}-${PORTVERSION}beta @@ -46,6 +46,12 @@ PORTDOCS= AUTHORS COPYING COPYING.GPLv2 NEWS README THANKS TODO \ faq.txt history.txt lzma-file-format.txt xz-file-format.txt +.include + +.if (${OSVERSION} > 800504 && ${OSVERSION} < 900000) || ${OSVERSION} > 900011 +IGNORE= already included in base +.endif + # no need to (attempt to) run aclocal pre-build: @touch -r ${WRKSRC}/configure.ac ${WRKSRC}/aclocal.m4 @@ -53,4 +59,5 @@ regression-test: build @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check -.include + +.include Index: ports/archivers/py-liblzma/Makefile =================================================================== RCS file: /home/pcvs/ports/archivers/py-liblzma/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- ports/archivers/py-liblzma/Makefile 16 Oct 2009 14:00:34 -0000 1.4 +++ ports/archivers/py-liblzma/Makefile 18 May 2010 13:34:18 -0000 @@ -6,7 +6,7 @@ PORTNAME= liblzma PORTVERSION= 0.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers python MASTER_SITES= ${MASTER_SITE_CHEESESHOP}source/p/pyliblzma/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,11 +16,22 @@ 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 + +post-patch: +.if (${OSVERSION} > 800504 && ${OSVERSION} < 900000) || ${OSVERSION} > 900011 + @${REINPLACE_CMD} -e "s/link_args = .*/link_args = ['-llzma']/g" \ + ${WRKSRC}/setup.py +.endif + +.include Index: ports/archivers/deco/Makefile =================================================================== RCS file: /home/pcvs/ports/archivers/deco/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- ports/archivers/deco/Makefile 14 Apr 2010 06:17:26 -0000 1.15 +++ ports/archivers/deco/Makefile 18 May 2010 13:34:18 -0000 @@ -7,6 +7,7 @@ PORTNAME= deco PORTVERSION= 1.6.1.1 +PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= http://hartlich.com/deco/download/:site1 \ http://hartlich.com/deco/archive/download/:site2 @@ -20,7 +21,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 \ @@ -34,6 +34,12 @@ NO_LATEST_LINK= yes CONFLICTS= deco-[0-9]* +.include + +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 || ${OSVERSION} < 900012) +RUN_DEPENDS+= lzma:${PORTSDIR}/archivers/xz +.endif + do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} @@ -48,4 +54,4 @@ .endfor @cd ${WRKDIR}/${PORTNAME}-archive-1.5.1/ && ${CP} -pPR * ${DATADIR} -.include +.include Index: ports/archivers/gtar/Makefile =================================================================== RCS file: /home/pcvs/ports/archivers/gtar/Makefile,v retrieving revision 1.69 diff -u -r1.69 Makefile --- ports/archivers/gtar/Makefile 29 Mar 2010 17:36:25 -0000 1.69 +++ ports/archivers/gtar/Makefile 18 May 2010 13:34:18 -0000 @@ -7,6 +7,7 @@ PORTNAME= tar PORTVERSION= 1.23 +PORTREVISION= 1 CATEGORIES= archivers sysutils MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,9 +16,6 @@ MAINTAINER= naddy@FreeBSD.org 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 - INFO= tar USE_AUTOTOOLS= autoconf:262:env # autom4te @@ -47,7 +45,13 @@ PLIST_SUB+= NLS="@comment " .endif +.include + +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 || ${OSVERSION} < 900012) +RUN_DEPENDS+= xz:${PORTSDIR}/archivers/xz +.endif + regression-test: build @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check -.include +.include Index: ports/archivers/libarchive/Makefile =================================================================== RCS file: /home/pcvs/ports/archivers/libarchive/Makefile,v retrieving revision 1.60 diff -u -r1.60 Makefile --- ports/archivers/libarchive/Makefile 22 Mar 2010 02:43:11 -0000 1.60 +++ ports/archivers/libarchive/Makefile 18 May 2010 13:34:18 -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 @@ -52,7 +50,13 @@ CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" +.include + +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 || ${OSVERSION} < 900012) +LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/xz +.endif + check: (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check) -.include +.include Index: ports/archivers/rpm5/Makefile =================================================================== RCS file: /home/pcvs/ports/archivers/rpm5/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- ports/archivers/rpm5/Makefile 28 Mar 2010 06:30:32 -0000 1.30 +++ ports/archivers/rpm5/Makefile 18 May 2010 13:34:18 -0000 @@ -6,7 +6,7 @@ PORTNAME= rpm PORTVERSION= 5.0.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= archivers MASTER_SITES= http://rpm5.org/files/rpm/rpm-5.0/ PATCHFILES= rpm-5.0.3.1.patch @@ -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) @@ -122,6 +121,10 @@ CFLAGS+= -fPIC .endif +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 || ${OSVERSION} < 900012) +LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/xz +.endif + post-patch:: @${REINPLACE_CMD} -E -e \ 's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \ Index: ports/x11/kdelibs4/Makefile =================================================================== RCS file: /home/pcvs/ports/x11/kdelibs4/Makefile,v retrieving revision 1.251 diff -u -r1.251 Makefile --- ports/x11/kdelibs4/Makefile 11 May 2010 14:21:03 -0000 1.251 +++ ports/x11/kdelibs4/Makefile 18 May 2010 13:34:18 -0000 @@ -82,7 +82,7 @@ .include -.if ${OSVERSION} < 900012 +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 || ${OSVERSION} < 900012) LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/xz .endif Index: ports/x11/kdebase4-runtime/Makefile =================================================================== RCS file: /home/pcvs/ports/x11/kdebase4-runtime/Makefile,v retrieving revision 1.234 diff -u -r1.234 Makefile --- ports/x11/kdebase4-runtime/Makefile 11 May 2010 14:21:00 -0000 1.234 +++ ports/x11/kdebase4-runtime/Makefile 18 May 2010 13:34:18 -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: ports/audio/gnormalize/Makefile =================================================================== RCS file: /home/pcvs/ports/audio/gnormalize/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- ports/audio/gnormalize/Makefile 28 Mar 2010 06:31:01 -0000 1.11 +++ ports/audio/gnormalize/Makefile 18 May 2010 13:34:18 -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 @@ -38,6 +37,10 @@ .include +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 || ${OSVERSION} < 900012) +BUILD_DEPENDS+= lzma:${PORTSDIR}/archivers/xz +.endif + .if defined(WITH_GNORMALIZE_MP3) RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame \ ${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info Index: ports/sysutils/warden/Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/warden/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- ports/sysutils/warden/Makefile 6 Apr 2010 14:26:25 -0000 1.1 +++ ports/sysutils/warden/Makefile 18 May 2010 13:34:18 -0000 @@ -7,6 +7,7 @@ PORTNAME= warden PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.pcbsd.org/pub/software/ \ http://www.pcbsd.org/~kris/software/ @@ -14,8 +15,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 @@ -30,6 +30,12 @@ SUB_FILES= pkg-message +.include + +.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 || ${OSVERSION} < 900012) +RUN_DEPENDS+= xz:${PORTSDIR}/archivers/xz +.endif + post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/warden.pro \ @@ -42,4 +48,4 @@ @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${QMAKE} -unix CONFIG+="configure" ${QMAKE_PRO} -.include +.include Index: ports/misc/kdeutils4/Makefile =================================================================== RCS file: /home/pcvs/ports/misc/kdeutils4/Makefile,v retrieving revision 1.141 diff -u -r1.141 Makefile --- ports/misc/kdeutils4/Makefile 11 May 2010 14:20:55 -0000 1.141 +++ ports/misc/kdeutils4/Makefile 18 May 2010 13:34:18 -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: ports/japanese/font-ume/Makefile =================================================================== RCS file: /home/pcvs/ports/japanese/font-ume/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- ports/japanese/font-ume/Makefile 25 Apr 2010 13:52:12 -0000 1.10 +++ ports/japanese/font-ume/Makefile 18 May 2010 13:34:19 -0000 @@ -16,7 +16,7 @@ MAINTAINER= hrs@FreeBSD.org COMMENT= Ume Japanese TrueType fonts -EXTRACT_DEPENDS= xz:${PORTSDIR}/archivers/xz +USE_LZMA= yes RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig NO_BUILD= yes