The xz utils and lzma library have been imported into base, so make

the dependency on the archivers/xz port conditional on OSVERSION.

6 files changed, 40 insertions, 12 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 9a10ed294382..dfd88494860b 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -16,7 +16,7 @@ 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
+#RUN_DEPENDS=	# see below
 
 INFO=		tar
 
@@ -50,4 +50,10 @@ PLIST_SUB+=	NLS="@comment "
 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>
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index 4d05d7035081..cfa9ae7b9e96 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 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 @@ CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" \
 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>
diff --git a/archivers/py-liblzma/Makefile b/archivers/py-liblzma/Makefile
index 78642f50187d..eec72d1e8465 100644
--- a/archivers/py-liblzma/Makefile
+++ b/archivers/py-liblzma/Makefile
@@ -16,11 +16,16 @@ MAINTAINER=	naylor.b.david@gmail.com
 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>
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index 7671c5012e6e..6bd3d0130c0b 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -22,7 +22,6 @@ LIB_DEPENDS=	db-${DB_VERSION:C/(.)/\1./}:${PORTSDIR}/databases/db${DB_VERSION} \
 		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 @@ PORTDOCS=	*
 
 .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
diff --git a/audio/gnormalize/Makefile b/audio/gnormalize/Makefile
index 8c84ad995e3b..9c7460bdbc77 100644
--- a/audio/gnormalize/Makefile
+++ b/audio/gnormalize/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	SF
 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+=	mac:${PORTSDIR}/audio/mac
 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,; \
diff --git a/japanese/font-ume/Makefile b/japanese/font-ume/Makefile
index b0de05ae9467..a69d8284597c 100644
--- a/japanese/font-ume/Makefile
+++ b/japanese/font-ume/Makefile
@@ -16,11 +16,9 @@ EXTRACT_SUFX=	.tar.xz
 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 @@ post-install:
 	${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>