6 files changed, 46 insertions, 42 deletions

diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile
index f08307ee3dd3..48a0078839a5 100644
--- a/x11-themes/gtk-qt-engine/Makefile
+++ b/x11-themes/gtk-qt-engine/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	gtk-qt-engine
 PORTVERSION=	0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://people.freedesktop.org/~davidsansome/ \
+MASTER_SITES=	http://gtk-qt.ecs.soton.ac.uk/files/${PORTVERSION}/ \
 		http://freebsd.ricin.com/ports/distfiles/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danny@ricin.com
 COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
 
 LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3
@@ -20,33 +20,36 @@ LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomehack gtk20
+USE_GNOME=	gtk20
 USE_QT_VER=	3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_SUB=	GTK_VER=${GTK2_VERSION}
-PLIST_SUB+=	LOCALBASE=${LOCALBASE}
 
 CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 
-OPTIONS=	BONOBOUI "With libbonoboui (recommended)" on
+OPTIONS=	LIBBONOBOUI "Install libbonoboui if missing" off
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_BONOBOUI)
-LIB_DEPENDS+=	bonoboui-2:${PORTSDIR}/x11-toolkits/libbonoboui
+# Note: had to turn off libbonoboui (dependency) OPTION for technical reasons
+# So a "vanilla" package will have no libbonoboui support
+.if defined(WITH_LIBBONOBOUI)
+USE_GNOME+=	libbonoboui
 .endif
 
-post-configure:
-	@${REINPLACE_CMD} -e "s|/usr/lib/menu|/tmp/menu|" \
-		${WRKSRC}/kcm_gtk/Makefile
+post-patch:
+	@${REINPLACE_CMD} -e "s|GTK_LIBPREFIX)/gtk|PREFIX)/lib/gtk|" \
+		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e "s|GTK_PREFIX)/share|PREFIX)/share|g" \
+		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e "s|/usr/lib/menu|${WRKDIR}/menu|g" \
+		${WRKSRC}/kcm_gtk/Makefile.in
 	@${REINPLACE_CMD} -e \
 		"s|/usr/share/applications|${PREFIX}/share/applications/kde|g" \
-		${WRKSRC}/kcm_gtk/Makefile
+		${WRKSRC}/kcm_gtk/Makefile.in
 
 post-install:
-	@${RM} /tmp/menu/kcmgtk.menu
-	@if [ "`ls /tmp/menu`" = "" ]; then ${RMDIR} /tmp/menu; fi
+	@${RM} -r ${WRKDIR}/menu
 	@${RM} ${PREFIX}/share/applnk/Settings/LookNFeel/kcmgtk.desktop
 
 .include <bsd.port.post.mk>
diff --git a/x11-themes/gtk-qt-engine/pkg-descr b/x11-themes/gtk-qt-engine/pkg-descr
index 6a323864567c..622ce904b686 100644
--- a/x11-themes/gtk-qt-engine/pkg-descr
+++ b/x11-themes/gtk-qt-engine/pkg-descr
@@ -2,6 +2,6 @@ GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
 so that they fit in more nicely with KDE. Includes a KDE
 control center module for GTK theme selection.
 
-WWW: http://www.freedesktop.org/Software/gtk-qt
+WWW: http://gtk-qt.ecs.soton.ac.uk/index.php
 
 Author: David Sansome <me@davidsansome.com>
diff --git a/x11-themes/gtk-qt-engine/pkg-plist b/x11-themes/gtk-qt-engine/pkg-plist
index 5be5974ed5c8..2695c200abd7 100644
--- a/x11-themes/gtk-qt-engine/pkg-plist
+++ b/x11-themes/gtk-qt-engine/pkg-plist
@@ -1,16 +1,15 @@
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtengine.a
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtengine.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtengine.so
 lib/kde3/kcm_kcmgtk.a
 lib/kde3/kcm_kcmgtk.la
 lib/kde3/kcm_kcmgtk.so
+share/gtk-qt-engine/kde-index.theme
 share/applications/kde/kcmgtk-xdg.desktop
 share/locale/de/LC_MESSAGES/gtkqtengine.mo
 share/locale/es/LC_MESSAGES/gtkqtengine.mo
 share/locale/fr/LC_MESSAGES/gtkqtengine.mo
 share/locale/nn/LC_MESSAGES/gtkqtengine.mo
