From 037a3b5bf96e407a2da867ec3e413bcecd2519ab Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Tue, 29 Jul 2014 21:25:30 +0000 Subject: [PATCH] Remove the final usages of USE_XZ from the tree, and replace them with USES=tar:xz. Approved by: portmgr (most of them) --- deskutils/gbirthday/Makefile | 2 +- devel/libcidr/Makefile | 2 +- devel/xdg-utils/Makefile | 2 +- editors/calligra-l10n/files/bsd.l10n.mk | 3 +-- games/gnomechess/Makefile | 3 +-- graphics/poppler/Makefile | 3 +-- japanese/font-mplus/Makefile | 2 +- lang/libhx/Makefile | 2 +- mail/milter-callback/Makefile | 2 +- math/matlab-installer/Makefile | 2 +- misc/ddate/Makefile | 2 +- net-p2p/eiskaltdcpp-data/Makefile | 2 +- news/leafnode/Makefile | 2 +- print/pdfcolorsplit/Makefile | 2 +- print/tex-jadetex/Makefile | 2 +- security/openvpn-beta/Makefile | 2 +- security/pam_search_list/Makefile | 2 +- sysutils/auto-admin/Makefile | 2 +- sysutils/desktop-installer/Makefile | 2 +- sysutils/diskimage-tools/Makefile | 2 +- sysutils/downtimed/Makefile | 2 +- sysutils/edid-decode/Makefile | 2 +- sysutils/linrename/Makefile | 2 +- textproc/pecl-ctemplate/Makefile | 2 +- textproc/rnv/Makefile | 2 +- www/webbrowser/Makefile | 2 +- x11-themes/audacious-skins/Makefile | 2 +- x11-themes/mate-icon-theme-faenza/Makefile | 2 +- 28 files changed, 28 insertions(+), 31 deletions(-) diff --git a/deskutils/gbirthday/Makefile b/deskutils/gbirthday/Makefile index 163679a56468..7c520d12d1c4 100644 --- a/deskutils/gbirthday/Makefile +++ b/deskutils/gbirthday/Makefile @@ -24,7 +24,7 @@ NLS_USE= GNOME=intltool NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>0:${PORTSDIR}/devel/py-notify THUNDERBIRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 -USE_XZ= yes +USES= tar:xz USE_PYTHON_RUN= 2 USE_GNOME= pygtk2 LANGUAGES= de en es fr gl it pl pt ru sk diff --git a/devel/libcidr/Makefile b/devel/libcidr/Makefile index e9c58a6806a5..2bed16b441bf 100644 --- a/devel/libcidr/Makefile +++ b/devel/libcidr/Makefile @@ -13,7 +13,7 @@ COMMENT= Library to handle manipulating CIDR netblocks LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USE_XZ= yes +USES= tar:xz USE_LDCONFIG= yes MAKE_ENV+= CIDR_DOCDIR=${DOCSDIR} CIDR_EXDIR=${EXAMPLESDIR} diff --git a/devel/xdg-utils/Makefile b/devel/xdg-utils/Makefile index b081042bbfa7..788b5347098b 100644 --- a/devel/xdg-utils/Makefile +++ b/devel/xdg-utils/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicol xset:${PORTSDIR}/x11/xset SNAPDATE= 20130919 -USE_XZ= yes +USES= tar:xz GNU_CONFIGURE= yes post-patch: diff --git a/editors/calligra-l10n/files/bsd.l10n.mk b/editors/calligra-l10n/files/bsd.l10n.mk index ef46a63f7073..bad58b3cbdfe 100644 --- a/editors/calligra-l10n/files/bsd.l10n.mk +++ b/editors/calligra-l10n/files/bsd.l10n.mk @@ -9,7 +9,6 @@ CONFLICTS= ${PKGNAMEPREFIX}koffice-l10n-2.* USE_KDE4= kdehier kdelibs kdeprefix automoc4 USE_QT4= corelib xml moc_build qmake_build rcc_build uic_build -USES= cmake gettext +USES= cmake gettext tar:xz NO_ARCH= yes -USE_XZ= yes .endif diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile index d7fcf1fb5e12..265d3d760e6d 100644 --- a/games/gnomechess/Makefile +++ b/games/gnomechess/Makefile @@ -18,10 +18,9 @@ BUILD_DEPENDS= crafty:${PORTSDIR}/games/crafty \ xmllint:${PORTSDIR}/textproc/libxml2 \ p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser -USES= gmake pathfix pkgconfig desktop-file-utils shared-mime-info +USES= gmake pathfix pkgconfig desktop-file-utils shared-mime-info tar:xz USE_GL= gl glu USE_GNOME= gtk30 librsvg2 -USE_XZ= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 49adf49dd8a9..c3f0ab2d107f 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -18,8 +18,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblcms2.so:${PORTSDIR}/graphics/lcms2 RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data -USE_XZ= yes -USES= gmake libtool:keepla pathfix pkgconfig +USES= gmake libtool:keepla pathfix pkgconfig tar:xz USE_GNOME= libxml2 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/japanese/font-mplus/Makefile b/japanese/font-mplus/Makefile index aedfc49971e8..c8ace4da147d 100644 --- a/japanese/font-mplus/Makefile +++ b/japanese/font-mplus/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ fc-cache:${PORTSDIR}/x11-fonts/fontconfig -USE_XZ= yes +USES= tar:xz NO_BUILD= yes PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install diff --git a/lang/libhx/Makefile b/lang/libhx/Makefile index 35f62154fef6..774be108baac 100644 --- a/lang/libhx/Makefile +++ b/lang/libhx/Makefile @@ -12,7 +12,7 @@ COMMENT= C/C++ library with common data structures and functions CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USE_XZ= yes +USES= tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool diff --git a/mail/milter-callback/Makefile b/mail/milter-callback/Makefile index 34fd06f41895..ddfffb2ef959 100644 --- a/mail/milter-callback/Makefile +++ b/mail/milter-callback/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 LIB_DEPENDS+= libspf2.so:${PORTSDIR}/mail/libspf2 -USE_XZ= yes +USES= tar:xz USE_RC_SUBR= milter-callback USE_GCC= any diff --git a/math/matlab-installer/Makefile b/math/matlab-installer/Makefile index 25303fb36f28..18765e0842f1 100644 --- a/math/matlab-installer/Makefile +++ b/math/matlab-installer/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= mount_cd9660_image:${PORTSDIR}/sysutils/diskimage-tools \ webbrowser:${PORTSDIR}/www/webbrowser \ ${LINUXBASE}/usr/bin/gfortran:${PORTSDIR}/devel/linux-f10-devtools -USE_XZ= yes +USES= tar:xz USE_LINUX= yes USE_LINUX_APPS= ncurses-base dri USE_JAVA= yes diff --git a/misc/ddate/Makefile b/misc/ddate/Makefile index c437a24724fb..953020b56e54 100644 --- a/misc/ddate/Makefile +++ b/misc/ddate/Makefile @@ -17,7 +17,7 @@ LICENSE= GPLv2 PLIST_FILES= bin/ddate man/man1/ddate.1.gz GNU_CONFIGURE= yes -USE_XZ= yes +USES= tar:xz CONFIGURE_ARGS= --disable-libuuid --disable-libblkid --disable-libmount \ --disable-mount --disable-losetup --disable-fsck \ diff --git a/net-p2p/eiskaltdcpp-data/Makefile b/net-p2p/eiskaltdcpp-data/Makefile index e2e05649e2ac..f8e55227a0f6 100644 --- a/net-p2p/eiskaltdcpp-data/Makefile +++ b/net-p2p/eiskaltdcpp-data/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3 PROJECTHOST= eiskaltdc -USE_XZ= yes +USES= tar:xz NO_BUILD= yes INSTALLS_ICONS= yes diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile index 58a5508acca0..2cc69c702292 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -13,7 +13,7 @@ COMMENT= NNTP package for offline news caching and reading LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -USE_XZ= yes +USES= tar:xz GNU_CONFIGURE= yes CONFLICTS= newsx-1* s-news-0* diff --git a/print/pdfcolorsplit/Makefile b/print/pdfcolorsplit/Makefile index 81e51b63df1c..a251d8c4b22b 100644 --- a/print/pdfcolorsplit/Makefile +++ b/print/pdfcolorsplit/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= pdftk:${PORTSDIR}/print/pdftk \ USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= yes -USE_XZ= yes +USES= tar:xz PLIST_FILES= bin/${PORTNAME} diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile index c0aa41fd267f..b4235122a26f 100644 --- a/print/tex-jadetex/Makefile +++ b/print/tex-jadetex/Makefile @@ -13,7 +13,7 @@ EXTRACT_ONLY= MAINTAINER= hrs@FreeBSD.org COMMENT= TeX backend for Jade, DSSSL processor for SGML/XML documents -USE_XZ= yes +USES= tar:xz USE_TEX= texlive texmf pdftex xmltex fmtutil TEXHASHDIRS= ${TEXMFDISTDIR} EXTRACT_AFTER_ARGS=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \ diff --git a/security/openvpn-beta/Makefile b/security/openvpn-beta/Makefile index 526e6da5b411..4cd89a010754 100644 --- a/security/openvpn-beta/Makefile +++ b/security/openvpn-beta/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 CONFLICTS_INSTALL= openvpn-[0-9]* openvpn-beta-[0-9]* -USE_XZ= yes +USES= tar:xz GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include diff --git a/security/pam_search_list/Makefile b/security/pam_search_list/Makefile index 05cff10fadf3..82ac326cae97 100644 --- a/security/pam_search_list/Makefile +++ b/security/pam_search_list/Makefile @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME:S/_/-/g}-${PORTVERSION} MAINTAINER= v.a.popov@gmail.com COMMENT= PAM module to search arbitrary file for user -USE_XZ= yes +USES= tar:xz PLIST_FILES= lib/libpam_search_list.a \ lib/libpam_search_list_p.a \ diff --git a/sysutils/auto-admin/Makefile b/sysutils/auto-admin/Makefile index a965f8e548b7..3543ec98775c 100644 --- a/sysutils/auto-admin/Makefile +++ b/sysutils/auto-admin/Makefile @@ -12,7 +12,7 @@ COMMENT= Tools for automating system management LICENSE= BSD -USE_XZ= yes +USES= tar:xz NO_BUILD= yes diff --git a/sysutils/desktop-installer/Makefile b/sysutils/desktop-installer/Makefile index d53bcbd6f601..145c737a73a5 100644 --- a/sysutils/desktop-installer/Makefile +++ b/sysutils/desktop-installer/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD RUN_DEPENDS= auto-admin>=0.3.3:${PORTSDIR}/sysutils/auto-admin -USE_XZ= yes +USES= tar:xz NO_BUILD= yes diff --git a/sysutils/diskimage-tools/Makefile b/sysutils/diskimage-tools/Makefile index d5c9dd1eece7..ef74b9a41acf 100644 --- a/sysutils/diskimage-tools/Makefile +++ b/sysutils/diskimage-tools/Makefile @@ -13,7 +13,7 @@ COMMENT= Convenience tools for manipulating disk images LICENSE= BSD NO_BUILD= yes -USE_XZ= yes +USES= tar:xz do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/sbin diff --git a/sysutils/downtimed/Makefile b/sysutils/downtimed/Makefile index f438925fd2a4..b757f023ca09 100644 --- a/sysutils/downtimed/Makefile +++ b/sysutils/downtimed/Makefile @@ -13,7 +13,7 @@ COMMENT= System downtime monitoring and reporting tool LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -USE_XZ= yes +USES= tar:xz MAN1= downtimes.1 MAN8= downtimed.8 USE_RC_SUBR= ${PORTNAME} diff --git a/sysutils/edid-decode/Makefile b/sysutils/edid-decode/Makefile index 5b9f274a7a7f..e1eb05b9eedc 100644 --- a/sysutils/edid-decode/Makefile +++ b/sysutils/edid-decode/Makefile @@ -11,7 +11,7 @@ COMMENT= Decodes binary EDID information from monitors LICENSE= MIT -USE_XZ= yes +USES= tar:xz PLIST_FILES= bin/edid-decode diff --git a/sysutils/linrename/Makefile b/sysutils/linrename/Makefile index 5f9d72a73d31..59ffa5c8e70e 100644 --- a/sysutils/linrename/Makefile +++ b/sysutils/linrename/Makefile @@ -18,7 +18,7 @@ COMMENT= Rename multiple files using substitution BUILD_WRKSRC= ${WRKSRC}/misc-utils INSTALL_WRKSRC= ${WRKSRC}/misc-utils -USE_XZ= yes +USES= tar:xz CPPFLAGS+= -I../include \ -DHAVE_DIRFD -DHAVE_ERR_H -DHAVE_LANGINFO_H -DHAVE_LOCALE_H \ diff --git a/textproc/pecl-ctemplate/Makefile b/textproc/pecl-ctemplate/Makefile index eb808060eb4b..1070fa89245d 100644 --- a/textproc/pecl-ctemplate/Makefile +++ b/textproc/pecl-ctemplate/Makefile @@ -15,7 +15,7 @@ COMMENT= A PECL extension for Google ctemplate library LIB_DEPENDS= libctemplate.so:${PORTSDIR}/textproc/google-ctemplate -USE_XZ= yes +USES= tar:xz USE_PHP= yes USE_PHPEXT= yes DEFAULT_PHP_VER= 5 diff --git a/textproc/rnv/Makefile b/textproc/rnv/Makefile index 1f6222e18e0b..b5fc0694c974 100644 --- a/textproc/rnv/Makefile +++ b/textproc/rnv/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 -USE_XZ= yes +USES= tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-expat="${LOCALBASE}" diff --git a/www/webbrowser/Makefile b/www/webbrowser/Makefile index 2db8ffeedd68..7097a416fb2e 100644 --- a/www/webbrowser/Makefile +++ b/www/webbrowser/Makefile @@ -13,7 +13,7 @@ COMMENT= Wrapper for running the "best" available WEB browser LICENSE= BSD NO_BUILD= yes -USE_XZ= yes +USES= tar:xz do-install: ${INSTALL_SCRIPT} ${WRKSRC}/webbrowser ${STAGEDIR}${PREFIX}/bin diff --git a/x11-themes/audacious-skins/Makefile b/x11-themes/audacious-skins/Makefile index 7ed5bb38dd83..fce166511bf1 100644 --- a/x11-themes/audacious-skins/Makefile +++ b/x11-themes/audacious-skins/Makefile @@ -11,7 +11,7 @@ COMMENT= Collection of audacious skins BUILD_DEPENDS= audacious:${PORTSDIR}/multimedia/audacious -USE_XZ= yes +USES= tar:xz NO_BUILD= yes DATADIR= ${PREFIX}/share/audacious diff --git a/x11-themes/mate-icon-theme-faenza/Makefile b/x11-themes/mate-icon-theme-faenza/Makefile index 58070514ef1d..29ccf033265c 100644 --- a/x11-themes/mate-icon-theme-faenza/Makefile +++ b/x11-themes/mate-icon-theme-faenza/Makefile @@ -12,7 +12,7 @@ COMMENT= Collection of Faenza and Faience icons for the MATE desktop PORTSCOUT= limitw:1,even -USE_XZ= yes +USES= tar:xz NO_BUILD= yes INSTALLS_ICONS= yes