43 files changed, 33 insertions, 87 deletions

diff --git a/accessibility/at-spi-reference/Makefile b/accessibility/at-spi-reference/Makefile
index 91f47f6788cf..821d44d45d5a 100644
--- a/accessibility/at-spi-reference/Makefile
+++ b/accessibility/at-spi-reference/Makefile
@@ -3,7 +3,6 @@
 
 PORTREVISION=	1
 
-NO_STAGE=	yes
 BOOKS=		cspi idl
 
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/accessibility/atk-reference/Makefile b/accessibility/atk-reference/Makefile
index 019a64b3a108..8fd6e117e965 100644
--- a/accessibility/atk-reference/Makefile
+++ b/accessibility/atk-reference/Makefile
@@ -3,7 +3,6 @@
 
 PORTREVISION=	0
 
-NO_STAGE=	yes
 REFERENCE_SRC=	${WRKSRC}/docs
 
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/databases/libgda2-reference/Makefile b/databases/libgda2-reference/Makefile
index 266b0d7fe857..2cf9495e7df1 100644
--- a/databases/libgda2-reference/Makefile
+++ b/databases/libgda2-reference/Makefile
@@ -6,5 +6,4 @@ PORTEPOCH=	0
 
 REFERENCE_SRC=	${WRKSRC}/doc/C
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/databases/libgda3-reference/Makefile b/databases/libgda3-reference/Makefile
index 39022edae6d1..be165b834399 100644
--- a/databases/libgda3-reference/Makefile
+++ b/databases/libgda3-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/C
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/databases/libgda4-reference/Makefile b/databases/libgda4-reference/Makefile
index 29429449b299..10a20e251906 100644
--- a/databases/libgda4-reference/Makefile
+++ b/databases/libgda4-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	0
 
 REFERENCE_SRC=	${WRKSRC}/doc/C
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/databases/libgnomedb-reference/Makefile b/databases/libgnomedb-reference/Makefile
index 39022edae6d1..be165b834399 100644
--- a/databases/libgnomedb-reference/Makefile
+++ b/databases/libgnomedb-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/C
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/devel/ORBit2-reference/Makefile b/devel/ORBit2-reference/Makefile
index 89024b3d8d66..eacbe39e4ae8 100644
--- a/devel/ORBit2-reference/Makefile
+++ b/devel/ORBit2-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	0
 
 REFERENCE_SRC=	${WRKSRC}/docs/api
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/devel/gconf2-reference/Makefile b/devel/gconf2-reference/Makefile
index d00c27a9dad1..adc90c022d46 100644
--- a/devel/gconf2-reference/Makefile
+++ b/devel/gconf2-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/gconf
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/devel/glib20-reference/bsd.gnome-reference.mk b/devel/glib20-reference/bsd.gnome-reference.mk
index ea7f97b83721..1bef2a9bc5b9 100644
--- a/devel/glib20-reference/bsd.gnome-reference.mk
+++ b/devel/glib20-reference/bsd.gnome-reference.mk
@@ -56,10 +56,9 @@ make-descr:
 do-install:
 .    for d in ${BOOKS}
 	if [ -d ${REFERENCE_SRC}/${d}/html ]; then \
-		${MKDIR} ${DOCSDIR}/${d}; \
+		${MKDIR} ${STAGEDIR}${DOCSDIR}/${d}; \
 		cd ${REFERENCE_SRC}/${d}/html && \
-		${FIND} * -type d ! -empty -exec ${MKDIR} "${DOCSDIR}/${d}/{}" \; && \
-		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/${d}/{}" \; ; \
+		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${d}; \
 	fi
 .    endfor
 .endif
diff --git a/devel/glibmm-reference/Makefile b/devel/glibmm-reference/Makefile
index 2a70463bf9bc..8954443658da 100644
--- a/devel/glibmm-reference/Makefile
+++ b/devel/glibmm-reference/Makefile
@@ -6,13 +6,11 @@ PORTREVISION=	1
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc:${PORTSDIR}/devel/glibmm \
 		gm4:${PORTSDIR}/devel/m4
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		gmake pkgconfig
 
 DOCSDIR=	${PREFIX}/share/doc/glibmm-2.4
 
