4 files changed, 24 insertions, 18 deletions

diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 3ef4c63f520f..88a1e8fe3558 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk-doc
-PORTVERSION=	1.8
-PORTREVISION=	1
+PORTVERSION=	1.9
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,11 +17,11 @@ 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 \
-		scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+		rarian-sk-config:${PORTSDIR}/textproc/rarian
 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 \
-		scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+		rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 DOCBOOK_VERSION=	4.1.2
 
@@ -33,7 +32,7 @@ CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack gnometarget libxslt
+USE_GNOME=	gnomehack gnometarget gnomeprefix libxslt
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
 
@@ -41,10 +40,6 @@ PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
 		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
 		CATALOG_DIR=${CATALOG_DIR}
 
-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 57dfde8e5ba1..9fc10e82f9d1 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-doc-1.8.tar.bz2) = e61595df21431db28c83fe4c7d4a4fa8
-SHA256 (gtk-doc-1.8.tar.bz2) = 7a21c6f094f39b73ab23653ec628dd78ded47412636c491b3513fa760a8a22d3
-SIZE (gtk-doc-1.8.tar.bz2) = 186203
+MD5 (gtk-doc-1.9.tar.bz2) = bcd002f381385812737a05538eb8b21e
+SHA256 (gtk-doc-1.9.tar.bz2) = d1be2fc7be880b912f871675baed4a9e28ee4c19eef7fd1299c9c5d11cc9a80d
+SIZE (gtk-doc-1.9.tar.bz2) = 391957
diff --git a/textproc/gtk-doc/files/patch-help_manual_C_Makefile.in b/textproc/gtk-doc/files/patch-help_manual_C_Makefile.in
new file mode 100644
index 000000000000..4c52d15064d9
--- /dev/null
+++ b/textproc/gtk-doc/files/patch-help_manual_C_Makefile.in
@@ -0,0 +1,10 @@
+--- help/manual/C/Makefile.in.orig	2007-10-02 12:53:30.000000000 -0500
++++ help/manual/C/Makefile.in	2007-10-02 12:53:52.000000000 -0500
+@@ -213,7 +213,6 @@
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+ @ENABLE_SCROLLKEEPER_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+-docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ glib_prefix = @glib_prefix@
diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist
index 29f1437d9c6f..52438fd79b66 100644
--- a/textproc/gtk-doc/pkg-plist
+++ b/textproc/gtk-doc/pkg-plist
@@ -1,19 +1,24 @@
+bin/gtkdoc-check
 bin/gtkdoc-fixxref
 bin/gtkdoc-mkdb
 bin/gtkdoc-mkhtml
 bin/gtkdoc-mkman
 bin/gtkdoc-mktmpl
+bin/gtkdoc-rebase
 bin/gtkdoc-scan
 bin/gtkdoc-scangobj
 bin/gtkdoc-scanobj
 bin/gtkdocize
 libdata/pkgconfig/gtk-doc.pc
 share/aclocal/gtk-doc.m4
+share/gnome/help/gtk-doc-manual/C/fdl-appendix.xml
+share/gnome/help/gtk-doc-manual/C/gtk-doc-manual.xml
 %%DATADIR%%/data/devhelp.xsl
 %%DATADIR%%/data/devhelp2.xsl
 %%DATADIR%%/data/gtk-doc.dcl
 %%DATADIR%%/data/gtk-doc.dsl
 %%DATADIR%%/data/gtk-doc.make
+%%DATADIR%%/data/gtk-doc.notmpl.make
 %%DATADIR%%/data/gtk-doc.xsl
 %%DATADIR%%/data/gtkdoc-common.pl
 %%DATADIR%%/data/home.png
@@ -22,17 +27,13 @@ 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%%
+@dirrm share/gnome/help/gtk-doc-manual/C
+@dirrm share/gnome/help/gtk-doc-manual