From pav@oook.cz  Sat Dec  2 22:21:27 2006
Return-Path: <pav@oook.cz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id ABD0816A500
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  2 Dec 2006 22:21:27 +0000 (UTC)
	(envelope-from pav@oook.cz)
Received: from hood.oook.cz (hood.oook.cz [195.250.137.134])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D53C043CAB
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  2 Dec 2006 22:21:01 +0000 (GMT)
	(envelope-from pav@oook.cz)
Received: from ikaros.oook.cz (localhost [127.0.0.1])
	by hood.oook.cz (8.13.8/8.13.8) with ESMTP id kB2MLMZ2021028
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 2 Dec 2006 23:21:22 +0100 (CET)
	(envelope-from pav@ikaros.oook.cz)
Received: (from pav@localhost)
	by ikaros.oook.cz (8.13.8/8.13.8/Submit) id kB2MLMjM021027;
	Sat, 2 Dec 2006 23:21:22 +0100 (CET)
	(envelope-from pav)
Message-Id: <200612022221.kB2MLMjM021027@ikaros.oook.cz>
Date: Sat, 2 Dec 2006 23:21:22 +0100 (CET)
From: Pav Lucistnik <pav@freebsd.org>
Reply-To: Pav Lucistnik <pav@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: fix USE_LDCONFIG for ports using @cwd
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         106235
>Category:       ports
>Synopsis:       fix USE_LDCONFIG for ports using @cwd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 02 22:30:13 GMT 2006
>Closed-Date:    Wed Jan 31 16:15:00 GMT 2007
>Last-Modified:  Wed Jan 31 16:15:00 GMT 2007
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: pav 
Responsible-Changed-When: Sat Dec 2 22:35:33 UTC 2006 
Responsible-Changed-Why:  
For exprun test. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106235 
State-Changed-From-To: open->analyzed 
State-Changed-By: pav 
State-Changed-When: Tue Jan 23 20:03:33 UTC 2007 
State-Changed-Why:  
Accepted for a test build on the cluster. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106235 
State-Changed-From-To: analyzed->closed 
State-Changed-By: pav 
State-Changed-When: Wed Jan 31 16:14:52 UTC 2007 
State-Changed-Why:  
Committed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106235 
>Unformatted:
