From nobody@FreeBSD.org  Mon Feb  5 00:23:30 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 31B7516A403
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  5 Feb 2007 00:23:30 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 0861713C467
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  5 Feb 2007 00:23:30 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l150NT7k008184
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 5 Feb 2007 00:23:29 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l150NTwh008183;
	Mon, 5 Feb 2007 00:23:29 GMT
	(envelope-from nobody)
Message-Id: <200702050023.l150NTwh008183@www.freebsd.org>
Date: Mon, 5 Feb 2007 00:23:29 GMT
From: Scot Hetzel<swhetzel@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: x11/kdelibs3: Convert to USE_LDCONFIG
X-Send-Pr-Version: www-3.0

>Number:         108779
>Category:       ports
>Synopsis:       x11/kdelibs3: Convert to USE_LDCONFIG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kde
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 05 00:30:13 GMT 2007
>Closed-Date:    Tue Mar 13 20:13:59 GMT 2007
>Last-Modified:  Tue Mar 13 20:13:59 GMT 2007
>Originator:     Scot Hetzel
>Release:        7.0-CURRENT
>Organization:
>Environment:
FreeBSD hp010 7.0-CURRENT FreeBSD 7.0-CURRENT #6: Sat Feb  3 16:55:35 CST 2007     root@hp010:/usr/src/7x/sys-patched/amd64/compile/GENERIC.debug  amd64

>Description:
Currently the x11/kdelibs3 port uses a script to add PREFIX/lib/kde3 directory to the library search path.  We currently have a new way to deal with the library search paths by creating a file in /usr/local/libdata/ldconfig*/ by using the USE_LDCONFIG variable in the ports Makefile.
>How-To-Repeat:

>Fix:
The attached patch removes kdelibs.sh, and adds the USE_LDCONFIG variable to the ports Makefile.

I have been running with the attached patch for several releases of KDE.

I don't believe we need to bump PORTREVISION as the only change is the removal of PREFIX/etc/rc.d/kdelibs.sh and its functionality placed in PREFIX/libdata/ldconfig/kdelibs.




Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/kdelibs3/Makefile,v
retrieving revision 1.207
diff -u -r1.207 Makefile
--- Makefile	31 Jan 2007 13:52:41 -0000	1.207
+++ Makefile	31 Jan 2007 14:43:48 -0000
@@ -56,7 +56,7 @@
 USE_QT_VER=	3
 PREFIX=		${KDE_PREFIX}
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	${PREFIX}/lib/kde3
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 USE_AUTOTOOLS=  libtool:15
@@ -102,11 +102,4 @@
 	${TOUCH} ${WRKSRC}/kio/kssl/ksslconfig.h.in
 	${TOUCH} ${WRKSRC}/kjs/global.h.in
 
-post-install:
-	${MKDIR} ${PREFIX}/etc/rc.d
-	${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh \
-		> ${PREFIX}/etc/rc.d/kdelibs.sh
-	${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/kdelibs.sh
-	${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/etc/rc.d/kdelibs.sh
-
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11/kdelibs3/pkg-plist,v
retrieving revision 1.71
diff -u -r1.71 pkg-plist
--- pkg-plist	19 Dec 2006 21:19:52 -0000	1.71
+++ pkg-plist	20 Dec 2006 06:41:04 -0000
@@ -60,7 +60,6 @@
 bin/meinproc
 bin/preparetips
 bin/start_kdeinit
-etc/rc.d/kdelibs.sh
 etc/xdg/menus/kde-applications.menu
 include/arts/artskde.h
 include/arts/kartsdispatcher.h
Index: files/kdelibs.sh
===================================================================
RCS file: files/kdelibs.sh
diff -N files/kdelibs.sh
--- files/kdelibs.sh	22 Apr 2002 02:00:06 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-PREFIX=%%PREFIX%%
-ldconfig -m $PREFIX/lib/kde3

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kde 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Feb 5 00:30:24 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=108779 

From: "Scot Hetzel" <swhetzel@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports-bugs@freebsd.org
Cc:  
Subject: Re: ports/108779: x11/kdelibs3: Convert to USE_LDCONFIG
Date: Fri, 9 Feb 2007 13:46:14 -0600

 ------=_Part_55597_2078324.1171050374944
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Attached is an updated patch for kdelibs3 due to the recent changes.
 
 The attached patch makes the following changes:
 
 - Set USE_LDCONFIG to PREFIX/lib/kde
 - Remove LDCONFIG_DIRS - Used only by INSTALL_SHLIBS.
 - Remove post-install target, since it isn't needed anymore
 - Remove files/kdelibs.sh, not needed
 
 With these changes the port will create
 PREFIX/libdata/ldconfig/kdelibs3 file, which will automatically add
 PREFIX/lib/kde to the ldconfig search path for the kde libraries when
 the system is booted.
 
 Scot
 -- 
 DISCLAIMER:
 No electrons were mamed while sending this message. Only slightly bruised.
 
 ------=_Part_55597_2078324.1171050374944
 Content-Type: text/x-diff; name=kdelibs.patch; charset=ANSI_X3.4-1968
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_exz0pfmc
 Content-Disposition: attachment; filename="kdelibs.patch"
 
 SW5kZXg6IE1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL25jdnMvcG9ydHMveDEx
 L2tkZWxpYnMzL01ha2VmaWxlLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjIwOQpkaWZmIC11IC1y
 MS4yMDkgTWFrZWZpbGUKLS0tIE1ha2VmaWxlCTcgRmViIDIwMDcgMDg6MjI6MjAgLTAwMDAJMS4y
 MDkKKysrIE1ha2VmaWxlCTkgRmViIDIwMDcgMTk6Mjg6MzcgLTAwMDAKQEAgLTU2LDggKzU2LDcg
 QEAKIFVTRV9RVF9WRVI9CTMKIFBSRUZJWD0JCSR7S0RFX1BSRUZJWH0KIAotVVNFX0xEQ09ORklH
 PQl5ZXMKLUxEQ09ORklHX0RJUlMrPQklJVBSRUZJWCUlL2xpYiAlJVBSRUZJWCUlL2xpYi9rZGUz
 CitVU0VfTERDT05GSUc9CSR7UFJFRklYfS9saWIva2RlMwogCiBVU0VfQVVUT1RPT0xTPSAgbGli
 dG9vbDoxNQogQ09ORklHVVJFX1RBUkdFVD0jIGVtcHR5CkBAIC0xMDIsMTEgKzEwMSw0IEBACiAJ
 JHtUT1VDSH0gJHtXUktTUkN9L2tpby9rc3NsL2tzc2xjb25maWcuaC5pbgogCSR7VE9VQ0h9ICR7
 V1JLU1JDfS9ranMvZ2xvYmFsLmguaW4KIAotcG9zdC1pbnN0YWxsOgotCSR7TUtESVJ9ICR7UFJF
 RklYfS9ldGMvcmMuZAotCSR7U0VEfSAtZSAncywlJVBSRUZJWCUlLCR7UFJFRklYfSxnJyAke0ZJ
 TEVTRElSfS9rZGVsaWJzLnNoIFwKLQkJPiAke1BSRUZJWH0vZXRjL3JjLmQva2RlbGlicy5zaAot
 CSR7Q0hNT0R9ICR7QklOTU9ERX0gJHtQUkVGSVh9L2V0Yy9yYy5kL2tkZWxpYnMuc2gKLQkke0NI
 T1dOfSAke0JJTk9XTn06JHtCSU5HUlB9ICR7UFJFRklYfS9ldGMvcmMuZC9rZGVsaWJzLnNoCi0K
 IC5pbmNsdWRlIDxic2QucG9ydC5wb3N0Lm1rPgpJbmRleDogcGtnLXBsaXN0Cj09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
 UkNTIGZpbGU6IC9ob21lL25jdnMvcG9ydHMveDExL2tkZWxpYnMzL3BrZy1wbGlzdCx2CnJldHJp
 ZXZpbmcgcmV2aXNpb24gMS43MQpkaWZmIC11IC1yMS43MSBwa2ctcGxpc3QKLS0tIHBrZy1wbGlz
 dAkxOSBEZWMgMjAwNiAyMToxOTo1MiAtMDAwMAkxLjcxCisrKyBwa2ctcGxpc3QJMjAgRGVjIDIw
 MDYgMDY6NDE6MDQgLTAwMDAKQEAgLTYwLDcgKzYwLDYgQEAKIGJpbi9tZWlucHJvYwogYmluL3By
 ZXBhcmV0aXBzCiBiaW4vc3RhcnRfa2RlaW5pdAotZXRjL3JjLmQva2RlbGlicy5zaAogZXRjL3hk
 Zy9tZW51cy9rZGUtYXBwbGljYXRpb25zLm1lbnUKIGluY2x1ZGUvYXJ0cy9hcnRza2RlLmgKIGlu
 Y2x1ZGUvYXJ0cy9rYXJ0c2Rpc3BhdGNoZXIuaApJbmRleDogZmlsZXMva2RlbGlicy5zaAo9PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09ClJDUyBmaWxlOiBmaWxlcy9rZGVsaWJzLnNoCmRpZmYgLU4gZmlsZXMva2RlbGlicy5z
 aAotLS0gZmlsZXMva2RlbGlicy5zaAkyMiBBcHIgMjAwMiAwMjowMDowNiAtMDAwMAkxLjIKKysr
 IC9kZXYvbnVsbAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCkBAIC0xLDMgKzAsMCBAQAotIyEv
 YmluL3NoCi1QUkVGSVg9JSVQUkVGSVglJQotbGRjb25maWcgLW0gJFBSRUZJWC9saWIva2RlMwo=
 
 ------=_Part_55597_2078324.1171050374944--

From: "Scot Hetzel" <swhetzel@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports-bugs@freebsd.org
Cc:  
Subject: Re: ports/108779: x11/kdelibs3: Convert to USE_LDCONFIG
Date: Fri, 9 Feb 2007 14:23:21 -0600

 ------=_Part_56230_13119288.1171052601041
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 On 2/9/07, Scot Hetzel <swhetzel@gmail.com> wrote:
 > Attached is an updated patch for kdelibs3 due to the recent changes.
 >
 > The attached patch makes the following changes:
 >
 > - Set USE_LDCONFIG to PREFIX/lib/kde
 > - Remove LDCONFIG_DIRS - Used only by INSTALL_SHLIBS.
 > - Remove post-install target, since it isn't needed anymore
 > - Remove files/kdelibs.sh, not needed
 >
 > With these changes the port will create
 > PREFIX/libdata/ldconfig/kdelibs3 file, which will automatically add
 > PREFIX/lib/kde to the ldconfig search path for the kde libraries when
 > the system is booted.
 >
 I checked gnats, and the patch appeared corrupted.
 
 Try this again.  If it's still corrupted email me for the patch.
 
 Scot
 -- 
 DISCLAIMER:
 No electrons were mamed while sending this message. Only slightly bruised.
 
 ------=_Part_56230_13119288.1171052601041
 Content-Type: text/x-diff; name=kdelibs.patch; charset=ANSI_X3.4-1968
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_exz2e70g
 Content-Disposition: attachment; filename="kdelibs.patch"
 
 SW5kZXg6IE1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL25jdnMvcG9ydHMveDEx
 L2tkZWxpYnMzL01ha2VmaWxlLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjIwOQpkaWZmIC11IC1y
 MS4yMDkgTWFrZWZpbGUKLS0tIE1ha2VmaWxlCTcgRmViIDIwMDcgMDg6MjI6MjAgLTAwMDAJMS4y
 MDkKKysrIE1ha2VmaWxlCTkgRmViIDIwMDcgMTk6Mjg6MzcgLTAwMDAKQEAgLTU2LDggKzU2LDcg
 QEAKIFVTRV9RVF9WRVI9CTMKIFBSRUZJWD0JCSR7S0RFX1BSRUZJWH0KIAotVVNFX0xEQ09ORklH
 PQl5ZXMKLUxEQ09ORklHX0RJUlMrPQklJVBSRUZJWCUlL2xpYiAlJVBSRUZJWCUlL2xpYi9rZGUz
 CitVU0VfTERDT05GSUc9CSR7UFJFRklYfS9saWIva2RlMwogCiBVU0VfQVVUT1RPT0xTPSAgbGli
 dG9vbDoxNQogQ09ORklHVVJFX1RBUkdFVD0jIGVtcHR5CkBAIC0xMDIsMTEgKzEwMSw0IEBACiAJ
 JHtUT1VDSH0gJHtXUktTUkN9L2tpby9rc3NsL2tzc2xjb25maWcuaC5pbgogCSR7VE9VQ0h9ICR7
 V1JLU1JDfS9ranMvZ2xvYmFsLmguaW4KIAotcG9zdC1pbnN0YWxsOgotCSR7TUtESVJ9ICR7UFJF
 RklYfS9ldGMvcmMuZAotCSR7U0VEfSAtZSAncywlJVBSRUZJWCUlLCR7UFJFRklYfSxnJyAke0ZJ
 TEVTRElSfS9rZGVsaWJzLnNoIFwKLQkJPiAke1BSRUZJWH0vZXRjL3JjLmQva2RlbGlicy5zaAot
 CSR7Q0hNT0R9ICR7QklOTU9ERX0gJHtQUkVGSVh9L2V0Yy9yYy5kL2tkZWxpYnMuc2gKLQkke0NI
 T1dOfSAke0JJTk9XTn06JHtCSU5HUlB9ICR7UFJFRklYfS9ldGMvcmMuZC9rZGVsaWJzLnNoCi0K
 IC5pbmNsdWRlIDxic2QucG9ydC5wb3N0Lm1rPgpJbmRleDogcGtnLXBsaXN0Cj09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
 UkNTIGZpbGU6IC9ob21lL25jdnMvcG9ydHMveDExL2tkZWxpYnMzL3BrZy1wbGlzdCx2CnJldHJp
 ZXZpbmcgcmV2aXNpb24gMS43MQpkaWZmIC11IC1yMS43MSBwa2ctcGxpc3QKLS0tIHBrZy1wbGlz
 dAkxOSBEZWMgMjAwNiAyMToxOTo1MiAtMDAwMAkxLjcxCisrKyBwa2ctcGxpc3QJMjAgRGVjIDIw
 MDYgMDY6NDE6MDQgLTAwMDAKQEAgLTYwLDcgKzYwLDYgQEAKIGJpbi9tZWlucHJvYwogYmluL3By
 ZXBhcmV0aXBzCiBiaW4vc3RhcnRfa2RlaW5pdAotZXRjL3JjLmQva2RlbGlicy5zaAogZXRjL3hk
 Zy9tZW51cy9rZGUtYXBwbGljYXRpb25zLm1lbnUKIGluY2x1ZGUvYXJ0cy9hcnRza2RlLmgKIGlu
 Y2x1ZGUvYXJ0cy9rYXJ0c2Rpc3BhdGNoZXIuaApJbmRleDogZmlsZXMva2RlbGlicy5zaAo9PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09ClJDUyBmaWxlOiBmaWxlcy9rZGVsaWJzLnNoCmRpZmYgLU4gZmlsZXMva2RlbGlicy5z
 aAotLS0gZmlsZXMva2RlbGlicy5zaAkyMiBBcHIgMjAwMiAwMjowMDowNiAtMDAwMAkxLjIKKysr
 IC9kZXYvbnVsbAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCkBAIC0xLDMgKzAsMCBAQAotIyEv
 YmluL3NoCi1QUkVGSVg9JSVQUkVGSVglJQotbGRjb25maWcgLW0gJFBSRUZJWC9saWIva2RlMwo=
 
 ------=_Part_56230_13119288.1171052601041--
State-Changed-From-To: open->closed 
State-Changed-By: lofi 
State-Changed-When: Tue Mar 13 20:13:37 UTC 2007 
State-Changed-Why:  
Applied in kdelibs-3.5.6. Thanks for reporting! 



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