Index: head/audio/libebur128/Makefile
===================================================================
--- head/audio/libebur128/Makefile	(revision 377814)
+++ head/audio/libebur128/Makefile	(revision 377815)
@@ -1,25 +1,26 @@
 # Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	libebur128
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implementation of the EBU R128 loudness standard
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libspeexdsp.so:${PORTSDIR}/audio/speex
+LIB_DEPENDS=	libspeexdsp.so:${PORTSDIR}/audio/speexdsp
 
 USES=		cmake:outsource pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jiixyj
 GH_TAGNAME=	v${PORTVERSION}
 GH_COMMIT=	1214547
 
 PLIST_SUB+=	VER1=${PORTVERSION:R:R} \
 		VER3=${PORTVERSION}
 
 .include <bsd.port.mk>
Index: head/audio/pulseaudio/Makefile
===================================================================
--- head/audio/pulseaudio/Makefile	(revision 377814)
+++ head/audio/pulseaudio/Makefile	(revision 377815)
@@ -1,89 +1,89 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/trunk/audio/pulseaudio/Makefile 20031 2014-11-02 21:47:55Z kwm $
 #
 # !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by
 # PORTREVISION bumps of depending ports.
 
 PORTNAME=	pulseaudio
 PORTVERSION=	5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Sound server for UNIX
 
 LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libspeexdsp.so:${PORTSDIR}/audio/speex \
+		libspeexdsp.so:${PORTSDIR}/audio/speexdsp \
 		libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
 		liborc-0.4.so:${PORTSDIR}/devel/orc \
 		libjson-c.so:${PORTSDIR}/devel/json-c \
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libltdl.so:${PORTSDIR}/devel/libltdl \
 		libck-connector.so:${PORTSDIR}/sysutils/consolekit
 
 USE_GNOME=	glib20 intltool
 USE_XORG=	x11 sm xtst ice
 USE_LDCONFIG=	yes
 USES=		execinfo gettext gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		OPENSSL_CFLAGS="-I/usr/include" \
 		OPENSSL_LIBS="-lcrypto -lssl" \
 		LIBS="-lm -lintl" \
 		ac_cv_header_linux_input_h=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-database=simple \
 		--without-caps \
 		--disable-udev \
 		--disable-gtk3 \
 		--disable-systemd \
 		--disable-neon-opt \
 		--disable-lirc # untested
 
 #FIXME --with-database=auto|tdb|gdbm|simple
 
 USERS=		pulse
 GROUPS=		pulse pulse-access pulse-rt
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	JACK AVAHI GCONF ALSA SIMD
 OPTIONS_DEFAULT=AVAHI SIMD
 JACK_CONFIGURE_ENABLE=	jack
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 AVAHI_CONFIGURE_ENABLE=	avahi
 AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 GCONF_CONFIGURE_ENABLE=	gconf
 GCONF_USE=	GNOME=gconf2
 ALSA_CONFIGURE_ENABLE=	alsa
 ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 SIMD_CONFIGURE_ENABLE=	orc
 SIMD_LIB_DEPENDS=	liborc-0.4.so:${PORTSDIR}/devel/orc
 
 PULSE_VERSION=	${PORTVERSION}
 PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/daemon/default.pa.in
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 		${WRKSRC}/configure
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/pulse
 .for ii in default.pa daemon.conf client.conf system.pa
 	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
 		${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/comms/gnuradio/Makefile
===================================================================
--- head/comms/gnuradio/Makefile	(revision 377814)
+++ head/comms/gnuradio/Makefile	(revision 377815)
@@ -1,152 +1,152 @@
 # $FreeBSD$
 
 PORTNAME=	gnuradio
 PORTVERSION=	3.7.4
 PORTREVISION=	1
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	sdl-config:${PORTSDIR}/devel/sdl12 \
 		swig2.0:${PORTSDIR}/devel/swig20 \
 		cheetah:${PORTSDIR}/devel/py-cheetah \
-		${PYTHON_SITELIBDIR}/lxml:${PORTSDIR}/devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
 		${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
 		${PYTHON_SITELIBDIR}/PyQt4/Qt.py:${PORTSDIR}/devel/py-qt4 \
 		xdg-open:${PORTSDIR}/devel/xdg-utils \
 		guile:${PORTSDIR}/lang/guile \
 		icebox:${PORTSDIR}/devel/ice \
 		aconnect:${PORTSDIR}/audio/alsa-utils \
 		git:${PORTSDIR}/devel/git \
 		${PYNUMPY} \
 		${PYTHON_SITELIBDIR}/ephem/__init__.py:${PORTSDIR}/astro/pyephem\
 		${PYTHON_SITELIBDIR}/PyQt4/Qt.py:${PORTSDIR}/devel/py-qt4
 LIB_DEPENDS=	libcppunit.so:${PORTSDIR}/devel/cppunit \
 		libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
 		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
 		libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
 		libportaudio.so:${PORTSDIR}/audio/portaudio2 \
 		libjack.so:${PORTSDIR}/audio/jack \
 		libasound.so:${PORTSDIR}/audio/alsa-lib \
 		libgsl.so:${PORTSDIR}/math/gsl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		iconv cmake:outsource perl5 python:2.7 shebangfix
 SHEBANG_FILES=	grc/freedesktop/grc_setup_freedesktop.in
 CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"
 CMAKE_ARGS+=	-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 		-DICONV_LIB:STRING="X${ICONV_LIB}" \
 		-DICE_CONFIG_INCLUDE_DIR="${LOCALBASE}/include/"
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
 DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
 USE_WX=		3.0+
 USE_QT4=	gui xml qmake moc rcc uic
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_LDCONFIG=	yes
 PLIST_SUB+=	MAJOR_VERSION="3"
 
 OPTIONS_DEFINE=		USRP TESTING
 # Unfortunately building docs on i386 fails
 ##OPTIONS_EXCLUDE_${i386}=	DOCS
 # Yay. building docs is broken on 10 and HEAD too so turn them all off
 OPTIONS_EXCLUDE=	DOCS
 OPTIONS_DEFAULT=	USRP
 USRP_DESC=	Include USRP support (UHD) from Ettus
 TESTING_DESC=	Include testing support
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 # Only use port clang34 on 10 if not RELEASE. I think this should do it.
 .if ${OSVERSION} <= 1000510 && ${OSVERSION} > 1000000
 # Debug hack
 #.if ${OSVERSION} <= 1200000
 BUILD_DEPENDS+=	clang34:${PORTSDIR}/lang/clang34
 CC=		clang34
 CXX=		clang++34
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
 		${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \
 		dot:${PORTSDIR}/graphics/graphviz \
 		xmlto:${PORTSDIR}/textproc/xmlto \
 		${LOCALBASE}/lib/X11/fonts/freefont-ttf/fonts.scale:${PORTSDIR}/x11-fonts/freefont-ttf
 CMAKE_ARGS+=	-DENABLE_DOXYGEN:STRING="ON"
 CMAKE_ARGS+=	-DENABLE_DOCS:STRING="ON"
 CMAKE_ARGS+=	-DENABLE_BAD_BOOST="ON"
 HAVE_PORTDOCS=	YES
 .else
 CMAKE_ARGS+=	-DENABLE_DOXYGEN:STRING="OFF"
 CMAKE_ARGS+=	-DENABLE_DOCS:STRING="OFF"
 CMAKE_ARGS+=	-DENABLE_BAD_BOOST="ON"
 .endif
 
 .if ${PORT_OPTIONS:MUSRP}
 CMAKE_ARGS+=	-DENABLE_GR_UHD:STRING="ON"
 BUILD_DEPENDS+=	${LOCALBASE}/include/uhd/config.hpp:${PORTSDIR}/comms/usrp
 PLIST_SUB+=	UHD=""
 .else
 CMAKE_ARGS+=	-DENABLE_GR_UHD:STRING="OFF"
 PLIST_SUB+=	UHD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTESTING}
 CMAKE_ARGS+=	-DENABLE_TESTING:STRING="ON"
 BUILD_DEPENDS+=	cppunit-config:${PORTSDIR}/devel/cppunit
 .else
 CMAKE_ARGS+=	-DENABLE_TESTING:STRING="OFF"
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \
 	    ${XARGS} ${REINPLACE_CMD} -e \
 		 "s|{GR_LIBRARY_DIR}/pkgconfig|{GR_PKGCONFIG_DIR}/pkgconfig|g"
 
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		${WRKSRC}/docs/doxygen/Doxyfile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/cmake/Modules/FindPortaudio.cmake
 
 PLISTMAIN=	pkg-plist.main
 PLISTDIRS=	pkg-plist.dirs
 PLIST=	${WRKDIR}/.pkg-plist
 
 pre-install:
 	@${RM} -f ${PLIST}
 	@${CAT} ${PLISTMAIN} > ${PLIST}
 .if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKDIR}/.build/docs/doxygen && ${FIND} html -type f  | \
 	    ${SED} -e 's|html|%%PORTDOCS%%%%DOCSDIR%%/html|' \
 		| ${SORT} >> ${PLIST}
 	@cd ${WRKDIR}/.build/gr-trellis && ${FIND} doc -name \*.html -type f  | \
 	    ${SED} -e 's|doc|%%PORTDOCS%%%%DOCSDIR%%/html|' \
 		| ${SORT} >> ${PLIST}
 	@cd ${WRKDIR}/.build/docs/doxygen && ${FIND} xml -type f  | \
 	    ${SED} -e 's|xml|%%PORTDOCS%%%%DOCSDIR%%/xml|' \
 		| ${SORT} >> ${PLIST}
 	@cd ${WRKDIR}/.build/gr-trellis && ${FIND} doc -name \*.xml -type f  | \
 	    ${SED} -e 's|doc|%%PORTDOCS%%%%DOCSDIR%%/xml|' \
 		| ${SORT} >> ${PLIST}
 	@${CAT} ${PLISTDIRS} >> ${PLIST}
 	@cd ${WRKDIR}/.build/docs/doxygen && ${FIND} html -type d | ${SORT} -r | \
 	    ${SED} -e 's|html|%%PORTDOCS%%@dirrm %%DOCSDIR%%/html|' \
 		 >> ${PLIST}
 	@cd ${WRKDIR}/.build/docs/doxygen && ${FIND} xml -type d | ${SORT} -r | \
 	    ${SED} -e 's|xml|%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml|' \
 		 >> ${PLIST}
 	@${ECHO_CMD} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST}
 .else
 	@${CAT} ${PLISTDIRS} >> ${PLIST}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/deskutils/conduit/Makefile