-NO_STAGE=	yes
 post-patch:
 	@${FIND} ${WRKSRC}/examples -name Makefile.in \
 		| ${XARGS} ${REINPLACE_CMD} -e '/^install-am:/ s| all-am||'
@@ -22,7 +20,7 @@ post-build:
 
 do-install:
 .  for d in docs examples
-	@cd ${WRKSRC}/${d} && ${GMAKE} install
+	@cd ${WRKSRC}/${d} && ${GMAKE} ${MAKE_ARGS} install
 .  endfor
 
 
diff --git a/devel/gnome-vfs-reference/Makefile b/devel/gnome-vfs-reference/Makefile
index 63fcf9e647e4..aa3039ebc9a8 100644
--- a/devel/gnome-vfs-reference/Makefile
+++ b/devel/gnome-vfs-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/devel/libbonobo-reference/Makefile b/devel/libbonobo-reference/Makefile
index 872b3257eeab..c2d727af9698 100644
--- a/devel/libbonobo-reference/Makefile
+++ b/devel/libbonobo-reference/Makefile
@@ -6,5 +6,4 @@ PORTREVISION=	0
 REFERENCE_SRC=	${WRKSRC}/doc
 BOOKS=		activation-api api
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/devel/libglade2-reference/Makefile b/devel/libglade2-reference/Makefile
index 63fcf9e647e4..aa3039ebc9a8 100644
--- a/devel/libglade2-reference/Makefile
+++ b/devel/libglade2-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/devel/libsoup-reference/Makefile b/devel/libsoup-reference/Makefile
index 80598d19cec4..c7afa52936fb 100644
--- a/devel/libsoup-reference/Makefile
+++ b/devel/libsoup-reference/Makefile
@@ -3,5 +3,4 @@
 
 PORTREVISION=	0
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/graphics/cairo-reference/Makefile b/graphics/cairo-reference/Makefile
index 5008415c5d99..3a2f9b536b8b 100644
--- a/graphics/cairo-reference/Makefile
+++ b/graphics/cairo-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	0
 
 REFERENCE_SRC=	${WRKSRC}/doc/public
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/graphics/libgnomecanvas-reference/Makefile b/graphics/libgnomecanvas-reference/Makefile
index e71973d3271d..aceaba6b9e60 100644
--- a/graphics/libgnomecanvas-reference/Makefile
+++ b/graphics/libgnomecanvas-reference/Makefile
@@ -3,5 +3,4 @@
 
 PORTREVISION=	1
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/misc/gnome2-reference/Makefile b/misc/gnome2-reference/Makefile
index 6c27e530f4c1..677386a5d7cc 100644
--- a/misc/gnome2-reference/Makefile
+++ b/misc/gnome2-reference/Makefile
@@ -53,11 +53,12 @@ REF_LIST=	accessibility/at-spi-reference \
 		x11-toolkits/vte-reference
 
 NO_BUILD=	yes
+NO_INSTALL=	yes
+NO_MTREE=	yes
 
 .MAKE.FreeBSD_UL= yes
 
 REF_LIST_INC=	${.CURDIR}/Makefile.inc
-NO_STAGE=	yes
 .include "${REF_LIST_INC}"
 
 .for ref in ${_PORT_REF_LIST:C/^([^:]+).*/\1/}
@@ -74,13 +75,11 @@ RUN_DEPENDS+=	${ref:C|^[^:]+:([^:]+).*|\1|:C|^[^/]+/([^/]+).*|\1|}>0:${PORTSDIR}
 .endif
 .endfor
 
-do-install:	# empty
-
 create-ref-list:
 	${CP} ${REF_LIST_INC} ${REF_LIST_INC}.bak
 	${ECHO_CMD} "_PORT_REF_LIST= \\" > ${REF_LIST_INC}
 .for port in ${REF_LIST}
-	(cd ${PORTSDIR}/${port} && ${ECHO_CMD} "${port}:`${MAKE} -V PORTNAME` \\" >> ${REF_LIST_INC})
+	(cd ${PORTSDIR}/${port} && ${ECHO_CMD} "${port}:`${MAKE} -V PKGBASE` \\" >> ${REF_LIST_INC})
 .endfor
 
 .include <bsd.port.mk>
