Index: head/benchmarks/netperf/Makefile
===================================================================
--- head/benchmarks/netperf/Makefile	(revision 459450)
+++ head/benchmarks/netperf/Makefile	(revision 459451)
@@ -1,51 +1,51 @@
 # Created by: koshy
 # $FreeBSD$
 
 PORTNAME=	netperf
 PORTVERSION=	2.7.0
 CATEGORIES=	benchmarks ipv6
 MASTER_SITES=	http://fossies.org/unix/misc/
 
 MAINTAINER=	marius@FreeBSD.org
 COMMENT=	Network performance benchmarking package
 
 OPTIONS_DEFINE=		EXAMPLES EXS HISTOGRAM OMNI SCTP SOCKETS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 EXS_DESC=	Enable ICSC async socket support
-HISTOGRAM_DESC=	Enable optional histogram output
+HISTOGRAM_DESC=	Enable histogram output
 OMNI_DESC=	Enable OMNI tests
 SCTP_DESC=	Enable SCTP support
 SOCKETS_DESC=	Enable Unix Domain socket support
 
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	"transform="
 CONFIGURE_ARGS=	--program-prefix="" --program-suffix="" --enable-dirty \
 		--enable-demo --enable-burst --enable-intervals
 
 INFO=		netperf
 
 HISTOGRAM_CONFIGURE_ENABLE=	histogram
 EXS_CONFIGURE_ENABLE=		exs
 OMNI_CONFIGURE_ENABLE=		omni
 SOCKETS_CONFIGURE_ENABLE=	unixdomain
 SCTP_CONFIGURE_ENABLE=		sctp
 
 SCRIPTS=	arr_script bloat.sh packet_byte_script runemomni.sh \
 		runemomniagg2.sh runemomniaggdemo.sh sctp_stream_script \
 		snapshot_script tcp_range_script tcp_rr_script \
 		tcp_stream_script udp_rr_script udp_stream_script
 
 post-patch:
 .for i in ${SCRIPTS}
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/doc/examples/$i
 .endfor
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in ${SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKSRC}/doc/examples/$i ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/devel/viewvc/Makefile
===================================================================
--- head/devel/viewvc/Makefile	(revision 459450)
+++ head/devel/viewvc/Makefile	(revision 459451)
@@ -1,73 +1,73 @@
 # Created by: will
 # $FreeBSD$
 
 PORTNAME=	viewvc
 DISTVERSION=	1.1.26
 CATEGORIES=	devel python
 
 MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	Web-based Version Control Repository Browsing
 
 LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=		WEBSRV APMOD SVN MYSQL
 OPTIONS_DEFAULT=	WEBSRV APACHE SVN
 
 OPTIONS_SINGLE=		WEBSRV APMOD
 OPTIONS_SINGLE_WEBSRV=	APACHE LIGHTTPD
 OPTIONS_SINGLE_APMOD=	MODPYTHON33 MODPYTHON35 MODWSGI
 
 WEBSRV_DESC=		Enable web server support
-APMOD_DESC=		depend on optional Apache module
+APMOD_DESC=		depend on Apache module
 
 MODWSGI_DESC=		Add mod_wsgi to the list of package dependencies
 MODPYTHON33_DESC=	Add mod_python33 to the list of package dependencies
 MODPYTHON35_DESC=	Add mod_python35 to the list of package dependencies
 MYSQL_DESC=		Bonsai-like repository query facilities
 
 APACHE_USE=		APACHE_RUN=22+
 LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 MODPYTHON33_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python33>=3.3:www/mod_python33
 MODPYTHON35_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python35>=3.5:www/mod_python35
 MODWSGI_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_wsgi4>=4.4.13:www/mod_wsgi4
 SVN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${PY_FLAVOR}
 
 .include <bsd.port.options.mk>
 
 USES=		cpe python:2.7
 NO_BUILD=	yes
 USE_RC_SUBR=	viewvc
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \
 		CHOWN=${CHOWN} RM=${RM:Q}
 
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR}
 
 pre-everything::
 .if ${PORT_OPTIONS:MAPMOD} && !${PORT_OPTIONS:MAPACHE}
 IGNORE=	apache module needs Apache server, please re-run 'make config' then choose WEBSRV and APACHE
 .endif
 
 post-patch:
 .for i in cvsgraph.conf mimetypes.conf viewvc.conf
 	${MV} ${WRKSRC}/conf/${i}.dist ${WRKSRC}/conf/${i}.sample
 	${REINPLACE_CMD} -e '/"${i}"/d' ${WRKSRC}/viewvc-install
 .endfor
 	${REINPLACE_CMD} -e 's/conf.dist/conf.sample/g' \
 		${WRKSRC}/viewvc-install \
 		${WRKSRC}/bin/standalone.py
 # to much files, use own shebangfix
 	${FIND} ${WRKSRC} -type f | ${GREP} -v -e 'png' -e 'images' \
 		| ${XARGS} ${SED} -i '' \
 		-e '1s|^\#![[:space:]]*/usr/bin/env python|\#!${PYTHON_CMD}|' \
 		-e '1s|^\#![[:space:]]*/usr/bin/python|\#!${PYTHON_CMD}|'
 
 do-install:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${PORTNAME} --destdir="${STAGEDIR}" --clean-mode=false)
 
 .include <bsd.port.mk>