===================================================================
--- head/deskutils/conduit/Makefile	(revision 377814)
+++ head/deskutils/conduit/Makefile	(revision 377815)
@@ -1,53 +1,53 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/deskutils/conduit/Makefile,v 1.7 2008/03/18 14:53:42 ahze Exp $
 
 PORTNAME=	conduit
 PORTVERSION=	0.3.17
 PORTREVISION=	7
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Synchronization application for GNOME
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		xmlproc_parse:${PORTSDIR}/textproc/py-xml \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \
-		${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus
+		${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		xmlproc_parse:${PORTSDIR}/textproc/py-xml \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \
-		${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
 		xdg-open:${PORTSDIR}/devel/xdg-utils
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake pathfix pkgconfig python
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	pygnome2 gnomeprefix gnomedocutils
 CONFIGURE_ARGS=	--disable-nautilus-extension
 
 OPTIONS_DEFINE=	EOG
 OPTIONS_DEFAULT=EOG
 EOG_DESC=	Build Eye-Of-Gnome Plugin
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEOG}
 BUILD_DEPENDS+=	eog:${PORTSDIR}/graphics/eog
 RUN_DEPENDS+=	eog:${PORTSDIR}/graphics/eog
 CONFIGURE_ARGS+=	--enable-eog-plugin
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \
 		-e 's|/usr/bin/python|${LOCALBASE}/bin/python|' \
 		-e 's|/usr/lib/firefox*|${LOCALBASE}/lib/firefox|'
 
 .include <bsd.port.mk>
Index: head/deskutils/gnome-documents/Makefile
===================================================================
--- head/deskutils/gnome-documents/Makefile	(revision 377814)
+++ head/deskutils/gnome-documents/Makefile	(revision 377815)
@@ -1,43 +1,43 @@
 # Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	gnome-documents
 PORTVERSION=	3.14.2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Document manager application designed to work with GNOME 3
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
 		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libclutter-1.0.so:${PORTSDIR}/graphics/clutter \
 		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
 		libevview3.so:${PORTSDIR}/graphics/evince \
 		libgdata.so:${PORTSDIR}/devel/libgdata \
 		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
 		libgjs.so:${PORTSDIR}/lang/gjs \
 		libtracker-sparql-1.0.so:${PORTSDIR}/sysutils/tracker \
 		libzapojit-0.0.so:${PORTSDIR}/net/libzapojit
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
+RUN_DEPENDS=	py2?-dbus>0:${PORTSDIR}/devel/py-dbus \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		unoconv:${PORTSDIR}/textproc/unoconv
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomedesktop3 gnomeprefix gtk30 intlhack \
 		introspection:build librsvg2 libxml2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.Documents.enums.xml \
 		org.gnome.documents.gschema.xml
 
 .include <bsd.port.mk>
Index: head/deskutils/xfce4-tumbler/Makefile
===================================================================
--- head/deskutils/xfce4-tumbler/Makefile	(revision 377814)
+++ head/deskutils/xfce4-tumbler/Makefile	(revision 377815)
@@ -1,182 +1,181 @@
 # Created by: Olivier Duchateau
 # $FreeBSD$
 
 PORTNAME=	tumbler
 PORTVERSION=	0.1.30
 PORTREVISION=	5
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 PKGNAMEPREFIX=	xfce4-
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Thumbnail service for Xfce desktop
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
 USES=		pathfix pkgconfig gmake libtool tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 intltool intlhack
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv
 
 CONFIGURE_ARGS=	--enable-xdg-cache \
 		--disable-gtk-doc-html
 
 OPTIONS_DEFINE=	DOCS NLS PIXBUF FONTS JPEG FFMPEG POPPLER \
 		GSTREAMER ODF OPENRAW COVER
 OPTIONS_DEFAULT=	PIXBUF FONTS JPEG POPPLER ODF
 FONTS_DESC=	Fonts thumbnailer plugin
 COVER_DESC=	Open Movie Database thumbnailer plugin
 GSTREAMER_DESC=	GStreamer (1.0) thumbnailer plugin
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
 .else
 CONFIGURE_ARGS+=--without-html-dir
 PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPIXBUF}
 USE_GNOME+=	gdkpixbuf2
 CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF=""
 .else
 CONFIGURE_ARGS+=--disable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFONTS}
 # PIXBUF needs to be set
 .if ! ${PORT_OPTIONS:MPIXBUF}
 USE_GNOME+=	gdkpixbuf2
 CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF=""
 .endif
 LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
 CONFIGURE_ARGS+=--enable-font-thumbnailer
 PLIST_SUB+=	FONTS=""
 .else
 CONFIGURE_ARGS+=--disable-font-thumbnailer
 PLIST_SUB+=	FONTS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MJPEG}
 .if ! ${PORT_OPTIONS:MPIXBUF}
 USE_GNOME+=	gdkpixbuf2
 CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF=""
 .endif
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libexif.so:${PORTSDIR}/graphics/exif
+LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 CONFIGURE_ARGS+=--enable-jpeg-thumbnailer
 PLIST_SUB+=	JPEG=""
 .else
 CONFIGURE_ARGS+=--disable-jpeg-thumbnailer
 PLIST_SUB+=	JPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
 .if ! ${PORT_OPTIONS:MPIXBUF}
 USE_GNOME+=	gdkpixbuf2
 CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF=""
 .endif
 LIB_DEPENDS+=	libffmpegthumbnailer.so:${PORTSDIR}/multimedia/ffmpegthumbnailer
 CONFIGURE_ARGS+=--enable-ffmpeg-thumbnailer
 PLIST_SUB+=	FFMPEG=""
 .else
 CONFIGURE_ARGS+=--disable-ffmpeg-thumbnailer
 PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPOPPLER}
 .if ! ${PORT_OPTIONS:MPIXBUF}
 USE_GNOME+=	gdkpixbuf2
 CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF=""
 .endif
 LIB_DEPENDS+=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 CONFIGURE_ARGS+=--enable-poppler-thumbnailer
 PLIST_SUB+=	POPPLER=""
 .else
 CONFIGURE_ARGS+=--disable-poppler-thumbnailer
 PLIST_SUB+=	POPPLER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGSTREAMER}
 .if ! ${PORT_OPTIONS:MPIXBUF}
 USE_GNOME+=	gdkpixbuf2
 CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF=""
 .endif
 USE_GSTREAMER1=	yes
 CONFIGURE_ARGS+=--enable-gstreamer-thumbnailer
 PLIST_SUB+=	GSTREAMER=""
 .else
 CONFIGURE_ARGS+=--disable-gstreamer-thumbnailer
 PLIST_SUB+=	GSTREAMER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MODF}
 .if ! ${PORT_OPTIONS:MPIXBUF}
 USE_GNOME+=	gdkpixbuf2
 CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF=""
 .endif
 USE_GNOME+=	libgsf
 CONFIGURE_ARGS+=--enable-odf-thumbnailer
 PLIST_SUB+=	ODF=""
 .else
 CONFIGURE_ARGS+=--disable-odf-thumbnailer
 PLIST_SUB+=	ODF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPENRAW}
 .if ! ${PORT_OPTIONS:MPIXBUF}
 USE_GNOME+=	gdkpixbuf2
 CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF=""
 .endif
 LIB_DEPENDS+=	libopenraw.so:${PORTSDIR}/graphics/libopenraw
 CONFIGURE_ARGS+=--enable-raw-thumbnailer
 PLIST_SUB+=	RAW=""
 .else
 CONFIGURE_ARGS+=--disable-raw-thumbnailer
 PLIST_SUB+=	RAW="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCOVER}
 .if ! ${PORT_OPTIONS:MPIXBUF}
 USE_GNOME+=	gdkpixbuf2
 CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF=""
 .endif
 LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=--enable-cover-thumbnailer
 PLIST_SUB+=	COVER=""
 .else
 CONFIGURE_ARGS+=--disable-cover-thumbnailer
 PLIST_SUB+=	COVER="@comment "
 .endif
 
 .include <bsd.port.mk>