diff --git a/misc/gnome2-reference/Makefile.inc b/misc/gnome2-reference/Makefile.inc
index 6000edaf59e6..90010e19651d 100644
--- a/misc/gnome2-reference/Makefile.inc
+++ b/misc/gnome2-reference/Makefile.inc
@@ -24,9 +24,9 @@ x11/gnome-panel-reference:gnome-panel-reference \
 x11/libgnome-reference:libgnome-reference \
 x11-fonts/fontconfig-reference:fontconfig-reference \
 x11-toolkits/gal2-reference:gal2-reference \
-x11-toolkits/gtk20-reference:gtk-reference \
-x11-toolkits/gtkmm20-reference:gtkmm-reference \
-x11-toolkits/gtkmm24-reference:gtkmm-reference \
+x11-toolkits/gtk20-reference:gtk2-reference \
+x11-toolkits/gtkmm20-reference:gtkmm20-reference \
+x11-toolkits/gtkmm24-reference:gtkmm24-reference \
 x11-toolkits/gtksourceview-reference:gtksourceview-reference \
 x11-toolkits/libbonoboui-reference:libbonoboui-reference \
 x11-toolkits/libgnomeui-reference:libgnomeui-reference \
diff --git a/net/linc-reference/Makefile b/net/linc-reference/Makefile
index d8703bfd3c76..8fd6e117e965 100644
--- a/net/linc-reference/Makefile
+++ b/net/linc-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	0
 
 REFERENCE_SRC=	${WRKSRC}/docs
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/print/libgnomeprint-reference/Makefile b/print/libgnomeprint-reference/Makefile
index 5cf7d79a96fa..ac16cd772a8b 100644
--- a/print/libgnomeprint-reference/Makefile
+++ b/print/libgnomeprint-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/reference
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/textproc/gtkspell-reference/Makefile b/textproc/gtkspell-reference/Makefile
index 80070086b036..c64045d10ec5 100644
--- a/textproc/gtkspell-reference/Makefile
+++ b/textproc/gtkspell-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/docs
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/textproc/libxml++26-reference/Makefile b/textproc/libxml++26-reference/Makefile
index 03ee947743db..02051c50b95e 100644
--- a/textproc/libxml++26-reference/Makefile
+++ b/textproc/libxml++26-reference/Makefile
@@ -12,10 +12,7 @@ GNU_CONFIGURE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/libxml++-2.6
 
-NO_STAGE=	yes
 do-install:
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC} && ${GMAKE} install-data-local install-dist_referenceDATA
-.endif
+	@cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} install-data-local install-dist_referenceDATA
 
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/textproc/libxml2-reference/Makefile b/textproc/libxml2-reference/Makefile
index d738084295d0..482d1217d93f 100644
--- a/textproc/libxml2-reference/Makefile
+++ b/textproc/libxml2-reference/Makefile
@@ -7,7 +7,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/textproc/libxml2:configure
 
 PARENT_WRKSRC!=	cd ${.CURDIR}/../libxml2 && ${MAKE} -V WRKSRC
 EXTRACT_ONLY=
-USE_GMAKE=	yes
+USES=		gmake
 
 .if !defined(NOPORTEXAMPLES)
 EXAMPLES=	testHTML.c testSAX.c testXPath.c xmllint.c
@@ -15,12 +15,9 @@ PLIST_FILES=	${EXAMPLES:S|^|%%EXAMPLESDIR%%/|}
 PLIST_DIRS=	%%EXAMPLESDIR%%
 .endif
 
-NO_STAGE=	yes
 do-install:
-.if !defined(NOPORTDOCS)
 .for d in . doc doc/devhelp doc/examples
-	@cd ${PARENT_WRKSRC}/${d} && ${GMAKE} install-data-local
+	@cd ${PARENT_WRKSRC}/${d} && ${GMAKE} ${MAKE_ARGS} install-data-local
 .endfor
-.endif
 
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/textproc/libxslt-reference/Makefile b/textproc/libxslt-reference/Makefile
index 1f318e966b59..0710dfcc37c1 100644
--- a/textproc/libxslt-reference/Makefile
+++ b/textproc/libxslt-reference/Makefile
@@ -7,12 +7,9 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/textproc/libxslt:configure
 
 PARENT_WRKSRC!=	cd ${.CURDIR}/../libxslt && ${MAKE} -V WRKSRC
 EXTRACT_ONLY=
-USE_GMAKE=	yes
+USES=		gmake
 
