Index: head/databases/dbh/Makefile
===================================================================
--- head/databases/dbh/Makefile	(revision 500959)
+++ head/databases/dbh/Makefile	(revision 500960)
@@ -1,46 +1,38 @@
 # Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dbh
 PORTVERSION=	5.0.22
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	SF
 DISTNAME=	libdbh2-${PORTVERSION}
 
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Disk Based Hashtables
 
 LICENSE=	GPLv3
 
 CONFLICTS=	dbh-[0-4]*
 
 USES=		libtool pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pkglibdata
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	GTKDOC
-GTKDOC_DESC=	Enable GTK html documentation
+OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+DOCS_CONFIGURE_ENABLE=	gtk-doc-html
 
-.if ${PORT_OPTIONS:MGTKDOC}
-CONFIGURE_ARGS+=	--enable-gtk-doc-html
-PLIST_SUB+=	GTKDOC=""
-.else
-CONFIGURE_ARGS+=	--disable-gtk-doc-html
-PLIST_SUB+=	GTKDOC="@comment "
-.endif
-
 post-patch:
 # Fix the build on big-endian architectures.
 	@${REINPLACE_CMD} -e '/fractalidad/d' ${WRKSRC}/src/dbh_static.i
 # Needed to remove gtk-doc installation.
-.if empty(PORT_OPTIONS:MGTKDOC)
+
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's|^\(SUBDIRS = src man\).*|\1|' \
 		${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>
Index: head/databases/dbh/pkg-plist
===================================================================
--- head/databases/dbh/pkg-plist	(revision 500959)
+++ head/databases/dbh/pkg-plist	(revision 500960)
@@ -1,57 +1,57 @@
 include/dbh/dbh.h
 lib/libdbh.a
 lib/libdbh.so
 lib/libdbh.so.2
 lib/libdbh.so.2.0.3
 libdata/pkgconfig/dbh2.pc
 man/man3/dbh.3.gz
 man/man3/dbh.h.3.gz
 man/man3/dbh_close.3.gz
 man/man3/dbh_create.3.gz
 man/man3/dbh_destroy.3.gz
 man/man3/dbh_erase.3.gz
 man/man3/dbh_exit_fanout.3.gz
 man/man3/dbh_exit_sweep.3.gz
 man/man3/dbh_fanout.3.gz
 man/man3/dbh_find.3.gz
 man/man3/dbh_foreach_fanout.3.gz
 man/man3/dbh_foreach_sweep.3.gz
 man/man3/dbh_genkey.3.gz
 man/man3/dbh_genkey2.3.gz
 man/man3/dbh_load.3.gz
 man/man3/dbh_load_address.3.gz
 man/man3/dbh_load_child.3.gz
 man/man3/dbh_load_parent.3.gz
 man/man3/dbh_macros.3.gz
 man/man3/dbh_open.3.gz
 man/man3/dbh_open_ro.3.gz
 man/man3/dbh_orderkey.3.gz
 man/man3/dbh_prune.3.gz
 man/man3/dbh_regen_fanout.3.gz
 man/man3/dbh_regen_sweep.3.gz
 man/man3/dbh_set_data.3.gz
 man/man3/dbh_set_key.3.gz
 man/man3/dbh_set_recordsize.3.gz
 man/man3/dbh_set_size.3.gz
 man/man3/dbh_settempdir.3.gz
 man/man3/dbh_sweep.3.gz
 man/man3/dbh_unerase.3.gz
 man/man3/dbh_unprune.3.gz
 man/man3/dbh_update.3.gz
 man/man3/dbh_writeheader.3.gz
 %%DATADIR%%/Makefile.am
 %%DATADIR%%/dbh.vim
 %%DATADIR%%/filesystem.c
 %%DATADIR%%/simple_hash.c
-%%GTKDOC%%share/gtk-doc/html/dbh/DBH.html
-%%GTKDOC%%share/gtk-doc/html/dbh/articulo001.pdf
-%%GTKDOC%%share/gtk-doc/html/dbh/calc.png
-%%GTKDOC%%share/gtk-doc/html/dbh/ch01.html
-%%GTKDOC%%share/gtk-doc/html/dbh/dbh.pdf
-%%GTKDOC%%share/gtk-doc/html/dbh/home.png
-%%GTKDOC%%share/gtk-doc/html/dbh/index.html
-%%GTKDOC%%share/gtk-doc/html/dbh/index.sgml
-%%GTKDOC%%share/gtk-doc/html/dbh/left.png
-%%GTKDOC%%share/gtk-doc/html/dbh/right.png
-%%GTKDOC%%share/gtk-doc/html/dbh/style.css
-%%GTKDOC%%share/gtk-doc/html/dbh/up.png
+%%PORTDOCS%%share/gtk-doc/html/dbh/DBH.html
+%%PORTDOCS%%share/gtk-doc/html/dbh/articulo001.pdf
+%%PORTDOCS%%share/gtk-doc/html/dbh/calc.png
+%%PORTDOCS%%share/gtk-doc/html/dbh/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/dbh/dbh.pdf
+%%PORTDOCS%%share/gtk-doc/html/dbh/home.png
+%%PORTDOCS%%share/gtk-doc/html/dbh/index.html
+%%PORTDOCS%%share/gtk-doc/html/dbh/index.sgml
+%%PORTDOCS%%share/gtk-doc/html/dbh/left.png
+%%PORTDOCS%%share/gtk-doc/html/dbh/right.png
+%%PORTDOCS%%share/gtk-doc/html/dbh/style.css
+%%PORTDOCS%%share/gtk-doc/html/dbh/up.png
Index: head/graphics/graphene/Makefile
===================================================================
--- head/graphics/graphene/Makefile	(revision 500959)
+++ head/graphics/graphene/Makefile	(revision 500960)
@@ -1,41 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=	graphene
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Optimizations for speeding up vector operations
 
 LICENSE=	MIT
 
 USES=		gnome meson pkgconfig python:3.4+ shebangfix tar:xz
 USE_GNOME=	glib20 pygobject3
 USE_LDCONFIG=	yes
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	GTKDOC #INTROSPECTION
+OPTIONS_DEFINE=	DOCS #INTROSPECTION
 #OPTIONS_DEFAULT=INTROSPECTION
 
 SHEBANG_FILES=	src/identfilter.py
 
 USE_GNOME+=		introspection:build
 #INTROSPECTION_DESC=	Build Gobject Introspection
 #INTROSPECTION_USE=	gnome=introspection:build
 #INTROSPECTION_MESON_OFF=	-Denable-introspection=false
 
-GTKDOC_MESON_TRUE=	gtk_doc
-GTKDOC_DESC=		Build documentation
-GTKDOC_BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc
+DOCS_MESON_TRUE=	gtk_doc
+DOCS_BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|=python |=${PYTHON_VERSION} |g' \
 		${WRKSRC}/src/meson.build
 
 # We don't want install tests
 post-install:
 	@${RM} -rf ${STAGEDIR}${PREFIX}/libexec/installed-tests
 	@${RM} -rf ${STAGEDIR}${PREFIX}/share/installed-tests
 
 .include <bsd.port.mk>
Index: head/graphics/graphene/pkg-plist
===================================================================
--- head/graphics/graphene/pkg-plist	(revision 500959)
+++ head/graphics/graphene/pkg-plist	(revision 500960)
@@ -1,74 +1,74 @@
 include/graphene-1.0/graphene-box.h
 include/graphene-1.0/graphene-euler.h
 include/graphene-1.0/graphene-frustum.h
 include/graphene-1.0/graphene-gobject.h
 include/graphene-1.0/graphene-macros.h
 include/graphene-1.0/graphene-matrix.h
 include/graphene-1.0/graphene-plane.h
 include/graphene-1.0/graphene-point.h
 include/graphene-1.0/graphene-point3d.h
 include/graphene-1.0/graphene-quad.h
 include/graphene-1.0/graphene-quaternion.h
 include/graphene-1.0/graphene-ray.h
 include/graphene-1.0/graphene-rect.h
 include/graphene-1.0/graphene-simd4f.h
 include/graphene-1.0/graphene-simd4x4f.h
 include/graphene-1.0/graphene-size.h
 include/graphene-1.0/graphene-sphere.h
 include/graphene-1.0/graphene-triangle.h
 include/graphene-1.0/graphene-types.h
 include/graphene-1.0/graphene-vec2.h
 include/graphene-1.0/graphene-vec3.h
 include/graphene-1.0/graphene-vec4.h
 include/graphene-1.0/graphene-version-macros.h
 include/graphene-1.0/graphene-version.h
 include/graphene-1.0/graphene.h
 lib/girepository-1.0/Graphene-1.0.typelib
 lib/graphene-1.0/include/graphene-config.h
 lib/libgraphene-1.0.so
 lib/libgraphene-1.0.so.0
 lib/libgraphene-1.0.so.0.800.2
 libdata/pkgconfig/graphene-1.0.pc
 libdata/pkgconfig/graphene-gobject-1.0.pc
 share/gir-1.0/Graphene-1.0.gir
-%%GTKDOC%%share/gtk-doc/html/graphene/annotation-glossary.html
-%%GTKDOC%%share/gtk-doc/html/graphene/api-index.html
-%%GTKDOC%%share/gtk-doc/html/graphene/ch01.html
-%%GTKDOC%%share/gtk-doc/html/graphene/deprecated-api-index.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Box.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Euler.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Frustum.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-GObject-integration.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Matrix.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Plane.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Point.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Point3D.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Quad.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Quaternion.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Ray.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Rectangle.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-SIMD-matrix.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-SIMD-vector.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Size.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Sphere.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Triangle.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Vectors.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene-Versioning-information.html
-%%GTKDOC%%share/gtk-doc/html/graphene/graphene.devhelp2
-%%GTKDOC%%share/gtk-doc/html/graphene/home.png
-%%GTKDOC%%share/gtk-doc/html/graphene/index.html
-%%GTKDOC%%share/gtk-doc/html/graphene/ix03.html
-%%GTKDOC%%share/gtk-doc/html/graphene/ix04.html
-%%GTKDOC%%share/gtk-doc/html/graphene/ix05.html
-%%GTKDOC%%share/gtk-doc/html/graphene/ix06.html
-%%GTKDOC%%share/gtk-doc/html/graphene/left-insensitive.png
-%%GTKDOC%%share/gtk-doc/html/graphene/left.png
-%%GTKDOC%%share/gtk-doc/html/graphene/rectangle-intersection.png
-%%GTKDOC%%share/gtk-doc/html/graphene/rectangle-union.png
-%%GTKDOC%%share/gtk-doc/html/graphene/rectangle.png
-%%GTKDOC%%share/gtk-doc/html/graphene/right-insensitive.png
-%%GTKDOC%%share/gtk-doc/html/graphene/right.png
-%%GTKDOC%%share/gtk-doc/html/graphene/style.css
-%%GTKDOC%%share/gtk-doc/html/graphene/triangle-barycentric.png
-%%GTKDOC%%share/gtk-doc/html/graphene/up-insensitive.png
-%%GTKDOC%%share/gtk-doc/html/graphene/up.png
+%%PORTDOCS%%share/gtk-doc/html/graphene/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/api-index.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/deprecated-api-index.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Box.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Euler.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Frustum.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-GObject-integration.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Matrix.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Plane.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Point.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Point3D.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Quad.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Quaternion.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Ray.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Rectangle.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-SIMD-matrix.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-SIMD-vector.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Size.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Sphere.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Triangle.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Vectors.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene-Versioning-information.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/graphene.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/graphene/home.png
+%%PORTDOCS%%share/gtk-doc/html/graphene/index.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/ix03.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/ix04.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/ix05.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/ix06.html
+%%PORTDOCS%%share/gtk-doc/html/graphene/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/graphene/left.png
+%%PORTDOCS%%share/gtk-doc/html/graphene/rectangle-intersection.png
+%%PORTDOCS%%share/gtk-doc/html/graphene/rectangle-union.png
+%%PORTDOCS%%share/gtk-doc/html/graphene/rectangle.png
+%%PORTDOCS%%share/gtk-doc/html/graphene/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/graphene/right.png
+%%PORTDOCS%%share/gtk-doc/html/graphene/style.css
+%%PORTDOCS%%share/gtk-doc/html/graphene/triangle-barycentric.png
+%%PORTDOCS%%share/gtk-doc/html/graphene/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/graphene/up.png
Index: head/x11/keybinder/Makefile
===================================================================
--- head/x11/keybinder/Makefile	(revision 500959)
+++ head/x11/keybinder/Makefile	(revision 500960)
@@ -1,58 +1,57 @@
 # $FreeBSD$
 
 PORTNAME=	keybinder
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for registering keyboard shortcuts
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	engla
 
 USES=		autoreconf gmake libtool pathfix pkgconfig
 USE_GNOME=	gtk20 introspection:build
 USE_XORG=	x11 xext xrender
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	EXAMPLES GTKDOC LUA PYTHON
+OPTIONS_DEFINE=	EXAMPLES DOCS LUA PYTHON
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=	yes
 
-GTKDOC_DESC=		Build API documentation (requires textproc/gtk-doc)
-GTKDOC_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
-GTKDOC_CONFIGURE_ON=	--enable-gtk-doc
+DOCS_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
+DOCS_CONFIGURE_ON=	--enable-gtk-doc
 
 # Override LUA description
 LUA_DESC=		Lua bindings
 LUA_USES=		lua:51
 LUA_CONFIGURE_ON=	--with-lua-includes=${LUA_INCDIR}
 LUA_CONFIGURE_OFF=	--disable-lua
 
 PYTHON_USES=		python:2.7
 PYTHON_USE=		gnome=pygtk2
 PYTHON_CONFIGURE_OFF=	--disable-python
 
-post-patch-GTKDOC-off:
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -E '/GTK_DOC_CHECK|docs/d' ${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s, docs,,' ${WRKSRC}/Makefile.am
 
-pre-configure-GTKDOC-on:
+pre-configure-DOCS-on:
 	@(cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/gtkdocize)
 
 post-build-EXAMPLES-on:
 	@${REINPLACE_CMD} -i '' -e \
 		's|lua5.1|lua-${LUA_VER}|g' ${WRKSRC}/examples/Makefile
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/x11/keybinder/pkg-plist
===================================================================
--- head/x11/keybinder/pkg-plist	(revision 500959)
+++ head/x11/keybinder/pkg-plist	(revision 500960)
@@ -1,37 +1,37 @@
 include/keybinder.h
 lib/girepository-1.0/Keybinder-0.0.typelib
 lib/libkeybinder.so
 lib/libkeybinder.so.0
 lib/libkeybinder.so.0.1.0
 %%LUA%%%%LUA_MODLIBDIR%%/keybinder.so
 libdata/pkgconfig/keybinder.pc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/__init__.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/_keybinder.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.lua
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_gi.lua
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keybinder.vapi
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lminigtk.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vexample.vala
 share/gir-1.0/Keybinder-0.0.gir
-%%GTKDOC%%share/gtk-doc/html/keybinder/annotation-glossary.html
-%%GTKDOC%%share/gtk-doc/html/keybinder/api-index-full.html
-%%GTKDOC%%share/gtk-doc/html/keybinder/ch01.html
-%%GTKDOC%%share/gtk-doc/html/keybinder/deprecated-api-index.html
-%%GTKDOC%%share/gtk-doc/html/keybinder/home.png
-%%GTKDOC%%share/gtk-doc/html/keybinder/index.html
-%%GTKDOC%%share/gtk-doc/html/keybinder/keybinder-keybinder.html
-%%GTKDOC%%share/gtk-doc/html/keybinder/keybinder.devhelp2
-%%GTKDOC%%share/gtk-doc/html/keybinder/left-insensitive.png
-%%GTKDOC%%share/gtk-doc/html/keybinder/left.png
-%%GTKDOC%%share/gtk-doc/html/keybinder/object-tree.html
-%%GTKDOC%%share/gtk-doc/html/keybinder/right-insensitive.png
-%%GTKDOC%%share/gtk-doc/html/keybinder/right.png
-%%GTKDOC%%share/gtk-doc/html/keybinder/style.css
-%%GTKDOC%%share/gtk-doc/html/keybinder/up-insensitive.png
-%%GTKDOC%%share/gtk-doc/html/keybinder/up.png
+%%PORTDOCS%%share/gtk-doc/html/keybinder/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/keybinder/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/keybinder/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/keybinder/deprecated-api-index.html
+%%PORTDOCS%%share/gtk-doc/html/keybinder/home.png
+%%PORTDOCS%%share/gtk-doc/html/keybinder/index.html
+%%PORTDOCS%%share/gtk-doc/html/keybinder/keybinder-keybinder.html
+%%PORTDOCS%%share/gtk-doc/html/keybinder/keybinder.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/keybinder/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/keybinder/left.png
+%%PORTDOCS%%share/gtk-doc/html/keybinder/object-tree.html
+%%PORTDOCS%%share/gtk-doc/html/keybinder/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/keybinder/right.png
+%%PORTDOCS%%share/gtk-doc/html/keybinder/style.css
+%%PORTDOCS%%share/gtk-doc/html/keybinder/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/keybinder/up.png
Index: head/x11-toolkits/pango/Makefile
===================================================================
--- head/x11-toolkits/pango/Makefile	(revision 500959)
+++ head/x11-toolkits/pango/Makefile	(revision 500960)
@@ -1,56 +1,55 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pango
 PORTVERSION=	1.42.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Open-source framework for the layout and rendering of i18n text
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	help2man:misc/help2man
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfribidi.so:converters/fribidi
 RUN_DEPENDS=	xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \
 		${FONTENCOD}:x11-fonts/encodings
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 gettext gnome localbase meson pkgconfig tar:xz
 USE_LDCONFIG=	yes
 USE_GNOME=	cairo glib20 introspection:build
 
 VERSION=	1.8.0
 LIBVERSION=	0.4200.3
 PLIST_SUB+=     VERSION=${VERSION} LIBVERSION=${LIBVERSION}
 
 FONTSCALE=	${LOCALBASE}/share/fonts/TTF/luximb.ttf
 FONTENCOD=	${LOCALBASE}/share/fonts/encodings/encodings.dir
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	X11 GTKDOC
+OPTIONS_DEFINE=	X11 DOCS
 OPTIONS_DEFAULT=X11
 
-GTKDOC_DESC=		Build and install gtk-doc generated documentation
-GTKDOC_MESON_TRUE=	enable_docs
-GTKDOC_BUILD_DEPENDS=	gtk-doc>=0:textproc/gtk-doc
+DOCS_MESON_TRUE=	enable_docs
+DOCS_BUILD_DEPENDS=	gtk-doc>=0:textproc/gtk-doc
 
 X11_MESON_TRUE=	xft
 X11_USE=	XORG=x11,xft,xrender
 
 pre-configure:
 # .if !exists() evaluates too early before cairo has a chance to be installed
 	@if ! pkg-config --exists cairo-gobject; then \
 		${ECHO_MSG} "${PKGNAME}: Needs cairo with GLIB (GObject) support enabled."; \
 		${FALSE}; \
 	fi
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/pango/pkg-plist
===================================================================
--- head/x11-toolkits/pango/pkg-plist	(revision 500959)
+++ head/x11-toolkits/pango/pkg-plist	(revision 500960)
@@ -1,127 +1,127 @@
 bin/pango-list
 bin/pango-view
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-bidi-type.h
 include/pango-1.0/pango/pango-break.h
 include/pango-1.0/pango/pango-context.h
 include/pango-1.0/pango/pango-coverage.h
 include/pango-1.0/pango/pango-engine.h
 include/pango-1.0/pango/pango-enum-types.h
 include/pango-1.0/pango/pango-features.h
 include/pango-1.0/pango/pango-font.h
 include/pango-1.0/pango/pango-fontmap.h
 include/pango-1.0/pango/pango-fontset.h
 include/pango-1.0/pango/pango-glyph-item.h
 include/pango-1.0/pango/pango-glyph.h
 include/pango-1.0/pango/pango-gravity.h
 include/pango-1.0/pango/pango-item.h
 include/pango-1.0/pango/pango-language.h
 include/pango-1.0/pango/pango-layout.h
 include/pango-1.0/pango/pango-matrix.h
 include/pango-1.0/pango/pango-modules.h
 include/pango-1.0/pango/pango-ot.h
 include/pango-1.0/pango/pango-renderer.h
 include/pango-1.0/pango/pango-script.h
 include/pango-1.0/pango/pango-tabs.h
 include/pango-1.0/pango/pango-types.h
 include/pango-1.0/pango/pango-utils.h
 include/pango-1.0/pango/pango-version-macros.h
 include/pango-1.0/pango/pango.h
 include/pango-1.0/pango/pangocairo.h
 include/pango-1.0/pango/pangofc-decoder.h
 include/pango-1.0/pango/pangofc-font.h
 include/pango-1.0/pango/pangofc-fontmap.h
 include/pango-1.0/pango/pangoft2.h
 %%X11%%include/pango-1.0/pango/pangoxft-render.h
 %%X11%%include/pango-1.0/pango/pangoxft.h
 lib/girepository-1.0/Pango-1.0.typelib
 lib/girepository-1.0/PangoCairo-1.0.typelib
 lib/girepository-1.0/PangoFT2-1.0.typelib
 %%X11%%lib/girepository-1.0/PangoXft-1.0.typelib
 lib/libpango-1.0.so
 lib/libpango-1.0.so.0
 lib/libpango-1.0.so.%%LIBVERSION%%
 lib/libpangocairo-1.0.so
 lib/libpangocairo-1.0.so.0
 lib/libpangocairo-1.0.so.%%LIBVERSION%%
 lib/libpangoft2-1.0.so
 lib/libpangoft2-1.0.so.0
 lib/libpangoft2-1.0.so.%%LIBVERSION%%
 %%X11%%lib/libpangoxft-1.0.so
 %%X11%%lib/libpangoxft-1.0.so.0
 %%X11%%lib/libpangoxft-1.0.so.%%LIBVERSION%%
 libdata/pkgconfig/pango.pc
 libdata/pkgconfig/pangocairo.pc
 libdata/pkgconfig/pangoft2.pc
 %%X11%%libdata/pkgconfig/pangoxft.pc
 man/man1/pango-view.1.gz
 share/gir-1.0/Pango-1.0.gir
 share/gir-1.0/PangoCairo-1.0.gir
 share/gir-1.0/PangoFT2-1.0.gir
 %%X11%%share/gir-1.0/PangoXft-1.0.gir
-%%GTKDOC%%share/gtk-doc/html/pango/PangoEngineLang.html
-%%GTKDOC%%share/gtk-doc/html/pango/PangoEngineShape.html
-%%GTKDOC%%share/gtk-doc/html/pango/PangoFcDecoder.html
-%%GTKDOC%%share/gtk-doc/html/pango/PangoFcFont.html
-%%GTKDOC%%share/gtk-doc/html/pango/PangoFcFontMap.html
-%%GTKDOC%%share/gtk-doc/html/pango/PangoMarkupFormat.html
-%%GTKDOC%%share/gtk-doc/html/pango/PangoRenderer.html
-%%GTKDOC%%share/gtk-doc/html/pango/annotation-glossary.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-10.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-12.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-14.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-16.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-18.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-2.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-20.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-22.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-24.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-26.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-30.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-31-0.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-32-4.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-32.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-34.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-38.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-4.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-40.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-6.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-8.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-deprecated.html
-%%GTKDOC%%share/gtk-doc/html/pango/api-index-full.html
-%%GTKDOC%%share/gtk-doc/html/pango/home.png
-%%GTKDOC%%share/gtk-doc/html/pango/index.html
-%%GTKDOC%%share/gtk-doc/html/pango/layout.gif
-%%GTKDOC%%share/gtk-doc/html/pango/left-insensitive.png
-%%GTKDOC%%share/gtk-doc/html/pango/left.png
-%%GTKDOC%%share/gtk-doc/html/pango/lowlevel.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Bidirectional-Text.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Cairo-Rendering.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-CoreText-Fonts.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Coverage-Maps.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Engines.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Fonts.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Glyph-Storage.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Layout-Objects.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Modules.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Scripts-and-Languages.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Tab-Stops.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Text-Attributes.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Text-Processing.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Version-Checking.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Vertical-Text.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango-hierarchy.html
-%%GTKDOC%%share/gtk-doc/html/pango/pango.devhelp2
-%%GTKDOC%%share/gtk-doc/html/pango/pango.html
-%%GTKDOC%%share/gtk-doc/html/pango/rendering.html
-%%GTKDOC%%share/gtk-doc/html/pango/right-insensitive.png
-%%GTKDOC%%share/gtk-doc/html/pango/right.png
-%%GTKDOC%%share/gtk-doc/html/pango/rotated-text.png
-%%GTKDOC%%share/gtk-doc/html/pango/style.css
-%%GTKDOC%%share/gtk-doc/html/pango/up-insensitive.png
-%%GTKDOC%%share/gtk-doc/html/pango/up.png
+%%PORTDOCS%%share/gtk-doc/html/pango/PangoEngineLang.html
+%%PORTDOCS%%share/gtk-doc/html/pango/PangoEngineShape.html
+%%PORTDOCS%%share/gtk-doc/html/pango/PangoFcDecoder.html
+%%PORTDOCS%%share/gtk-doc/html/pango/PangoFcFont.html
+%%PORTDOCS%%share/gtk-doc/html/pango/PangoFcFontMap.html
+%%PORTDOCS%%share/gtk-doc/html/pango/PangoMarkupFormat.html
+%%PORTDOCS%%share/gtk-doc/html/pango/PangoRenderer.html
+%%PORTDOCS%%share/gtk-doc/html/pango/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-10.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-12.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-14.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-16.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-18.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-2.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-20.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-22.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-24.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-26.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-30.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-31-0.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-32-4.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-32.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-34.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-38.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-4.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-40.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-6.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-1-8.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-deprecated.html
+%%PORTDOCS%%share/gtk-doc/html/pango/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/pango/home.png
+%%PORTDOCS%%share/gtk-doc/html/pango/index.html
+%%PORTDOCS%%share/gtk-doc/html/pango/layout.gif
+%%PORTDOCS%%share/gtk-doc/html/pango/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/pango/left.png
+%%PORTDOCS%%share/gtk-doc/html/pango/lowlevel.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Bidirectional-Text.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Cairo-Rendering.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-CoreText-Fonts.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Coverage-Maps.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Engines.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Fonts.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Glyph-Storage.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Layout-Objects.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Modules.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Scripts-and-Languages.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Tab-Stops.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Text-Attributes.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Text-Processing.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Version-Checking.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Vertical-Text.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango-hierarchy.html
+%%PORTDOCS%%share/gtk-doc/html/pango/pango.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/pango/pango.html
+%%PORTDOCS%%share/gtk-doc/html/pango/rendering.html
+%%PORTDOCS%%share/gtk-doc/html/pango/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/pango/right.png
+%%PORTDOCS%%share/gtk-doc/html/pango/rotated-text.png
+%%PORTDOCS%%share/gtk-doc/html/pango/style.css
+%%PORTDOCS%%share/gtk-doc/html/pango/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/pango/up.png