ports/108222: x11-themes/gtk-qt-engine: fix/tidy up (supersedes ports/108165)

[Danny Pansters]

>Number:         108222
>Category:       ports
>Synopsis:       x11-themes/gtk-qt-engine: fix/tidy up (supersedes ports/108165)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 22 21:40:19 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Danny Pansters
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD desktop.homenet 6.2-STABLE FreeBSD 6.2-STABLE #2: Sun Jan 21 22:34:28 CET 2007 danny at desktop.homenet:/usr/obj/usr/src/sys/DESKTOP i386


	
>Description:
	- No longer need to use X11BASE or partly install to it (because of GTK location)
	- Use REINPLACE on Makefile.in at pre-configure stage, not on Makefile post-configure
	- Remove unneeded PLIST vars, use only %%GTK2_VERSION%% as intended
	- Adapt pkg-plist
	- Port is finally PREFIX-safe
	- Bump revision
	- Set myself as MAINTAINER, this supersedes ports/108165
>How-To-Repeat:
	
>Fix:

	

--- x11-themes::gtk-qt-engine.diff begins here ---
diff -ruN x11-themes/gtk-qt-engine/Makefile x11-themes/gtk-qt-engine.new/Makefile
--- x11-themes/gtk-qt-engine/Makefile	Sun Nov  5 20:50:42 2006
+++ x11-themes/gtk-qt-engine.new/Makefile	Mon Jan 22 22:04:04 2007
@@ -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/ \
 		http://freebsd.ricin.com/ports/distfiles/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	danny at ricin.com
 COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
 
 LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3
@@ -24,12 +24,8 @@
 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=	BONOBOUI "With libbonoboui" on
 
 .include <bsd.port.pre.mk>
 
@@ -37,16 +33,19 @@
 LIB_DEPENDS+=	bonoboui-2:${PORTSDIR}/x11-toolkits/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 -ruN x11-themes/gtk-qt-engine/pkg-plist x11-themes/gtk-qt-engine.new/pkg-plist
--- x11-themes/gtk-qt-engine/pkg-plist	Thu Jan 11 01:13:29 2007
+++ x11-themes/gtk-qt-engine.new/pkg-plist	Mon Jan 22 22:04:28 2007
@@ -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
- at 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
--- x11-themes::gtk-qt-engine.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: