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

72 files changed, 97 insertions, 172 deletions

diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index bd49db39e..489d4afb7 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -18,9 +18,8 @@ BUILD_DEPENDS=	gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desk
 RUN_DEPENDS=	gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		at-spi2-core>=2.1.5:${PORTSDIR}/accessibility/at-spi2-core
 
-USES=		gettext gmake pkgconfig shebangfix tar:xz
+USES=		gettext gmake pkgconfig python:3 shebangfix tar:xz
 USE_GNOME=	gtk30 intlhack py3gobject3
-USE_PYTHON=	3
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index 01c0dfd95..807c4c112 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -20,22 +20,19 @@ LIB_DEPENDS=	libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
 		libxklavier.so:${PORTSDIR}/x11/libxklavier
 RUN_DEPENDS=	py2?-atspi>=2.1.91:${PORTSDIR}/accessibility/py-atspi
 
-USES=		gettext gmake pathfix pkgconfig shebangfix tar:xz
+USES=		gettext gmake pathfix pkgconfig python:2 shebangfix tar:xz
 USE_GNOME=	gnomehier gtk30 intlhack introspection:build libxml2 \
 		libxslt:build pygobject3
 SHEBANG_FILES=	tools/fix_gir.py tools/make_schema.py
-USE_PYTHON=	2
 USE_XORG=	x11 xtst
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
+
 CONFIGURE_ARGS=	--enable-gtk2-module=no
 GLIB_SCHEMAS=	org.gnome.caribou.gschema.xml \
 		org.gnome.antler.gschema.xml
 python_CMD=	${PYTHON_CMD}
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcaribou.so.0
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules/libcaribou-gtk-module.so
-
 .include <bsd.port.mk>
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 46ffedf76..91ca237bd 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -24,9 +24,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py3-dbus \
 # and py*-json-py shadows this.
 CONFLICTS=	py*-json-py-[0-9]*
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake pathfix pkgconfig python:3 tar:xz
 USE_GNOME=	gnomeprefix gtk30 py3gobject3
-USE_PYTHON=	3
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index adead4313..daf3d6389 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -19,10 +19,9 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at
 
 CONFLICTS=	at-spi-1.[0-9]*
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake pathfix pkgconfig python:2 tar:xz
 USE_GNOME=	gnomehier intlhack pygobject3
 GNU_CONFIGURE=	yes
-USE_PYTHON=	2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/accessibility/py3-atspi/Makefile b/accessibility/py3-atspi/Makefile
index 7dd3b663f..d9b7ea2b5 100644
--- a/accessibility/py3-atspi/Makefile
+++ b/accessibility/py3-atspi/Makefile
@@ -19,10 +19,9 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at
 
 CONFLICTS=	at-spi-1.[0-9]*
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake pathfix pkgconfig python:3 tar:xz
 USE_GNOME=	gnomehier intlhack py3gobject3
 GNU_CONFIGURE=	yes
-USE_PYTHON=	3
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/audio/gnome-music/Makefile b/audio/gnome-music/Makefile
index fac6f499c..cc33ad8d1 100644
--- a/audio/gnome-music/Makefile
+++ b/audio/gnome-music/Makefile
@@ -15,12 +15,12 @@ COMMENT=	GNOME music playing application
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 LIB_DEPENDS=	libgrilo-0.2.so:${PORTSDIR}/net/grilo
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig \
+		python:3 tar:xz
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomedesktop3 gnomeprefix gtk30 intlhack \
 		introspection:build
 GNU_CONFIGURE=	yes
-USE_PYTHON=	3
 USE_GSTREAMER1=	ogg mad
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 235202b50..02c833a62 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -23,11 +23,9 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 		${LOCALBASE}/libdata/pkgconfig/libgda-mysql-5.0.pc:${PORTSDIR}/databases/libgda5-mysql \
 		${LOCALBASE}/libdata/pkgconfig/libgda-postgres-5.0.pc:${PORTSDIR}/databases/libgda5-postgresql
 
-USE_XZ=		yes
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
-		shared-mime-info
+		python shared-mime-info tar:xz
 USE_GNOME=	gnomedocutils gnomeprefix intltool pygobject3 libxml2 \
 		gtksourceviewmm3 libgdamm5
 USE_LDCONFIG=	yes
