From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 17 00:50:19 2006 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 8A27616A40F for ; Sun, 17 Dec 2006 00:50:19 +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 107A743CA2 for ; Sun, 17 Dec 2006 00:50:16 +0000 (GMT) (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 kBH0oFGo079241 for ; Sun, 17 Dec 2006 00:50:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kBH0oFum079240; Sun, 17 Dec 2006 00:50:15 GMT (envelope-from gnats) Resent-Date: Sun, 17 Dec 2006 00:50:15 GMT Resent-Message-Id: <200612170050.kBH0oFum079240@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, Tim Bishop Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C164916A412 for ; Sun, 17 Dec 2006 00:40:43 +0000 (UTC) (envelope-from t.d.bishop@kent.ac.uk) Received: from mx5.kent.ac.uk (mx5.kent.ac.uk [129.12.21.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A96543C9D for ; Sun, 17 Dec 2006 00:40:43 +0000 (GMT) (envelope-from t.d.bishop@kent.ac.uk) Received: from hathor.ukc.ac.uk ([129.12.4.12]) by mx5.kent.ac.uk with esmtps (TLSv1:AES256-SHA:256) (Exim 4.62) (envelope-from ) id 1Gvk4v-0001vK-D6 for FreeBSD-gnats-submit@freebsd.org; Sun, 17 Dec 2006 00:40:33 +0000 Received: from pendennis.ukc.ac.uk ([129.12.3.232] helo=pendennis.kent.ac.uk) by hathor.ukc.ac.uk with esmtps (TLSv1:AES256-SHA:256) (Exim 4.60) (envelope-from ) id 1Gvk4v-00078I-62 for FreeBSD-gnats-submit@freebsd.org; Sun, 17 Dec 2006 00:40:33 +0000 Received: from tdb by pendennis.kent.ac.uk with local (Exim 4.63 (FreeBSD)) (envelope-from ) id 1Gvk4v-000OTC-1W for FreeBSD-gnats-submit@freebsd.org; Sun, 17 Dec 2006 00:40:33 +0000 Message-Id: Date: Sun, 17 Dec 2006 00:40:33 +0000 From: Tim Bishop Sender: "T.D.Bishop" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/106827: x11/kdelibs3 - respect LOCALBASE X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Tim Bishop List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Dec 2006 00:50:19 -0000 >Number: 106827 >Category: ports >Synopsis: x11/kdelibs3 - respect LOCALBASE >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Dec 17 00:50:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: T.D.Bishop >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD pendennis.kent.ac.uk 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #3: Wed Nov 29 16:26:58 GMT 2006 tdb@pendennis.kent.ac.uk:/u2/obj/usr/src/sys/PENDENNIS i386 >Description: kdelibs3 does not respect LOCALBASE in one of its patches. It refers directly to /usr/local. >How-To-Repeat: >Fix: The following patch fixes that behaviour, and has been tested in my tinderbox. --- kdelibs3.diff begins here --- Index: kdelibs3/Makefile =================================================================== RCS file: /home/pcvs/ports/x11/kdelibs3/Makefile,v retrieving revision 1.205 diff -u -r1.205 Makefile --- kdelibs3/Makefile 24 Oct 2006 01:09:56 -0000 1.205 +++ kdelibs3/Makefile 17 Dec 2006 00:35:53 -0000 @@ -82,7 +82,8 @@ .endif # !exists(/usr/bin/bzip2) pre-configure: - ${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp + ${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" \ + ${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp ${WRKSRC}/configure ${REINPLACE_CMD} -e "s,ac_cups_share_test=.*,ac_cups_share_test=\`\$$kde_cups_config --datadir\`,g" \ -e "s,pcreposix.h,pcre.h,g" ${WRKSRC}/configure ${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \ Index: kdelibs3/files/patch-configure =================================================================== RCS file: /home/pcvs/ports/x11/kdelibs3/files/patch-configure,v retrieving revision 1.6 diff -u -r1.6 patch-configure --- kdelibs3/files/patch-configure 5 Jun 2006 19:24:25 -0000 1.6 +++ kdelibs3/files/patch-configure 17 Dec 2006 00:35:54 -0000 @@ -5,11 +5,11 @@ # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh" ++LIBTOOL_DEPS=" %%LOCALBASE%%/share/libtool/ltmain.sh" # Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' -+LIBTOOL='$(SHELL) /usr/local/bin/libtool --silent' ++LIBTOOL='$(SHELL) %%LOCALBASE%%/bin/libtool --silent' # Prevent multiple expansion --- kdelibs3.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: