From a39d5573ba14d3ab5f4e7d8995c62ac5d63581f4 Mon Sep 17 00:00:00 2001 From: David Naylor Date: Thu, 24 Apr 2014 20:11:01 +0000 Subject: [PATCH] Update my ports to be compliant with new USES framework and fix other issues. Changes: * various: migrate USE_BZIP2 to USES=tar:bzip2 * various: migrate USE_XZ to USES=tar:xz * multimedia/py-ffmpeg: add and prefer github (GH) as master site * ports-mgmt/portbuilder: specify license as BSD2CLAUSE (instead of just BSD) Most ports are updated infrequently so a single batch commit is preferred over collating changes per port. --- archivers/py-liblzma/Makefile | 3 +-- audio/flake/Makefile | 3 +-- audio/kaudiocreator/Makefile | 3 +-- deskutils/plasma-applet-cwp/Makefile | 3 +-- devel/kdesvn-kde4/Makefile | 3 +-- devel/svn2git/Makefile | 3 +-- emulators/i386-wine/Makefile.inc | 2 +- games/knights-kde4/Makefile | 3 +-- lang/pypy-devel/Makefile | 3 +-- lang/pypy/Makefile | 3 +-- lang/pypy3-devel/Makefile | 3 +-- multimedia/py-ffmpeg/Makefile | 2 +- ports-mgmt/portbuilder/Makefile | 4 ++-- x11-themes/cursor-crystal-theme/Makefile | 3 +-- 14 files changed, 15 insertions(+), 26 deletions(-) diff --git a/archivers/py-liblzma/Makefile b/archivers/py-liblzma/Makefile index ed01f241314e..58a374e12591 100644 --- a/archivers/py-liblzma/Makefile +++ b/archivers/py-liblzma/Makefile @@ -15,8 +15,7 @@ COMMENT= Python binding for the LZMA compression library LICENSE= LGPL3 -USES= pkgconfig -USE_BZIP2= yes +USES= pkgconfig tar:bzip2 USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes diff --git a/audio/flake/Makefile b/audio/flake/Makefile index 6b7462e96a88..89dd896d392a 100644 --- a/audio/flake/Makefile +++ b/audio/flake/Makefile @@ -14,8 +14,7 @@ LICENSE= LGPL21 CONFIGURE_ARGS+= --cc="${CC}" HAS_CONFIGURE= yes -USE_BZIP2= yes -USES= gmake +USES= gmake tar:bzip2 MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/flake include/flake.h lib/libflake.a diff --git a/audio/kaudiocreator/Makefile b/audio/kaudiocreator/Makefile index 1564fb6c7372..989f0c8d24e0 100644 --- a/audio/kaudiocreator/Makefile +++ b/audio/kaudiocreator/Makefile @@ -21,8 +21,7 @@ RUN_DEPENDS= flac:${PORTSDIR}/audio/flac \ RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame .endif -USE_BZIP2= yes -USES= cmake +USES= cmake tar:bzip2 USE_QT4= moc_build qmake_build rcc_build uic_build USE_KDE4= automoc4 kdehier kdeprefix libkcddb libkcompactdisc diff --git a/deskutils/plasma-applet-cwp/Makefile b/deskutils/plasma-applet-cwp/Makefile index 2a1d147ad0fc..fc450db16923 100644 --- a/deskutils/plasma-applet-cwp/Makefile +++ b/deskutils/plasma-applet-cwp/Makefile @@ -13,8 +13,7 @@ COMMENT= Weather plasma applet for KDE4 LICENSE= GPLv3 -USE_BZIP2= yes -USES= cmake gettext +USES= cmake gettext tar:bzip2 USE_KDE4= automoc4 kdeprefix kdelibs USE_QT4= gui dbus network opengl svg phonon webkit xml \ qmake_build moc_build rcc_build uic_build diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile index e441e9516897..589f5eb3e41e 100644 --- a/devel/kdesvn-kde4/Makefile +++ b/devel/kdesvn-kde4/Makefile @@ -16,8 +16,7 @@ LICENSE= GPLv2 CONFLICTS= qsvn-[0-9]* -USE_BZIP2= yes -USES= cmake +USES= cmake tar:bzip2 CMAKE_ARGS+= -DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 USE_KDE4= kdelibs kdeprefix automoc4 USE_LDCONFIG= yes diff --git a/devel/svn2git/Makefile b/devel/svn2git/Makefile index fc200cf17a6f..5978bb846080 100644 --- a/devel/svn2git/Makefile +++ b/devel/svn2git/Makefile @@ -16,8 +16,7 @@ RUN_DEPENDS+= git:${PORTSDIR}/devel/git \ p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \ p5-subversion>=0:${PORTSDIR}/devel/p5-subversion -USES= qmake -USE_XZ= yes +USES= qmake tar:xz USE_QT4= corelib OPTIONS_DEFINE= FREEBSD_REPO diff --git a/emulators/i386-wine/Makefile.inc b/emulators/i386-wine/Makefile.inc index 1588a3ffce68..3bfcdc031004 100644 --- a/emulators/i386-wine/Makefile.inc +++ b/emulators/i386-wine/Makefile.inc @@ -36,7 +36,7 @@ PKGDEINSTALL= ${PKGINSTALL} PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message USE_LDCONFIG32= ${PREFIX}/lib32 ${PREFIX}/lib32/wine -USE_XZ= yes +USES= tar:xz PORTSCOUT= limitw:1,even diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile index 9f43e938bdb0..d96e9469ce1a 100644 --- a/games/knights-kde4/Makefile +++ b/games/knights-kde4/Makefile @@ -14,8 +14,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess LICENSE= GPLv2 -USE_BZIP2= yes -USES= cmake:outsource +USES= cmake:outsource tar:bzip2 USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace libkdegames USE_QT4= qmake_build moc_build rcc_build uic_build diff --git a/lang/pypy-devel/Makefile b/lang/pypy-devel/Makefile index 28c45c9964a1..071eee231348 100644 --- a/lang/pypy-devel/Makefile +++ b/lang/pypy-devel/Makefile @@ -43,8 +43,7 @@ ALL_TARGET= ${PYPY_NAMES} BUILD_WRKSRC= ${WRKDIR} COMMIT= 92ff43b19372 DATE= 20131216 -USE_BZIP2= yes -USES= compiler:c11 gettext iconv +USES= compiler:c11 gettext iconv tar:bzip2 MAKEFILE= ${FILESDIR}/Makefile PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile index adc8a73f81cb..a868f984fe80 100644 --- a/lang/pypy/Makefile +++ b/lang/pypy/Makefile @@ -39,8 +39,7 @@ CONFLICTS_INSTALL= pypy-devel-[0-9]* ALL_TARGET= ${PYPY_NAMES} BUILD_WRKSRC= ${WRKDIR} DATE= 20130810 -USE_BZIP2= yes -USES= compiler:c11 gettext iconv +USES= compiler:c11 gettext iconv tar:bzip2 MAKEFILE= ${FILESDIR}/Makefile PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall diff --git a/lang/pypy3-devel/Makefile b/lang/pypy3-devel/Makefile index 8ea62e1c85e3..4c3513293222 100644 --- a/lang/pypy3-devel/Makefile +++ b/lang/pypy3-devel/Makefile @@ -38,8 +38,7 @@ CONFLICTS_INSTALL= pypy3-[0-9]* ALL_TARGET= ${PYPY_NAMES} BUILD_WRKSRC= ${WRKDIR} -USE_BZIP2= yes -USES= compiler:c11 gettext iconv +USES= compiler:c11 gettext iconv tar:bzip2 MAKEFILE= ${FILESDIR}/Makefile PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall diff --git a/multimedia/py-ffmpeg/Makefile b/multimedia/py-ffmpeg/Makefile index 9f9fc0df48ee..320c1a37c7d9 100644 --- a/multimedia/py-ffmpeg/Makefile +++ b/multimedia/py-ffmpeg/Makefile @@ -4,7 +4,7 @@ PORTNAME= ffmpeg PORTVERSION= 1.2.4 CATEGORIES= multimedia python -MASTER_SITES= LOCAL/dbn/${PORTNAME} +MASTER_SITES= GH LOCAL/dbn/${PORTNAME} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTNAME}-android-${PORTVERSION} diff --git a/ports-mgmt/portbuilder/Makefile b/ports-mgmt/portbuilder/Makefile index c3db25796e79..f26a1ecd5e58 100644 --- a/ports-mgmt/portbuilder/Makefile +++ b/ports-mgmt/portbuilder/Makefile @@ -10,11 +10,11 @@ MASTER_SITES= http://cloud.github.com/downloads/DragonSA/portbuilder/ MAINTAINER= dbn@FreeBSD.org COMMENT= Concurrent FreeBSD port builder -LICENSE= BSD +LICENSE= BSD2CLAUSE USE_PYTHON= yes USE_PYDISTUTILS=yes -USE_XZ= yes +USES= tar:xz PORTDOCS= BUGS ChangeLog COPYRIGHT README diff --git a/x11-themes/cursor-crystal-theme/Makefile b/x11-themes/cursor-crystal-theme/Makefile index fb2c26d5a275..c118d696ea4b 100644 --- a/x11-themes/cursor-crystal-theme/Makefile +++ b/x11-themes/cursor-crystal-theme/Makefile @@ -17,8 +17,7 @@ LICENSE= LGPL21 BUILD_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \ xcursorgen:${PORTSDIR}/x11/xcursorgen -USES= gmake -USE_BZIP2= yes +USES= gmake tar:bzip2 post-patch: @${REINPLACE_CMD} -e 's|function ||' \