Convert:

USE_PYTHON* -> USES=python*
USE_XZ|USE_BZIP2 -> USES=tar:
replace some post-install ${STRIP_CMD} with INSTALL_TARGET=install-strip


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19804 df743ca5-7f9a-e211-a948-0013205c9059

14 files changed, 27 insertions, 35 deletions

diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile
index f641d8a43..5795556a5 100644
--- a/devel/anjuta-extras/Makefile
+++ b/devel/anjuta-extras/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Extra anjuta 3 plugins
 
 LIB_DEPENDS=	libanjuta-3.so:${PORTSDIR}/devel/anjuta
 		
-USE_XZ=		yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk30 intltool libxml2
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index b4b81b6e5..b63eac643 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -24,10 +24,9 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc
 		libtool>=2.4:${PORTSDIR}/devel/libtool \
 		gdb>=7.3:${PORTSDIR}/devel/gdb \
 		yelp>=3.0.0:${PORTSDIR}/x11/yelp
-USE_XZ=		yes
 USE_CSTD=	gnu89
 USES=		bison desktop-file-utils gettext gmake pathfix perl5 \
-		pkgconfig shared-mime-info shebangfix
+		pkgconfig python shared-mime-info shebangfix tar:xz
 SHEBANG_FILES=	plugins/project-wizard/templates/js_minimal/src/main.js \
 		plugins/tools/scripts/find-fixmes.pl \
 		plugins/tools/scripts/translation-status.pl \
@@ -36,7 +35,6 @@ SHEBANG_LANG+=	gjs
 gjs_OLD_CMD=	/usr/bin/gjs
 gjs_CMD=	${LOCALBASE}/bin/gjs
 INSTALLS_ICONS=	yes
-USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix vte3 gtksourceview3 libgda5 libwnck3
 GNU_CONFIGURE=	yes
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index a199d2873..09d430e64 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -17,14 +17,14 @@ COMMENT=	Configuration database system for GNOME
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_XZ=		yes
+USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)
 
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig
+USES+=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	gnomehier orbit2 gtk20 libxml2 \
 		referencehack intlhack dconf introspection:build
 USE_LDCONFIG=	yes
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index d683c7991..32486bd9d 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -19,9 +19,9 @@ LIB_DEPENDS=	libgit2-glib-1.0.so:${PORTSDIR}/devel/libgit2-glib \
 		libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3 \
 		libgee-0.8.so:${PORTSDIR}/devel/libgee
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig \
+		python:3 tar:xz
 USE_GNOME=	gnomeprefix gtk30 gtksourceview3 intlhack libxslt
-USE_PYTHON=	3
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index d1c200a9c..960a5114e 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -27,9 +27,8 @@ USE_LDCONFIG=	yes
 # iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)
 # (wchar_t is used by glibmm, rawtherapee triggered this)
 USES+=		gettext gmake iconv:wchar_t libtool:keepla pathfix perl5 \
-		pkgconfig shebangfix
-USE_PYTHON=	yes
-PYTHON_PY3K_PLIST_HACK=	yes
+		pkgconfig python shebangfix
+PYTHON_FEATURES=	py3kplist
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
 		--disable-man --without-xml-catalog \
 		--enable-static=yes \
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index c29a80408..e85dad9fc 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Generate interface introspection data for GObject libraries
 BUILD_DEPENDS=	cairo-trace:${PORTSDIR}/graphics/cairo
 LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
 
-USES=		bison gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		bison gettext gmake libtool:keepla pathfix pkgconfig \
+		python:2 tar:xz
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehier glib20
-USE_PYTHON=	2
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 1c8996424..701dc0398 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -21,11 +21,10 @@ LIB_DEPENDS=	libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
-USE_XZ=		yes
 USE_GNOME=	intlhack gnomeprefix gtk30 libgda5 gtksourceview3 libxml2 \
 		introspection:build
-USES=		desktop-file-utils gettext gmake pathfix pkgconfig
-USE_PYTHON=	yes
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
+		python tar:xz
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/devel/libgdata06/Makefile b/devel/libgdata06/Makefile
index 76423495e..8747259e6 100644
--- a/devel/libgdata06/Makefile
+++ b/devel/libgdata06/Makefile
@@ -16,10 +16,9 @@ LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
 
 CONFLICTS=	libgdata-0.10.*
 
-USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool:keepla pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	intltool glib20 introspection:build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 4b59cd84f..cea41f0e1 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -11,10 +11,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 top library
 
-USE_XZ=		yes
 USE_PERL5=	build
 USE_XORG=	xau
-USES=		gettext gmake libtool:keepla pathfix perl5 pkgconfig
+USES=		gettext gmake libtool:keepla pathfix perl5 pkgconfig tar:xz
 USE_GNOME=	gnomeprefix glib20 intlhack introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index d4b05418c..f561b3bf8 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libhal.so:${PORTSDIR}/sysutils/hal
 RUN_DEPENDS=	${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig
+USES=		gmake pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix glib20
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-hal
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index edbf86a3e..cbeed422c 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Next evolution of the Gedit plugins engine
 
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig \
+		python:3 tar:xz
 USE_GNOME=	gtk30 introspection:build
-USE_PYTHON=	3
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 7e38d376e..8788ddeb2 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -19,16 +19,17 @@ USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)
 
-USES+=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES+=		gettext gmake libtool:keepla pathfix pkgconfig \
+		python:3:build tar:xz
 USE_GNOME=	glib20 gnomehier intltool introspection:build \
 		libxml2 referencehack
 USE_SQLITE=	3
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_PYTHON_BUILD=	3
 CONFIGURE_ARGS=	--disable-more-warnings
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 LIBVERSION=	1.7.0
 PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}
@@ -68,7 +69,6 @@ post-install:
 .else
 	${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \
 		${STAGEDIR}${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsoup*.so*
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/pydbus-common/Makefile b/devel/pydbus-common/Makefile
index f5aa59121..3b97069e6 100644
--- a/devel/pydbus-common/Makefile
+++ b/devel/pydbus-common/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 INSTALL_TARGET=	install-strip
 
 .if ${SLAVE_PORT} == no
-USE_PYTHON_BUILD=	2
+USES+=		python:build,2
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
@@ -70,10 +70,10 @@ LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS+=	pydbus-common>=0:${PORTSDIR}/devel/pydbus-common
 USE_LDCONFIG=	yes
 .if ${SLAVE_PORT} == python2
-USE_PYTHON=	2
+USES+=		python:2
 .endif
 .if ${SLAVE_PORT} == python3
-USE_PYTHON=	3
+USES+=		python:3
 .endif
 
 post-install:
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
index 8fc60e4bf..a8b9ca0c2 100644
--- a/devel/pygobject3-common/Makefile
+++ b/devel/pygobject3-common/Makefile
@@ -23,6 +23,7 @@ SLAVE_PORT?=	no
 
 USES=		gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 
 # this port doesn't work with py-gobject < 2.28.6_2, clungle below
 CONFLICTS=	py*-gtk-0* py*-gobject-2.*.[0-6] py*-gobject-2.*.[7-9] \
@@ -33,7 +34,7 @@ PLIST_SUB=	ARCH=${ARCH} UNAME_R=${UNAME_R} VERSION=${PORTVERSION} \
 
 .if ${SLAVE_PORT} == no
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-USE_PYTHON_BUILD=	2
+USES+=		python:build
 USE_GNOME=	glib20:build introspection:build
 NO_BUILD=	yes
 
@@ -49,20 +50,19 @@ LIB_DEPENDS+=	libffi.so:${PORTSDIR}/devel/libffi
 RUN_DEPENDS+=	pygobject3-common>=0:${PORTSDIR}/devel/pygobject3-common
 
 .if ${SLAVE_PORT} == python2
-USE_PYTHON=	2
+USES+=		python:2
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
 .endif
 
 .if ${SLAVE_PORT} == python3
-USE_PYTHON=	3
+USES+=		python:3
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:${PORTSDIR}/graphics/py3-cairo
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:${PORTSDIR}/graphics/py3-cairo
 PLIST_SUB+=	PYTVER=${PYTHON_VER:S/.//}
 .endif
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gi/*.so
 	@${RM} -rf ${STAGEDIR}${PREFIX}/include/pygobject-3.0 \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc
 .endif