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

[svn at pcbsd.org]

Author: kris
Date: 2010-10-15 12:56:57 -0700 (Fri, 15 Oct 2010)
New Revision: 7836

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

Looks like setting LD_LIBRARY_PATH is unavoidable for now, needs to be set to make a lot of
ports when not using /usr/local prefix, and doing linking. 

Also fix some bugs with logfile creation with pbi_autobuild / patch generation



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-10-15 13:38:17 UTC (rev 7835)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-10-15 19:56:57 UTC (rev 7836)
@@ -980,14 +980,16 @@
 	LDCONFIG_DIRS="${PREFIX}/lib"
 	export LDCONFIG_DIRS
 
-	#LD_LIBRARY_PATH="${PREFIX}/lib:${PREFIX}/kde4/lib"
-	#export LD_LIBRARY_PATH
+	LD_LIBRARY_PATH="${PREFIX}/lib"
+	export LD_LIBRARY_PATH
 
 	echo "LDFLAGS+=-L${PREFIX}/lib" >> ${__MAKE_CONF}
-	echo "CFLAGS+=-Wl,-L${PREFIX}/lib/" >> ${__MAKE_CONF}
-	echo "CFLAGS+=-Wl,-rpath=${PREFIX}/lib/" >> ${__MAKE_CONF}
-	echo "CPPFLAGS+=-Wl,-L${PREFIX}/lib" >> ${__MAKE_CONF}
-	echo "CPPFLAGS+=-Wl,-rpath=${PREFIX}/lib" >> ${__MAKE_CONF}
+	#echo "CFLAGS+=-Wl,-L${PREFIX}/lib/" >> ${__MAKE_CONF}
+	#echo "CFLAGS+=-Wl,-rpath-link=${PREFIX}/lib/" >> ${__MAKE_CONF}
+	#echo "CPPFLAGS+=-Wl,-L${PREFIX}/lib" >> ${__MAKE_CONF}
+	#echo "CPPFLAGS+=-Wl,-rpath-link=${PREFIX}/lib" >> ${__MAKE_CONF}
+	#echo "CXXFLAGS+=-Wl,-L${PREFIX}/lib" >> ${__MAKE_CONF}
+	#echo "CXXFLAGS+=-Wl,-rpath-link=${PREFIX}/lib" >> ${__MAKE_CONF}
 
 	# Set the DBDIRS
 	PKG_DBDIR="${PREFIX}/.pkgdb" ; export PKG_DBDIR
@@ -3403,9 +3405,9 @@
 	echo "pbi_makeport ${_flags} ${_mp}"
 
 	if [ ! -d "${_od}" ] ; then mkdir -p "${_od}" ; fi
-	oldpbi="`ls ${_od}/*.pbi* 2>/dev/null`"
+	oldpbi="`ls ${_od}/*.pbi 2>/dev/null`"
 
-	pbi_makeport ${_flags} ${_mp} 2>${_od}/build.log >${_od}/build.log
+	pbi_makeport ${_flags} ${_mp} >>${_od}/build.log 2>>${_od}/build.log
 	if [ "$?" = "0" ] ; then
 
 		# Check for new PBIs, don't want to remove a rebuild of the same version
@@ -3421,6 +3423,7 @@
 				for _oldPBI in $oldpbi
 				do
 			  	 	rm "$_oldPBI"
+			  	 	rm "${_oldPBI}.sha256" >/dev/null 2>/dev/null
 				done
 			fi
 		fi
@@ -3816,7 +3819,7 @@
 	# mv the old PBIs into the dir
 	for _oldPBI in $_oldpbifiles
 	do
-  	 	mv "${_od}/$_oldPBI" "${_od}/archived/"
+  	 	mv "${_od}/${_oldPBI}*" "${_od}/archived/"
 	done
 
 	# Prune anything beyond the _keepnum