Fix the dependency and plist by add ${HAVE_GNOME:Mlibgnomeui} and knob in

plist.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7576 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 67 insertions, 56 deletions

diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 5df31d846..de74f9ecc 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glade3/Makefile,v 1.16 2006/09/29 21:36:09 ahze Exp $
+#   $MCom: ports/devel/glade3/Makefile,v 1.17 2006/10/02 04:52:51 bland Exp $
 #
 
 PORTNAME=	glade3
 PORTVERSION=	3.0.2
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -27,4 +28,14 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+USE_GNOME+=	libgnomeui
+CONFIGURE_ARGS+=--enable-gnome
+PKGNAMESUFFIX:=	-gnome
+.else
+CONFIGURE_ARGS+=--disable-gnome
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index 62e55c637..2fb50d900 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -37,8 +37,8 @@ include/libgladeui-1.0/libgladeui/glade-widget-class.h
 include/libgladeui-1.0/libgladeui/glade-widget.h
 include/libgladeui-1.0/libgladeui/glade-xml-utils.h
 include/libgladeui-1.0/libgladeui/glade.h
-lib/glade3/modules/libgladegnome.la
-lib/glade3/modules/libgladegnome.so
+%%GNOME:%%lib/glade3/modules/libgladegnome.la
+%%GNOME:%%lib/glade3/modules/libgladegnome.so
 lib/glade3/modules/libgladegtk.la
 lib/glade3/modules/libgladegtk.so
 lib/libgladeui-1.la
@@ -47,12 +47,12 @@ lib/libgladeui-1.so.4
 libdata/pkgconfig/glade-3.pc
 libdata/pkgconfig/libgladeui-1.0.pc
 share/gnome/applications/glade-3.desktop
-share/gnome/glade3/catalogs/bonobo.xml
-share/gnome/glade3/catalogs/bonobo.xml.in
-share/gnome/glade3/catalogs/canvas.xml
-share/gnome/glade3/catalogs/canvas.xml.in
-share/gnome/glade3/catalogs/gnome.xml
-share/gnome/glade3/catalogs/gnome.xml.in
+%%GNOME:%%share/gnome/glade3/catalogs/bonobo.xml
+%%GNOME:%%share/gnome/glade3/catalogs/bonobo.xml.in
+%%GNOME:%%share/gnome/glade3/catalogs/canvas.xml
+%%GNOME:%%share/gnome/glade3/catalogs/canvas.xml.in
+%%GNOME:%%share/gnome/glade3/catalogs/gnome.xml
+%%GNOME:%%share/gnome/glade3/catalogs/gnome.xml.in
 share/gnome/glade3/catalogs/gtk+.xml
 share/gnome/glade3/catalogs/gtk+.xml.in
 share/gnome/glade3/pixmaps/16x16/aboutdialog.png
@@ -60,8 +60,8 @@ share/gnome/glade3/pixmaps/16x16/accellabel.png
 share/gnome/glade3/pixmaps/16x16/alignment.png
 share/gnome/glade3/pixmaps/16x16/arrow.png
 share/gnome/glade3/pixmaps/16x16/aspectframe.png
-share/gnome/glade3/pixmaps/16x16/bonobodock.png
-share/gnome/glade3/pixmaps/16x16/bonobodockitem.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/bonobodock.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/bonobodockitem.png
 share/gnome/glade3/pixmaps/16x16/button.png
 share/gnome/glade3/pixmaps/16x16/calendar.png
 share/gnome/glade3/pixmaps/16x16/checkbutton.png
@@ -89,27 +89,27 @@ share/gnome/glade3/pixmaps/16x16/fontselection.png
 share/gnome/glade3/pixmaps/16x16/fontselectiondialog.png
 share/gnome/glade3/pixmaps/16x16/frame.png
 share/gnome/glade3/pixmaps/16x16/gammacurve.png
-share/gnome/glade3/pixmaps/16x16/gnomeabout.png
-share/gnome/glade3/pixmaps/16x16/gnomeapp.png
-share/gnome/glade3/pixmaps/16x16/gnomeappbar.png
-share/gnome/glade3/pixmaps/16x16/gnomecanvas.png
-share/gnome/glade3/pixmaps/16x16/gnomecolorpicker.png
-share/gnome/glade3/pixmaps/16x16/gnomedateedit.png
-share/gnome/glade3/pixmaps/16x16/gnomedialog.png
-share/gnome/glade3/pixmaps/16x16/gnomedruid.png
-share/gnome/glade3/pixmaps/16x16/gnomedruidpageedge.png
-share/gnome/glade3/pixmaps/16x16/gnomedruidpagestandard.png
-share/gnome/glade3/pixmaps/16x16/gnomeentry.png
-share/gnome/glade3/pixmaps/16x16/gnomefileentry.png
-share/gnome/glade3/pixmaps/16x16/gnomefontpicker.png
-share/gnome/glade3/pixmaps/16x16/gnomehref.png
-share/gnome/glade3/pixmaps/16x16/gnomeiconentry.png
-share/gnome/glade3/pixmaps/16x16/gnomeiconlist.png
-share/gnome/glade3/pixmaps/16x16/gnomeiconselection.png
-share/gnome/glade3/pixmaps/16x16/gnomemessagebox.png
-share/gnome/glade3/pixmaps/16x16/gnomepixmap.png
-share/gnome/glade3/pixmaps/16x16/gnomepixmapentry.png
-share/gnome/glade3/pixmaps/16x16/gnomepropertybox.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeabout.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeapp.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeappbar.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomecanvas.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomecolorpicker.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedateedit.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedialog.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedruid.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedruidpageedge.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedruidpagestandard.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeentry.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomefileentry.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomefontpicker.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomehref.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeiconentry.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeiconlist.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeiconselection.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomemessagebox.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomepixmap.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomepixmapentry.png
+%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomepropertybox.png
 share/gnome/glade3/pixmaps/16x16/handlebox.png
 share/gnome/glade3/pixmaps/16x16/hbox.png
 share/gnome/glade3/pixmaps/16x16/hbuttonbox.png
@@ -165,8 +165,8 @@ share/gnome/glade3/pixmaps/22x22/accellabel.png
 share/gnome/glade3/pixmaps/22x22/alignment.png
 share/gnome/glade3/pixmaps/22x22/arrow.png
 share/gnome/glade3/pixmaps/22x22/aspectframe.png
-share/gnome/glade3/pixmaps/22x22/bonobodock.png
-share/gnome/glade3/pixmaps/22x22/bonobodockitem.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/bonobodock.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/bonobodockitem.png
 share/gnome/glade3/pixmaps/22x22/button.png
 share/gnome/glade3/pixmaps/22x22/calendar.png
 share/gnome/glade3/pixmaps/22x22/checkbutton.png
@@ -194,27 +194,27 @@ share/gnome/glade3/pixmaps/22x22/fontselection.png
 share/gnome/glade3/pixmaps/22x22/fontselectiondialog.png
 share/gnome/glade3/pixmaps/22x22/frame.png
 share/gnome/glade3/pixmaps/22x22/gammacurve.png
-share/gnome/glade3/pixmaps/22x22/gnomeabout.png
-share/gnome/glade3/pixmaps/22x22/gnomeapp.png
-share/gnome/glade3/pixmaps/22x22/gnomeappbar.png
-share/gnome/glade3/pixmaps/22x22/gnomecanvas.png
-share/gnome/glade3/pixmaps/22x22/gnomecolorpicker.png
-share/gnome/glade3/pixmaps/22x22/gnomedateedit.png
-share/gnome/glade3/pixmaps/22x22/gnomedialog.png
-share/gnome/glade3/pixmaps/22x22/gnomedruid.png
-share/gnome/glade3/pixmaps/22x22/gnomedruidpageedge.png
-share/gnome/glade3/pixmaps/22x22/gnomedruidpagestandard.png
-share/gnome/glade3/pixmaps/22x22/gnomeentry.png
-share/gnome/glade3/pixmaps/22x22/gnomefileentry.png
-share/gnome/glade3/pixmaps/22x22/gnomefontpicker.png
-share/gnome/glade3/pixmaps/22x22/gnomehref.png
-share/gnome/glade3/pixmaps/22x22/gnomeiconentry.png
-share/gnome/glade3/pixmaps/22x22/gnomeiconlist.png
-share/gnome/glade3/pixmaps/22x22/gnomeiconselection.png
-share/gnome/glade3/pixmaps/22x22/gnomemessagebox.png
-share/gnome/glade3/pixmaps/22x22/gnomepixmap.png
-share/gnome/glade3/pixmaps/22x22/gnomepixmapentry.png
-share/gnome/glade3/pixmaps/22x22/gnomepropertybox.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeabout.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeapp.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeappbar.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomecanvas.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomecolorpicker.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedateedit.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedialog.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedruid.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedruidpageedge.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedruidpagestandard.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeentry.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomefileentry.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomefontpicker.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomehref.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeiconentry.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeiconlist.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeiconselection.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomemessagebox.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomepixmap.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomepixmapentry.png
+%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomepropertybox.png
 share/gnome/glade3/pixmaps/22x22/handlebox.png
 share/gnome/glade3/pixmaps/22x22/hbox.png
 share/gnome/glade3/pixmaps/22x22/hbuttonbox.png