Disable GNOME support and split the Makefile to aid in the addition of the

new glade2-gnome package, which provides the missing bits.  Bump PKGREVISION
to 1.

While here, pick maintainership.  This package was maintained by the same
person as gnome2-terminal, who is unreachable according to ben@.

Addresses PR pkg/25030.

4 files changed, 42 insertions, 41 deletions

diff --git a/devel/glade2/DESCR b/devel/glade2/DESCR
index 0f59647f687..261923c8fbe 100644
--- a/devel/glade2/DESCR
+++ b/devel/glade2/DESCR
@@ -1,6 +1,7 @@
-Glade is a free user interface builder for GTK+ released under
-the GNU General Public License (GPL).  (GTK+, which stands for
-the Gimp ToolKit, is a library for creating graphical user
-interfaces for the X Window System.  See http://www.gtk.org/)
+Glade is a free user interface builder for GTK+ released under the GNU
+General Public License (GPL).  (GTK+, which stands for the Gimp ToolKit,
+is a library for creating graphical user interfaces for the X Window
+System.  See http://www.gtk.org/)
 
-This is the GTK2/GNOME2 version of Glade.
+This package provides Glade built with GTK2 support only.  If you want
+GNOME2 support, install the glade2-gnome package instead.
diff --git a/devel/glade2/MESSAGE b/devel/glade2/MESSAGE
deleted file mode 100644
index 0a29961f3ee..00000000000
--- a/devel/glade2/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/09/02 19:24:15 wiz Exp $
-
-You might want to install the libgail-gnome package for better gnome
-accessibility support.
-
-===========================================================================
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 4d733d1d634..37362c81773 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,35 +1,12 @@
-# $NetBSD: Makefile,v 1.34 2004/11/26 09:49:10 adam Exp $
+# $NetBSD: Makefile,v 1.35 2004/12/29 12:56:50 jmmv Exp $
 
-DISTNAME=	glade-2.6.5
-PKGNAME=	${DISTNAME:S/-/2-/}
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/glade/2.6/}
-EXTRACT_SUFX=	.tar.bz2
+.include "Makefile.common"
 
-MAINTAINER=	sab@posix.org.uk
-HOMEPAGE=	http://glade.gnome.org/
-COMMENT=	User interface builder for the GTK2+ toolkit and GNOME2
+PKGREVISION=		1
 
-BUILD_USES_MSGFMT=	YES
+CONFLICTS+=		glade2-gnome-[0-9]*
 
-USE_BUILDLINK3=		YES
-USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
-USE_LIBTOOL=		YES
-USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
-GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--disable-gnome
+CONFIGURE_ARGS+=	--disable-gnome-db
 
-.include "../../databases/libgda/buildlink3.mk"
-.include "../../databases/libgnomedb/buildlink3.mk"
-.include "../../devel/gail/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glade2/Makefile.common b/devel/glade2/Makefile.common
new file mode 100644
index 00000000000..dd31511d387
--- /dev/null
+++ b/devel/glade2/Makefile.common
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile.common,v 1.1 2004/12/29 12:56:50 jmmv Exp $
+
+DISTNAME=	glade-2.6.5
+PKGNAME=	${DISTNAME:S/-/2-/}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/glade/2.6/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	jmmv@NetBSD.org
+HOMEPAGE=	http://glade.gnome.org/
+COMMENT=	User interface builder for the GTK2+ toolkit
+
+DISTINFO_FILE=	${.CURDIR}/../../devel/glade2/distinfo
+PATCHDIR=	${.CURDIR}/../../devel/glade2/patches
+PLIST_SRC=	${.CURDIR}/../../devel/glade2/PLIST
+
+GNU_CONFIGURE=		YES
+USE_BUILDLINK3=		YES
+USE_DIRS+=		gnome2-1.5
+USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		YES
+USE_PKGLOCALEDIR=	YES
+USE_X11=		YES
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../x11/gtk2/buildlink3.mk"