Fixes to allow versionless packages on cd

tools/packages.install

@@ -1,79 +1,74 @@
-9e-1.0
+9e-
-apr-1.4.2
+apr-1
-apr-util-1.3.10
+apr-util-
-autoconf-2.65nb2
+autoconf-
-automake-1.11.1
+automake-
-bash-2.05.2.7nb10
+bash-2
-bash-4.1nb1
+bash-4
-bchunk-1.2.0
+bchunk-
-bcrypt-1.1
+bcrypt-
-binutils-2.17nb2
+binutils-
-bison-2.4.2nb1
+bison-
-curl-7.20.0
+curl-
-db4-4.8.30
+diffutils-
-diffutils-2.8.1nb4
+digest-
-digest-20080510
+doom1-
-doom1-1.8
+expat-
-expat-2.0.1nb2
+f2c-
-f2c-20090411nb4
+figlet-2
-figlet-2.2.2nb1
+flex-
-flex-2.5.35nb1
+gawk-
-gawk-3.1.7
+gcc44-
-gcc44-4.4.3nb3
+gettext-lib-
-gettext-lib-0.14.6
+gettext-tools-
-gettext-tools-0.14.6nb1
+gmake-
-gmake-3.81
+gmp-
-gmp-5.0.1
+grep-
-grep-2.5.3
+groff-
-groff-1.20.1nb2
+gsed-
-gsed-4.2.1
+gtexinfo-
-gtexinfo-4.12
+gzip-
-gzip-1.3.12nb3
+lcov-
-lcov-1.7
+libiberty-
-libiberty-1.0nb2
+libiconv-
-libiconv-1.12nb1
+libidn-
-libidn-1.19
+libtool-base-
-libtool-base-2.2.6bnb4
+lua-
-lua-5.1.4nb2
+m4-
-m4-1.4.14
+mdf2iso-
-mdf2iso-0.3.0
+mpfr-
-mpfr-2.4.2.3nb1
+naim-
-naim-0.11.8.3.1
+nano-
-nano-2.2.4
+nawk-
-nawk-20050424nb3
+ncurses-
-ncurses-5.7nb3
+neon-
-neon-0.29.3
+openssh-
-openssh-5.5.1
+openssl-
-openssl-0.9.8o
+p5-Digest-SHA1-
-p5-Digest-SHA1-2.12
+p5-Error-
-p5-Error-0.17016
+p5-enum-
-p5-enum-1.016nb1
+p5-pkgsrc-Dewey-
-p5-pkgsrc-Dewey-1.1
+patch-
-patch-2.5.4nb2
+pax-
-pax-20080110
+pdksh-
-pdksh-5.2.14nb5
+pkg-config-
-perl-5.10.1nb1
+pkg_install-info-
-pkg-config-0.23nb1
+pkg_leaves-
-pkg_install-info-4.5nb3
+pkgdep-
-pkg_leaves-1.2
+pkgdepgraph-
-pkgdep-1.0
+pkgdiff-
-pkgdepgraph-2.8
+pkgin-
-pkgdiff-0.122
+pkglint-
-pkgin-0.3.3.1nb1
+png-
-pkglint-4.93
+pth-
-png-1.4.2
+readline-
-pth-2.0.7
+rsync-
-readline-6.1
+scmgit-base-
-rsync-3.0.7
+sqlite3-
-scmgit-base-1.7.0.5
+unzip-
-sqlite3-3.6.23.1
+url2pkg-
-subversion-base-1.6.9nb1
+vim-7
-sudo-1.7.2p7
+vim-share-
-unzip-6.0
+x11-6
-url2pkg-2.12
+x11-links-
-vim-7.2.442
+zip-
-vim-share-7.2.442
-x11-6.8.2
-x11-links-0.50
-zip-3.0nb2
-minix-all-1nb1

tools/release.functions

@@ -33,15 +33,25 @@ retrieve()
 {
 	dir=$1
 	list=`pwd`/$2
-	url=${PACKAGEURL}
+	URLS=""
+	echo "Retrieving packages form $PACKAGEURL"
 	(
 	cd $dir || exit 1
-		echo  " * Updating $dir
+	SUMMARY=pkg_summary
-   from $url
+	rm -f pkg_summary* || true
-   with $list"
+	fetch $PACKAGEURL/$SUMMARY.bz2
-		files=`awk <$list '{ print "'$url'/" $1 ".tgz" }'`
+	bzip2 -d $SUMMARY.bz2
-		fetch -r $files || true
+	cat $list | while read name
+	do	pkgname="`fgrep PKGNAME=${name} $SUMMARY | sed 's/PKGNAME=//g'`"
+		if [ `echo $pkgname | wc -w` -ne 1 ]
+		then	echo " *** Could not resolve $name (not found or too many matches: $pkgname) ***"
+		else	echo Getting $pkgname
+			fetch -r ${PACKAGEURL}/${pkgname}.tgz
+		fi
+		echo -n "."
+	done
 	)
+	echo done
 }
 
 cd_root_changes()
@@ -135,17 +145,18 @@ copy_local_packages()
 		echo "" >$PACKAGEDIR/All/$index
 	
 	        echo " * Transfering $PACKAGEDIR to $RELEASEPACKAGE"
-	        for p in `cat $PACKAGELIST`
+	        for pkgprefix in `cat $PACKAGELIST`
-	        do	if [ -f $PACKAGEDIR/All/$p.tgz ]
+	        do	realfn="`echo $PACKAGEDIR/All/${pkgprefix}*.tgz`"
+			if [ -f "$realfn" ]
 	               then
 			  # Copy package and create package's index
 			  (
+			      p="`basename $realfn`"
 			      cd $PACKAGEDIR/All
-			      cp $p.tgz $RELEASEPACKAGE/
+			      cp $p $RELEASEPACKAGE/
 	
-			      f=$p.tgz
+			      indexname=$indexpath/$p.$index
-			      indexname=$indexpath/$f.$index
+			      pkg_info -X $p >$indexname
-			      pkg_info -X $f >$indexname
 	
 			      if [ ! -f $indexname ]
 			      then	echo Missing $indexname.
@@ -161,7 +172,7 @@ copy_local_packages()
 			      cat $indexname >>$PACKAGEDIR/All/$index
 			  )
 	               else
-	                  echo "Can't copy $PACKAGEDIR/$p.tgz. Missing."
+	                  echo "Can't find $pkgprefix Missing."
 	               fi
 	        done