[PC-BSD Commits] r9561 - pcbsd/current/src-sh/pbi-manager

[svn at pcbsd.org]

Author: kris
Date: 2011-03-07 10:24:52 -0800 (Mon, 07 Mar 2011)
New Revision: 9561

Modified:
   pcbsd/current/src-sh/pbi-manager/pbi-manager
Log:

Fixed a bug when we have multiple binaries which need wrappers that use
the same BASENAME

Also don't need to do the buildsycoca4 stuff, let apps do that manually
if need be. May cause weirdness if done all the time



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-03-07 17:54:14 UTC (rev 9560)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-03-07 18:24:52 UTC (rev 9561)
@@ -3262,6 +3262,12 @@
 	ch="${3}"
 	onlywrap="${4}"
 
+	# Check if the fake-bin wrapper already exists, and if so use
+	# a different name
+	if [ -e "${dir}/${fbin}" ] ; then
+		fbin=`echo $bin | sed 's|/|-|g'`
+	fi
+
 	# Save the wrapper location so we know what files to modify at install time
 	MOD_WRAPPERS="${PBI_FAKEBIN_DIR}/${fbin} ${MOD_WRAPPERS}"
 
@@ -3296,16 +3302,6 @@
   done
 fi
 
-# Check for KDE4 services / libs to parse
-if [ -d "${PROGDIR}/kde4" ] ; then
-	KDEDIRS="${KDEDIRS}:${PROGDIR}/kde4"
-	export KDEDIRS
-	which kbuildsycoca4 >/dev/null 2>/dev/null
-	if [ "$?" = "0" ] ; then
-		kbuildsycoca4
-	fi
-fi
-
 #Setup our LD_LIBRARY_PATH variable with all found lib dirs
 LD_LIBRARY_PATH="${LDCONFIGDIRS}:${PROGDIR}/lib/:${PROGDIR}/kde4/lib:${PROGDIR}/lib/qt4"
 LD_32_LIBRARY_PATH="${LDCONFIGDIRS}:${PROGDIR}/lib/:${PROGDIR}/kde4/lib:${PROGDIR}/lib/qt4"