4 files changed, 16 insertions, 105 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index b6c1f4780a8d..ef4bac32f34f 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -30,6 +30,7 @@
     SUBDIR += gai
     SUBDIR += gal
     SUBDIR += gal2
+    SUBDIR += gal2-reference
     SUBDIR += gauche-gtk
     SUBDIR += gdl
     SUBDIR += gnocl
diff --git a/x11-toolkits/gal2-reference/Makefile b/x11-toolkits/gal2-reference/Makefile
new file mode 100644
index 000000000000..fe0035ece1de
--- /dev/null
+++ b/x11-toolkits/gal2-reference/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+REFERENCE_SRC=	${WRKSRC}/docs
+
+.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index ce06dad18656..a0a79ce9136b 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gal2
 PORTVERSION=	2.5.3
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
@@ -19,7 +18,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A collection of widgets taken from GNOME 2 gnumeric
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
+
+.if !defined(REFERENCE_PORT)
+
+PORTREVISION=	2
+
+USE_XLIB=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
@@ -40,6 +45,7 @@ post-extract:
 	${TOUCH} -f ${WRKSRC}/gal/util/e-util-private.h
 
 post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|docs||' ${WRKSRC}/Makefile.in
 .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
 	( ${OSVERSION} < 503101 )
 .for po in da.po it.po zh_CN.po
@@ -48,3 +54,5 @@ post-patch:
 .endif
 
 .include <bsd.port.post.mk>
+
+.endif
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index c6662a8c8f4f..88628fe7321d 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -158,108 +158,6 @@ lib/libgal-a11y-%%SHLIBVERSION%%.la
 lib/libgal-a11y-%%SHLIBVERSION%%.so
 lib/libgal-a11y-%%SHLIBVERSION%%.so.0
 libdata/pkgconfig/gal-%%VERSION%%.pc
-share/doc/gal/book1.html
-share/doc/gal/cell-renderers.html
-share/doc/gal/combo-boxes.html
-share/doc/gal/cut-and-paste.html
-share/doc/gal/e-font.html
-share/doc/gal/e-table-core.html
-share/doc/gal/e-table.html
-share/doc/gal/e-text.html
-share/doc/gal/ecanvas.html
-share/doc/gal/ecanvasvbox.html
-share/doc/gal/ecell.html
-share/doc/gal/ecellcheckbox.html
-share/doc/gal/ecelltext.html
-share/doc/gal/ecelltoggle.html
-share/doc/gal/ecelltree.html
-share/doc/gal/eentry.html
-share/doc/gal/ehpaned.html
-share/doc/gal/ehscrollbar.html
-share/doc/gal/epaned.html
-share/doc/gal/eprintable.html
-share/doc/gal/ereflow.html
-share/doc/gal/ereflowsorted.html
-share/doc/gal/escrollframe.html
-share/doc/gal/etable.html
-share/doc/gal/etableclicktoadd.html
-share/doc/gal/etablecol.html
-share/doc/gal/etablecolumnspecification.html
-share/doc/gal/etableconfig.html
-share/doc/gal/etableconfigfield.html
-share/doc/gal/etableextras.html
-share/doc/gal/etablefieldchooser.html
-share/doc/gal/etablefieldchooserdialog.html
-share/doc/gal/etablefieldchooseritem.html
-share/doc/gal/etablegroup.html
-share/doc/gal/etablegroupcontainer.html
-share/doc/gal/etablegroupleaf.html
-share/doc/gal/etableheader.html
-share/doc/gal/etableheaderitem.html
-share/doc/gal/etableitem.html
-share/doc/gal/etablemodel.html
-share/doc/gal/etableone.html
-share/doc/gal/etablescrolled.html
-share/doc/gal/etableselectionmodel.html
-share/doc/gal/etablesimple.html
-share/doc/gal/etablesorted.html
-share/doc/gal/etablesortedvariable.html
-share/doc/gal/etablesorter.html
-share/doc/gal/etablesortinfo.html
-share/doc/gal/etablespecification.html
-share/doc/gal/etablestate.html
-share/doc/gal/etablesubset.html
-share/doc/gal/etablesubsetvariable.html
-share/doc/gal/etabletextmodel.html
-share/doc/gal/etext.html
-share/doc/gal/etexteventprocessor.html
-share/doc/gal/etexteventprocessoremacslike.html
-share/doc/gal/etextmodel.html
-share/doc/gal/etreesimple.html
-share/doc/gal/evpaned.html
-share/doc/gal/evscrollbar.html
-share/doc/gal/gal-api.html
-share/doc/gal/gal-api.sgml
-share/doc/gal/gal-colorcombo.html
-share/doc/gal/gal-colorgroup.html
-share/doc/gal/gal-colorpalette.html
-share/doc/gal/gal-decl.txt
-share/doc/gal/gal-e-cache.html
-share/doc/gal/gal-e-canvas-utils.html
-share/doc/gal/gal-e-colors.html
-share/doc/gal/gal-e-cursors.html
-share/doc/gal/gal-e-font.html
-share/doc/gal/gal-e-gui-utils.html
-share/doc/gal/gal-e-popup-menu.html
-share/doc/gal/gal-e-table-col-dnd.html
-share/doc/gal/gal-e-table-defines.html
-share/doc/gal/gal-e-table-header-utils.html
-share/doc/gal/gal-e-table-tooltip.html
-share/doc/gal/gal-e-table-tree.html
-share/doc/gal/gal-e-text-event-processor-types.html
-share/doc/gal/gal-e-tree-model.html
-share/doc/gal/gal-e-unicode.html
-share/doc/gal/gal-e-util.html
-share/doc/gal/gal-e-xml-utils.html
-share/doc/gal/gal-gtkcombobox.html
-share/doc/gal/gal-sections.txt
-share/doc/gal/gal.hierarchy
-share/doc/gal/gal.signals
-share/doc/gal/gal.types
-share/doc/gal/galdefineviewsdialog.html
-share/doc/gal/galdefineviewsmodel.html
-share/doc/gal/galview.html
-share/doc/gal/galviewcollection.html
-share/doc/gal/galviewetable.html
-share/doc/gal/galviewfactory.html
-share/doc/gal/galviewfactoryetable.html
-share/doc/gal/galviewnewdialog.html
-share/doc/gal/gtkcombostack.html
-share/doc/gal/gtkcombotext.html
-share/doc/gal/pixmapcombo.html
-share/doc/gal/reflow.html
-share/doc/gal/utility-widgets.html
-share/doc/gal/view-configurationt.html
 share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-categories-master-list-dialog.glade
 share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config-no-group.glade
 share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config.glade
@@ -352,7 +250,6 @@ share/locale/zh_TW/LC_MESSAGES/gal-%%VERSION%%.mo
 @dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade
 @dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%
 @dirrm share/gnome/gal-%%VERSION%%
-@dirrm share/doc/gal
 @dirrm include/gal-%%VERSION%%/gal/widgets
 @dirrm include/gal-%%VERSION%%/gal/util
 @dirrm include/gal-%%VERSION%%/gal/shortcut-bar