[PC-BSD Commits] r7392 - in pcbsd-projects/pbi-manager: . port-files

[svn at pcbsd.org]

Author: kris
Date: 2010-08-17 13:45:13 -0700 (Tue, 17 Aug 2010)
New Revision: 7392

Modified:
   pcbsd-projects/pbi-manager/install.sh
   pcbsd-projects/pbi-manager/pbi-manager
   pcbsd-projects/pbi-manager/port-files/pkg-plist
Log:

Disable pbildconfig bits until we get some patches for FreeBSD written which allow setting of hints
files via path lookup



Modified: pcbsd-projects/pbi-manager/install.sh
===================================================================
--- pcbsd-projects/pbi-manager/install.sh	2010-08-17 20:39:35 UTC (rev 7391)
+++ pcbsd-projects/pbi-manager/install.sh	2010-08-17 20:45:13 UTC (rev 7392)
@@ -45,6 +45,6 @@
 cp ${DIR}/keys/pubkey.ssl /var/db/pbi-keys/pcbsd.ssl
 
 # Copy the ldconfig script / pbi.conf
-mkdir -p ${LB}/etc/rc.d >/dev/null 2>/dev/null
-cp ${DIR}/rc.d/ldpbiconfig ${LB}/etc/rc.d/ldpbiconfig
+#mkdir -p ${LB}/etc/rc.d >/dev/null 2>/dev/null
+#cp ${DIR}/rc.d/ldpbiconfig ${LB}/etc/rc.d/ldpbiconfig
 cp ${DIR}/etc/pbi.conf ${LB}/etc/pbi.conf

Modified: pcbsd-projects/pbi-manager/pbi-manager
===================================================================
--- pcbsd-projects/pbi-manager/pbi-manager	2010-08-17 20:39:35 UTC (rev 7391)
+++ pcbsd-projects/pbi-manager/pbi-manager	2010-08-17 20:45:13 UTC (rev 7392)
@@ -1137,12 +1137,14 @@
 	echo "${PBI_PROGDIRPATH}" >${dir}/pbi_installedpath
 
 	# Remove any duplicate ldconfig entry
-	cat "${PBI_LDCONFIGFILE}" 2>/dev/null | grep "^${PBI_PROGDIRPATH}" >/dev/null 2>/dev/null
-	if [ "$?" = "0" ] ; then
-		sed -i "\|^${PBI_PROGDIRPATH}\$|d" ${PBI_LDCONFIGFILE} 2>/dev/null
-	fi
+        # KPM - 08172010 - Disable until we get a patch to BSD to support hints via path
+	#cat "${PBI_LDCONFIGFILE}" 2>/dev/null | grep "^${PBI_PROGDIRPATH}" >/dev/null 2>/dev/null
+	#if [ "$?" = "0" ] ; then
+	#	sed -i "\|^${PBI_PROGDIRPATH}\$|d" ${PBI_LDCONFIGFILE} 2>/dev/null
+	#fi
 
-	echo "${PBI_PROGDIRPATH}" >>${PBI_LDCONFIGFILE}
+	#echo "${PBI_PROGDIRPATH}" >>${PBI_LDCONFIGFILE}
+
         delete_header_tmp
 
 	# Re-gen the ldconfig hints files
@@ -2052,7 +2054,8 @@
 	rm -rf "${PBI_DBDIR}/${PBI_DELETENAME}"
 
 	# Remove the ldconfig entry
-	sed -i "\|^${PBI_PROGDIRPATH}\$|d" ${PBI_LDCONFIGFILE} 2>/dev/null
+        # KPM - 08172010 - Disable until we get a patch to BSD to support hints via path
+	#sed -i "\|^${PBI_PROGDIRPATH}\$|d" ${PBI_LDCONFIGFILE} 2>/dev/null
 }
 
 # Check if we have a preinstall script we need to use

Modified: pcbsd-projects/pbi-manager/port-files/pkg-plist
===================================================================
--- pcbsd-projects/pbi-manager/port-files/pkg-plist	2010-08-17 20:39:35 UTC (rev 7391)
+++ pcbsd-projects/pbi-manager/port-files/pkg-plist	2010-08-17 20:45:13 UTC (rev 7392)
@@ -7,7 +7,6 @@
 sbin/pbi_makeport
 sbin/pbi_update
 etc/pbi.conf
-etc/rc.d/ldpbiconfig
 %%DATADIR%%/module-examples/gimp/xdg-menu/gimp.desktop
 %%DATADIR%%/module-examples/gimp/xdg-mime/gimp-xdg.png
 %%DATADIR%%/module-examples/gimp/xdg-mime/gimp-xdg.xml