Use xmlcatmgr to manage the share/xml/catalog file, so it can be shared

across multiple packages (really, the package did not register itself in
the catalog before this change). Bump PKGREVISION to 4.

4 files changed, 23 insertions, 5 deletions

diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 78576d3cca4..61fc77c12a9 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/01/05 12:17:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/10 19:36:02 jmmv Exp $
 #
 
 DISTNAME=		libglade-2.0.1
 PKGNAME=		${DISTNAME:S/libglade/libglade2/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglade/2.0/}
 
@@ -24,8 +24,12 @@ CONFIGURE_ARGS+=	--enable-gtk-doc=no
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/libglade/2.0
+	${PREFIX}/bin/xmlcatmgr add "system" \
+	    "http://glade.gnome.org/glade-2.0.dtd" \
+	    $(PREFIX)/share/xml/libglade/glade-2.0.dtd
 
 .include "../../lang/python/application.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
+.include "../../textproc/xmlcatmgr/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libglade2/PLIST b/devel/libglade2/PLIST
index 81427f50ba3..ee6a46865e1 100644
--- a/devel/libglade2/PLIST
+++ b/devel/libglade2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/05 12:17:43 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/01/10 19:36:02 jmmv Exp $
 bin/libglade-convert
 include/libglade-2.0/glade/glade-build.h
 include/libglade-2.0/glade/glade-init.h
@@ -25,8 +25,9 @@ share/doc/html/libglade/libglade-modules.html
 share/doc/html/libglade/libglade-notes.html
 share/doc/html/libglade/libglade.html
 share/xml/libglade/glade-2.0.dtd
+@exec %D/bin/xmlcatmgr add "system" "http://glade.gnome.org/glade-2.0.dtd" %D/share/xml/libglade/glade-2.0.dtd
+@unexec %D/bin/xmlcatmgr remove "http://glade.gnome.org/glade-2.0.dtd"
 @dirrm share/xml/libglade
-@unexec ${RMDIR} %D/share/xml 2>/dev/null || ${TRUE}
 @dirrm share/doc/html/libglade
 @exec ${MKDIR} %D/lib/libglade/2.0
 @dirrm lib/libglade/2.0
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index 3ee38deac7c..b1d01292c6f 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/01/05 11:54:44 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/01/10 19:36:02 jmmv Exp $
 
 SHA1 (libglade-2.0.1.tar.gz) = 15197752962c8b12efd4a2832d78c3577d11ffea
 Size (libglade-2.0.1.tar.gz) = 354841 bytes
 SHA1 (patch-aa) = 2aee085383d9f712fd75ea34fc033be53ea4484a
+SHA1 (patch-ab) = 2f911c8763e936ae5ed9f0f5326064136540cfcc
diff --git a/devel/libglade2/patches/patch-ab b/devel/libglade2/patches/patch-ab
new file mode 100644
index 00000000000..eae298bbec1
--- /dev/null
+++ b/devel/libglade2/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2003/01/10 19:36:03 jmmv Exp $
+
+--- Makefile.in.orig	Thu Aug 29 14:53:59 2002
++++ Makefile.in
+@@ -636,7 +636,6 @@ uninstall-info: uninstall-info-recursive
+ 
+ 
+ install-data-local:
+-	-xmlcatalog --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
+ uninstall-local:
+ 	-xmlcatalog --noout --del $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
+