-NO_STAGE=	yes
 do-install:
-.if !defined(NOPORTDOCS)
-	@cd ${PARENT_WRKSRC}/doc && ${GMAKE} install-data-local
-.endif
+	@cd ${PARENT_WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install-data-local
 
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-fonts/fontconfig-reference/Makefile b/x11-fonts/fontconfig-reference/Makefile
index 500d761bdc2a..8e8af29662bd 100644
--- a/x11-fonts/fontconfig-reference/Makefile
+++ b/x11-fonts/fontconfig-reference/Makefile
@@ -8,12 +8,10 @@ DOCSDIR=	${PREFIX}/share/doc/fontconfig-devel
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.3 ${STAGEDIR}${PREFIX}/man/man3
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/fontconfig-devel.pdf \
 		${WRKSRC}/doc/fontconfig-devel.txt ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/fontconfig-devel/* ${STAGEDIR}${DOCSDIR}/html
-.endif
 
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gal2-reference/Makefile b/x11-toolkits/gal2-reference/Makefile
index 80070086b036..c64045d10ec5 100644
--- a/x11-toolkits/gal2-reference/Makefile
+++ b/x11-toolkits/gal2-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/docs
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtk20-reference/Makefile b/x11-toolkits/gtk20-reference/Makefile
index 2ad8266da0d4..9f0e925101c9 100644
--- a/x11-toolkits/gtk20-reference/Makefile
+++ b/x11-toolkits/gtk20-reference/Makefile
@@ -5,16 +5,12 @@ PORTREVISION=	1
 
 BOOKS=		gdk gtk
 
-PLIST=		${.CURDIR}/pkg-plist
-
-NO_STAGE=	yes
 do-install:
 .for d in ${BOOKS}
 	if [ -d ${REFERENCE_SRC}/${d}/html ]; then \
-		${MKDIR} ${PREFIX}/share/doc/${d}2; \
+		${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/${d}2; \
 		cd ${REFERENCE_SRC}/${d}/html && \
-		${FIND} * -type d ! -empty -exec ${MKDIR} "${PREFIX}/share/doc/${d}2/{}" \; && \
-		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/share/doc/${d}2/{}" \; ; \
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/doc/${d}2; \
 	fi
 .endfor
 
diff --git a/x11-toolkits/gtk30-reference/Makefile b/x11-toolkits/gtk30-reference/Makefile
index 304ef837c637..11f6a44aae0a 100644
--- a/x11-toolkits/gtk30-reference/Makefile
+++ b/x11-toolkits/gtk30-reference/Makefile
@@ -5,16 +5,12 @@ PORTREVISION=	2
 
 BOOKS=		gdk gtk
 
-PLIST=		${.CURDIR}/pkg-plist
-
-NO_STAGE=	yes
 do-install:
 .for d in ${BOOKS}
 	if [ -d ${REFERENCE_SRC}/${d}/html ]; then \
-		${MKDIR} ${PREFIX}/share/doc/${d}3; \
+		${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/${d}3; \
 		cd ${REFERENCE_SRC}/${d}/html && \
-		${FIND} * -type d ! -empty -exec ${MKDIR} "${PREFIX}/share/doc/${d}3/{}" \; && \
-		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/share/doc/${d}3/{}" \; ; \
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/doc/${d}3; \
 	fi
 .endfor
 
diff --git a/x11-toolkits/gtk30-reference/pkg-plist b/x11-toolkits/gtk30-reference/pkg-plist
index ee3b56b1bd4e..acd82e586d55 100644
--- a/x11-toolkits/gtk30-reference/pkg-plist
+++ b/x11-toolkits/gtk30-reference/pkg-plist
@@ -9,6 +9,7 @@ share/doc/gdk3/api-index-3-0.html
 share/doc/gdk3/api-index-3-2.html
 share/doc/gdk3/api-index-3-4.html
 share/doc/gdk3/api-index-3-6.html
+share/doc/gdk3/api-index-3-8.html
 share/doc/gdk3/api-index-deprecated.html
 share/doc/gdk3/api-index-full.html
 share/doc/gdk3/arrow.png
@@ -45,6 +46,8 @@ share/doc/gdk3/gdk3-Drag-and-Drop.html
 share/doc/gdk3/gdk3-Event-Structures.html
 share/doc/gdk3/gdk3-Events.html
 share/doc/gdk3/gdk3-General.html
+share/doc/gdk3/gdk3-GdkFrameClock.html
+share/doc/gdk3/gdk3-GdkFrameTimings.html
 share/doc/gdk3/gdk3-Keyboard-Handling.html
 share/doc/gdk3/gdk3-Pango-Interaction.html
 share/doc/gdk3/gdk3-Pixbufs.html
@@ -123,6 +126,7 @@ share/doc/gtk3/Application.html
 share/doc/gtk3/ApplicationChoosing.html
 share/doc/gtk3/Builder.html
 share/doc/gtk3/ButtonWidgets.html
+share/doc/gtk3/DeprecatedObjects.html
 share/doc/gtk3/DisplayWidgets.html
 share/doc/gtk3/GtkAboutDialog.html
 share/doc/gtk3/GtkAccelLabel.html
@@ -337,6 +341,7 @@ share/doc/gtk3/api-index-3-0.html
 share/doc/gtk3/api-index-3-2.html
 share/doc/gtk3/api-index-3-4.html
 share/doc/gtk3/api-index-3-6.html
+share/doc/gtk3/api-index-3-8.html
 share/doc/gtk3/api-index-deprecated.html
 share/doc/gtk3/api-index-full.html
 share/doc/gtk3/appchooserbutton.png
@@ -353,13 +358,14 @@ share/doc/gtk3/border2.png
 share/doc/gtk3/border3.png
 share/doc/gtk3/box-expand.png
 share/doc/gtk3/box-packing.png
+share/doc/gtk3/broadwayd.html
 share/doc/gtk3/button.png
 share/doc/gtk3/ch02.html
 share/doc/gtk3/ch03.html
-share/doc/gtk3/ch24s02.html
-share/doc/gtk3/ch26s02.html
-share/doc/gtk3/ch28s02.html
-share/doc/gtk3/ch28s03.html
+share/doc/gtk3/ch25s02.html
+share/doc/gtk3/ch27s02.html
+share/doc/gtk3/ch29s02.html
+share/doc/gtk3/ch29s03.html
 share/doc/gtk3/chap-drawing-model.html
 share/doc/gtk3/check-button.png
 share/doc/gtk3/checklist-gdkeventexpose-region.html
@@ -500,6 +506,7 @@ share/doc/gtk3/gtk-select-color.png
 share/doc/gtk3/gtk-undelete-ltr.png
 share/doc/gtk3/gtk-undelete-rtl.png
 share/doc/gtk3/gtk-update-icon-cache.html
+share/doc/gtk3/gtk-wayland.html
 share/doc/gtk3/gtk-windows.html
 share/doc/gtk3/gtk-x11.html
 share/doc/gtk3/gtk-yes.png
diff --git a/x11-toolkits/gtkmm20-reference/Makefile b/x11-toolkits/gtkmm20-reference/Makefile
index 7f8eebad7140..00645a38227b 100644
--- a/x11-toolkits/gtkmm20-reference/Makefile
+++ b/x11-toolkits/gtkmm20-reference/Makefile
@@ -10,16 +10,13 @@ GNU_CONFIGURE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/gtkmm-2.0
 
-NO_STAGE=	yes
 post-patch:
 	@${FIND} ${WRKSRC}/examples -name Makefile.in \
 		| ${XARGS} ${REINPLACE_CMD} -e '/^install-am:/ s| all-am||'
 
 do-install:
-.if !defined(NOPORTDOCS)
 .for d in docs examples
-	@cd ${WRKSRC}/${d} && ${GMAKE} install
+	@cd ${WRKSRC}/${d} && ${GMAKE} ${MAKE_ARGS} install
 .endfor
-.endif
 
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtkmm24-reference/Makefile b/x11-toolkits/gtkmm24-reference/Makefile
index 77163cbf5bf0..d7be86d9bd7c 100644
--- a/x11-toolkits/gtkmm24-reference/Makefile
+++ b/x11-toolkits/gtkmm24-reference/Makefile
@@ -11,12 +11,9 @@ GNU_CONFIGURE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/gtkmm-2.4
 
-NO_STAGE=	yes
 do-install:
-.if !defined(NOPORTDOCS)
 .for d in docs
-	@cd ${WRKSRC}/${d} && ${GMAKE} install
+	@cd ${WRKSRC}/${d} && ${GMAKE} ${MAKE_ARGS} install
 .endfor
-.endif
 
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtkmm30-reference/Makefile b/x11-toolkits/gtkmm30-reference/Makefile
index 02b6dbc1746d..821668eeb300 100644
--- a/x11-toolkits/gtkmm30-reference/Makefile
+++ b/x11-toolkits/gtkmm30-reference/Makefile
@@ -11,12 +11,9 @@ GNU_CONFIGURE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/gtkmm-3.0
 
-NO_STAGE=	yes
 do-install:
-.if !defined(NOPORTDOCS)
 .for d in docs
-	@cd ${WRKSRC}/${d} && ${GMAKE} install
+	@cd ${WRKSRC}/${d} && ${GMAKE} ${MAKE_ARGS} install
 .endfor
-.endif
 
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtksourceview-reference/Makefile b/x11-toolkits/gtksourceview-reference/Makefile
index e71973d3271d..aceaba6b9e60 100644
--- a/x11-toolkits/gtksourceview-reference/Makefile
+++ b/x11-toolkits/gtksourceview-reference/Makefile
@@ -3,5 +3,4 @@
 
 PORTREVISION=	1
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtksourceview2-reference/Makefile b/x11-toolkits/gtksourceview2-reference/Makefile
index fa8c0ce55f51..5867f5b78899 100644
--- a/x11-toolkits/gtksourceview2-reference/Makefile
+++ b/x11-toolkits/gtksourceview2-reference/Makefile
@@ -4,5 +4,4 @@
 
 PORTREVISION=	0
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtksourceview3-reference/Makefile b/x11-toolkits/gtksourceview3-reference/Makefile
index fa8c0ce55f51..5867f5b78899 100644
--- a/x11-toolkits/gtksourceview3-reference/Makefile
+++ b/x11-toolkits/gtksourceview3-reference/Makefile
@@ -4,5 +4,4 @@
 
 PORTREVISION=	0
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/libbonoboui-reference/Makefile b/x11-toolkits/libbonoboui-reference/Makefile
index 17dbab07060a..be6badd9f4d5 100644
--- a/x11-toolkits/libbonoboui-reference/Makefile
+++ b/x11-toolkits/libbonoboui-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/api
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/libgnomeui-reference/Makefile b/x11-toolkits/libgnomeui-reference/Makefile
index 5cf7d79a96fa..ac16cd772a8b 100644
--- a/x11-toolkits/libgnomeui-reference/Makefile
+++ b/x11-toolkits/libgnomeui-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/reference
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/libwnck-reference/Makefile b/x11-toolkits/libwnck-reference/Makefile
index 63fcf9e647e4..aa3039ebc9a8 100644
--- a/x11-toolkits/libwnck-reference/Makefile
+++ b/x11-toolkits/libwnck-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/pango-reference/Makefile b/x11-toolkits/pango-reference/Makefile
index 80070086b036..c64045d10ec5 100644
--- a/x11-toolkits/pango-reference/Makefile
+++ b/x11-toolkits/pango-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/docs
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/vte-reference/Makefile b/x11-toolkits/vte-reference/Makefile
index 5cf7d79a96fa..ac16cd772a8b 100644
--- a/x11-toolkits/vte-reference/Makefile
+++ b/x11-toolkits/vte-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/reference
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11/gnome-desktop-reference/Makefile b/x11/gnome-desktop-reference/Makefile
index 8249a8fac68c..6965d6bc77cf 100644
--- a/x11/gnome-desktop-reference/Makefile
+++ b/x11/gnome-desktop-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/docs/reference/gnome-desktop
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11/gnome-panel-reference/Makefile b/x11/gnome-panel-reference/Makefile
index 34e042cc7a6b..cbbb077fade9 100644
--- a/x11/gnome-panel-reference/Makefile
+++ b/x11/gnome-panel-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/reference/panel-applet
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11/libgnome-reference/Makefile b/x11/libgnome-reference/Makefile
index 5cf7d79a96fa..ac16cd772a8b 100644
--- a/x11/libgnome-reference/Makefile
+++ b/x11/libgnome-reference/Makefile
@@ -5,5 +5,4 @@ PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/reference
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"