Index: head/editors/abiword/Makefile
===================================================================
--- head/editors/abiword/Makefile	(revision 459450)
+++ head/editors/abiword/Makefile	(revision 459451)
@@ -1,176 +1,177 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	abiword
 PORTVERSION=	3.0.1
 PORTREVISION=	8
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
 DIST_SUBDIR=	AbiWord
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Open-source, cross-platform WYSIWYG word processor
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libpopt.so:devel/popt \
 		libpng.so:graphics/png \
 		libwv.so:textproc/wv \
 		libfribidi.so:converters/fribidi \
 		libgoffice-0.10.so:devel/goffice010
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu
 
 USES=		desktop-file-utils gmake iconv jpeg libtool pathfix pkgconfig
 USE_GNOME=	libxml2 gtk30 librsvg2 libxslt
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--without-gnomevfs --enable-plugins="${ABIWORD_PLUGINS}" \
 		--enable-shared="yes" --enable-static="no"
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB+=	ABIVERSION=3.0
 
 OPTIONS_DEFINE=	CLIPART DEBUG MATHVIEW NLS OTS PSION \
 		TEMPLATES WP
 OPTIONS_DEFAULT=CLIPART COLSERVICE COLSUGAR COLTCP SPELLCHECK TEMPLATES
 OPTIONS_SUB=	yes
 
 OPTIONS_GROUP=	DICT COLLAB
 OPTIONS_GROUP_DICT=	GRAMMAR SPELLCHECK
 OPTIONS_GROUP_COLLAB=	COLFAKE COLSERVICE COLSIP COLSUGAR COLTCP COLTELEPATHY COLXMPP
 
 CLIPART_DESC=		Include clipart
 COLLAB_DESC=		Collaboration backend
 COLFAKE_DESC=		Fake collaboration for debugging purposes only
 COLSERVICE_DESC=	Collaborate with AbiCollab.net webservice
 COLSIP_DESC=		Collaborate with the SIP/SIMPLE backend
 COLSUGAR_DESC=		Collaborate with the Sugar/OLPC environment
 COLTCP_DESC=		Collaborate with direct TCP peer to peer connections
 COLTELEPATHY_DESC=	Collaborate with the Telepathy backend (experimental)
 COLXMPP_DESC=		Collaborate with the Jabber/XMPP backend
 DICT_DESC=		Spelling and grammar checking
-GRAMMAR_DESC=		Grammar checking plugin (requires SPELLCHECK option)
+GRAMMAR_DESC=		Grammar checking plugin
 MATHVIEW_DESC=		MathML render plugin
 OTS_DESC=		Text Summarizer plugin
 PSION_DESC=		Psion 5(MX) files convertion plugin
 SPELLCHECK_DESC=	Spell checking support
 TEMPLATES_DESC=		Include additional templates
 WP_DESC=		WordPerfect img/doc import/export plugin
 
 # check configure for ALL_PLUGINS for complete list
 ABIWORD_PLUGINS=	garble loadbindings opml xslfo bmp iscii sdw babelfish \
 			paint command latex pdf wikipedia hrtext openxml \
 			goffice wmf kword mif wml s5 freetranslation gdict mht \
 			applix t602 docbook google eml hancom presentation \
 			clarisworks pdb urldict openwriter mswrite gimp \
 			passepartout eml
 
 # opendocument enabled by default, rsvg plugin isn't needed on unix.
 # Plugins we don't support:
 # gda
 
 CLIPART_CONFIGURE_ENABLE=	clipart
 
 COLFAKE_CONFIGURE_ENABLE=	collab-backend-fake
 
 COLSERVICE_CONFIGURE_ENABLE=	collab-backend-service
 COLSERVICE_BUILD_DEPENDS=	${LOCALBASE}/include/asio.hpp:net/asio
 COLSERVICE_LIB_DEPENDS=		libsoup-2.4.so:devel/libsoup \
 				libgnutls.so:security/gnutls
 COLSERVICE_RUN_DEPENDS=		${LOCALBASE}/include/asio.hpp:net/asio
 
 COLSIP_CONFIGURE_ENABLE=	collab-backend-sip
 
 COLSUGAR_CONFIGURE_ENABLE=	collab-backend-sugar
 COLSUGAR_LIB_DEPENDS=		libdbus-glib-1.so:devel/dbus-glib
 
 COLTCP_CONFIGURE_ENABLE=	collab-backend-tcp
 COLTCP_BUILD_DEPENDS=		${LOCALBASE}/include/asio.hpp:net/asio
 COLTCP_RUN_DEPENDS=		${LOCALBASE}/include/asio.hpp:net/asio
 
 COLTELEPATHY_CONFIGURE_ENABLE=	collab-backend-telepathy
 COLTELEPATHY_LIB_DEPENDS=	libtelepathy-glib.so:net-im/telepathy-glib
 
 COLXMPP_CONFIGURE_ENABLE=	collab-backend-xmpp
 COLXMPP_LIB_DEPENDS=		libloudmouth-1.so:net-im/loudmouth
 
 DEBUG_CONFIGURE_ENABLE=		debug
 
 GRAMMAR_LIB_DEPENDS=		liblink-grammar.so:textproc/link-grammar
+GRAMMAR_IMPLIES=		SPELLCHECK
 
 MATHVIEW_USES=			bison
 MATHVIEW_LIB_DEPENDS=		libmathview.so:x11-toolkits/gtkmathview
 
 NLS_USES=			gettext
 NLS_CONFIGURE_ENABLE=		nls
 
 OTS_LIB_DEPENDS=		libots-1.so:textproc/ots
 
 PSION_LIB_DEPENDS=		libpsiconv.so:converters/psiconv
 
 SPELLCHECK_LIB_DEPENDS=		libenchant.so:textproc/enchant
 SPELLCHECK_CONFIGURE_ENABLE=	spell
 
 TEMPLATES_CONFIGURE_ENABLE=	templates
 
 WP_USE=		gnome=libgsf
 WP_LIB_DEPENDS=	libwpg-0.3.so:graphics/libwpg03 \
 		libwpd-0.10.so:textproc/libwpd010 \
 		libwps-0.4.so:textproc/libwps
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCOL*}
 PLIST_SUB+=		COLLAB=""
 ABIWORD_PLUGINS+=	collab
 .else
 PLIST_SUB+=		COLLAB="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGRAMMAR}
 ABIWORD_PLUGINS+=	grammar
 .endif
 
 .if ${PORT_OPTIONS:MMATHVIEW}
 ABIWORD_PLUGINS+=	mathview
 .endif
 
 .if ${PORT_OPTIONS:MOTS}
 ABIWORD_PLUGINS+=	ots
 .endif
 
 .if ${PORT_OPTIONS:MPSION}
 ABIWORD_PLUGINS+=	psion
 .endif
 
 .if ${PORT_OPTIONS:MWP}
 ABIWORD_PLUGINS+=	wpg wordperfect
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/goffice-bits/goffice/app/goffice-app.h \
 		${WRKSRC}/src/af/util/xp/ut_go_file.h
 # The following substitutions ensure that plugins are linked with libabiword
 # from the work or stage directory instead of a previously installed library.
 # In pseudo code:
 # s,PLUGIN_LIBS="$PLUGIN_LIBS -Lsrc -labiword",
 #   PLUGIN_LIBS="src/libabiword.la $PLUGIN_LIBS",
 # s,foo_LIBS="$foo_LIBS $PLUGIN_LIBS",
 #   foo_LIBS="$PLUGIN_LIBS $foo_LIBS",
 # The initial value of PLUGIN_LIBS may contain -L/usr/local/lib so it would
 # have to come after -Lsrc, but -Lsrc is not correct when libtool relinks
 # plugins during staging so use src/libabiword.la and let libtool figure out
 # what flags are needed.  Secondly, switch around foo_LIBS and PLUGIN_LIBS
 # because foo_LIBS may contain -L/usr/local/lib.
 	@${REINPLACE_CMD} \
 		-e "s,\$$PLUGIN_LIBS \"'-L\$${top_builddir}/src'\" -labiword-\$$ABIWORD_SERIES,\\\\\$${top_builddir}/src/libabiword-\$$ABIWORD_SERIES.la \$$PLUGIN_LIBS," \
 		-e "/_LIBS=/s,\"\\(.*\\)\"\\('\$${PLUGIN_LIBS}.*'\\),\\2\" \\1\"," \
 		-e 's|" == "|" = "|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: head/graphics/osg/Makefile
===================================================================
--- head/graphics/osg/Makefile	(revision 459450)
+++ head/graphics/osg/Makefile	(revision 459451)
@@ -1,156 +1,156 @@
 # Created by: Randall Hopper <aa8vb@nc.rr.com>
 # $FreeBSD$
 
 PORTNAME=	osg
 PORTVERSION=	3.4.0
 PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	OpenSceneGraph-${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	C++ OpenGL scene graph library for real-time rendering
 
 LICENSE=	OSGPL
 LICENSE_NAME=	OpenSceneGraph Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 CONFLICTS=	osg-devel-[0-9]*
 
 USES=		alias cmake:outsource jpeg pkgconfig zip
 USE_GL=		gl glu
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
 		OSG_SHLIBVER=130 \
 		OPENTHREADS_VERSION=3.3.0 \
 		OPENTHREADS_SHLIBVER=20
 
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA INVENTOR \
 		JASPER LIBLAS LUA NVTT OPENEXR PDF SDL \
 		SVG VNC XINE XRANDR
 OPTIONS_RADIO=	QT
 OPTIONS_RADIO_QT=QT4 QT5
 OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR
 
 GDAL_DESC=	GDAL support
 GTA_DESC=	GTA file format support
 INVENTOR_DESC=	SGI OpenInventor support
 LIBLAS_DESC=	liblas support
 NVTT_DESC=	Use NVidia texture tools
-QT_DESC=	QT toolkit support (optional)
+QT_DESC=	QT toolkit support
 SDL_DESC=	Use SDL (joystick support in present3d)
 VNC_DESC=	LibVNCServer support
 
 OPTIONS_SUB=	yes
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_VARS=		FORCE_REQUIRE+=CURL
 CURL_VARS_OFF=		FORCE_IGNORE+=CURL
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_VARS=		FORCE_REQUIRE+=FFmpeg
 FFMPEG_VARS_OFF=	FORCE_IGNORE+=FFmpeg
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_VARS=		FORCE_REQUIRE+=Freetype
 FREETYPE_VARS_OFF=	FORCE_IGNORE+=Freetype
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 GDAL_VARS=		FORCE_REQUIRE+=GDAL
 GDAL_VARS_OFF=		FORCE_IGNORE+=GDAL
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_VARS=		FORCE_REQUIRE+=GIFLIB
 GIF_VARS_OFF=		FORCE_IGNORE+=GIFLIB
 GSTREAMER_USE=		GNOME=glib20 GSTREAMER1=yes
 GSTREAMER_VARS=		FORCE_REQUIRE+=GStreamer
 GSTREAMER_VARS_OFF=	FORCE_IGNORE+=GStreamer
 GSTREAMER_BROKEN=	fails when linking gstreamer plugin, with error cannot find -lgstreamer-1.0
 GTA_LIB_DEPENDS=	libgta.so:devel/libgta
 GTA_VARS=		FORCE_REQUIRE+=GTA
 GTA_VARS_OFF=		FORCE_IGNORE+=GTA
 INVENTOR_LIB_DEPENDS=	libInventor.so:graphics/inventor
 INVENTOR_VARS=		FORCE_REQUIRE+=Inventor
 INVENTOR_VARS_OFF=	FORCE_IGNORE+=Inventor
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 JASPER_VARS=		FORCE_REQUIRE+=Jasper
 JASPER_VARS_OFF=	FORCE_IGNORE+=Jasper
 LIBLAS_LIB_DEPENDS=	liblas.so:devel/liblas
 LIBLAS_VARS=		FORCE_REQUIRE+=LIBLAS
 LIBLAS_VARS_OFF=	FORCE_IGNORE+=LIBLAS
 LUA_USES=		lua:52
 LUA_CMAKE_ON=		-DOSG_USE_LOCAL_LUA_SOURCE:BOOL=OFF
 LUA_VARS=		FORCE_IGNORE+=Lua51 FORCE_REQUIRE+=Lua52
 LUA_VARS_OFF=		FORCE_IGNORE+="Lua51 Lua52"
 NVTT_LIB_DEPENDS=	libnvtt.so:graphics/nvidia-texture-tools
 NVTT_VARS=		FORCE_REQUIRE+=NVTT
 NVTT_VARS_OFF=		FORCE_IGNORE+=NVTT
 OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 OPENEXR_VARS=		FORCE_REQUIRE+=OpenEXR
 OPENEXR_VARS_OFF=	FORCE_IGNORE+=OpenEXR
 PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 PDF_USE=		gnome=cairo
 PDF_VARS=		FORCE_REQUIRE+=Poppler-glib
 PDF_VARS_OFF=		FORCE_IGNORE+=Poppler-glib
 QT4_USE=		qt4=corelib,gui,moc_build,opengl,qmake_build,rcc_build,uic_build
 QT4_CMAKE_ON=		-DDESIRED_QT_VERSION=4
 QT4_VARS=		FORCE_REQUIRE+=Qt4
 QT4_VARS_OFF=		FORCE_IGNORE+=Qt4
 QT5_USE=		qt5=buildtools_build,core,gui,opengl,qmake_build,webkit
 QT5_CMAKE_ON=		-DDESIRED_QT_VERSION=5
 QT5_VARS=		FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets"
 QT5_VARS_OFF=		FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
 SDL_USE=		sdl=sdl
 SDL_VARS=		FORCE_REQUIRE+=SDL
 SDL_VARS_OFF=		FORCE_IGNORE+=SDL
 SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 SVG_USE=		gnome=cairo
 SVG_VARS=		FORCE_REQUIRE+=RSVG
 SVG_VARS_OFF=		FORCE_IGNORE+=RSVG
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VNC_VARS=		FORCE_REQUIRE+=LibVNCServer
 VNC_VARS_OFF=		FORCE_IGNORE+=LibVNCServer
 XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 XINE_VARS=		FORCE_REQUIRE+=Xine
 XINE_VARS_OFF=		FORCE_IGNORE+=Xine
 XRANDR_CMAKE_ON=	-DOSGVIEWER_USE_XRANDR:BOOL=ON
 XRANDR_CMAKE_OFF=	-DOSGVIEWER_USE_XRANDR:BOOL=OFF
 XRANDR_USE=		xorg=xrandr
 
 # GUI toolkits are only needed for building examples, which are not even installed
 FORCE_IGNORE=	FLTK GLUT FOX Qt3 wxWidgets OpenAL GtkGl SDL2	# only for examples
 FORCE_IGNORE+=	COLLADA Performer OurDCMTK XUL FBX		# not in ports
 FORCE_IGNORE+=	OpenVRML					# ports version too old
 FORCE_IGNORE+=	ITK						# ports version doesn't build on 10.x
 FORCE_REQUIRE=	Threads OpenGL X11 JPEG PNG TIFF ZLIB		# common & lightweight
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5}
 CMAKE_ARGS+=		-DOSG_USE_QT:BOOL=ON
 PLIST_SUB+=		QT=""
 .else
 CMAKE_ARGS+=		-DOSG_USE_QT:BOOL=OFF
 PLIST_SUB+=		QT="@comment "
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'
 	@${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d' \
 		${WRKSRC}/CMakeLists.txt
 .for p in ${FORCE_REQUIRE}
 	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|)$$| REQUIRED&|' \
 		${WRKSRC}/CMakeLists.txt
 .endfor
 .for p in ${FORCE_IGNORE}
 	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|^|#|' \
 		${WRKSRC}/CMakeLists.txt
 .endfor
 
 .include <bsd.port.mk>
