15 files changed, 18 insertions, 37 deletions

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"