@@ -35,6 +33,7 @@ USE_PGSQL=	yes
 INSTALLS_OMF=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--with-postgres-utils=${LOCALBASE}/bin \
 		--disable-documentation
 INSTALLS_ICONS=	yes
@@ -60,8 +59,4 @@ post-patch:
 		${WRKSRC}/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc \
 		${WRKSRC}/glom/main.cc
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
-	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/*.so
-
 .include <bsd.port.mk>
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 871178360..45c9eaddf 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -14,10 +14,9 @@ COMMENT=	Freedesktop compliant menu editor for GNOME
 
 BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
 
-USES=		gettext gmake pkgconfig tar:xz
+USES=		gettext gmake pkgconfig python:3 tar:xz
 USE_GNOME=	gnomemenus3 gnomeprefix intlhack libxslt:build \
 		py3gobject3
-USE_PYTHON=	3
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/gnome-search-tool/Makefile b/deskutils/gnome-search-tool/Makefile
index 7e807884b..56683b5c2 100644
--- a/deskutils/gnome-search-tool/Makefile
+++ b/deskutils/gnome-search-tool/Makefile
@@ -15,8 +15,7 @@ BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
 CONFLICTS=	gnome-utils-2.[0-9]*
 
-USE_XZ=		yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gtk30 intlhack
diff --git a/deskutils/gnome-sound-recorder/Makefile b/deskutils/gnome-sound-recorder/Makefile
index 14f73f5fb..001f1b8b5 100644
--- a/deskutils/gnome-sound-recorder/Makefile
+++ b/deskutils/gnome-sound-recorder/Makefile
@@ -14,12 +14,11 @@ COMMENT=	GNOME sound recorder application
 
 LIB_DEPENDS=	libgjs.so:${PORTSDIR}/lang/gjs
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig python:3 tar:xz
 USE_GNOME=	gnomedesktop3 gnomeprefix gtk30 intlhack \
 		introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_PYTHON=	3
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/deskutils/gnome-tweak-tool/Makefile b/deskutils/gnome-tweak-tool/Makefile
index 5042107e4..f37fb6612 100644
--- a/deskutils/gnome-tweak-tool/Makefile
+++ b/deskutils/gnome-tweak-tool/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Allows to tweak some hidden settings in GTK3 / GNOME3
 BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake pathfix pkgconfig python:2 tar:xz
 USE_GNOME=	gnomeprefix gtk30 pygobject3
-USE_PYTHON=	2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 922084317..2a6ce422d 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -18,9 +18,8 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 
 CONFLICTS=	xfce4-notification-daemon-[0-9]* xfce4-notifyd-[0-9]*
 
-USE_XZ=		yes
 USE_GNOME=	gnomeprefix intlhack gtk30
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
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
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 35e0494b8..d2a415a1f 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -23,6 +23,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.gedit.plugins.drawspaces.gschema.xml \
 		org.gnome.gedit.plugins.wordcompletion.gschema.xml
@@ -34,7 +35,7 @@ PYTHON_DESC=	Build plugins that depend on python
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
+USES+=		python
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/bus.py:${PORTSDIR}/devel/py-dbus
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/bus.py:${PORTSDIR}/devel/py-dbus
 # the charmap plugin doesn't work, missing py-gucharmap stuff
@@ -49,8 +50,5 @@ post-patch:
 	@${REINPLACE_CMD} -e 's| \\t\\r\\n\\f|[:space:]|g' \
 	    	${WRKSRC}/configure
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gedit/plugins/lib*.so
-
 .include <bsd.port.mk>
 
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 396fadb8c..4a6a919f0 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -21,12 +21,11 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 USES=		desktop-file-utils gettext gmake libtool:keepla \
-		pathfix pkgconfig tar:xz
+		pathfix pkgconfig python:3 tar:xz
 USE_GNOME=	gnomeprefix gtksourceview3 intlhack introspection:build \
 		libxml2 py3gobject3
 USE_XORG=	sm
 GNU_CONFIGURE=	yes
-USE_PYTHON=	3
 CONFIGURE_ARGS=	--disable-updater
 CONFIGURE_ARGS+=--disable-zeitgeist \
 		--enable-python
diff --git a/games/gnome-sudoku/Makefile b/games/gnome-sudoku/Makefile
index 074fe3409..280120cd0 100644
--- a/games/gnome-sudoku/Makefile
+++ b/games/gnome-sudoku/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Sudoku game for gnome
 
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
-USES=		gettext gmake pathfix pkgconfig shebangfix tar:xz
+USES=		gettext gmake pathfix pkgconfig python:3 shebangfix tar:xz
 USE_GNOME=	gtk30 intlhack libxml2:build py3gobject3
-USE_PYTHON=	3
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/colord-gtk/Makefile b/graphics/colord-gtk/Makefile
index 675ca1a54..7812698b0 100644
--- a/graphics/colord-gtk/Makefile
+++ b/graphics/colord-gtk/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS=	libcolord.so:${PORTSDIR}/graphics/colord \
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2
 
-USE_XZ=		yes
 USE_GNOME=	gnomehier gtk30 intlhack introspection:build
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_SQLITE=	3
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index 3ffe9f78d..4abbeb70a 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -44,7 +44,7 @@ PLIST_SUB+=	CHAMPLAIN="@comment "
 PLIST_SUB+=	PYVER=${PYTHON_VER:S|.||}
 .if ${PORT_OPTIONS:MPYTHON}
 CONFIGURE_ARGS+=--enable-python
-USE_PYTHON=	3
+USES+=		python:3
 PLIST_SUB+=	PYTHON=""
 GLIB_SCHEMAS+=	org.gnome.eog.plugins.export-to-folder.gschema.xml \
 		org.gnome.eog.plugins.fullscreenbg.gschema.xml \
diff --git a/graphics/gnome-video-effects/Makefile b/graphics/gnome-video-effects/Makefile
index 63e249568..f7b396d46 100644
--- a/graphics/gnome-video-effects/Makefile
+++ b/graphics/gnome-video-effects/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	GNOME
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Collection of Gstreamer effects
 
-USE_XZ=		yes
 USE_GNOME=	intlhack
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix tar:xz
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile
index 5947b1b14..37e7780f4 100644
--- a/lang/cjs/Makefile
+++ b/lang/cjs/Makefile
@@ -18,10 +18,10 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 
 CONFLICTS_BUILD=spidermonkey17-1.7.*
 
-USES=		gettext libtool gmake pathfix pkgconfig shebangfix
+USES=		gettext libtool gmake pathfix pkgconfig python:build \
+		shebangfix
 USE_GNOME=	cairo glib20 gnomeprefix introspection:build \
 		intlhack
-USE_PYTHON_BUILD=yes
 USE_LDCONFIG=	yes
 PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 8ceae1d28..13bd29163 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -14,16 +14,14 @@ COMMENT=	GNOME Javascript binding
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libmozjs-24.so:${PORTSDIR}/lang/spidermonkey24
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig \
+		python:build tar:xz
 USE_GNOME=	cairo glib20 gnomeprefix introspection:build \
 		intlhack
-USE_PYTHON_BUILD=yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgjs.so.*
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index ee976791a..04204c48f 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -29,12 +29,11 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 		grilo-plugins>=0:${PORTSDIR}/net/grilo-plugins
 
 USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
-		shebangfix tar:xz
+		python:3 shebangfix tar:xz
 USE_GNOME=	gnomehier gnomeprefix gtk30 intlhack introspection:build \
 		libxml2 nautilus3 py3gobject3
 USE_XORG=	x11 xproto xtst ice sm
 USE_GSTREAMER1=	core good bad soup ugly
-USE_PYTHON=	3
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net-im/ekiga/Makefile b/net-im/ekiga/Makefile
index f33c97376..9f98ab3cb 100644
--- a/net-im/ekiga/Makefile
+++ b/net-im/ekiga/Makefile
@@ -18,9 +18,8 @@ LIB_DEPENDS=	libboost_signals.so:${PORTSDIR}/devel/boost-libs \
 		libv4l2.so:${PORTSDIR}/multimedia/libv4l
 RUN_DEPENDS=	gnome-icon-theme>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme
 
-USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USES=		gettext gmake pathfix perl5 pkgconfig
+USES=		gettext gmake pathfix perl5 pkgconfig tar:xz
 USE_XORG=	xv
 USE_GNOME=	gtk20 intltool libxml2
 INSTALLS_ICONS=	yes
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index be533bd20..4ab5bbf2d 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -38,9 +38,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 		geoclue>=0:${PORTSDIR}/net/geoclue \
     		${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig python tar:xz
 USE_GNOME=	evolutiondataserver3 gnomeprefix
-USE_PYTHON=	yes
 USE_GSTREAMER1=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index c83ba820a..e005f7a5f 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Collection of GStreamer modules and libraries for videoconferencing
 LIB_DEPENDS=	libnice.so:${PORTSDIR}/net-im/libnice
 RUN_DEPENDS=	libnice-gst010>=0:${PORTSDIR}/net-im/libnice-gst010
 
-USES=		gettext libtool gmake pathfix pkgconfig
+USES=		gettext libtool gmake pathfix pkgconfig python
 USE_LDCONFIG=	yes
-USE_PYTHON=	yes
 USE_GNOME=	glib20
 USE_GSTREAMER=	core good bad python
 GNU_CONFIGURE=	yes
diff --git a/net-im/farstream/Makefile b/net-im/farstream/Makefile
index 947378bba..942a64d4d 100644
--- a/net-im/farstream/Makefile
+++ b/net-im/farstream/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS=	libnice.so:${PORTSDIR}/net-im/libnice
 RUN_DEPENDS=	libnice-gst1>=0:${PORTSDIR}/net-im/libnice-gst1
 
 USE_LDCONFIG=	yes
-USE_PYTHON=	yes
-USES=		gettext libtool gmake pathfix pkgconfig
+USES=		gettext libtool gmake pathfix pkgconfig python
 USE_GNOME=	glib20 introspection:build
 USE_GSTREAMER1=	good bad
 GNU_CONFIGURE=	yes
diff --git a/net-im/libtelepathy/Makefile b/net-im/libtelepathy/Makefile
index 6e7022a0a..2f5ab2e31 100644
--- a/net-im/libtelepathy/Makefile
+++ b/net-im/libtelepathy/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
 BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 
-USE_PYTHON_BUILD=	yes
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool pathfix pkgconfig python:build
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 libxslt:build
 GNU_CONFIGURE=	yes
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index c13e4cbcf..811a7d329 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Lightweight Jabber client library
 
 LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
 
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	glib20
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc
diff --git a/net-im/telepathy-farstream/Makefile b/net-im/telepathy-farstream/Makefile
index bedbee680..39a815d3b 100644
--- a/net-im/telepathy-farstream/Makefile
+++ b/net-im/telepathy-farstream/Makefile
@@ -16,11 +16,10 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
 		libfarstream-0.2.so:${PORTSDIR}/net-im/farstream
 
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool pathfix pkgconfig python
 USE_GNOME=	glib20 libxslt:build introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_PYTHON=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index 57dd119f9..a012b59c3 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -24,11 +24,10 @@ RUN_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool pathfix pkgconfig python:build
 USE_GNOME=	glib20 libxslt:build
 USE_SQLITE=	3
 USE_OPENSSL=	yes
-USE_PYTHON_BUILD=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 CONFIGURE_ENV=	LIBS="-pthread"
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index 3506755ef..01ed07f46 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -17,11 +17,9 @@ RUN_DEPENDS=	vapigen:${PORTSDIR}/lang/vala-vapigen
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool pathfix pkgconfig python:build
 USE_GNOME=	glib20 gnomehier introspection:build libxslt:build
 USE_LDCONFIG=	yes
-USE_PYTHON_BUILD=	yes
-#MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-vala-bindings
 INSTALL_TARGET=	install-strip
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 2e09ae15d..f1c6575f6 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -13,11 +13,10 @@ COMMENT=	IRC Connection Manager for Telepathy Framework
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
 
-USES=		execinfo gmake pathfix pkgconfig
+USES=		execinfo gmake pathfix pkgconfig python:build
 USE_GNOME=	glib20 libxslt:build
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-USE_PYTHON_BUILD=yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index 3fc9b1534..249277240 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -17,13 +17,12 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 
 LICENSE=	LGPL21
 
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool pathfix pkgconfig python:build tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 gnomedocutils intltool libxml2 \
 		libxslt:build
 USE_SQLITE=	yes
-USE_PYTHON_BUILD=	yes
 GLIB_SCHEMAS=	org.freedesktop.Telepathy.Logger.gschema.xml
 INSTALL_TARGET=	install-strip
 
diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index 199390253..72ba2ef7a 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -20,10 +20,9 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
 
 USE_GNOME=	libxslt:build
 USE_GSTREAMER=	yes
-USE_PYTHON_BUILD=	2.5+
 USE_QT4=	dbus gui network qtestlib_build xml \
 		moc_build qmake_build rcc_build uic_build
-USES=		cmake pkgconfig
+USES=		cmake pkgconfig python:build
 CMAKE_ARGS=	-DENABLE_FARSIGHT:BOOL=False \
 		-DENABLE_FARSTREAM:BOOL=True \
 		-DENABLE_TESTS:BOOL=False
diff --git a/net-im/telepathy-rakia/Makefile b/net-im/telepathy-rakia/Makefile
index c09f2cafd..d95c19377 100644
--- a/net-im/telepathy-rakia/Makefile
+++ b/net-im/telepathy-rakia/Makefile
@@ -14,11 +14,10 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libsofia-sip-ua-glib.so:${PORTSDIR}/net/sofia-sip \
 		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
 
-USES=		gmake pathfix pkgconfig
+USES=		gmake pathfix pkgconfig python:build
 USE_GNOME=	glib20 libxslt:build
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-USE_PYTHON_BUILD=yes
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 0e40ca46a..f8c44f387 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -18,9 +18,8 @@ LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-USE_XZ=		yes
 USE_GNOME=	gnomehier gtk30 introspection:build
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/ports-mgmt/packagekit-qt4/Makefile b/ports-mgmt/packagekit-qt4/Makefile
index 3a459f237..fd3e1c6dd 100644
--- a/ports-mgmt/packagekit-qt4/Makefile
+++ b/ports-mgmt/packagekit-qt4/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Qt4 bindings to packagekit
 BUILD_DEPENDS=	packagekit>=0.8.8:${PORTSDIR}/ports-mgmt/packagekit
 RUN_DEPENDS=	packagekit>=0.8.8:${PORTSDIR}/ports-mgmt/packagekit
 
-USE_XZ=		yes
 USE_LDCONFIG=	yes
-USES=		cmake:outsource pkgconfig
+USES=		cmake:outsource pkgconfig tar:xz
 USE_GNOME=	glib20
 USE_QT4=	dbus xml sql qmake_build moc_build uic_build rcc_build
 
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index 3ff0b11f8..bfb5b77e2 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -15,16 +15,15 @@ BUILD_DEPENDS=	docbook2man:${PORTSDIR}/textproc/docbook-utils
 LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
 
-USE_XZ=		yes
 USES=		execinfo gettext gmake iconv pathfix pkgconfig \
-		shared-mime-info
+		python:2 shared-mime-info tar:xz
 USE_GNOME=	glib20 intltool introspection
 USE_LDCONFIG=	yes
 USE_SQLITE=	3
-USE_PYTHON=	-2.7
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=--with-security-framework=polkit \
 		--localstatedir=/var \
 		--disable-gtk-doc \
@@ -71,8 +70,5 @@ post-patch:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/cache/PackageKit/downloads
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so*
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/packagekit-backend/libpk*.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/packagekit-plugins/libpk*.so
 
 .include <bsd.port.mk>
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index a4826f3b6..b08db54f1 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -36,11 +36,10 @@ RUN_DEPENDS=	py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
 		ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
 		py*-lxml>=0:${PORTSDIR}/devel/py-lxml
 
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool pathfix python pkgconfig
 USE_GNOME=	evolutiondataserver3 gconf2 gnomeprefix \
 		gtk30 intlhack libgnomekbd
 USE_XORG=	x11 xfixes sm
-USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtoolize autoconf automake
 USE_LDCONFIG=	yes
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index 57654309f..774a857bc 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
     		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 
 WRKSRC=		${WRKDIR}/ConsoleKit-${PORTVERSION}
-USE_BZIP2=	yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:bzip2
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/drwright/Makefile b/sysutils/drwright/Makefile
index eb2208388..e3532fcad 100644
--- a/sysutils/drwright/Makefile
+++ b/sysutils/drwright/Makefile
@@ -13,10 +13,9 @@ COMMENT=	GNOME 3 RSI prevention tool
 LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
 		libnotify.so:${PORTSDIR}/devel/libnotify
 
-USE_XZ=		yes
 USE_GNOME=	intlhack gtk30 gnomecontrolcenter3
 USE_XORG=	x11 xscrnsaver
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index aae1e0d13..893c75846 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -12,8 +12,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gconf database editor for the GNOME 3 environment
 
-USE_XZ=		yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:xz
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomedocutils
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index 266992e72..5e5ffcd8e 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -12,8 +12,7 @@ COMMENT=	GNOME frontend to the PolicyKit framework
 
 LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 
-USES=		gettext gmake pathfix pkgconfig
-USE_XZ=		yes
+USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtk20 gtk30 intlhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 760d58abe..7a2302750 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 RUN_DEPENDS=	p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
 
-USE_BZIP2=	yes
-USES=		gmake pathfix perl5 pkgconfig
+USES=		gmake pathfix perl5 pkgconfig tar:bzip2
 USE_GNOME=	intlhack glib20
 GNU_CONFIGURE=	yes
 USE_GNOME_SUBR=	yes
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 0a639f9b7..4025ae940 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -16,15 +16,16 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig \
+		python tar:xz
 USE_GNOME=	intlhack glib20 introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_PYTHON=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--localstatedir=/var
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 CONFIGURE_ENV=	GTKDOC="false"
 
 .if defined(NO_INSTALL_MANPAGES)
@@ -38,7 +39,4 @@ USE_GNOME+=	libxslt:build
 PLIST_SUB+=	MAN=""
 .endif
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so*
-
 .include <bsd.port.mk>
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 153e24112..11f7f429c 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -26,9 +26,8 @@ CATALOG_DIR=		${PREFIX}/share/sgml/${PORTNAME}
 XMLCATMGR=		${LOCALBASE}/bin/xmlcatmgr
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
-USES=		gmake pathfix perl5 pkgconfig tar:xz
+USES=		gmake pathfix perl5 pkgconfig python tar:xz
 USE_GNOME=	gnomeprefix libxslt
-USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
 
diff --git a/textproc/itstool/Makefile b/textproc/itstool/Makefile
index d835d5e32..df01e7a37 100644
--- a/textproc/itstool/Makefile
+++ b/textproc/itstool/Makefile
@@ -16,8 +16,7 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
 
-USES=		tar:bzip2
-USE_PYTHON_RUN=	2
+USES=		python:2 tar:bzip2
 GNU_CONFIGURE=	yes
 
 post-patch:
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index d46921bbc..3b2920b55 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -28,11 +28,10 @@ RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
 		gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
 
 USES=		desktop-file-utils gettext gmake pathfix \
-		pkgconfig tar:xz
+		pkgconfig python:3 tar:xz
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack libwnck3 libxml2 libxslt
 USE_XORG=	ice x11 sm
 INSTALLS_ICONS=	yes
-USE_PYTHON=	3
 USE_SQLITE=	3
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/libepc/Makefile b/www/libepc/Makefile
index 26252262d..db3fee4a0 100644
--- a/www/libepc/Makefile
+++ b/www/libepc/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		libgnutls.so:${PORTSDIR}/security/gnutls \
 		libavahi-ui-gtk3.so:${PORTSDIR}/net/avahi-gtk3
 
-USE_XZ=		yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtk30
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 7a6d0f88e..da119ff05 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -24,11 +24,10 @@ RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
 		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 USES=		desktop-file-utils gettext gmake libtool pathfix \
-		pkgconfig shared-mime-info
+		pkgconfig python:2 shared-mime-info
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack introspection:build \
 		libxml2 pygobject3
 INSTALLS_ICONS=	yes
-USE_PYTHON=	2
 USE_AUTOTOOLS=	libtoolize autoconf automake
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index e19e70e4a..e44d1c088 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ wrapper for Pango
 
-USE_XZ=		yes
+USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)
 
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		gmake pathfix pkgconfig
+USES+=		gmake pathfix pkgconfig
 USE_GNOME=	cairomm glibmm pango
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index 1532efccd..7419d6aa6 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -21,12 +21,11 @@ LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop
 RUN_DEPENDS=	zenity3>=3.0.0:${PORTSDIR}/x11/zenity3
 
-USES=		execinfo gettext libtool gmake pathfix pkgconfig
+USES=		execinfo gettext libtool gmake pathfix pkgconfig python
 USE_GNOME=	gconf2 gnomedocutils gnomehier gnomeprefix gtk30 \
 		introspection:build
 USE_AUTOTOOLS=	libtoolize autoconf automake
 USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm
-USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 USE_CSTD=	gnu89
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
index e9774e775..9b4ea42d8 100644
--- a/x11/cinnamon-menus/Makefile
+++ b/x11/cinnamon-menus/Makefile
@@ -17,10 +17,9 @@ BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
 RUN_DEPENDS=	xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
 		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig python tar:xz
 USE_GNOME=	gnomehier gnomemenus3 gnomeprefix gtk30 intlhack \
 		introspection:build
-USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtoolize autoconf automake
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 8d4091d8b..29f6229a6 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -38,7 +38,7 @@ RUN_DEPENDS=	py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
 
 WRKSRC=		${WRKDIR}/Cinnamon-${PORTVERSION}
 
-USES=		gettext gmake libtool pathfix pkgconfig shebangfix
+USES=		gettext gmake libtool pathfix pkgconfig python shebangfix
 USE_GNOME=	evolutiondataserver3 gconf2 gnomedesktop3 \
 		gnomeprefix gtk30 intlhack introspection:build
 # this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX})
@@ -49,7 +49,6 @@ USE_GSTREAMER=	theora vp8 ogg
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_PYTHON=	yes
 CONFIGURE_ARGS+=--enable-compile-warnings=no \
 		--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 CPPFLAGS+=	-I${LOCALASE}/include
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 4121364d2..b7c9ee321 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -26,11 +26,10 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 		${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \
 		${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
 
-USES+=		bison gettext gmake libtool:keepla pathfix pkgconfig
+USES+=		bison gettext gmake libtool:keepla pathfix pkgconfig python:3
 USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build \
 		referencehack
 USE_XORG=	x11 xrandr xext
-USE_PYTHON=	3
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project"
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index e5d5bd147..446dcd327 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -11,11 +11,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Implementation of the FreeDesktop Desktop Menu Spec
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig python tar:xz
 USE_GNOME=	glib20 gnomehier gnomeprefix intlhack \
 		introspection:build
 GNU_CONFIGURE=	yes
-USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index ce198546b..78bbee904 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS=	pam_helper:${PORTSDIR}/security/pam_helper \
 		gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
 
-USE_XZ=		yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xext xxf86vm xxf86misc xscrnsaver
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack libgnomekbd
diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index 7cc30ad95..9c10686c3 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -23,14 +23,13 @@ LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake pathfix pkgconfig python tar:xz
 USE_MATE=	autogen common:build desktop docutils icontheme intlhack \
 		libmateweather libmatewnck mucharmap panel \
 		polkit settingsdaemon
 USE_XORG=	x11
 USE_GNOME=	gdkpixbuf2 glib20 gnomehier gtk20 introspection:build \
 		libxml2 libxslt pygobject pygtk2
-USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 USE_AUTOTOOLS=	aclocal:env autoconf:env automake:env libtool libtoolize:env
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 9d9dea9cb..c08a6bfb7 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 CONFLICTS=	gtkada-1.2.* zenity3-*
 
 USE_GNOME=	gnomeprefix gtk20 gnomedocutils intlhack
-USE_BZIP2=	yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}