Index: head/devel/py-roxlib/Makefile
===================================================================
--- head/devel/py-roxlib/Makefile	(revision 377814)
+++ head/devel/py-roxlib/Makefile	(revision 377815)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	roxlib
 PORTVERSION=	2.0.6
 PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	SF/rox/ROX-Lib/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	rox-lib2-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Python libraries for ROX
 
 USES=		python tar:bzip2
+USE_GNOME=	pygtk2:run
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
-		${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 	@cd ${WRKSRC}/ROX-Lib2/python && ${PYTHON_CMD} make_docs.py
 
 do-install:
 	${CP} -r ${WRKSRC}/ROX-Lib2 ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>
Index: head/devel/ruby-build/Makefile
===================================================================
--- head/devel/ruby-build/Makefile	(revision 377814)
+++ head/devel/ruby-build/Makefile	(revision 377815)
@@ -1,40 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	ruby-build
 PORTVERSION=	20150116
 CATEGORIES=	devel ruby
 
 MAINTAINER=	meta+ports@vmeta.jp
 COMMENT=	Compile and install different ruby versions
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
+RUN_DEPENDS=	autoconf>0:${PORTSDIR}/devel/autoconf \
 		curl:${PORTSDIR}/ftp/curl \
 		gmake:${PORTSDIR}/devel/gmake
 
 OPTIONS_DEFINE=	RBENV
 RBENV_DESC=	Install rbenv for installation support
 OPTIONS_DEFAULT=	RBENV
 RBENV_RUN_DEPENDS=	rbenv:${PORTSDIR}/devel/rbenv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sstephenson
 GH_COMMIT=	e12b960
 GH_TAGNAME=	v${PORTVERSION}
 
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/ruby-build \
 		libexec/rbenv-install \
 		libexec/rbenv-uninstall
 PORTDATA=	*
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/ruby-build ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/rbenv-install ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/rbenv-uninstall ${STAGEDIR}${PREFIX}/libexec
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	( cd ${WRKSRC}/share/ruby-build && ${COPYTREE_BIN} \* ${STAGEDIR}${DATADIR} )
 
 .include <bsd.port.mk>
Index: head/games/balazarbrothers/Makefile
===================================================================
--- head/games/balazarbrothers/Makefile	(revision 377814)
+++ head/games/balazarbrothers/Makefile	(revision 377815)
@@ -1,50 +1,50 @@
 # Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
 
 PORTNAME=	balazarbrothers
 PORTVERSION=	0.3.1
 PORTREVISION=	7
 CATEGORIES=	games python
 MASTER_SITES=	http://download.gna.org/${PORTNAME:S/brothers//}/
 DISTNAME=	${PORTNAME:S/b/B/g}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free software 3D puzzle game
 
 LICENSE=	GPLv2 # or later
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcal3d.so:${PORTSDIR}/graphics/cal3d \
 		libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ogg>0:${PORTSDIR}/audio/py-vorbis \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vorbis>0:${PORTSDIR}/audio/py-vorbis \
 		${PYTHON_PKGNAMEPREFIX}soya3d>0:${PORTSDIR}/graphics/py-soya3d \
 		${PYTHON_PKGNAMEPREFIX}tofu>0:${PORTSDIR}/net/py-tofu \
 		${PYTHON_PKGNAMEPREFIX}cerealizer>0:${PORTSDIR}/security/py-cerealizer
 
 NO_ARCH=	yes
 
 USES=		gettext python tar:bzip2 twisted
 USE_GL=		glew
 USE_PYTHON=	autoplist distutils
 
 PYDISTUTILS_PKGNAME=	BalazarBrothers
 PYDISTUTILS_EGGINFODIR=	${PREFIX}/share
 PYDISTUTILS_SETUP=	${PYSETUP}
 PYDISTUTILS_INSTALLNOSINGLE=	yes
 
 DESKTOP_ENTRIES="BalazarBrothers" "" "" "balazarbrothers" "" ""
 
 OPTIONS_DEFINE=		OPENAL
 OPTIONS_DEFAULT=	OPENAL
 
 OPENAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openal>0:${PORTSDIR}/audio/py-openal
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^install-purelib/s|=.*|= ${PREFIX}/share| ; \
 		 /^install-scripts/s|=.*|= ${PREFIX}/bin| ; \
 		 /^install-data/s|=.*|= ${PREFIX}/share|' ${WRKSRC}/setup.cfg
 	@${REINPLACE_CMD} -e \
 		'/LC_MESSAGES/s|".",||' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
Index: head/net/gq/Makefile
===================================================================
--- head/net/gq/Makefile	(revision 377814)
+++ head/net/gq/Makefile	(revision 377815)
@@ -1,43 +1,43 @@
 # Created by: Roman Shterenzon <roman@xpert.com>
 # $FreeBSD$
 
 PORTNAME=	gq
 PORTVERSION=	1.3.4
-PORTREVISION=	12
+PORTREVISION=	13
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}client/GQ%20Unstable/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK-based LDAP client
 
-LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/gnome-keyring
+LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 
 OPTIONS_DEFINE=	DND CACHE
 OPTIONS_DEFAULT=	DND CACHE
 DND_DESC=	Enable Drag and drop support in browse mode
 CACHE_DESC=	Support the OpenLDAP experimental client cache
 
 USE_GNOME=	libglade2 gnomedocutils
 USE_OPENSSL=	yes
 USE_OPENLDAP=	yes
 USES=		gettext gmake pkgconfig shared-mime-info desktop-file-utils
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ldap-prefix=${LOCALBASE} --disable-update-mimedb
 DND_CONFIGURE_ENABLE=	browser-dns
 CACHE_CONFIGURE_ENABLE=	cache
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include -Wno-return-type
 LIBS+=		-L${LOCALBASE}/lib -lcrypto
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/src/syntax.h \
 		${WRKSRC}/src/glib-helpers.[ch] \
 		${WRKSRC}/src/gq-hash.h \
 		${WRKSRC}/src/gq-main-loop.h \
 		${WRKSRC}/src/gq-stack.[ch] \
 		${WRKSRC}/src/gq-tab.h
 
 .include <bsd.port.mk>
