From 04e230cbe4ba10cfd433f7a3c5f3e8a7043f0405 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Fri, 1 Jun 2007 15:21:16 +0000
Subject: [PATCH] remove gnome1 flavor

---
 devel/libglade/Makefile               | 20 ++++----------------
 devel/libglade/pkg/DESCR              |  6 ------
 devel/libglade/pkg/PFRAG.gnome        |  5 -----
 devel/libglade/pkg/PFRAG.shared-gnome |  2 --
 4 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 devel/libglade/pkg/PFRAG.gnome
 delete mode 100644 devel/libglade/pkg/PFRAG.shared-gnome

diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index d27a4b8f587..e1681483199 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2007/04/14 21:20:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.25 2007/06/01 15:21:16 jasper Exp $
 
 COMMENT=		"library for loading GLADE interface files at runtime"
 
 DISTNAME=		libglade-0.17
-PKGNAME=		${DISTNAME}p2
+PKGNAME=		${DISTNAME}p3
 SHARED_LIBS +=	glade                5.0      # .5.0
-SHARED_LIBS +=	glade-gnome          5.0      # .5.0
 
 CATEGORIES=		devel
 
@@ -20,9 +19,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		X11 Xau Xdmcp Xext Xi glib gmodule m z
 
-FLAVORS=		gnome
-FLAVOR?=
-
 MODULES=		devel/gettext
 LIB_DEPENDS=		xml.>=9::textproc/libxml1 \
 			gtk.>=1.2,gdk.>=1.2::x11/gtk+
@@ -32,17 +28,9 @@ USE_X11=		Yes
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= 	--disable-gnomedb
+CONFIGURE_ARGS+= 	--disable-gnomedb \
+			--without-gnome
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
-.if ${FLAVOR:L:Mgnome}
-LIB_DEPENDS+=		gnome.>=36,art_lgpl,gnomesupport,gnomeui::x11/gnome/libs
-WANTLIB+=		ICE SM audiofile esd gdk_imlib jpeg png tiff ungif
-CONFIGURE_ARGS+=	--with-gnome
-PKGNAME=		${DISTNAME}p3
-.else
-CONFIGURE_ARGS+=	--without-gnome
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/libglade/pkg/DESCR b/devel/libglade/pkg/DESCR
index 5ba899c3177..25ccce72e58 100644
--- a/devel/libglade/pkg/DESCR
+++ b/devel/libglade/pkg/DESCR
@@ -1,9 +1,3 @@
 This library allows you to load glade interface files in a program at runtime.
 It doesn't require GLADE to be used, but GLADE is by far the easiest way to
 create the interface files.
-
-Available flavors:
-
-	gnome: Build with GNOME support
-
-For more information about libglade, visit:
diff --git a/devel/libglade/pkg/PFRAG.gnome b/devel/libglade/pkg/PFRAG.gnome
deleted file mode 100644
index 6469858f180..00000000000
--- a/devel/libglade/pkg/PFRAG.gnome
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PFRAG.gnome,v 1.4 2004/09/15 19:38:49 espie Exp $
-lib/libglade-gnome.a
-lib/libglade-gnome.la
-lib/pkgconfig/libglade-gnome.pc
-%%SHARED%%
diff --git a/devel/libglade/pkg/PFRAG.shared-gnome b/devel/libglade/pkg/PFRAG.shared-gnome
deleted file mode 100644
index c04049bcae0..00000000000
--- a/devel/libglade/pkg/PFRAG.shared-gnome
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-gnome,v 1.3 2006/01/03 14:55:19 bernd Exp $
-@lib lib/libglade-gnome.so.${LIBglade-gnome_VERSION}