From 62ef31db615ddc3281afd0dddf1fde3202266e54 Mon Sep 17 00:00:00 2001 From: Christian Weisgerber Date: Thu, 13 Mar 2014 16:11:14 +0000 Subject: [PATCH] USE_BZIP2 -> USES+=tar:bzip2 USE_XZ -> USES+=tar:xz --- archivers/gcpio/Makefile | 2 +- archivers/gtar/Makefile | 3 +-- audio/flac/Makefile | 3 +-- audio/libvorbis/Makefile | 3 +-- audio/xmms-flac/Makefile | 3 +-- audio/xmms-wavpack/Makefile | 3 +-- games/gtypist/Makefile | 3 +-- math/galculator/Makefile | 3 +-- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile index f443be8098d1..cc54875b6d2d 100644 --- a/archivers/gcpio/Makefile +++ b/archivers/gcpio/Makefile @@ -11,7 +11,7 @@ PKGNAMEPREFIX= g MAINTAINER= naddy@FreeBSD.org COMMENT= GNU cpio copies files to and from archives -USE_BZIP2= yes +USES= tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g \ --disable-silent-rules \ diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile index 3d466a47b51b..9eb81acac09e 100644 --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -15,8 +15,7 @@ LICENSE= GPLv3 INFO= tar -USES= iconv:${STATIC_ARGS} -USE_XZ= yes +USES= iconv:${STATIC_ARGS} tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g \ --disable-silent-rules diff --git a/audio/flac/Makefile b/audio/flac/Makefile index a17459aaad1d..5323d597e3aa 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -12,10 +12,9 @@ COMMENT= Free lossless audio codec LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg -USES= pathfix pkgconfig +USES= pathfix pkgconfig tar:xz USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_XZ= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-sse \ --with-ogg="${LOCALBASE}" \ diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index 368a6a68c20b..ba16096bab47 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -12,10 +12,9 @@ COMMENT= Audio compression codec library LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg -USES= pathfix +USES= pathfix tar:xz USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_XZ= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ogg=${LOCALBASE} \ diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile index d1dfc8eac819..dc4ffccf4f11 100644 --- a/audio/xmms-flac/Makefile +++ b/audio/xmms-flac/Makefile @@ -14,11 +14,10 @@ LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms \ libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \ libogg.so:${PORTSDIR}/audio/libogg -USES= gettext iconv +USES= gettext iconv tar:xz USE_AUTOTOOLS= libtool USE_GNOME= gtk12 USE_XORG= x11 xau xcb xdmcp xext xi -USE_XZ= yes CONFIGURE_ARGS= --disable-silent-rules CPPFLAGS+= -I${LOCALBASE}/include diff --git a/audio/xmms-wavpack/Makefile b/audio/xmms-wavpack/Makefile index a74c1bafaf90..deb0f9109d8a 100644 --- a/audio/xmms-wavpack/Makefile +++ b/audio/xmms-wavpack/Makefile @@ -12,8 +12,7 @@ COMMENT= XMMS input plugin to play WavPack files LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack \ libxmms.so:${PORTSDIR}/multimedia/xmms -USES= pkgconfig -USE_BZIP2= yes +USES= pkgconfig tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/games/gtypist/Makefile b/games/gtypist/Makefile index 80b26ced96e1..b065806398c0 100644 --- a/games/gtypist/Makefile +++ b/games/gtypist/Makefile @@ -9,8 +9,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= naddy@FreeBSD.org COMMENT= Interactive typing tutor -USES= iconv -USE_XZ= yes +USES= iconv tar:xz GNU_CONFIGURE= yes CONFIGURE_ENV= EMACS=no CPPFLAGS+= -I${WRKDIR}/include diff --git a/math/galculator/Makefile b/math/galculator/Makefile index 8f215d40dc0c..d50ba0e33d7c 100644 --- a/math/galculator/Makefile +++ b/math/galculator/Makefile @@ -8,8 +8,7 @@ MASTER_SITES= SF MAINTAINER= naddy@FreeBSD.org COMMENT= GTK-based scientific calculator -USES= gmake pkgconfig -USE_BZIP2= yes +USES= gmake pkgconfig tar:bzip2 USE_GNOME= gtk20 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include