3 files changed, 24 insertions, 8 deletions

diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index a2487e0a4bc7..f09b8caab6ca 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -6,20 +6,22 @@
 #
 
 PORTNAME=	gtk-doc
-PORTVERSION=	1.4
+PORTVERSION=	1.6
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.6
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Code documentation system, originally for GTK+
 
 BUILD_DEPENDS=	jade:${PORTSDIR}/textproc/jade \
 		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
+		scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 RUN_DEPENDS=	jade:${PORTSDIR}/textproc/jade \
 		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
+		scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
 DOCBOOK_VERSION=	4.1.2
 
@@ -31,7 +33,8 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget libxslt
-CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog
+INSTALLS_OMF=	yes
+CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
 
 PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
 		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
@@ -43,6 +46,10 @@ PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
 IGNORE=		gtk-doc requires Perl 5.6.x or higher
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile.in
+
 post-install:
 	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${CATALOG_DIR}/gtk-doc.cat
 
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index cf703b6106df..bf6e9b157aa5 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-doc-1.4.tar.bz2) = 44d1cdce88c2eb4ccb962998ad0c0d1a
-SHA256 (gtk-doc-1.4.tar.bz2) = 9b4b69a4cfeecda77b4480b123495f13b2e94b5dd259043b788fcfef20e2d1ad
-SIZE (gtk-doc-1.4.tar.bz2) = 148758
+MD5 (gtk-doc-1.6.tar.bz2) = 09c7a89efff2e0bbaba02a12bff58dfd
+SHA256 (gtk-doc-1.6.tar.bz2) = c7f2051ddb46881122cf15f11395f31b94fe3c1690c8dd8148698d069555de08
+SIZE (gtk-doc-1.6.tar.bz2) = 177476
diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist
index bcb5589812e5..29f1437d9c6f 100644
--- a/textproc/gtk-doc/pkg-plist
+++ b/textproc/gtk-doc/pkg-plist
@@ -10,6 +10,7 @@ bin/gtkdocize
 libdata/pkgconfig/gtk-doc.pc
 share/aclocal/gtk-doc.m4
 %%DATADIR%%/data/devhelp.xsl
+%%DATADIR%%/data/devhelp2.xsl
 %%DATADIR%%/data/gtk-doc.dcl
 %%DATADIR%%/data/gtk-doc.dsl
 %%DATADIR%%/data/gtk-doc.make
@@ -21,9 +22,17 @@ share/aclocal/gtk-doc.m4
 %%DATADIR%%/data/style.css
 %%DATADIR%%/data/up.png
 %%DATADIR%%/data/version-greater-or-equal.xsl
+share/help/gtk-doc-manual/C/fdl-appendix.xml
+share/help/gtk-doc-manual/C/gtk-doc-manual.xml
+share/omf/gtk-doc/gtk-doc-manual-C.omf
 @unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG %%CATALOG_DIR%%/gtk-doc.cat
 share/sgml/gtk-doc/gtk-doc.cat
 @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%CATALOG_DIR%%/gtk-doc.cat
 @dirrm share/sgml/gtk-doc
+@dirrm share/omf/gtk-doc
+@dirrmtry share/omf
+@dirrm share/help/gtk-doc-manual/C
+@dirrm share/help/gtk-doc-manual
+@dirrmtry share/help
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%