Date: Sun, 7 Jun 2009 18:19:49 -0700 From: <corky1951@comcast.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/135343: [MAINTAINER UPDATE] finance/qtstalker - fix for custom PREFIX Message-ID: <20090608022219.313928FC08@mx1.freebsd.org> Resent-Message-ID: <200906080230.n582U2m8080652@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135343
>Category: ports
>Synopsis: [MAINTAINER UPDATE] finance/qtstalker - fix for custom PREFIX
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 08 02:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Charlie Kester
>Release: FreeBSD 7.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD atom.local 7.2-RELEASE FreeBSD 7.2-RELEASE #1: Mon May 4 15:50:49 PDT 2009 root@atom.local:/usr/obj/usr/src/sys/ATOM i386
>Description:
Makefile incorrectly uses LOCALBASE in sed lines intended to
fix hardcoded paths in source files.
Result is that builds using custom PREFIX failed.
>How-To-Repeat:
>Fix:
--- qtstalker-0.36-1.diff begins here ---
diff -ruN /usr/ports/finance/qtstalker/Makefile qtstalker/Makefile
--- /usr/ports/finance/qtstalker/Makefile 2009-05-10 14:08:18.000000000 -0700
+++ qtstalker/Makefile 2009-06-07 18:06:05.000000000 -0700
@@ -7,6 +7,7 @@
PORTNAME= qtstalker
PORTVERSION= 0.36
+PORTREVISION= 1
CATEGORIES= finance kde
MASTER_SITES= SF
@@ -56,31 +57,33 @@
VERSION_PLUGIN="${VERSION_PLUGIN}"
post-patch:
+# NB: LOCALBASE should NOT be used instead of "/usr/local" in the following post-patch substitutions
+# since the point is to fix some hardcoded path info in the package as downloaded.
# tell qtstalker where to install plugins
@${FIND} ${WRKSRC} -type f -name "*pro" | \
${XARGS} -x -n 5 \
${REINPLACE_CMD} -E \
- -e 's|${LOCALBASE}/lib/qtstalker/|${PREFIX}/lib/${PORTNAME}/|'
+ -e 's|/usr/local/lib/qtstalker/|${PREFIX}/lib/${PORTNAME}/|'
# where to find plugins
@${REINPLACE_CMD} -E \
- -e 's|${LOCALBASE}/lib/qtstalker/|${PREFIX}/lib/${PORTNAME}/|' \
+ -e 's|/usr/local/lib/qtstalker/|${PREFIX}/lib/${PORTNAME}/|' \
${WRKSRC}/lib/Config.cpp \
# where to both find and install docs
@${REINPLACE_CMD} -E \
- -e 's|${LOCALBASE}/share/doc/qtstalker/html|${DOCSDIR}/html|' \
+ -e 's|/usr/local/share/doc/qtstalker/html|${DOCSDIR}/html|' \
${WRKSRC}/lib/Config.cpp \
${WRKSRC}/docs/docs.pro
# where to find examples
@${REINPLACE_CMD} -e \
- 's|${LOCALBASE}/share/qtstalker/indicator|${EXAMPLESDIR}/indicator|' \
+ 's|/usr/local/share/qtstalker/indicator|${EXAMPLESDIR}/indicator|' \
${WRKSRC}/docs/docs.pro
# where to install program
@${REINPLACE_CMD} -E \
- -e 's|${LOCALBASE}/bin|${PREFIX}/bin|' \
+ -e 's|/usr/local/bin|${PREFIX}/bin|' \
${WRKSRC}/src/src.pro
# where to install libs
@${REINPLACE_CMD} -E \
- -e 's|${LOCALBASE}/lib|${PREFIX}/lib|' \
+ -e 's|/usr/local/lib|${PREFIX}/lib|' \
${WRKSRC}/lib/lib.pro
# correctly use database/db43
@${REINPLACE_CMD} -E \
@@ -90,6 +93,7 @@
-e 's|-ldb$$|-ldb-4.3|' \
${WRKSRC}/lib/lib.pro
+# Use of LOCALBASE is OK from this point on
do-configure:
@cd ${WRKSRC} && \
${SETENV} ${CONFIGURE_ENV} \
--- qtstalker-0.36-1.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?20090608022219.313928FC08>