- Rename port textproc/gnomedocutils -> textproc/gnome-doc-utils

10 files changed, 6 insertions, 230 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 8a328ff21135..b03624f9a65c 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -3227,6 +3227,7 @@ gnome-control-center1	ports/sysutils/gnome-control-center1
 gnome-crash	ports/devel/gnome-crash
 gnome-cups-manager	ports/print/gnome-cups-manager
 gnome-db	ports/databases/gnome-db
+gnome-doc-utils	ports/textproc/gnome-doc-utils
 gnome-font-sampler	ports/x11-fonts/gnome-font-sampler
 gnome-games	ports/games/gnome-games
 gnome-games-extra-data	ports/games/gnome-games-extra-data
@@ -3302,7 +3303,6 @@ gnomecanvas	ports/graphics/gnomecanvas
 gnomechess	ports/games/gnomechess
 gnomedesktop	ports/x11/gnomedesktop
 gnomedesktop-reference	ports/x11/gnomedesktop-reference
-gnomedocutils	ports/textproc/gnomedocutils
 gnomefind	ports/sysutils/gnomefind
 gnomehier	ports/misc/gnomehier
 gnomeiconedit	ports/graphics/gnomeiconedit
diff --git a/MOVED b/MOVED
index b6980a4720d2..6874b481a546 100644
--- a/MOVED
+++ b/MOVED
@@ -2331,3 +2331,4 @@ sysutils/gnomecontrolcenter|sysutils/gnome-control-center1|2006-05-28|Renamed to
 sysutils/gnomecontrolcenter2|sysutils/gnome-control-center|2006-05-28|Renamed to use real vendor package name
 sysutils/gnomesystemmonitor|sysutils/gnome-system-monitor|2006-05-28|Renamed to use real vendor package name
 sysutils/gnomesystemtools|sysutils/gnome-system-tools|2006-05-28|Renamed to use real vendor package name
+textproc/gnomedocutils|textproc/gnome-doc-utils|2006-05-28|Renamed to use real vendor package name
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 691f3c88cffb..387a9bfad28f 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -483,8 +483,8 @@ pygnomeextras_RUN_DEPENDS=	${pygnomeextras_DETECT}:${PORTSDIR}/x11-toolkits/py-g
 pygnomeextras_USE_GNOME_IMPL=pygnome2 libgtkhtml
 
 gnomedocutils_DETECT=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc
-gnomedocutils_BUILD_DEPENDS=${gnomedocutils_DETECT}:${PORTSDIR}/textproc/gnomedocutils
-gnomedocutils_RUN_DEPENDS=${gnomedocutils_DETECT}:${PORTSDIR}/textproc/gnomedocutils
+gnomedocutils_BUILD_DEPENDS=${gnomedocutils_DETECT}:${PORTSDIR}/textproc/gnome-doc-utils
+gnomedocutils_RUN_DEPENDS=${gnomedocutils_DETECT}:${PORTSDIR}/textproc/gnome-doc-utils
 gnomedocutils_USE_GNOME_IMPL=libxslt
 
 pygnomedesktop_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-python-desktop-2.0.pc
diff --git a/textproc/Makefile b/textproc/Makefile
index ccae7517b014..deb4de41ac08 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -144,8 +144,8 @@
     SUBDIR += glimpse
     SUBDIR += gmat
     SUBDIR += gmetadom
+    SUBDIR += gnome-doc-utils
     SUBDIR += gnome-translate
-    SUBDIR += gnomedocutils
     SUBDIR += gnomespell
     SUBDIR += google-ctemplate
     SUBDIR += gpp
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 34d84c465606..e2a4ff55a2e0 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -3,10 +3,9 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/textproc/gnomedocutils/Makefile,v 1.32 2006/03/14 03:06:20 marcus Exp $
 #
 
-PORTNAME=	gnomedocutils
+PORTNAME=	gnome-doc-utils
 PORTVERSION=	0.6.0
 PORTREVISION=	2
 CATEGORIES=	textproc gnome
diff --git a/textproc/gnomedocutils/Makefile b/textproc/gnomedocutils/Makefile
deleted file mode 100644
index 34d84c465606..000000000000
--- a/textproc/gnomedocutils/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:	gnome-doc-utils
-# Date created:				11 November 2004
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/textproc/gnomedocutils/Makefile,v 1.32 2006/03/14 03:06:20 marcus Exp $
-#
-
-PORTNAME=	gnomedocutils
-PORTVERSION=	0.6.0
-PORTREVISION=	2
-CATEGORIES=	textproc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-doc-utils/0.6
-DISTNAME=	gnome-doc-utils-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME doc utils
-
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
-		${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
-
-PREFIX?=	${X11BASE}
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomehier gnometarget gnomehack libxslt
-USE_PYTHON=	yes
-INSTALLS_OMF=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-omf-dir=${PREFIX}/share/gnome/omf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1=		xml2po.1
-
-post-install:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PREFIX}/share/xml2po
-
-.include <bsd.port.mk>
diff --git a/textproc/gnomedocutils/distinfo b/textproc/gnomedocutils/distinfo
deleted file mode 100644
index 84b1fd90ac68..000000000000
--- a/textproc/gnomedocutils/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome-doc-utils-0.6.0.tar.bz2) = 1e0c26e3e1159f60551aab5187634744
-SHA256 (gnome-doc-utils-0.6.0.tar.bz2) = 1b13413919086cadd948cf886359176c23fa15c6740e6c8b4ccbff4aaf4f5681
-SIZE (gnome-doc-utils-0.6.0.tar.bz2) = 373670
diff --git a/textproc/gnomedocutils/files/patch-configure b/textproc/gnomedocutils/files/patch-configure
deleted file mode 100644
index 33df31f408fb..000000000000
--- a/textproc/gnomedocutils/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sat Mar 11 13:14:03 2006
-+++ configure	Sat Mar 11 13:14:17 2006
-@@ -7249,6 +7249,7 @@ echo "${ECHO_T}found xgettext program is
-        echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
- echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
-        NEW_LINGUAS=
-+       unset LINGUAS
-        for presentlang in $ALL_LINGUAS; do
-          useit=no
-          if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
diff --git a/textproc/gnomedocutils/pkg-descr b/textproc/gnomedocutils/pkg-descr
deleted file mode 100644
index f8e90484ef5e..000000000000
--- a/textproc/gnomedocutils/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-The GNOME Doc Utils is a collection of documentation utilities for the GNOME
-project. Notably, it contains utilities for building documentation and all
-auxiliary files in the source tree, and it contains the DocBook XSLT
-stylesheets that were once distributed with Yelp. Starting with GNOME 2.8, Yelp
-require GNOME Doc Utils for the XSLT.
diff --git a/textproc/gnomedocutils/pkg-plist b/textproc/gnomedocutils/pkg-plist
deleted file mode 100644
index dbdfaec5ac3b..000000000000
--- a/textproc/gnomedocutils/pkg-plist
+++ /dev/null
@@ -1,162 +0,0 @@
-bin/gnome-doc-prepare
-bin/xml2po
-libdata/pkgconfig/gnome-doc-utils.pc
-libdata/pkgconfig/xml2po.pc
-share/aclocal/gnome-doc-utils.m4
-share/gnome-doc-utils/gnome-doc-utils.make
-share/gnome/help/gnome-doc-make/C/gnome-doc-make.xml
-share/gnome/help/gnome-doc-make/C/legal.xml
-share/gnome/help/gnome-doc-make/C/make-ref.xml
-share/gnome/help/gnome-doc-xslt/C/db-chunk.xml
-share/gnome/help/gnome-doc-xslt/C/db-common.xml
-share/gnome/help/gnome-doc-xslt/C/db-label.xml
-share/gnome/help/gnome-doc-xslt/C/db-title.xml
-share/gnome/help/gnome-doc-xslt/C/db-xref.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-admon.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-autotoc.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-bibliography.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-block.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-callout.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-classsynopsis.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-cmdsynopsis.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-css.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-division.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-ebnf.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-footnote.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-funcsynopsis.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-info.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-inline.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-l10n.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-list.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-media.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-qanda.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-refentry.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-suppressed.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-table.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-title.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-xref.xml
-share/gnome/help/gnome-doc-xslt/C/db2html.xml
-share/gnome/help/gnome-doc-xslt/C/db2omf.xml
-share/gnome/help/gnome-doc-xslt/C/gettext.xml
-share/gnome/help/gnome-doc-xslt/C/gnome-doc-xslt.xml
-share/gnome/help/gnome-doc-xslt/C/l10n-numbers.xml
-share/gnome/help/gnome-doc-xslt/C/legal.xml
-share/gnome/help/gnome-doc-xslt/C/translating.xml
-share/gnome/help/gnome-doc-xslt/C/xsldoc.xml
-share/gnome/omf/gnome-doc-make/gnome-doc-make-C.omf
-share/gnome/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf
-share/locale/ar/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/bg/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/bn/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ca/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/cs/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/da/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/de/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/el/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/en_CA/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/en_GB/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/es/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/et/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/fi/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/fr/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/gl/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/gu/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/he/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/hi/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/hu/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/id/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/it/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ja/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ko/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/lt/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/nb/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ne/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/nl/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/no/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/pa/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/pt/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ro/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ru/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/rw/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/sk/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/sq/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/sr/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/sv/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/th/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/tr/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ug/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/uk/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/vi/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/wa/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-doc-utils.mo
-share/xml/gnome/xslt/docbook/common/db-chunk.xsl
-share/xml/gnome/xslt/docbook/common/db-common.xsl
-share/xml/gnome/xslt/docbook/common/db-label.xsl
-share/xml/gnome/xslt/docbook/common/db-title.xsl
-share/xml/gnome/xslt/docbook/common/db-xref.xsl
-share/xml/gnome/xslt/docbook/html/db2html-admon.xsl
-share/xml/gnome/xslt/docbook/html/db2html-autotoc.xsl
-share/xml/gnome/xslt/docbook/html/db2html-bibliography.xsl
-share/xml/gnome/xslt/docbook/html/db2html-block.xsl
-share/xml/gnome/xslt/docbook/html/db2html-callout.xsl
-share/xml/gnome/xslt/docbook/html/db2html-classsynopsis.xsl
-share/xml/gnome/xslt/docbook/html/db2html-cmdsynopsis.xsl
-share/xml/gnome/xslt/docbook/html/db2html-css.xsl
-share/xml/gnome/xslt/docbook/html/db2html-division.xsl
-share/xml/gnome/xslt/docbook/html/db2html-ebnf.xsl
-share/xml/gnome/xslt/docbook/html/db2html-footnote.xsl
-share/xml/gnome/xslt/docbook/html/db2html-funcsynopsis.xsl
-share/xml/gnome/xslt/docbook/html/db2html-info.xsl
-share/xml/gnome/xslt/docbook/html/db2html-inline.xsl
-share/xml/gnome/xslt/docbook/html/db2html-l10n.xsl
-share/xml/gnome/xslt/docbook/html/db2html-list.xsl
-share/xml/gnome/xslt/docbook/html/db2html-media.xsl
-share/xml/gnome/xslt/docbook/html/db2html-qanda.xsl
-share/xml/gnome/xslt/docbook/html/db2html-refentry.xsl
-share/xml/gnome/xslt/docbook/html/db2html-suppressed.xsl
-share/xml/gnome/xslt/docbook/html/db2html-table.xsl
-share/xml/gnome/xslt/docbook/html/db2html-title.xsl
-share/xml/gnome/xslt/docbook/html/db2html-xref.xsl
-share/xml/gnome/xslt/docbook/html/db2html.xsl
-share/xml/gnome/xslt/docbook/omf/db2omf.xsl
-share/xml/gnome/xslt/docbook/utils/chunks.xsl
-share/xml/gnome/xslt/docbook/utils/credits.xsl
-share/xml/gnome/xslt/docbook/utils/ids.xsl
-share/xml/gnome/xslt/gettext/gettext.xsl
-share/xml/gnome/xslt/gettext/l10n-numbers.xsl
-share/xml/gnome/xslt/gettext/l10n.xml
-share/xml/gnome/xslt/xsldoc/xsldoc.xsl
-share/xml2po/docbook.py
-share/xml2po/docbook.pyc
-share/xml2po/empty.py
-share/xml2po/empty.pyc
-share/xml2po/gs.py
-share/xml2po/gs.pyc
-@dirrm share/xml2po
-@dirrm share/xml/gnome/xslt/xsldoc
-@dirrm share/xml/gnome/xslt/gettext
-@dirrm share/xml/gnome/xslt/docbook/utils
-@dirrm share/xml/gnome/xslt/docbook/omf
-@dirrm share/xml/gnome/xslt/docbook/html
-@dirrm share/xml/gnome/xslt/docbook/common
-@dirrm share/xml/gnome/xslt/docbook
-@dirrm share/xml/gnome/xslt
-@dirrm share/xml/gnome
-@dirrm share/xml
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrm share/gnome/omf/gnome-doc-xslt
-@dirrm share/gnome/omf/gnome-doc-make
-@dirrm share/gnome/help/gnome-doc-xslt/C
-@dirrm share/gnome/help/gnome-doc-xslt
-@dirrm share/gnome/help/gnome-doc-make/C
-@dirrm share/gnome/help/gnome-doc-make
-@dirrm share/gnome-doc-utils