-@cwd %%LOCALBASE%%
-lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.a
-lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.la
-lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.so
-share/gtk-qt-engine/kde-index.theme
 share/themes/Qt/gtk-2.0/gtkrc
 @dirrm share/themes/Qt/gtk-2.0
 @dirrm share/themes/Qt
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index f08307ee3dd3..48a0078839a5 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	gtk-qt-engine
 PORTVERSION=	0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://people.freedesktop.org/~davidsansome/ \
+MASTER_SITES=	http://gtk-qt.ecs.soton.ac.uk/files/${PORTVERSION}/ \
 		http://freebsd.ricin.com/ports/distfiles/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danny@ricin.com
 COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
 
 LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3
@@ -20,33 +20,36 @@ LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomehack gtk20
+USE_GNOME=	gtk20
 USE_QT_VER=	3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_SUB=	GTK_VER=${GTK2_VERSION}
-PLIST_SUB+=	LOCALBASE=${LOCALBASE}
 
 CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 
-OPTIONS=	BONOBOUI "With libbonoboui (recommended)" on
+OPTIONS=	LIBBONOBOUI "Install libbonoboui if missing" off
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_BONOBOUI)
-LIB_DEPENDS+=	bonoboui-2:${PORTSDIR}/x11-toolkits/libbonoboui
+# Note: had to turn off libbonoboui (dependency) OPTION for technical reasons
+# So a "vanilla" package will have no libbonoboui support
+.if defined(WITH_LIBBONOBOUI)
+USE_GNOME+=	libbonoboui
 .endif
 
-post-configure:
-	@${REINPLACE_CMD} -e "s|/usr/lib/menu|/tmp/menu|" \
-		${WRKSRC}/kcm_gtk/Makefile
+post-patch:
+	@${REINPLACE_CMD} -e "s|GTK_LIBPREFIX)/gtk|PREFIX)/lib/gtk|" \
+		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e "s|GTK_PREFIX)/share|PREFIX)/share|g" \
+		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e "s|/usr/lib/menu|${WRKDIR}/menu|g" \
+		${WRKSRC}/kcm_gtk/Makefile.in
 	@${REINPLACE_CMD} -e \
 		"s|/usr/share/applications|${PREFIX}/share/applications/kde|g" \
-		${WRKSRC}/kcm_gtk/Makefile
+		${WRKSRC}/kcm_gtk/Makefile.in
 
 post-install:
-	@${RM} /tmp/menu/kcmgtk.menu
-	@if [ "`ls /tmp/menu`" = "" ]; then ${RMDIR} /tmp/menu; fi
+	@${RM} -r ${WRKDIR}/menu
 	@${RM} ${PREFIX}/share/applnk/Settings/LookNFeel/kcmgtk.desktop
 
 .include <bsd.port.post.mk>
diff --git a/x11-themes/gtk-qt4-engine/pkg-descr b/x11-themes/gtk-qt4-engine/pkg-descr
index 6a323864567c..622ce904b686 100644
--- a/x11-themes/gtk-qt4-engine/pkg-descr
+++ b/x11-themes/gtk-qt4-engine/pkg-descr
@@ -2,6 +2,6 @@ GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
 so that they fit in more nicely with KDE. Includes a KDE
 control center module for GTK theme selection.
 
-WWW: http://www.freedesktop.org/Software/gtk-qt
+WWW: http://gtk-qt.ecs.soton.ac.uk/index.php
 
 Author: David Sansome <me@davidsansome.com>
diff --git a/x11-themes/gtk-qt4-engine/pkg-plist b/x11-themes/gtk-qt4-engine/pkg-plist
index 5be5974ed5c8..2695c200abd7 100644
--- a/x11-themes/gtk-qt4-engine/pkg-plist
+++ b/x11-themes/gtk-qt4-engine/pkg-plist
@@ -1,16 +1,15 @@
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtengine.a
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtengine.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtengine.so
 lib/kde3/kcm_kcmgtk.a
 lib/kde3/kcm_kcmgtk.la
 lib/kde3/kcm_kcmgtk.so
+share/gtk-qt-engine/kde-index.theme
 share/applications/kde/kcmgtk-xdg.desktop
 share/locale/de/LC_MESSAGES/gtkqtengine.mo
 share/locale/es/LC_MESSAGES/gtkqtengine.mo
 share/locale/fr/LC_MESSAGES/gtkqtengine.mo
 share/locale/nn/LC_MESSAGES/gtkqtengine.mo
-@cwd %%LOCALBASE%%
-lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.a
-lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.la
-lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.so
-share/gtk-qt-engine/kde-index.theme
 share/themes/Qt/gtk-2.0/gtkrc
 @dirrm share/themes/Qt/gtk-2.0
 @dirrm share/themes/Qt