Date: Mon, 5 Feb 2007 00:23:29 GMT From: Scot Hetzel<swhetzel@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/108779: x11/kdelibs3: Convert to USE_LDCONFIG Message-ID: <200702050023.l150NTwh008183@www.freebsd.org> Resent-Message-ID: <200702050030.l150UE1Z073066@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 108779
>Category: ports
>Synopsis: x11/kdelibs3: Convert to USE_LDCONFIG
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 05 00:30:13 GMT 2007
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702050023.l150NTwh008183>