maj pkgutils#5.35.0-1

3 files changed, 37 insertions, 57 deletions

diff --git a/base/pkgutils/.md5sum b/base/pkgutils/.md5sum
index 32edcd588..98be821fc 100644
--- a/base/pkgutils/.md5sum
+++ b/base/pkgutils/.md5sum
@@ -1,2 +1,2 @@
-0698e4a88025eb5ad3558cee4963e6a3  nutyx-2009.2.patch
-0fdbc780f6c7d70f36ebea85e84bb669  pkgutils-5.34.0.tar.gz
+00e6658a19d7b8192b8b4cd81a315b13  nutyx-attapu.1.patch
+edbe9ace5fb6e9a2cae806d2eabf62f1  pkgutils-5.35.0.tar.gz
diff --git a/base/pkgutils/Pkgfile b/base/pkgutils/Pkgfile
index 52be3e2af..7dd02602f 100644
--- a/base/pkgutils/Pkgfile
+++ b/base/pkgutils/Pkgfile
@@ -2,17 +2,16 @@
 # URL:         http://www.fukt.bsnet.se/~per/pkgutils/
 # Maintainer:  NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: 
 
 name=pkgutils
-version=5.34.0
-release=2
+version=5.35.0
+release=1
 source=(http://crux.nu/files/$name-$version.tar.gz \
-nutyx-2009.2.patch)
+nutyx-attapu.1.patch)
 build () {
 cd $name-$version
 mkdir -p $PKG/usr/share
-patch -Np1 -i ../nutyx-2009.2.patch
+patch -Np1 -i ../nutyx-attapu.1.patch
 make DESTDIR=$PKG install
 case `uname -m` in
 	x86_64)
diff --git a/base/pkgutils/nutyx-2009.2.patch b/base/pkgutils/nutyx-attapu.1.patch
index ecf0a438d..df13057cd 100644
--- a/base/pkgutils/nutyx-2009.2.patch
+++ b/base/pkgutils/nutyx-attapu.1.patch
@@ -1,42 +1,26 @@
---- pkgutils-5.34.0/pkgmk.in	2009-07-15 18:10:36.000000000 +0000
-+++ pkgutils-5.34.0/pkgmk.in.new	2009-07-19 09:29:56.000000000 +0000
+--- pkgutils-5.35.0-original/pkgmk.in	2010-06-26 18:46:59.000000000 +0200
++++ pkgutils-5.35.0/pkgmk.in	2010-08-21 16:20:34.000000000 +0200
 @@ -20,6 +20,7 @@
  #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
  #  USA.
  #
 +#  Adjusted for NuTyX 2009.1 by thierryn1 at hispeed dot ch
  
- info() {
- 	echo "=======> $1"
-@@ -162,8 +163,13 @@
- 	for FILE in ${source[@]}; do
- 		LOCAL_FILENAME=`get_filename $FILE`
- 		case $LOCAL_FILENAME in
--			*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tar.xz|*.zip)
--				COMMAND="bsdtar -C $SRC -xf $LOCAL_FILENAME" ;;
-+			*.tar.gz|*.tar.Z|*.tgz)
-+				COMMAND="tar -C $SRC --use-compress-program=gzip -xf $LOCAL_FILENAME" ;;
-+			*.tar.bz2)
-+				COMMAND="tar -C $SRC --use-compress-program=bzip2 -xf $LOCAL_FILENAME" ;;
-+			*.zip)
-+				COMMAND="unzip -qq -o -d $SRC $LOCAL_FILENAME" ;;
-+			
- 			*)
- 				COMMAND="cp $LOCAL_FILENAME $SRC" ;;
- 		esac
-@@ -282,13 +288,30 @@
+ ##
+ # error codes
+@@ -294,13 +295,30 @@
  
  	cd $PKG
  	
 -	find . -type f -path "*/man/man*/*" | while read FILE; do
-+	find . -type f -path "*/share/man/*" | while read FILE; do
++	find . -type f -path "*/share/man*/*" | while read FILE; do
  		if [ "$FILE" = "${FILE%%.gz}" ]; then
  			gzip -9 "$FILE"
  		fi
  	done
  	
 -	find . -type l -path "*/man/man*/*" | while read FILE; do
-+	find . -type l -path "*/share/man/*" | while read FILE; do
++	find . -type l -path "*/share/man*/*" | while read FILE; do
 +		TARGET=`readlink -n "$FILE"`
 +		TARGET="${TARGET##*/}"
 +		TARGET="${TARGET%%.gz}.gz"
@@ -57,18 +41,20 @@
  		TARGET=`readlink -n "$FILE"`
  		TARGET="${TARGET##*/}"
  		TARGET="${TARGET%%.gz}.gz"
-@@ -375,6 +398,10 @@
+@@ -392,7 +410,11 @@
+ 		fi
  		
  		compress_manpages
- 		
+-		
++
 +		if [ "$PKGMK_KEEP_LOCALES" == "no" ]; then
 +			remove_locale
 +		fi
-+
++	
  		cd $PKG
  		info "Build result:"
- 		tar czvvf $TARGET *
-@@ -505,27 +532,44 @@
+ 
+@@ -529,28 +551,45 @@
  print_help() {
  	echo "usage: `basename $PKGMK_COMMAND` [options]"
  	echo "options:"
@@ -81,6 +67,7 @@
 -	echo "  -utd, --up-to-date          do not build, only check if package is up to date"
 -	echo "  -uf,  --update-footprint    update footprint using result from last build"
 -	echo "  -if,  --ignore-footprint    build package without checking footprint"
+-	echo "  -in,  --ignore-new          build package, ignore new files in a footprint missmatch"
 -	echo "  -um,  --update-md5sum       update md5sum"
 -	echo "  -im,  --ignore-md5sum       build package without checking md5sum"
 -	echo "  -cm,  --check-md5sum        do not build, only check md5sum"
@@ -96,10 +83,11 @@
 +	echo "  -r,   --recursive           recherche et compile les paquets de façon récursive"
 +	echo "  -d,   --download            télécharge les fichiers sources manquants"
 +	echo "  -do,  --download-only       télécharge uniquement les fichiers sources sans compiler"
-+	echo "  -eo,  --extract-only        extrait uniquement les sources sans contruire"
-+	echo "  -utd, --up-to-date          vérifie uniquement si le paquet est à jour"
-+	echo "  -uf,  --update-footprint    met à jour la signature du paquet résultant de la dernière compilation"
++	echo "  -eo,  --extract-only        extrait uniquement les source sans construire le paquet"
++	echo "  -utd, --up-to-date          véridie uniquement si le paquet est à jour"
++	echo "  -uf,  --update-footprint    met à  jour la signature du paquet résultant de la dernière compilation"
 +	echo "  -if,  --ignore-footprint    compile le paquet en ignorant la signature"
++	echo "  -in,  --ignore-new          compile le paquet en ignorant la nouvelle signature"
 +	echo "  -um,  --update-md5sum       met à jour le md5sum"
 +	echo "  -im,  --ignore-md5sum       compile le paquet en ignorant le  md5sum"
 +	echo "  -cm,  --check-md5sum        vérifie seulement le md5sum"
@@ -111,7 +99,7 @@
 +	echo "  -cf,  --config-file <file>  utiliser un fichier de configuration spécifique"
 +	echo "  -v,   --version             affiche uniquement la version "
 +	echo "  -h,   --help                affiche uniquement l'aide"
- }
++}
 +remove_locale() {
 +local DIR FILE
 +	cd $PKG
@@ -126,13 +114,14 @@
 +		else
 +			rm -rf $FILE
 +		fi
- 
++ 
 +	done
-+}
+ }
+-
  parse_options() {
  	while [ "$1" ]; do
  		case $1 in
-@@ -562,6 +606,8 @@
+@@ -589,6 +628,8 @@
  				PKGMK_CLEAN="yes" ;;
  			-kw|--keep-work)
  				PKGMK_KEEP_WORK="yes" ;;
@@ -141,18 +130,7 @@
  			-cf|--config-file)
  				if [ ! "$2" ]; then
  					echo "`basename $PKGMK_COMMAND`: option $1 requires an argument"
-@@ -679,9 +725,8 @@
- 
- PKGMK_SOURCE_MIRRORS=()
- PKGMK_SOURCE_DIR="$PWD"
--PKGMK_PACKAGE_DIR="$PWD"
- PKGMK_WORK_DIR="$PWD/work"
--
-+PKGMK_PACKAGE_DIR="$PWD"
- PKGMK_INSTALL="no"
- PKGMK_RECURSIVE="no"
- PKGMK_DOWNLOAD="no"
-@@ -697,6 +742,8 @@
+@@ -735,6 +776,8 @@
  PKGMK_CHECK_MD5SUM="no"
  PKGMK_NO_STRIP="no"
  PKGMK_CLEAN="no"
@@ -161,9 +139,9 @@
  
  main "$@"
  
---- pkgutils-5.34.0/pkgmk.conf	2009-07-15 18:10:36.000000000 +0000
-+++ pkgutils-5.34.0/pkgmk.conf.new	2009-07-21 14:33:06.000000000 +0000
-@@ -2,16 +2,17 @@
+--- pkgutils-5.35.0-original/pkgmk.conf	2010-06-26 18:46:59.000000000 +0200
++++ pkgutils-5.35.0/pkgmk.conf	2010-08-21 16:31:12.000000000 +0200
+@@ -2,18 +2,19 @@
  # /etc/pkgmk.conf: pkgmk(8) configuration
  #
  
@@ -181,8 +159,11 @@
 +PKGMK_WORK_DIR="/tmp/work"
  # PKGMK_DOWNLOAD="no"
  # PKGMK_IGNORE_FOOTPRINT="no"
+ # PKGMK_IGNORE_NEW="no"
  # PKGMK_NO_STRIP="no"
  # PKGMK_WGET_OPTS=""
+-# PKGMK_COMPRESSION_MODE="gz"
++PKGMK_COMPRESSION_MODE="xz"
 +PKGMK_LOCALES="fr"
  
  # End of file