[pkgsrc/trunk]: pkgsrc/devel/glade2 Disable GNOME support and split the Makef...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/569f096a4b8d
branches:  trunk
changeset: 486541:569f096a4b8d
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Dec 29 12:56:50 2004 +0000

description:
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.

diffstat:

 devel/glade2/DESCR           |  11 ++++++-----
 devel/glade2/MESSAGE         |   7 -------
 devel/glade2/Makefile        |  37 +++++++------------------------------
 devel/glade2/Makefile.common |  30 ++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 42 deletions(-)

diffs (107 lines):

diff -r 47321778c133 -r 569f096a4b8d devel/glade2/DESCR
--- a/devel/glade2/DESCR        Wed Dec 29 12:16:56 2004 +0000
+++ b/devel/glade2/DESCR        Wed Dec 29 12:56:50 2004 +0000
@@ -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 -r 47321778c133 -r 569f096a4b8d devel/glade2/MESSAGE
--- a/devel/glade2/MESSAGE      Wed Dec 29 12:16:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 47321778c133 -r 569f096a4b8d devel/glade2/Makefile
--- a/devel/glade2/Makefile     Wed Dec 29 12:16:56 2004 +0000
+++ b/devel/glade2/Makefile     Wed Dec 29 12:56:50 2004 +0000
@@ -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@localhost
-HOMEPAGE=      http://glade.gnome.org/
-COMMENT=       User interface builder for the GTK2+ toolkit and GNOME2
-
-BUILD_USES_MSGFMT=     YES
+PKGREVISION=           1
 
-USE_BUILDLINK3=                YES
-USE_DIRS+=             gnome2-1.5
-USE_GNU_TOOLS+=                make
-USE_LIBTOOL=           YES
-USE_PKGLOCALEDIR=      YES
-USE_X11=               YES
-GNU_CONFIGURE=         YES
+CONFLICTS+=            glade2-gnome-[0-9]*
 
-.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"
+CONFIGURE_ARGS+=       --disable-gnome
+CONFIGURE_ARGS+=       --disable-gnome-db
+
 .include "../../mk/bsd.pkg.mk"
diff -r 47321778c133 -r 569f096a4b8d devel/glade2/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glade2/Makefile.common      Wed Dec 29 12:56:50 2004 +0000
@@ -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@localhost
+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"