Date: Sun, 17 Dec 2006 00:40:33 +0000 From: Tim Bishop <tdb@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/106827: x11/kdelibs3 - respect LOCALBASE Message-ID: <E1Gvk4v-000OTC-1W@pendennis.kent.ac.uk> Resent-Message-ID: <200612170050.kBH0oFum079240@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1Gvk4v-000OTC-1W>