From 2d5a0a57c9f3e4834e84d1e19eedc60ff7f4d798 Mon Sep 17 00:00:00 2001
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Tue, 8 Aug 2006 07:12:16 +0000
Subject: [PATCH] - x11-toolkits/libbonoboui is optional, reflect it in
 LIB_DEPENDS   bump PORTREVISION

PR:		ports/101617
Submitted by:	Bartosz Fabianowski <freebsd at chillt.de>
Approved by:	Danny Pansters <danny at ricin.com> (maintainer)
---
 x11-themes/gtk-qt-engine/Makefile  | 12 +++++++++---
 x11-themes/gtk-qt4-engine/Makefile | 12 +++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile
index 4166f2a6898d..5d1c023d172e 100644
--- a/x11-themes/gtk-qt-engine/Makefile
+++ b/x11-themes/gtk-qt-engine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-qt-engine
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://people.freedesktop.org/~davidsansome/ \
 		http://freebsd.ricin.com/ports/distfiles/
@@ -14,8 +15,7 @@ MASTER_SITES=	http://people.freedesktop.org/~davidsansome/ \
 MAINTAINER=	danny@ricin.com
 COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
 
-LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3 \
-		bonoboui-2:${PORTSDIR}/x11-toolkits/libbonoboui
+LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -31,6 +31,12 @@ CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 
 OPTIONS=	BONOBOUI "With libbonoboui (recommended)" on
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_BONOBOUI)
+LIB_DEPENDS+=	bonoboui-2:${PORTSDIR}/x11-toolkits/libbonoboui
+.endif
+
 pre-configure:
 	@${REINPLACE_CMD} -e "s|/share/themes/|/X11R6/share/themes/|" \
 		${WRKSRC}/kcm_gtk/kcmgtk.cpp
@@ -46,4 +52,4 @@ post-install:
 	@${RM} /tmp/menu/kcmgtk.menu
 	@if [ "`ls /tmp/menu`" = "" ]; then ${RMDIR} /tmp/menu; fi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index 4166f2a6898d..5d1c023d172e 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-qt-engine
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://people.freedesktop.org/~davidsansome/ \
 		http://freebsd.ricin.com/ports/distfiles/
@@ -14,8 +15,7 @@ MASTER_SITES=	http://people.freedesktop.org/~davidsansome/ \
 MAINTAINER=	danny@ricin.com
 COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
 
-LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3 \
-		bonoboui-2:${PORTSDIR}/x11-toolkits/libbonoboui
+LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -31,6 +31,12 @@ CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 
 OPTIONS=	BONOBOUI "With libbonoboui (recommended)" on
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_BONOBOUI)
+LIB_DEPENDS+=	bonoboui-2:${PORTSDIR}/x11-toolkits/libbonoboui
+.endif
+
 pre-configure:
 	@${REINPLACE_CMD} -e "s|/share/themes/|/X11R6/share/themes/|" \
 		${WRKSRC}/kcm_gtk/kcmgtk.cpp
@@ -46,4 +52,4 @@ post-install:
 	@${RM} /tmp/menu/kcmgtk.menu
 	@if [ "`ls /tmp/menu`" = "" ]; then ${RMDIR} /tmp/menu; fi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>