Index: head/net/vnc/Makefile
===================================================================
--- head/net/vnc/Makefile	(revision 377814)
+++ head/net/vnc/Makefile	(revision 377815)
@@ -1,134 +1,134 @@
 # Created by: msmith
 # $FreeBSD$
 
 PORTNAME=	vnc
 PORTVERSION=	4.1.3
 PORTREVISION=	8
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://home.bluelife.at/ports/distfiles/${DIST_SUBDIR}/:vnc
 DISTNAME=	vnc-4_1_3-unixsrc
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:vnc
 DIST_SUBDIR=	xc
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Display X and Win32 desktops on remote X/Win32/Java displays
 
 RUN_DEPENDS=	xorg-fonts>=7.2:${PORTSDIR}/x11-fonts/xorg-fonts \
 		showrgb:${PORTSDIR}/x11/rgb \
 		xauth:${PORTSDIR}/x11/xauth
 
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 USES=		perl5
 USE_XORG=	x11 xext xpm xext xtst sm ice inputproto
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 PLIST=		${WRKDIR}/pkg-plist
 CONFLICTS=	tightvnc-[0-9]* tridiavnc-[0-9]*
 
 OPTIONS_DEFINE=	SERVER
 OPTIONS_DEFAULT=	SERVER
 SERVER_DESC=	Install VNC server components
 
 .ifdef(REALVNC_BASE)
 PREFIX=${REALVNC_BASE}
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "arm"
 BROKEN=		Does not compile on arm
 .endif
 
 .if ${PORT_OPTIONS:MSERVER}
 MASTER_SITES+=	${MASTER_SITE_XORG:S/$/:x/}
 MASTER_SITE_SUBDIR+=	4.3.0/:x
 DISTFILES+=	X430src-1.tgz:x \
 		X430src-2.tgz:x \
 		X430src-3.tgz:x
 
 .if ${OSVERSION} > 1000054
 USE_GCC=	yes
 MAKE_ENV=	IMAKECPP="${CPP}"
 MAKE_ARGS=	AR='ar rc'
 .endif
 
 RUN_DEPENDS+=	xauth:${PORTSDIR}/x11/xauth \
