From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 22 21:40:20 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4A65C16A498 for ; Mon, 22 Jan 2007 21:40:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 0C6C013C4C6 for ; Mon, 22 Jan 2007 21:40:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l0MLeJM8091397 for ; Mon, 22 Jan 2007 21:40:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l0MLeJe5091396; Mon, 22 Jan 2007 21:40:19 GMT (envelope-from gnats) Resent-Date: Mon, 22 Jan 2007 21:40:19 GMT Resent-Message-Id: <200701222140.l0MLeJe5091396@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Danny Pansters Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 46FC016A403 for ; Mon, 22 Jan 2007 21:36:34 +0000 (UTC) (envelope-from danny@ricin.com) Received: from smtpq3.tilbu1.nb.home.nl (smtpq3.tilbu1.nb.home.nl [213.51.146.202]) by mx1.freebsd.org (Postfix) with ESMTP id DAD0413C43E for ; Mon, 22 Jan 2007 21:36:33 +0000 (UTC) (envelope-from danny@ricin.com) Received: from [213.51.146.189] (port=59846 helo=smtp2.tilbu1.nb.home.nl) by smtpq3.tilbu1.nb.home.nl with esmtp (Exim 4.30) id 1H96q8-0008WA-JU; Mon, 22 Jan 2007 22:36:32 +0100 Received: from cp464173-a.dbsch1.nb.home.nl ([84.27.221.74]:52463 helo=_HOSTNAME_) by smtp2.tilbu1.nb.home.nl with smtp (Exim 4.30) id 1H96q3-00014H-RN; Mon, 22 Jan 2007 22:36:27 +0100 Received: by _HOSTNAME_ (sSMTP sendmail emulation); Mon, 22 Jan 2007 22:36:17 +0100 Message-Id: <20070122213633.DAD0413C43E@mx1.freebsd.org> Date: Mon, 22 Jan 2007 22:36:17 +0100 From: "Danny Pansters" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/108222: x11-themes/gtk-qt-engine: fix/tidy up (supersedes ports/108165) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Danny Pansters List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jan 2007 21:40:20 -0000 >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@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@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 @@ -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 @@ -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 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 -@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: