Date: Sat, 2 Dec 2006 23:21:22 +0100 (CET) From: Pav Lucistnik <pav@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/106235: fix USE_LDCONFIG for ports using @cwd Message-ID: <200612022221.kB2MLMjM021027@ikaros.oook.cz> Resent-Message-ID: <200612022230.kB2MUDvq083777@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 106235
>Category: ports
>Synopsis: fix USE_LDCONFIG for ports using @cwd
>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: Sat Dec 02 22:30:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Pav Lucistnik
>Release: FreeBSD 6.2-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD ikaros.oook.cz 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Thu Sep 28 19:10:00 CEST 2006 root@ikaros.oook.cz:/usr/obj/usr/src/sys/SMP amd64
>Description:
Fix the pkg-plist of ports, that use USE_LDCONFIG with nonstandard directory,
and change installation prefix in plist using @cwd keyword.
The fix is to '@cwd' before adding ldconfig data file to plist.
>How-To-Repeat:
>Fix:
--- ldconfig.diff begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.544
diff -a -u -r1.544 bsd.port.mk
--- bsd.port.mk 30 Sep 2006 19:25:45 -0000 1.544
+++ bsd.port.mk 2 Dec 2006 22:19:24 -0000
@@ -3884,6 +3884,7 @@
.endif
@${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \
> ${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME}
+ @${ECHO_CMD} "@cwd" >> ${TMPPLIST}
@${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST}
.if defined(NO_LDCONFIG_MTREE)
@${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1 || true" >> ${TMPPLIST}
@@ -3914,6 +3915,7 @@
.endif
@${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \
> ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME}
+ @${ECHO_CMD} "@cwd" >> ${TMPPLIST}
@${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST}
.if defined(NO_LDCONFIG_MTREE)
@${ECHO_CMD} "@unexec rmdir ${LDCONFIG32_DIR} >/dev/null 2>&1" >> ${TMPPLIST}
--- ldconfig.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?200612022221.kB2MLMjM021027>