Index: head/graphics/osg-devel/Makefile
===================================================================
--- head/graphics/osg-devel/Makefile	(revision 459450)
+++ head/graphics/osg-devel/Makefile	(revision 459451)
@@ -1,157 +1,157 @@
 # Created by: Randall Hopper <aa8vb@nc.rr.com>
 # $FreeBSD$
 
 PORTNAME=	osg
 PORTVERSION=	3.5.1
 PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	OpenSceneGraph-${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	C++ OpenGL scene graph library for real-time rendering
 
 LICENSE=	OSGPL
 LICENSE_NAME=	OpenSceneGraph Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 CONFLICTS=	osg-[0-9]*
 
 USES=		alias cmake:outsource jpeg pkgconfig zip
 USE_GL=		gl glu
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
 		OSG_SHLIBVER=141 \
 		OPENTHREADS_VERSION=3.3.0 \
 		OPENTHREADS_SHLIBVER=20
 
 PORTSCOUT=	limitw:1,odd
 
 OPTIONS_DEFINE=	CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA INVENTOR \
 		JASPER LIBLAS LUA NVTT OPENEXR PDF SDL \
 		SVG VNC XINE XRANDR
 OPTIONS_RADIO=	QT
 OPTIONS_RADIO_QT=QT4 QT5
 OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR
 
 GDAL_DESC=	GDAL support
 GTA_DESC=	GTA file format support
 INVENTOR_DESC=	SGI OpenInventor support
 LIBLAS_DESC=	liblas support
 NVTT_DESC=	Use NVidia texture tools
-QT_DESC=	QT toolkit support (optional)
+QT_DESC=	QT toolkit support
 SDL_DESC=	Use SDL (joystick support in present3d)
 VNC_DESC=	LibVNCServer support
 
 OPTIONS_SUB=	yes
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_VARS=		FORCE_REQUIRE+=CURL
 CURL_VARS_OFF=		FORCE_IGNORE+=CURL
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_VARS=		FORCE_REQUIRE+=FFmpeg
 FFMPEG_VARS_OFF=	FORCE_IGNORE+=FFmpeg
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_VARS=		FORCE_REQUIRE+=Freetype
 FREETYPE_VARS_OFF=	FORCE_IGNORE+=Freetype
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 GDAL_VARS=		FORCE_REQUIRE+=GDAL
 GDAL_VARS_OFF=		FORCE_IGNORE+=GDAL
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_VARS=		FORCE_REQUIRE+=GIFLIB
 GIF_VARS_OFF=		FORCE_IGNORE+=GIFLIB
 GSTREAMER_USE=		GNOME=glib20 GSTREAMER1=yes
 GSTREAMER_VARS=		FORCE_REQUIRE+=GStreamer
 GSTREAMER_VARS_OFF=	FORCE_IGNORE+=GStreamer
 GSTREAMER_BROKEN=	fails when linking gstreamer plugin, with error cannot find -lgstreamer-1.0
 GTA_LIB_DEPENDS=	libgta.so:devel/libgta
 GTA_VARS=		FORCE_REQUIRE+=GTA
 GTA_VARS_OFF=		FORCE_IGNORE+=GTA
 INVENTOR_LIB_DEPENDS=	libInventor.so:graphics/inventor
 INVENTOR_VARS=		FORCE_REQUIRE+=Inventor
 INVENTOR_VARS_OFF=	FORCE_IGNORE+=Inventor
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 JASPER_VARS=		FORCE_REQUIRE+=Jasper
 JASPER_VARS_OFF=	FORCE_IGNORE+=Jasper
 LIBLAS_LIB_DEPENDS=	liblas.so:devel/liblas
 LIBLAS_VARS=		FORCE_REQUIRE+=LIBLAS
 LIBLAS_VARS_OFF=	FORCE_IGNORE+=LIBLAS
 LUA_USES=		lua:52
 LUA_CMAKE_ON=		-DOSG_USE_LOCAL_LUA_SOURCE:BOOL=OFF
 LUA_VARS=		FORCE_IGNORE+=Lua51 FORCE_REQUIRE+=Lua52
 LUA_VARS_OFF=		FORCE_IGNORE+="Lua51 Lua52"
 NVTT_LIB_DEPENDS=	libnvtt.so:graphics/nvidia-texture-tools
 NVTT_VARS=		FORCE_REQUIRE+=NVTT
 NVTT_VARS_OFF=		FORCE_IGNORE+=NVTT
 OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 OPENEXR_VARS=		FORCE_REQUIRE+=OpenEXR
 OPENEXR_VARS_OFF=	FORCE_IGNORE+=OpenEXR
 PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 PDF_USE=		gnome=cairo
 PDF_VARS=		FORCE_REQUIRE+=Poppler-glib
 PDF_VARS_OFF=		FORCE_IGNORE+=Poppler-glib
 QT4_USE=		qt4=corelib,gui,moc_build,opengl,qmake_build,rcc_build,uic_build
 QT4_CMAKE_ON=		-DDESIRED_QT_VERSION=4
 QT4_VARS=		FORCE_REQUIRE+=Qt4
 QT4_VARS_OFF=		FORCE_IGNORE+=Qt4
 QT5_USE=		qt5=buildtools_build,core,gui,opengl,qmake_build,webkit
 QT5_CMAKE_ON=		-DDESIRED_QT_VERSION=5
 QT5_VARS=		FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets"
 QT5_VARS_OFF=		FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
 SDL_USE=		sdl=sdl
 SDL_VARS=		FORCE_REQUIRE+=SDL
 SDL_VARS_OFF=		FORCE_IGNORE+=SDL
 SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 SVG_USE=		gnome=cairo
 SVG_VARS=		FORCE_REQUIRE+=RSVG
 SVG_VARS_OFF=		FORCE_IGNORE+=RSVG
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VNC_VARS=		FORCE_REQUIRE+=LibVNCServer
 VNC_VARS_OFF=		FORCE_IGNORE+=LibVNCServer
 XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 XINE_VARS=		FORCE_REQUIRE+=Xine
 XINE_VARS_OFF=		FORCE_IGNORE+=Xine
 XRANDR_CMAKE_ON=	-DOSGVIEWER_USE_XRANDR:BOOL=ON
 XRANDR_CMAKE_OFF=	-DOSGVIEWER_USE_XRANDR:BOOL=OFF
 XRANDR_USE=		xorg=xrandr
 
 # GUI toolkits are only needed for building examples, which are not even installed
 FORCE_IGNORE=	FLTK GLUT FOX Qt3 wxWidgets OpenAL GtkGl SDL2	# only for examples
 FORCE_IGNORE+=	COLLADA Performer OurDCMTK XUL FBX		# not in ports
 FORCE_IGNORE+=	OpenVRML					# ports version too old
 FORCE_IGNORE+=	ITK						# ports version doesn't build on 10.x
 FORCE_REQUIRE=	Threads OpenGL X11 JPEG PNG TIFF ZLIB		# common & lightweight
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5}
 CMAKE_ARGS+=		-DOSG_USE_QT:BOOL=ON
 PLIST_SUB+=		QT=""
 .else
 CMAKE_ARGS+=		-DOSG_USE_QT:BOOL=OFF
 PLIST_SUB+=		QT="@comment "
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'
 	@${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d; \
 		s|-pedantic||' ${WRKSRC}/CMakeLists.txt
 .for p in ${FORCE_REQUIRE}
 	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|)$$| REQUIRED&|' \
 		${WRKSRC}/CMakeLists.txt
 .endfor
 .for p in ${FORCE_IGNORE}
 	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|^|#|' \
 		${WRKSRC}/CMakeLists.txt
 .endfor
 
 .include <bsd.port.mk>
Index: head/mail/spamassassin/Makefile
===================================================================
--- head/mail/spamassassin/Makefile	(revision 459450)
+++ head/mail/spamassassin/Makefile	(revision 459451)
@@ -1,173 +1,173 @@
 # Created by: Anthony Kim
 # $FreeBSD$
 
 PORTNAME=	spamassassin
 PORTVERSION=	3.4.1
 PORTREVISION?=	11	# also bump japanese/spamassassin
 CATEGORIES?=	mail perl5
 MASTER_SITES=	APACHE/spamassassin/source CPAN/Mail
 DISTNAME=	Mail-SpamAssassin-${PORTVERSION}
 
 MAINTAINER?=	zeising@FreeBSD.org
 COMMENT?=	Highly efficient mail filter for identifying spam
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	p5-Encode-Detect>=0:converters/p5-Encode-Detect \
 		p5-HTML-Parser>=3.46:www/p5-HTML-Parser \
 		p5-HTTP-Date>=0:www/p5-HTTP-Date \
 		p5-Net-DNS>=0.63:dns/p5-Net-DNS \
 		p5-NetAddr-IP>=4.010:net-mgmt/p5-NetAddr-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode \
 		p5-Net-LibIDN>=0:dns/p5-Net-LibIDN \
 		p5-URI>=0:net/p5-URI \
 		re2c>=.12.0:devel/re2c
 
 .for dep in DCC DKIM MYSQL PGSQL PYZOR RAZOR RELAY_COUNTRY SPF_QUERY SSL
 TEST_DEPENDS+=	${${dep}_RUN_DEPENDS}
 .endfor
 
 CONFLICTS?=	ja-spamassassin-[0-9]*
 
 CPE_VENDOR=	apache
 
 USES=		cpe perl5
 USE_PERL5=	configure
 USE_LDCONFIG=	yes
 
 DATADIR=	${PREFIX}/share/spamassassin
 DBDIR?=		/var/db
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 ETCDIR?=	${PREFIX}/etc/mail/spamassassin
 
 SPAMASSASSIN_CONTACT_ADDRESS?=	The administrator of that system
 USERS?=		spamd
 GROUPS?=	spamd
 CONFIGURE_ARGS=	SYSCONFDIR="${PREFIX}/etc" \
 		CONTACT_ADDRESS="${SPAMASSASSIN_CONTACT_ADDRESS}" \
 		LOCALSTATEDIR="${DBDIR}/spamassassin" \
 		BUILD_SPAMC=yes
 
 OPTIONS_DEFINE=		AS_ROOT DOCS SSL
 OPTIONS_GROUP=		DATABASE GPG PLUGINS
 OPTIONS_GROUP_DATABASE=	MYSQL PGSQL
 OPTIONS_GROUP_PLUGINS=	DCC DKIM PYZOR RAZOR RELAY_COUNTRY SPF_QUERY
 OPTIONS_SINGLE=		GPG
 OPTIONS_SINGLE_GPG=	GNUPG_NONE GNUPG GNUPG2
 OPTIONS_DEFAULT=	AS_ROOT DKIM GNUPG SSL SPF_QUERY
 
 AS_ROOT_DESC=		Run spamd as root (recommended)
 
 DATABASE_DESC=		Optional user-config/bayes database backends
 
-GPG_DESC=		GnuPG (for sa-update, optional)
+GPG_DESC=		GnuPG (for sa-update)
 GNUPG_NONE_DESC=	Do not use GnuPG
 GNUPG_DESC=		GnuPG 1 (security/gnupg1)
 GNUPG2_DESC=		GnuPG 2 (security/gnupg)
 
 PLUGINS_DESC=		Optional SpamAssassin plugins
 DCC_DESC=		DCC digest list support (mail/dcc-dccd)
 DKIM_DESC=		Verify DKIM records (mail/p5-Mail-DKIM)
 PYZOR_DESC=		Pyzor digest list support (mail/pyzor)
 RAZOR_DESC=		Vipul's Razor digest list support (mail/razor-agents)
 RELAY_COUNTRY_DESC=	Location-based scoring (net/p5-Geo-IP)
 SPF_QUERY_DESC=		Verify SPF records (mail/p5-Mail-SPF)
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	SPAMD_OWN="${USERS}:${GROUPS}"
 PLIST_SUB+=	USER=${USERS} GROUP=${GROUPS}
 OPTIONS_SUB=	yes
 
 AS_ROOT_SUB_LIST=	RUN_AS_USER="-u ${USERS} -H /var/spool/spamd"
 AS_ROOT_SUB_LIST_OFF=	RUN_AS_USER=
 DCC_RUN_DEPENDS=	dcc-dccd>=1.3.111:mail/dcc-dccd
 DKIM_RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
 			p5-Mail-DKIM>=0.37:mail/p5-Mail-DKIM \
 			p5-Crypt-OpenSSL-RSA>=0.26_1:security/p5-Crypt-OpenSSL-RSA
 GNUPG_RUN_DEPENDS=	gnupg1>=1.4.7:security/gnupg1
 GNUPG2_RUN_DEPENDS=	gpg2:security/gnupg
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 PYZOR_RUN_DEPENDS=	pyzor:mail/pyzor
 RAZOR_RUN_DEPENDS=	razor-agents>=2.84:mail/razor-agents
 RELAY_COUNTRY_RUN_DEPENDS=	p5-Geo-IP>=0:net/p5-Geo-IP \
 			p5-IP-Country>=0:net/p5-IP-Country
 SPF_QUERY_RUN_DEPENDS=	p5-Mail-SPF>=0:mail/p5-Mail-SPF
 
 SSL_USES=		ssl
 SSL_RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 SSL_CONFIGURE_ON=	ENABLE_SSL=yes
 SSL_CONFIGURE_OFF=	ENABLE_SSL=no
 
 # plugin names in rules/*.pre, for enabling/disabling
 DCC_INITVAR=		DCC
 DKIM_INITVAR=		DKIM
 PYZOR_INITVAR=		Pyzor
 RAZOR_INITVAR=		Razor2
 RELAY_COUNTRY_INITVAR=	RelayCountry
 SPF_QUERY_INITVAR=	SPF
 
 DOCS=		CREDITS Changes INSTALL NOTICE PACKAGING README TRADEMARK UPGRADE USAGE procmailrc.example
 DOCSSQL=	README README.awl README.bayes awl_mysql.sql awl_pg.sql bayes_mysql.sql bayes_pg.sql userpref_mysql.sql userpref_pg.sql
 DOCSLDAP=	README README.testing sa_test.ldif
 PORTDOCS=	${DOCS} sql ldap
 
 USE_RC_SUBR=	sa-spamd
 
 ALL_TARGET=	all spamc/libspamc.so
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 ALL_TARGET+=	spamc/libsslspamc.so
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL}
 SUB_LIST+=	SQL_FLAG="-Q"
 .else
 SUB_LIST+=	SQL_FLAG=""
 .endif
 
 post-patch::
 	${REINPLACE_CMD} -e 's,B_CONFDIR)/local.cf,B_CONFDIR)/local.cf.sample,g' \
 		-e 's,B_CONFDIR)/init.pre,B_CONFDIR)/init.pre.sample,g' \
 		-e 's,B_CONFDIR)/v310.pre,B_CONFDIR)/v310.pre.sample,g' \
 		-e 's,B_CONFDIR)/v312.pre,B_CONFDIR)/v312.pre.sample,g' \
 		-e 's,B_CONFDIR)/v320.pre,B_CONFDIR)/v320.pre.sample,g' \
 		-e 's,B_CONFDIR)/v330.pre,B_CONFDIR)/v330.pre.sample,g' \
 		-e 's,B_CONFDIR)/v340.pre,B_CONFDIR)/v340.pre.sample,g' \
 		-e 's,B_CONFDIR)/v341.pre,B_CONFDIR)/v341.pre.sample,g' \
 		-e 's/require DBI/0/' \
 		${WRKSRC}/Makefile.PL
 	${REINPLACE_CMD} -e '/^CC =/d; \
 		s|@SSLCFLAGS@|& $${CFLAGS}|g' ${WRKSRC}/spamc/Makefile.in
 
 .for var in ${OPTIONS_GROUP_PLUGINS}
 .  if ${PORT_OPTIONS:M${var}}
 	${REINPLACE_CMD} -e '/${${var}_INITVAR}/s/^\#.*loadplugin/loadplugin/' ${WRKSRC}/rules/*.pre
 .  else
 	${REINPLACE_CMD} -e '/${${var}_INITVAR}/s/^loadplugin/\# loadplugin/' ${WRKSRC}/rules/*.pre
 .  endif
 .endfor
 
 pre-su-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_LIB} ${WRKSRC}/spamc/libspamc.so ${STAGEDIR}${PREFIX}/lib/libspamc.so.0
 	${LN} -sf libspamc.so.0 ${STAGEDIR}${PREFIX}/lib/libspamc.so
 .if ${PORT_OPTIONS:MSSL}
 	${INSTALL_LIB} ${WRKSRC}/spamc/libsslspamc.so ${STAGEDIR}${PREFIX}/lib/libsslspamc.so.0
 	${LN} -sf libsslspamc.so.0 ${STAGEDIR}${PREFIX}/lib/libsslspamc.so
 .endif
 	${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.h ${STAGEDIR}${PREFIX}/include
 
 post-install::
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spamc
 	@${MKDIR} ${STAGEDIR}/var/lib/spamassassin ${STAGEDIR}${DBDIR}/spamassassin ${STAGEDIR}/var/run/spamd
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "sql ldap" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.post.mk>
Index: head/net-im/ekiga/Makefile
===================================================================
--- head/net-im/ekiga/Makefile	(revision 459450)
+++ head/net-im/ekiga/Makefile	(revision 459451)
@@ -1,169 +1,171 @@
 # Created by: Charlie & <root@ws.ipfw.ru>
 # $FreeBSD$
 #    $MCom: ports/trunk/net-im/ekiga/Makefile 19954 2014-10-15 10:03:57Z kwm $
 
 PORTNAME=	ekiga
 PORTVERSION=	4.0.1
 PORTREVISION=	16
 CATEGORIES=	net-im
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VoIP and video conferencing application
 
 BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat \
 		gnome-icon-theme>=3.0.0:misc/gnome-icon-theme
 LIB_DEPENDS=	libboost_signals.so:devel/boost-libs \
 		libopal.so:net/opal \
 		libv4l2.so:multimedia/libv4l
 RUN_DEPENDS=	gnome-icon-theme>=3.0.0:misc/gnome-icon-theme
 
 GNU_CONFIGURE=	yes
 USES=		cpe gettext gmake kde:4 libtool pathfix perl5 pkgconfig \
 		tar:xz
 USE_XORG=	xv
 USE_GNOME=	gtk20 intlhack libxml2
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-I${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	LDAP NOTIFY EVOLUTION GCONF DBUS AVAHI GNOMEHELP
 OPTIONS_DEFAULT=NOTIFY DBUS GCONF AVAHI
 
 EVOLUTION_DESC=	Evolution data server support
 GNOMEHELP_DESC=	Build Ekiga help files
 
 #OPTIONS_GROUP=	EXP
 #OPTIONS_GROUP_EXP=	KDE KAB GSTREAMER XCAP LOUDMOUTH
 EXP_DESC=	Experimental features
 KDE_DESC=	KDE 4 support
-KAB_DESC=	KAddressBook support (implies KDE option)
+KAB_DESC=	KAddressBook support
 GSTREAMER_DESC=	Gstreamer support
 XCAP_DESC=	Remote contact storage via HTTP in xml format
 LOUDMOUTH_DESC=	XMPP (jabber) support
+
+KAB_IMPLIES=	KDE
 
 # Note that h.323 support is enabled when opal is build with it.
 
 .include <bsd.port.options.mk>
 
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .if ${PORT_OPTIONS:MKDE} || ${PORT_OPTIONS:MKAB}
 USE_KDE=	kdelibs
 USE_QT4=	corelib
 CONFIGURE_ARGS+=--enable-kde
 #CONFIGURE_ENV+=KDE_CFLAGS="-I${KDE_PREFIX}/include -I${QT_INCDIR} \
 #	-I${LOCALBASE}/include" KDE_LIBS="-L${KDE_PREFIX}/lib"
 CPPFLAGS+=	-I${KDE_PREFIX}/include
 LDFLAGS+=	-L${KDE_PREFIX}/lib
 .else
 CONFIGURE_ARGS+=--disable-kde
 .endif
 
 .if ${PORT_OPTIONS:MKAB}
 CONFIGURE_ARGS+=--enable-kab
 USE_KDE+=	pimlibs
 .else
 CONFIGURE_ARGS+=--disable-kab
 .endif
 
 .if ${PORT_OPTIONS:MGSTREAMER}
 CONFIGURE_ARGS+=--enable-gstreamer
 USE_GSTREAMER=	yes
 .else
 CONFIGURE_ARGS+=--disable-gstreamer
 .endif
 
 .if ${PORT_OPTIONS:MXCAP}
 CONFIGURE_ARGS+=--enable-xcap
 LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 .else
 CONFIGURE_ARGS+=--disable-xcap
 .endif
 
 .if ${PORT_OPTIONS:MLOUDMOUTH}
 CONFIGURE_ARGS+=--enable-loudmouth
 LIB_DEPENDS+=	libloudmouth-1.so:net-im/loudmouth
 .else
 CONFIGURE_ARGS+=--disable-loudmouth
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 LIB_DEPENDS+=	libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=--enable-ldap --with-ldap-dir="${LOCALBASE}" --with-libsasl2-dir="${LOCALBASE}"
 PLIST_SUB+=	LDAP=""
 WITH_PLUGINS=	1
 .else
 CONFIGURE_ARGS+=--disable-ldap
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
 .if defined(WITH_PLUGINS)
 PLIST_SUB+=	PLUGINS=""
 .else
 PLIST_SUB+=	PLUGINS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNOTIFY}
 LIB_DEPENDS+=	libnotify.so:devel/libnotify
 CONFIGURE_ARGS+=--enable-notify
 PLIST_SUB+=	NOTIFY=""
 WITH_PLUGINS=	1
 .else
 CONFIGURE_ARGS+=--disable-notify
 PLIST_SUB+=	NOTIFY="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 CONFIGURE_ARGS+=--enable-dbus --enable-dbus-service
 PLIST_SUB+=	DBUS=""
 .else
 CONFIGURE_ARGS+=--disable-dbus --disable-dbus-service
 PLIST_SUB+=	DBUS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGCONF}
 USE_GNOME+=	gconf2
 CONFIGURE_ARGS+=--enable-gconf
 GCONF_SCHEMAS=	ekiga.schemas
 PLIST_SUB+=	GCONF="@comment "
 .else
 CONFIGURE_ARGS+=--disable-gconf
 PLIST_SUB+=	GCONF=""
 .endif
 
 .if ${PORT_OPTIONS:MEVOLUTION}
 USE_GNOME+=	evolutiondataserver3
 LIB_DEPENDS+=	libgcr-3.so:security/gcr
 CONFIGURE_ARGS+=--enable-eds
 PLIST_SUB+=	EVOLUTION=""
 WITH_PLUGINS=	1
 .else
 CONFIGURE_ARGS+=--disable-eds
 PLIST_SUB+=	EVOLUTION="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=--enable-avahi
 LIB_DEPENDS+=	libavahi-client.so:net/avahi-app
 PLIST_SUB+=	AVAHI=""
 WITH_PLUGINS=	1
 .else
 CONFIGURE_ARGS+=--disable-avahi
 PLIST_SUB+=	AVAHI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGNOMEHELP}
 INSTALLS_OMF=	yes
 PLIST_SUB+=	GNOMEHELP=""
 USE_GNOME+=	gnomedocutils
 .else
 CONFIGURE_ARGS+=--disable-gdu
 PLIST_SUB+=	GNOMEHELP="@comment "
 .endif
 
 .include <bsd.port.mk>
Index: head/textproc/docproj/Makefile
===================================================================
--- head/textproc/docproj/Makefile	(revision 459450)
+++ head/textproc/docproj/Makefile	(revision 459451)
@@ -1,74 +1,74 @@
 # Created by: Nik Clayton <nik@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	docproj
 PORTVERSION=	2.0
 PORTREVISION=	9
 CATEGORIES=	textproc
 
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	Meta-port for the FreeBSD Documentation Project
 
 RUN_DEPENDS=	links:www/links1 \
 		pngtopnm:graphics/netpbm \
 		scr2png:graphics/scr2png \
 		scr2txt:textproc/scr2txt \
 		xsltproc:textproc/libxslt \
 		peps:graphics/peps \
 		${LOCALBASE}/share/xml/dtd/xhtml/xhtml.soc:textproc/xhtml \
 		docbook-xsl-ns>=1.78.1_4:textproc/docbook-xsl-ns \
 		${LOCALBASE}/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl:textproc/iso-schematron-xslt \
 		docbook>0:textproc/docbook \
 		${LOCALBASE}/share/xml/xmlcharent/catalog:textproc/xmlcharent \
 		p5-XML-Parser>=2.41:textproc/p5-XML-Parser \
 		zip:archivers/zip
 
 USES=		ghostscript:run metaport perl5
 USE_PERL5=	run
 
 OPTIONS_DEFINE=		DBLATEX CJK FOP IGOR JING SVN TRANSLATOR
 OPTIONS_DEFAULT=	        CJK     IGOR          TRANSLATOR
 .if !exists(/usr/bin/svnlite)
 OPTIONS_DEFAULT+=	SVN
 .endif
 CJK_DESC=		CJK support
 CJK_RUN_DEPENDS=	html2text:textproc/html2text
 SVN_DESC=		Subversion support (required to check out sources)
 SVN_RUN_DEPENDS=	svn:devel/subversion
 IGOR_DESC=		Igor automated proofreader for documentation
 IGOR_RUN_DEPENDS=	igor:textproc/igor
 FOP_DESC=		FOP PDF renderer (requires Java)
 FOP_RUN_DEPENDS=	fop:textproc/fop \
 			${FONTS}
-JING_DESC=		Jing for advanced RELAX NG validation (optional)
+JING_DESC=		Jing for advanced RELAX NG validation
 JING_RUN_DEPENDS=	jing:textproc/jing
 DBLATEX_DESC=		dblatex PDF renderer (experimental, requires TeXLive)
 DBLATEX_RUN_DEPENDS=	dblatex:textproc/dblatex \
 			${FONTS}
 DBLATEX_USE=		TEX=xetex
 TRANSLATOR_DESC=	Tools for translators
 TRANSLATOR_RUN_DEPENDS=	itstool:textproc/itstool \
 			msgcat:devel/gettext-tools
 
 FONTS=	${LOCALBASE}/share/fonts/GentiumPlus/GentiumPlus-R.ttf:x11-fonts/gentium-plus \
 	${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf \
 	${LOCALBASE}/share/fonts/Lohit/Lohit-Bengali.ttf:x11-fonts/lohit \
 	${LOCALBASE}/share/fonts/dejavu/DejaVuSansMono.ttf:x11-fonts/dejavu
 FONTS_CJK=${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:chinese/arphicttf \
 	${LOCALBASE}/share/fonts/OTF/ipam.otf:japanese/font-ipa \
 	${LOCALBASE}/share/fonts/nanum-ttf/NanumBarunGothic.ttf:korean/nanumfonts-ttf
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFOP} || ${PORT_OPTIONS:MDBLATEX}
 ONLY_FOR_ARCHS=	amd64 i386
 CJK_RUN_DEPENDS=	${FONTS_CJK}
 .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,$$, \\,'
 
 .include <bsd.port.mk>