Bump PKGREVISION to 3; changes:

- Fix PKGNAME to use variable modifiers.
- Depend on python, which is required to create a script.
- Disable gtk-doc detection (not required).
- Install documentation in share/doc/html, instead of share/gtk-doc/html.

4 files changed, 38 insertions, 25 deletions

diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 0b762078f94..d8a7f588d64 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/01/03 15:26:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/05 11:54:44 jmmv Exp $
 #
 
 DISTNAME=		libglade-2.0.1
-PKGNAME=		libglade2-2.0.1
-PKGREVISION=		2
+PKGNAME=		${DISTNAME:S/libglade/libglade2/}
+PKGREVISION=		3
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglade/2.0/}
 
@@ -19,6 +19,10 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+CONFIGURE_ENV+=		jh_cv_path_python="${PYTHONBIN}"
+CONFIGURE_ARGS+=	--enable-gtk-doc=no
+
+.include "../../lang/python/application.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libglade2/PLIST b/devel/libglade2/PLIST
index f53cd95ec00..bb658ecbea0 100644
--- a/devel/libglade2/PLIST
+++ b/devel/libglade2/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:19 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/05 11:54:44 jmmv Exp $
+bin/libglade-convert
 include/libglade-2.0/glade/glade-build.h
 include/libglade-2.0/glade/glade-init.h
 include/libglade-2.0/glade/glade-parser.h
@@ -10,23 +11,22 @@ lib/libglade-2.0.so
 lib/libglade-2.0.so.0
 lib/libglade-2.0.so.0.1
 lib/pkgconfig/libglade-2.0.pc
-share/gtk-doc/html/libglade/gladexml.html
-share/gtk-doc/html/libglade/libglade-dtd-exceptions.html
-share/gtk-doc/html/libglade/libglade-dtd.html
-share/gtk-doc/html/libglade/libglade-embedding.html
-share/gtk-doc/html/libglade/libglade-extending.html
-share/gtk-doc/html/libglade/libglade-i18n.html
-share/gtk-doc/html/libglade/libglade-lib.html
-share/gtk-doc/html/libglade/libglade-libglade-build.html
-share/gtk-doc/html/libglade/libglade-libglade-initialisation.html
-share/gtk-doc/html/libglade/libglade-libglade-sax-parser.html
-share/gtk-doc/html/libglade/libglade-modules.html
-share/gtk-doc/html/libglade/libglade-notes.html
-share/gtk-doc/html/libglade/libglade.html
+share/doc/html/libglade/gladexml.html
+share/doc/html/libglade/libglade-dtd-exceptions.html
+share/doc/html/libglade/libglade-dtd.html
+share/doc/html/libglade/libglade-embedding.html
+share/doc/html/libglade/libglade-extending.html
+share/doc/html/libglade/libglade-i18n.html
+share/doc/html/libglade/libglade-lib.html
+share/doc/html/libglade/libglade-libglade-build.html
+share/doc/html/libglade/libglade-libglade-initialisation.html
+share/doc/html/libglade/libglade-libglade-sax-parser.html
+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
 @dirrm share/xml/libglade
 @unexec ${RMDIR} %D/share/xml 2>/dev/null || ${TRUE}
-@dirrm share/gtk-doc/html/libglade
-@unexec ${RMDIR} %D/share/gtk-doc/html 2>/dev/null || ${TRUE}
+@dirrm share/doc/html/libglade
 @dirrm include/libglade-2.0/glade
 @dirrm include/libglade-2.0
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index 046b25a543a..3ee38deac7c 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/09/07 03:24:12 rh Exp $
+$NetBSD: distinfo,v 1.3 2003/01/05 11:54:44 jmmv Exp $
 
 SHA1 (libglade-2.0.1.tar.gz) = 15197752962c8b12efd4a2832d78c3577d11ffea
 Size (libglade-2.0.1.tar.gz) = 354841 bytes
-SHA1 (patch-aa) = daa85a2941cd4900139dda63f4e9b62aa3c2a7ed
+SHA1 (patch-aa) = 2aee085383d9f712fd75ea34fc033be53ea4484a
diff --git a/devel/libglade2/patches/patch-aa b/devel/libglade2/patches/patch-aa
index 96753826b78..8fa00473971 100644
--- a/devel/libglade2/patches/patch-aa
+++ b/devel/libglade2/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/12 17:33:14 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/05 11:54:44 jmmv Exp $
 
---- doc/Makefile.in.orig	Tue Jul  2 19:06:37 2002
-+++ doc/Makefile.in	Tue Jul  2 19:06:41 2002
-@@ -341,8 +341,6 @@
+--- doc/Makefile.in.orig	Thu Aug 29 14:53:59 2002
++++ doc/Makefile.in
+@@ -115,7 +115,7 @@ DOC_MAIN_SGML_FILE = libglade-docs.sgml
+ # The directory containing the source code (if it contains documentation).
+ DOC_SOURCE_DIR = ../glade
+ 
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(datadir)/doc/html
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 
+@@ -342,8 +342,6 @@ install-data-local: 
  	    echo '-- Installing '$$i ; \
  	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
  	  done; \