Pull the trigger, and replace all scrollkeeper dependencies with rarian.

The good news is yelp kind of works if you call it with, for example,
yelp ghelp:eog.  However. yelp launched from within apps will not work yet.
The problem has been reported, and it should all be working by the next
release.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9339 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 112 insertions, 7 deletions

diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 62841c0ec..027cec9cb 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.48 2007/07/10 03:19:00 marcus Exp $
+#   $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.49 2007/07/31 06:06:32 marcus Exp $
 #
 
 PORTNAME=	gnome-doc-utils
 PORTVERSION=	0.11.1
+PORTREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,9 +17,9 @@ DISTNAME=	gnome-doc-utils-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME doc utils
 
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
+BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian \
     		gawk:${PORTSDIR}/lang/gawk
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
+RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian \
 		${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
 		${LOCALBASE}/share/xml/docbook/4.3/catalog.xml:${PORTSDIR}/textproc/docbook-xml-430 \
 		${LOCALBASE}/share/xml/docbook/4.4/catalog.xml:${PORTSDIR}/textproc/docbook-xml-440
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
new file mode 100644
index 000000000..bfffd8749
--- /dev/null
+++ b/textproc/gtk-doc/Makefile
@@ -0,0 +1,57 @@
+# New ports collection makefile for:	gtk-doc
+# Date created:				8 March 2001
+# Whom:					fenner
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gtk-doc
+PORTVERSION=	1.8
+PORTREVISION=	2
+CATEGORIES=	textproc
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+
+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 \
+		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 \
+		rarian-sk-config:${PORTSDIR}/textproc/rarian
+
+DOCBOOK_VERSION=	4.1.2
+
+CATALOG_DIR=		${PREFIX}/share/sgml/${PORTNAME}
+XMLCATMGR=		${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
+
+USE_BZIP2=	yes
+USE_PERL5=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack gnometarget libxslt
+INSTALLS_OMF=	yes
+CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
+
+PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
+		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
+		CATALOG_DIR=${CATALOG_DIR}
+
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+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
+
+.include <bsd.port.post.mk>
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
new file mode 100644
index 000000000..57dfde8e5
--- /dev/null
+++ b/textproc/gtk-doc/distinfo
@@ -0,0 +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
diff --git a/textproc/gtk-doc/pkg-descr b/textproc/gtk-doc/pkg-descr
new file mode 100644
index 000000000..4be3fa282
--- /dev/null
+++ b/textproc/gtk-doc/pkg-descr
@@ -0,0 +1,4 @@
+This package automatically generates DocBook documentation for GTK+ and Gnome,
+and converts the DocBook documentation into HTML (and man pages in future).
+
+WWW: http://www.gtk.org/
diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist
new file mode 100644
index 000000000..29f1437d9
--- /dev/null
+++ b/textproc/gtk-doc/pkg-plist
@@ -0,0 +1,38 @@
+bin/gtkdoc-fixxref
+bin/gtkdoc-mkdb
+bin/gtkdoc-mkhtml
+bin/gtkdoc-mkman
+bin/gtkdoc-mktmpl
+bin/gtkdoc-scan
+bin/gtkdoc-scangobj
+bin/gtkdoc-scanobj
+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
+%%DATADIR%%/data/gtk-doc.xsl
+%%DATADIR%%/data/gtkdoc-common.pl
+%%DATADIR%%/data/home.png
+%%DATADIR%%/data/left.png
+%%DATADIR%%/data/right.png
+%%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%%
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
index 03f7e799f..2bb1dcd5e 100644
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/textproc/rarian/Makefile,v 1.1 2007/08/02 05:50:16 marcus Exp $
+#   $MCom: ports/textproc/rarian/Makefile,v 1.2 2007/08/02 20:48:23 marcus Exp $
 #
 
 PORTNAME=	rarian
 PORTVERSION=	0.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/textproc/rarian/files/patch-librarian_rarian-main.c b/textproc/rarian/files/patch-librarian_rarian-main.c
index a8e71ffb3..549390150 100644
--- a/textproc/rarian/files/patch-librarian_rarian-main.c
+++ b/textproc/rarian/files/patch-librarian_rarian-main.c
@@ -5,7 +5,7 @@
  
      if (!path || !strcmp (path, "")) {
 -        path = "/usr/local/share/:/usr/share/";
-+        path = "/usr/local/share/:/usr/local/share/gnome/";
++        path = "/usr/local/share/";
      }
      cur_path = path;
      do {
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 04f0be593..3b34c3100 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Rene Hexel <rh@netbsd.org>
 #
 # $FreeBSD$
-#    $MCom: ports/textproc/scrollkeeper/Makefile,v 1.9 2007/04/26 15:01:41 ahze Exp $
+#    $MCom: ports/textproc/scrollkeeper/Makefile,v 1.10 2007/07/30 20:41:08 mezz Exp $
 
 PORTNAME=	scrollkeeper
 PORTVERSION=	0.3.14
@@ -28,6 +28,8 @@ RUN_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
 
 DOCBOOK_VERSION=4.2
 
+CONFLICTS=	rarian-[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes