2009-11-15 Lukas (Luc) Oboril <[email protected]> * cbe-install: fix packaging system on Indiana, thx Shawn Walker bump pkgbuild to 1.3.101
authorxlucas
Sun, 15 Nov 2009 04:21:01 +0000
changeset 47 3d977811dbc1
parent 46 792c538b5cdc
child 48 7279c3f9140d
2009-11-15 Lukas (Luc) Oboril <[email protected]> * cbe-install: fix packaging system on Indiana, thx Shawn Walker bump pkgbuild to 1.3.101
ChangeLog
cbe-install
--- a/ChangeLog	Thu Jul 23 11:04:54 2009 +0000
+++ b/ChangeLog	Sun Nov 15 04:21:01 2009 +0000
@@ -1,5 +1,9 @@
+2009-11-15 Lukas (Luc) Oboril <[email protected]>
+	* cbe-install: fix packaging system on Indiana, thx Shawn Walker
+	bump pkgbuild to 1.3.101
+
 2009-07-23 Lukas (Luc) Oboril <[email protected]>
-	* CBEenv.spec: crete symlink for GNU grep
+	* CBEenv.spec: create symlink for GNU grep
 	
 2009-07-23 Lukas (Luc) Oboril <[email protected]>
 	* cbe-install: add git as optional tool
--- a/cbe-install	Thu Jul 23 11:04:54 2009 +0000
+++ b/cbe-install	Sun Nov 15 04:21:01 2009 +0000
@@ -32,7 +32,7 @@
 
 # this is listed separately because we are using the spec file
 # included in the pkgbuild tarball
-PKGBUILD_VERSION=1.3.98.4
+PKGBUILD_VERSION=1.3.101
 
 # Modules needed for building GNOME:
 GNOME_MODULES="ant m4 autoconf automake libtool bison coreutils diff flex gettext make subversion"
@@ -1048,8 +1048,9 @@
 # To identify, we check which system was used to install SUNWcs/SUNWcsu
 # Output: set the PKG_SYSTEM variable with either pkg or svr4
 check_pkg_system () {
-    if [ -x /usr/bin/pkg -a -d /var/pkg/catalog ]; then
-	pkg -R $rootdir list SUNWcs > /dev/null 2>&1 && {
+  
+   if [ -x /usr/bin/pkg ]; then
+ 	pkg -R $rootdir info entire > /dev/null 2>&1 && {
 	    PKG_SYSTEM=pkg
 	    return
 	}