-		${PREFIX}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
+		xorg-fonts-miscbitmaps>0:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
 		${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias
 
 EXTRA_PATCHES+=	${WRKSRC}/xc.patch \
 		${PATCHDIR}/vnc.def-patch \
 		${PATCHDIR}/FreeBSD.cf-patch \
 		${PATCHDIR}/extra-patch-xfree86 \
 		${PATCHDIR}/extra-patch-fix_Xvnc_no_valid_address \
 		${PATCHDIR}/extra-patch-xc-config-util-printver.c
 
 PLIST_SUB+=	SERVER=""
 .else
 PLIST_SUB+=	SERVER="@comment "
 .endif
 
 post-extract:
 .if ${PORT_OPTIONS:MSERVER}
 	@cd ${WRKSRC} && ${TAR} -cf - -C ${WRKDIR} xc | ${TAR} -xf - && \
 	${RM} -rf ${WRKDIR}/xc
 .endif
 
 post-patch:
 .if ${PORT_OPTIONS:MSERVER}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
 		${WRKSRC}/xc/config/cf/vnc.def
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' -e 's|%%CXX%%|${CXX}|g' \
 		-e 's|%%CFLAGS%%|${CFLAGS}|g' \
 		${WRKSRC}/xc/config/cf/FreeBSD.cf
 .endif
 
 post-build:
 .if ! ${PORT_OPTIONS:MSERVER}
 	@${ECHO_MSG} "Skipping build of VNC server."
 .else
 .if ${OSVERSION} > 1000054
 	cd ${WRKSRC}/xc && ${MAKE_ENV} make CC=${CC} CXX=${CXX} ${MAKE_ARGS} World
 .else
 	cd ${WRKSRC}/xc && make CC=${CC} CXX=${CXX} World
 .endif
 .endif
 
 pre-install:
 	@${CP} ${PKGDIR}/pkg-plist ${PLIST}
 .if ${PORT_OPTIONS:MSERVER}
 	@if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \
 		${ECHO_CMD} lib/modules/extensions/vnc.so ; \
 		${ECHO_CMD} "@dirrmtry lib/modules/extensions" ; \
 		${ECHO_CMD} "@dirrmtry lib/modules" ; \
 		${ECHO_CMD} "@dirrmtry lib" ; \
 	fi >> ${PLIST}
 .endif
 
 do-install:
 .for f in vncviewer vncpasswd vncconfig x0vncserver
 	${INSTALL_PROGRAM} ${WRKSRC}/${f}/${f} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${f}/${f}.man ${STAGEDIR}${PREFIX}/man/man1/${f}.1
 .endfor
 .if ${PORT_OPTIONS:MSERVER}
 	@${REINPLACE_CMD} -e \
 		's|/usr/local/vnc/classes|${DATADIR}/classes|g' \
 		${WRKSRC}/vncserver
 	${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/Xvnc ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${STAGEDIR}${PREFIX}/bin
 	@if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \
 		${MKDIR} ${STAGEDIR}${PREFIX}/lib/modules/extensions ; \
 		${INSTALL_PROGRAM} \
 			${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so \
 			${STAGEDIR}${PREFIX}/lib/modules/extensions ; \
 	fi
 	${INSTALL_MAN} ${WRKSRC}/xc/programs/Xserver/Xvnc.man \
 		${STAGEDIR}${PREFIX}/man/man1/Xvnc.1
 	${INSTALL_MAN} ${WRKSRC}/vncserver.man ${STAGEDIR}${PREFIX}/man/man1/vncserver.1
 	${MKDIR} ${STAGEDIR}${DATADIR}/classes
 	${INSTALL_DATA} ${WRKSRC}/../common/javabin/* ${STAGEDIR}${DATADIR}/classes
 .endif
 
 .include <bsd.port.post.mk>
Index: head/net-im/centerim/Makefile
===================================================================
--- head/net-im/centerim/Makefile	(revision 377814)
+++ head/net-im/centerim/Makefile	(revision 377815)
@@ -1,75 +1,75 @@
 # Created by: Frank Altpeter <frank@altpeter.de>
 # $FreeBSD$
 
 PORTNAME=	centerim
 PORTVERSION=	4.22.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.centerim.org/download/releases/ \
 		ftp://ftp.centerim.org/releases/
 
 MAINTAINER=	frank@altpeter.de
 COMMENT=	Text mode menu- and window-driven IM interface
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 USES=		iconv gmake pkgconfig shebangfix
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-ssl --with-openssl
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONFLICTS=	centericq-[0-9]* centerim-devel-[0-9]*
 
 SHEBANG_FILES=	misc/cimformathistory misc/cimextracthistory.pl
 SHEBANG_LANG=	gawk
 gawk_OLD_CMD=	/bin/gawk
 gawk_CMD=	/usr/bin/awk
 
 OPTIONS_DEFINE=	NLS MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG
 
 FRIBIDI_DESC=	Fribidi Support
 MSN_DESC=	MSN Protocol
 YAHOO_DESC=	Yahoo! Messenger Protocol
 AIM_DESC=	AOL's Instant Messenger Protocol
 IRC_DESC=	IRC Protocol
 GPGME_DESC=	PGP encrypted Jabber messages
 RSS_DESC=	RSS Support
 LJ_DESC=	LiveJournal Support
 GG_DESC=	Gadu-Gadu Protocol Support
 
 OPTIONS_DEFAULT=        MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG
 
 OPTIONS_SUB=	yes
 
 PORTDOCS=	FAQ README
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 MULTIBYTE_CONFIGURE_ENABLE=locales-fix
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
 FRIBIDI_CONFIGURE_WITH=	fribidi
 MSN_CONFIGURE_ENABLE=	msn
 YAHOO_CONFIGURE_ENABLE=	yahoo
 AIM_CONFIGURE_ENABLE=	aim
 IRC_CONFIGURE_ENABLE=	irc
 JABBER_CONFIGURE_ENABLE=jabber
 RSS_CONFIGURE_ENABLE=	rss
 LJ_CONFIGURE_ENABLE=	lj
-GG_LIB_DEPENDS=		libgadu.so:${PORTSDIR}/polish/ekg
+GG_LIB_DEPENDS=		libgadu.so:${PORTSDIR}/polish/libgadu
 GG_CONFIGURE_ENABLE=	gg
 GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
 GPGME_CONFIGURE_OFF=	--with-gpgme-prefix=/nonexistent
 
 post-patch:
 	@${REINPLACE_CMD} -e '1 s|/usr/bin/python|/usr/bin/env python|' \
 		${WRKSRC}/misc/CenterIMLog2HTML.py
 	@${REINPLACE_CMD} -e 's|-R$$found_dir|-Wl,-rpath,$$found_dir|' \
 		${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/)
 
 .include <bsd.port.mk>
Index: head/net-im/centerim-devel/Makefile
===================================================================
--- head/net-im/centerim-devel/Makefile	(revision 377814)
+++ head/net-im/centerim-devel/Makefile	(revision 377815)
@@ -1,76 +1,76 @@
 # Created by: Frank Altpeter <frank@altpeter.de>
 # $FreeBSD$
 
 PORTNAME=	centerim
 PORTVERSION=	4.22.10.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.centerim.org/download/mobshots/ \
 		ftp://ftp.centerim.org/mobshots/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	frank@altpeter.de
 COMMENT=	Text mode menu- and window-driven IM interface
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 USES=		iconv gmake perl5 pkgconfig python:run shebangfix
 USE_PERL5=	run
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ssl --with-openssl
 CONFLICTS=	centericq-[0-9]* centerim-[0-9]*
 
 SHEBANG_FILES=	misc/cimformathistory misc/cimextracthistory.pl
 SHEBANG_LANG=	gawk
 gawk_OLD_CMD=	/bin/gawk
 gawk_CMD=	/usr/bin/awk
 
 OPTIONS_DEFINE=	NLS MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG
 
 FRIBIDI_DESC=	Fribidi Support
 MSN_DESC=	MSN Protocol
 YAHOO_DESC=	Yahoo! Messenger Protocol
 AIM_DESC=	AOL's Instant Messenger Protocol
 IRC_DESC=	IRC Protocol
 GPGME_DESC=	PGP encrypted Jabber messages
 RSS_DESC=	RSS Support
 LJ_DESC=	LiveJournal Support
 GG_DESC=	Gadu-Gadu Protocol Support
 
 OPTIONS_DEFAULT=	MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG
 
 OPTIONS_SUB=	yes
 
 PORTDOCS=	FAQ README
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 MULTIBYTE_CONFIGURE_ENABLE=locales-fix
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
 FRIBIDI_CONFIGURE_WITH=	fribidi
 MSN_CONFIGURE_ENABLE=	msn
 YAHOO_CONFIGURE_ENABLE=	yahoo
 AIM_CONFIGURE_ENABLE=	aim
 IRC_CONFIGURE_ENABLE=	irc
 JABBER_CONFIGURE_ENABLE=jabber
 RSS_CONFIGURE_ENABLE=	rss
 LJ_CONFIGURE_ENABLE=	lj
-GG_LIB_DEPENDS=		libgadu.so:${PORTSDIR}/polish/ekg
+GG_LIB_DEPENDS=		libgadu.so:${PORTSDIR}/polish/libgadu
 GG_CONFIGURE_ENABLE=	gg
 GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
 GPGME_CONFIGURE_OFF=	--with-gpgme-prefix=/nonexistent
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/run/screen|/tmp/screens|' \
 		${WRKSRC}/src/icqconf.cc
 	@${REINPLACE_CMD} -e 's|-R$$found_dir|-Wl,-rpath,$$found_dir|' \
 		${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/)
 
 .include <bsd.port.mk>
Index: head/print/hpijs/Makefile
===================================================================
--- head/print/hpijs/Makefile	(revision 377814)
+++ head/print/hpijs/Makefile	(revision 377815)
@@ -1,67 +1,68 @@
 # $FreeBSD$
 
 PORTNAME=	hpijs
 PORTVERSION=	2.1.4
 PORTREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	SF/hpinkjet/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drivers and support resources for HP Inkjet Printers
 
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 CONFLICTS=	hplip-[0-9]*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=		--disable-dependency-tracking
 USE_GHOSTSCRIPT_RUN=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	CUPS DOCS FOOMATIC
 OPTIONS_DEFAULT=	CUPS FOOMATIC
 FOOMATIC_DESC=	Install foomatic-rip and PPD files
 INSTALL_TARGET=	install-exec install-foomatic
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCUPS} || ${PORT_OPTIONS:MFOOMATIC}
 CONFLICTS+=		foomatic-filters-*
 USES+=			perl5 shebangfix
 CONFIGURE_ARGS+=	--enable-foomatic-install
 PLIST_SUB+=		FOOMATIC=""
 SHEBANG_FILES=		foomatic-rip
 .else
 CONFIGURE_ARGS+=	--disable-foomatic-install
 PLIST_SUB+=		FOOMATIC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups-base
+BUILD_DEPENDS+=		cups-base>0:${PORTSDIR}/print/cups-base
+RUN_DEPENDS+=		cups-base>0:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups-install
 PLIST_SUB+=		CUPS=""
 .else
 CONFIGURE_ARGS+=	--disable-cups-install
 PLIST_SUB+=		CUPS="@comment "
 .endif
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/share/cups|${LOCALBASE}/share/cups|g ; \
 		s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \
 			${WRKSRC}/configure
 
 .if empty(PORT_OPTIONS:MCUPS) && empty(PORT_OPTIONS:MFOOMATIC)
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hpijs ${STAGEDIR}${PREFIX}/bin
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/gs_hpijs.png ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/hpijs_readme.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/science/afni/Makefile
===================================================================
--- head/science/afni/Makefile	(revision 377814)
+++ head/science/afni/Makefile	(revision 377815)
@@ -1,140 +1,140 @@
 # Created by: Jason W. Bacon <jwbacon@tds.net>
 # $FreeBSD$
 
 ############################################################################
 # http://www.neuro.mcw.edu/Ports has the latest source distribution from
 #  which this port is built.  It will be updated as time permits.
 #
 # afni.nimh.nih.gov is the ultimate source for AFNI, and will always
 # contain the latest source release.  If this port is not up to date,
 # you can download the latest sources and build manually.
 
 PORTNAME=	afni
 PORTVERSION=	2012.04.17.2129
 PORTREVISION=	12
 CATEGORIES=	science biology graphics
 MASTER_SITES=	http://personalpages.tds.net/~jwbacon/Ports/distfiles/AFNI/${PORTVERSION}/ \
 		http://www.acadix.biz/Ports/distfiles/AFNI/${PORTVERSION}/
 DISTFILES=	afni_src.tgz afni.1 3dClustBust.c \
 		TTatlas+tlrc.BRIK.gz TTatlas+tlrc.HEAD CA_EZ_v1.5-July3107.tgz
 DIST_SUBDIR=	AFNI-${PORTVERSION}
 EXTRACT_ONLY=	afni_src.tgz CA_EZ_v1.5-July3107.tgz
 
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Advanced Functional Neuro Imaging
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
 		libR.so:${PORTSDIR}/math/R \
 		libgsl.so:${PORTSDIR}/math/gsl \
-		libnetcdf.so:${PORTSDIR}/science/netcdf-fortran
+		libnetcdff.so:${PORTSDIR}/science/netcdf-fortran
 RUN_DEPENDS=	cjpeg:${PORTSDIR}/graphics/jpeg \
 		mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \
 		whirlgif:${PORTSDIR}/graphics/whirlgif \
 		ppmtogif:${PORTSDIR}/graphics/netpbm \
 		endian:${PORTSDIR}/sysutils/endian \
 		qhull:${PORTSDIR}/math/qhull5
 
 CONFLICTS=	im-[0-9]* \
 		nifticlib-[0-9]* \
 		open-usp-tukubai-[0-9]*
 
 USES=		gettext iconv gmake motif perl5 shebangfix
 SHEBANG_FILES=	suma_change_spec 3dPAR2AFNI.pl
 
 # Some prereqs use gcc anyway
 USE_GCC=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 BROKEN_sparc64=	Does not compile: "undefined reference to '_mcount'"
 
 USE_GL=		glw glu
 USE_XORG=	xi
 MAKE_ENV=	CC="${CC}"
 MAKE_JOBS_UNSAFE=yes
 
 WRKSRC=		${WRKDIR}/afni_src
 ALL_TARGET=	vastness suma
 
 ###########################################################################
 # Install parameters
 
 SUB_FILES=	pkg-message afni.cshrc afni.profile
 
 INSTALL_WRKSRC=	${WRKSRC}/BSD
 PRESTAGE=	${WRKSRC}/prestage
 
 X11R6_FILES=	coxplot/Makefile \
 		coxplot/Makefile.f2c \
 		3DEdge/src/Makefile \
 		SUMA/SUMA_Makefile \
 		edt_blur.c \
 		suma_datasets.c \
 		SUMA/SUMA_Load_Surface_Object.c \
 		SUMA/SUMA_MiscFunc.c \
 		SUMA/SUMA_ParseCommands.c \
 		SUMA/GLUT/libglut/glut_event.c \
 		SUMA/SUMA_Surface_IO.c
 
 post-extract:
 	@${CP} -f ${FILESDIR}/Makefile.FreeBSD_PORT ${WRKSRC}/Makefile
 .for f in ${X11R6_FILES}
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|$${LOCALBASE}|g' ${WRKSRC}/${f}
 .endfor
 	@${REINPLACE_CMD} -E 's|AFNI_[0-9_]+|${PORTVERSION}|g' ${WRKSRC}/AFNI_label.h
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/afni.1 ${WRKDIR}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/3dClustBust.c ${WRKSRC}
 	@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g" ${WRKDIR}/afni.1
 
 post-build:
 	${MKDIR} ${PRESTAGE}/bin \
 		${PRESTAGE}/scripts \
 		${PRESTAGE}/lib \
 		${PRESTAGE}/include \
 		${PRESTAGE}/trash \
 		${PRESTAGE}/doc \
 		${PRESTAGE}/share
 	${MV}	${INSTALL_WRKSRC}/libf2c.a \
 		${PRESTAGE}/trash
 	${MV}	${INSTALL_WRKSRC}/*.a \
 		${INSTALL_WRKSRC}/*.so \
 		${PRESTAGE}/lib
 	${MV}	${INSTALL_WRKSRC}/funstuff \
 		${INSTALL_WRKSRC}/AFNI.*rc \
 		${INSTALL_WRKSRC}/afnigui* \
 		${PRESTAGE}/share
 	${MV}	${INSTALL_WRKSRC}/*.h \
 		${PRESTAGE}/include
 	${MV}	${INSTALL_WRKSRC}/README* \
 		${PRESTAGE}/doc
 	${MV}	${INSTALL_WRKSRC}/abut ${INSTALL_WRKSRC}/afni_abut
 	for binary in `${FILE} ${INSTALL_WRKSRC}/* | fgrep 'ELF' | ${AWK} -F ':' ' { print $$1 }'` ; do \
 		${MV} $${binary} ${PRESTAGE}/bin ; \
 	done
 	${MV}	${INSTALL_WRKSRC}/* \
 		${PRESTAGE}/scripts
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR} \
 		${STAGEDIR}${PREFIX}/lib/afni \
 		${STAGEDIR}${PREFIX}/include/afni
 	${INSTALL_DATA} ${PRESTAGE}/lib/* ${STAGEDIR}${PREFIX}/lib/afni
 	${INSTALL_DATA} ${PRESTAGE}/include/* ${STAGEDIR}${PREFIX}/include/afni
 	${CP} -R ${PRESTAGE}/share/* ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${PRESTAGE}/bin/* ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${PRESTAGE}/scripts/* ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/TTatlas* ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/CA_EZ_v1.5-July3107/* ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKDIR}/afni.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${PREFIX}/etc/mri
 	${INSTALL_DATA} ${PRESTAGE}/doc/* ${STAGEDIR}${DOCSDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/afni.cshrc ${WRKDIR}/afni.profile \
 		${STAGEDIR}${PREFIX}/etc/mri
 .endif
 
 .include <bsd.port.mk>
Index: head/security/gnome-gpg/Makefile
===================================================================
--- head/security/gnome-gpg/Makefile	(revision 377814)
+++ head/security/gnome-gpg/Makefile	(revision 377815)
@@ -1,27 +1,27 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/security/gnome-gpg/Makefile,v 1.1 2006/09/02 15:20:58 ahze Exp $
 
 PORTNAME=	gnome-gpg
 PORTVERSION=	0.5.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Simple commandline wrapper around gpg for gnome-keyring
 
 BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
-LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/gnome-keyring
+LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 
 USES=		pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	libgnomeui
 CONFIGURE_ENV=	set_more_warnings="no"
 LIBS+=		-L${LOCALBASE}/lib -lX11
 
 PLIST_FILES=	bin/gnome-gpg \
 		man/man1/gnome-gpg.1.gz
 
 .include <bsd.port.mk>
Index: head/security/gnome-keyring-sharp/Makefile
===================================================================
--- head/security/gnome-keyring-sharp/Makefile	(revision 377814)
+++ head/security/gnome-keyring-sharp/Makefile	(revision 377815)
@@ -1,22 +1,22 @@
 # Created by: Romain Tartiere <romain@blogreen.org>
 # $FreeBSD$
 
 PORTNAME=	gnome-keyring-sharp
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://www.go-mono.com/archive/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fully managed implementation of gnome-keyring
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus \
-		${LOCALBASE}/libdata/pkgconfig/gnome-keyring-1.pc:${PORTSDIR}/security/gnome-keyring
+		${LOCALBASE}/libdata/pkgconfig/gnome-keyring-1.pc:${PORTSDIR}/security/libgnome-keyring
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pathfix pkgconfig
 USE_GNOME=	gtksharp20
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
Index: head/security/gpass/Makefile
===================================================================
--- head/security/gpass/Makefile	(revision 377814)
+++ head/security/gpass/Makefile	(revision 377815)
@@ -1,30 +1,30 @@
 # Created by: ports@c0decafe.net <ports@c0decafe.net>
 # $FreeBSD$
 
 PORTNAME=	gpass
 PORTVERSION=	0.5.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	security gnome
 MASTER_SITES=	http://projects.netlab.jp/gpass/release/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Password manager for GNOME2
 
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/mcrypt \
+LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt \
 		libmhash.so:${PORTSDIR}/security/mhash
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -export-dynamic
 
 USES=		desktop-file-utils gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix gtk20 libgnomeui intltool libglade2
 GCONF_SCHEMAS=	gpass.schemas
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|{packageprefix}/share|{datadir}|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/include/gpass/error.h \
 		${WRKSRC}/src/helper.h
 
 .include <bsd.port.mk>
Index: head/security/w3af/Makefile
===================================================================
--- head/security/w3af/Makefile	(revision 377814)
+++ head/security/w3af/Makefile	(revision 377815)
@@ -1,83 +1,82 @@
 # Created by: Stefan Esser <se@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	w3af
 DISTVERSION=	1.0-rc4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security python www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web Application Attack and Audit Framework
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtidy.so:${PORTSDIR}/www/py-utidy
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1:${PORTSDIR}/devel/py-lxml \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}soappy>=0:${PORTSDIR}/net/py-soappy \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}fpconst>0:${PORTSDIR}/math/py-fpconst \
 		nltk>0:${PORTSDIR}/textproc/nltk \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pdf>0:${PORTSDIR}/print/py-pdf \
 		scapy>0:${PORTSDIR}/net/scapy \
 		${PYTHON_PKGNAMEPREFIX}wordnet>0:${PORTSDIR}/textproc/py-wordnet \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		gettext python tar:bzip2
 
 OPTIONS_DEFINE=	GUI
 OPTIONS_SUB=	yes
 
 GUI_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>0:${PORTSDIR}/graphics/py-graphviz
 GUI_USE=	GNOME=pygtk2
 
 .include <bsd.port.options.mk>
 
 do-patch:
 .for f in SOAPpy fpconst-0.7.2 nltk nltk_contrib pyPdf scapy yaml
 	@${RM} -rf ${WRKSRC}/extlib/${f}
 .endfor
 	@${GREP} -lr '/usr/bin/python' ${WRKSRC} | \
 		${XARGS} ${REINPLACE_CMD} -i "" \
 			-E "s!/usr/bin/python2?!${PYTHON_CMD}!"
 do-build:
 	@${MKDIR} ${WRKDIR}/build
 	@${MKDIR} ${WRKSRC}/build/extlib
 	@${CP} ${WRKSRC}/w3af_console ${WRKDIR}/build/w3af_console.py
 .if ${PORT_OPTIONS:MGUI}
 	@${CP} ${WRKSRC}/w3af_gui ${WRKDIR}/build/w3af_gui.py
 .endif
 .for f in core locales plugins profiles readme scripts tools
 	@${MKDIR} ${WRKDIR}/build/${f}
 	@(cd ${WRKSRC}/${f}/ && ${COPYTREE_SHARE} \* ${WRKDIR}/build/${f})
 .endfor
 .for ext in cluster gtkcodebuffer ntlm socksipy xdot
 	@${MKDIR} ${WRKDIR}/build/extlib/${ext}
 	@(cd ${WRKSRC}/extlib/${ext}/ && ${COPYTREE_SHARE} \* ${WRKDIR}/build/extlib/${ext})
 .endfor
 	@${CP} ${WRKSRC}/extlib/__init__.py ${WRKDIR}/build/extlib/
 	@${PYTHON_CMD} -m compileall ${WRKDIR}/build
 	@${PYTHON_CMD} -O -m compileall ${WRKDIR}/build
 .for f in w3af_console w3af_gui
 	@${SED} -e 's:%%PATH%%:${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/:' \
 		-e 's:%%PYTHON_CMD%%:${PYTHON_CMD}:' \
 		< ${FILESDIR}/${f}.sh > ${WRKDIR}/${f}.sh
 .endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
 	@(cd ${WRKDIR}/build && ${COPYTREE_SHARE} \* \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME})
 	@${INSTALL_SCRIPT} ${WRKDIR}/w3af_console.sh \
 		${STAGEDIR}${PREFIX}/bin/w3af_console
 .if ${PORT_OPTIONS:MGUI}
 	@${INSTALL_SCRIPT} ${WRKDIR}/w3af_gui.sh \
 		${STAGEDIR}${PREFIX}/bin/w3af_gui
 .endif
 
 .include <bsd.port.mk>
Index: head/textproc/docproj/Makefile
===================================================================
--- head/textproc/docproj/Makefile	(revision 377814)
+++ head/textproc/docproj/Makefile	(revision 377815)
@@ -1,86 +1,86 @@
 # Created by: Nik Clayton <nik@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	docproj
 PORTVERSION=	2.0
 PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	The "meta-port" for the FreeBSD Documentation Project
 
 # This dependency list should be kept in sync with the list of
 # required ports in src/release/Makefile.inc.docports.
 RUN_DEPENDS=	links:${PORTSDIR}/www/links1 \
 		pngtopnm:${PORTSDIR}/graphics/netpbm \
 		scr2png:${PORTSDIR}/graphics/scr2png \
 		scr2txt:${PORTSDIR}/textproc/scr2txt \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		peps:${PORTSDIR}/graphics/peps \
 		${LOCALBASE}/share/xml/dtd/xhtml/xhtml.soc:${PORTSDIR}/textproc/xhtml \
 		docbook-xsl-ns>=1.78.1_4:${PORTSDIR}/textproc/docbook-xsl-ns \
 		${LOCALBASE}/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl:${PORTSDIR}/textproc/iso-schematron-xslt \
-		${LOCALBASE}/share/xml/docbook/catalog:${PORTSDIR}/textproc/docbook \
+		docbook>0:${PORTSDIR}/textproc/docbook \
 		${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent \
 		p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser \
 		zip:${PORTSDIR}/archivers/zip
 
 USES=		perl5
 USE_PERL5=	run
 USE_GHOSTSCRIPT_RUN=	yes
 DEPENDS_ARGS+=	BATCH=yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=		X11 CJK SVN IGOR FOP JING DBLATEX
 OPTIONS_DEFAULT=	X11 CJK     IGOR
 .if !exists(/usr/bin/svnlite)
 OPTIONS_DEFAULT+=	SVN
 .endif
 CJK_DESC=		CJK support
 CJK_RUN_DEPENDS=	html2text:${PORTSDIR}/textproc/html2text
 SVN_DESC=		Subversion support (required to check out sources)
 SVN_RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
 IGOR_DESC=		Igor automated proofreader for documentation
 IGOR_RUN_DEPENDS=	igor:${PORTSDIR}/textproc/igor
 FOP_DESC=		FOP PDF renderer (requires Java)
 FOP_RUN_DEPENDS=	fop:${PORTSDIR}/textproc/fop \
 			${FONTS}
 JING_DESC=		Jing for advanced RELAX NG validation (optional)
 JING_RUN_DEPENDS=	jing:${PORTSDIR}/textproc/jing
 DBLATEX_DESC=		dblatex PDF renderer (experimental, requires TeXLive)
 DBLATEX_RUN_DEPENDS=	dblatex:${PORTSDIR}/textproc/dblatex \
 			${FONTS}
 DBLATEX_USE=		TEX=xetex
 
 FONTS=	${LOCALBASE}/lib/X11/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus \
 	${LOCALBASE}/lib/X11/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
 	${LOCALBASE}/lib/X11/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit \
 	${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu
 FONTS_CJK=${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf \
 	${LOCALBASE}/share/fonts/OTF/ipam.otf:${PORTSDIR}/japanese/font-ipa
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFOP} || ${PORT_OPTIONS:MDBLATEX}
 ONLY_FOR_ARCHS=	amd64 i386
 .if ${PORT_OPTIONS:MCJK}
 RUN_DEPENDS+=	${FONTS_CJK}
 .endif
 .endif
 
 .if !${PORT_OPTIONS:MX11}
 DEPENDS_ARGS+=	WITHOUT_X11=${WITHOUT_X11}
 .endif
 
 # generate MINIMALDOCPORTS for src/release/Makefile.inc.docports.
 # (XXX: incomplete yet)
 minimaldocports:
 	@${ECHO_CMD} "MINIMALDOCPORTS= \\"
 	@${MAKE} all-depends-list | ${SED} -e 's,^${PORTSDIR}/,	,' -e 's,$$, \\,'
 
 do-install:	# empty
 
 .include <bsd.port.mk>
Index: head/textproc/sdom/Makefile
===================================================================
--- head/textproc/sdom/Makefile	(revision 377814)
+++ head/textproc/sdom/Makefile	(revision 377815)
@@ -1,33 +1,33 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	sdom
 PORTVERSION=	0.5.1
 CATEGORIES=	textproc scheme
 MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implementation of the W3C DOM recommendation in Scheme
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	guile>=0:${PORTSDIR}/devel/guile-lib
+RUN_DEPENDS=	guile-lib>=0:${PORTSDIR}/devel/guile-lib
 
 NO_BUILD=	yes
 
 INFO=		sdom
 PLIST_FILES=	share/guile/sdom/common.scm \
 		share/guile/sdom/core.scm \
 		share/guile/sdom/events.scm \
 		share/guile/sdom/ls.scm \
 		share/guile/sdom/parser.scm
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/guile/sdom
 .for f in common.scm core.scm events.scm ls.scm parser.scm
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/share/guile/sdom
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/sdom.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.mk>
Index: head/x11/hotwire-shell/Makefile
===================================================================
--- head/x11/hotwire-shell/Makefile	(revision 377814)
+++ head/x11/hotwire-shell/Makefile	(revision 377815)
@@ -1,28 +1,28 @@
 # Created by: Ashish Shukla <wahjava@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	hotwire-shell
 PORTVERSION=	0.721
 PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	hotwire-${DISTVERSION}
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Hotwire is an object-oriented hypershell
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
 		${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo \
 		${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc:${PORTSDIR}/devel/py-gobject \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte \
 		${PYXML}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 USE_GNOME=	pygnome2 pygtk2 pygtksourceview
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/py-kivy/Makefile
===================================================================
--- head/x11-toolkits/py-kivy/Makefile	(revision 377814)
+++ head/x11-toolkits/py-kivy/Makefile	(revision 377815)
@@ -1,155 +1,155 @@
 # Created by: David Naylor <dbn@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kivy
 PORTVERSION=	1.8.0
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	GH LOCAL/dbn/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbn@FreeBSD.org
 COMMENT=	Python NUI library for rapid application development
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
 
 MAKE_ENV=	KIVY_NO_CONFIG=yes KIVY_NO_FILELOG=yes PYTHONPATH=${WRKSRC}
 MAKE_JOBS_UNSAFE=	yes  # does not (really) use make
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}
 GH_COMMIT=	d602d4b
 USES=		python:2.7+ shebangfix
 USE_GL=		gl
 PYDISTUTILS_BUILD_TARGET=	build_ext
 PYDISTUTILS_BUILDARGS=	--inplace
 PYDISTUTILS_EGGINFO=	Kivy-${PORTVERSION}-py${PYTHON_VER}.egg-info
 USE_PYTHON=	autoplist distutils
 SHEBANG_FILES=	kivy/lib/osc/OSC.py
 
 OPTIONS_DEFINE=	DOCS PDF TEST
 OPTIONS_SET=	ENCHANT OPENCV PYGAME
 OPTIONS_SUB=	yes
 OPTIONS_GROUP=	VIDEO AUDIO IMAGE CAMERA SPELLING CLIPBOARD
 OPTIONS_MULTI=	WINDOW TEXT
 OPTIONS_MULTI_WINDOW=	PYGAME X11  SDL2
 OPTIONS_MULTI_TEXT=	PIL PYGAME SDL2
 OPTIONS_GROUP_VIDEO=	GSTREAMER FFMPEG
 OPTIONS_GROUP_AUDIO=	GSTREAMER PYGAME SDL2
 OPTIONS_GROUP_IMAGE=	PIL PYGAME
 OPTIONS_GROUP_CAMERA=	OPENCV GSTREAMER
 OPTIONS_GROUP_SPELLING=	ENCHANT
 OPTIONS_GROUP_CLIPBOARD=	PYGAME
 
 CAMERA_DESC=	Camera support
 CLIPBOARD_DESC=	Clipboard support
 IMAGE_DESC=	Image support
 SPELLING_DESC=	Spell checking support
 TEXT_DESC=	Text rendering support (compulsory)
 WINDOW_DESC=	Window support (compulsory)
 
 DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
 ENCHANT_DESC=		Spell checking support via Enchant
 ENCHANT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-enchant
 FFMPEG_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ffmpeg/__init__.py:${PORTSDIR}/multimedia/py-ffmpeg
 GSTREAMER_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygst.py:${PORTSDIR}/multimedia/py-gstreamer
 OPENCV_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cv.py:${PORTSDIR}/graphics/py-opencv
 PDF_DESC=		Build PDF documentation (required TeXLive, DOCS)
 PDF_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
 PDF_USE=		TEX=texlive,pdftex:build,dvipsk:build
 PDF_USES=		gmake
 PIL_DESC=		Text and window rendering support via PIL
-PIL_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PIL:${PORTSDIR}/graphics/py-imaging
+PIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}imaging>0:${PORTSDIR}/graphics/py-imaging
 PYGAME_DESC=		Window, text and image rendering support via PyGame
-PYGAME_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame:${PORTSDIR}/devel/py-game
-PYGLET_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyglet:${PORTSDIR}/graphics/py-pyglet
+PYGAME_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
+PYGLET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyglet>0:${PORTSDIR}/graphics/py-pyglet
 SDL2_DESC=		Simple Direct Media Layer v2.0 support
 SDL2_MAKE_ENV=		USE_SDL=1
 SDL2_USE=		SDL=sdl2,ttf2,mixer2
 TEST_BUILD_DEPENDS=	nosetests:${PORTSDIR}/devel/py-nose
 TEST_USES=		display:build
 X11_MAKE_ENV=		USE_X11=1
 X11_USE=		XORG=x11
 
 .if !defined(ARCH)
 ARCH!=		uname -p
 .endif
 
 .if ${ARCH} == i386
 OPTIONS_GROUP_VIDEO+=	PYGLET
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPDF}
 .if empty(PORT_OPTIONS:MDOCS)
 IGNORE=		option PDF requires DOCS
 .endif
 .endif
 
 .if empty(PORT_OPTIONS:MPYGAME)
 NOSE_ARGS+=	--exclude=test_fbo_pixels
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
 
 post-build: do-test-build
 
 do-test-build:
 	@${RM} -rf kivy/tests/build
 	@(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} nosetests ${NOSE_ARGS} ${WRKSRC}/kivy/tests)
 
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 
 post-build: do-build-docs
 	find ${WKRSRC} -name '*.so' | ${XARGS} ${STRIP_CMD}
 
 do-build-docs:
 	${MKDIR} ${WRKSRC}/doc/build/doctrees ${WRKSRC}/doc/build/html \
 		${WRKSRC}/doc/build/latex-a4 ${WRKSRC}/doc/build/latex-letter
 	${REINPLACE_CMD} -i '' -e 's/\(import pygame\.joystick\)/#\1/' \
 		${WRKSRC}/kivy/input/providers/androidjoystick.py
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} doc/autobuild.py)
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} sphinx-build -b html \
 			-d ${WRKSRC}/doc/build/doctrees \
 			doc/sources ${WRKSRC}/doc/build/html)
 .if ${PORT_OPTIONS:MPDF}
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} sphinx-build -b latex \
 			-d ${WRKSRC}/doc/build/doctrees \
 			-D latex_paper=a4 doc/sources ${WRKSRC}/doc/build/latex-a4)
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} sphinx-build -b latex \
 			-d ${WRKSRC}/doc/build/doctrees \
 			-D latex_paper=letter doc/sources ${WRKSRC}/doc/build/latex-letter)
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/doc/build/latex-a4 \
 		all-pdf < /dev/null > /dev/null
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/doc/build/latex-letter \
 		all-pdf < /dev/null > /dev/null
 .endif
 	${REINPLACE_CMD} -i '' -e 's/#\(import pygame\.joystick\)/\1/' \
 		${WRKSRC}/kivy/input/providers/androidjoystick.py
 
 post-install: do-install-docs
 
 do-install-docs:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/build/html; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 .if ${PORT_OPTIONS:MPDF}
 	${INSTALL_DATA} ${WRKSRC}/doc/build/latex-a4/Kivy.pdf \
 		${STAGEDIR}${DOCSDIR}/Kivy-a4.pdf
 	${INSTALL_DATA} ${WRKSRC}/doc/build/latex-letter/Kivy.pdf \
 		${STAGEDIR}${DOCSDIR}/Kivy-letter.pdf
 .endif
 .endif
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/kivy -name '*.so' | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
Index: head/x11-wm/wmakerconf/Makefile
===================================================================
--- head/x11-wm/wmakerconf/Makefile	(revision 377814)
+++ head/x11-wm/wmakerconf/Makefile	(revision 377815)
@@ -1,49 +1,49 @@
 # Created by: Dominik Rothert <dr@domix.de>
 # $FreeBSD$
 #    $MCom: ports/x11-wm/wmakerconf/Makefile,v 1.2 2006/10/05 07:31:44 mezz Exp $
 
 PORTNAME=	wmakerconf
 PORTVERSION=	2.12
 PORTREVISION=	11
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Configuration tool for Window Maker
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libwraster.so:${PORTSDIR}/x11-wm/windowmaker
+LIB_DEPENDS=	libWINGs.so:${PORTSDIR}/x11-wm/windowmaker
 RUN_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm4
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_GNOME=	gtk20
 USES=		gettext pkgconfig perl5 gmake shebangfix
 SHEBANG_FILES=	scripts/getfile.pl.in scripts/upgrade.pl.in
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wmakerdataprefix="${LOCALBASE}/share" \
 		--with-wmakeretcprefix="${LOCALBASE}/share"
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.gmo" -delete
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|lynx wget|lynx fetch|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$(prefix)/share/locale|${STAGEDIR}${PREFIX}/share/locale|g' \
 		${WRKSRC}/data/po/Makefile.am ${WRKSRC}/data/po/Makefile.in \
 		${WRKSRC}/po/Makefile.in.in
 	@${REINPLACE_CMD} -e '/chmod 0/d' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -E '/\/usr\/share/d; \
 			      s|/usr/local|${LOCALBASE}|g ; \
 		 	      s|/usr/X11R6|${LOCALBASE}|g; \
 			      s|(share/pixmaps.*),|\1|g' \
 		${WRKSRC}/data/WMWmakerconf*
 .for file in data/po/ja.po po/ja.po
 	@${REINPLACE_CMD} -e 's|JISX-0208-1983-0|euc-jp|g' ${WRKSRC}/${file}
 .endfor
 	@${FIND} ${WRKSRC}/src -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
 		'/WMWritePropListToFile/s|,[[:space:]]YES||g'
 
 .include <bsd.port.mk>