pkgutils, maj 5.35.0-4

3 files changed, 4 insertions, 205 deletions

diff --git a/base/pkgutils/.md5sum b/base/pkgutils/.md5sum
index 1568ecb70..bcf68d535 100644
--- a/base/pkgutils/.md5sum
+++ b/base/pkgutils/.md5sum
@@ -1,2 +1,2 @@
-bb94b0863da60bad70089c4dcff5d308  nutyx-attapu.3.patch
+1ba4346fe9e837b4480183be00e9d8c7  nutyx-attapu.4.patch
 edbe9ace5fb6e9a2cae806d2eabf62f1  pkgutils-5.35.0.tar.gz
diff --git a/base/pkgutils/Pkgfile b/base/pkgutils/Pkgfile
index ae6253904..e56d5cc28 100644
--- a/base/pkgutils/Pkgfile
+++ b/base/pkgutils/Pkgfile
@@ -5,13 +5,13 @@
 
 name=pkgutils
 version=5.35.0
-release=3
+release=4
 source=(http://crux.nu/files/$name-$version.tar.gz \
-nutyx-attapu.3.patch)
+http://nutyx.meticul.eu/files/patchs/files/nutyx-attapu.4.patch)
 build () {
 cd $name-$version
 mkdir -p $PKG/usr/share
-patch -Np1 -i ../nutyx-attapu.3.patch
+patch -Np1 -i ../nutyx-attapu.4.patch
 make DESTDIR=$PKG install
 case `uname -m` in
 	x86_64)
diff --git a/base/pkgutils/nutyx-attapu.3.patch b/base/pkgutils/nutyx-attapu.3.patch
deleted file mode 100644
index a45473554..000000000
--- a/base/pkgutils/nutyx-attapu.3.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-diff -Naur pkgutils-5.35.0.original/pkgmk.conf pkgutils-5.35.0/pkgmk.conf
---- pkgutils-5.35.0.original/pkgmk.conf	2010-06-26 18:46:59.000000000 +0200
-+++ pkgutils-5.35.0/pkgmk.conf	2010-10-06 13:03:43.000000000 +0200
-@@ -2,18 +2,19 @@
- # /etc/pkgmk.conf: pkgmk(8) configuration
- #
- 
--export CFLAGS="-O2 -march=i686 -pipe"
--export CXXFLAGS="-O2 -march=i686 -pipe"
-+export CFLAGS="-O2 -march=native -pipe"
-+export CXXFLAGS="-O2 -march=native -pipe"
- 
- # PKGMK_SOURCE_MIRRORS=()
--# PKGMK_SOURCE_DIR="$PWD"
-+PKGMK_SOURCE_DIR="/srv/sources"
- # PKGMK_PACKAGE_DIR="$PWD"
--# PKGMK_WORK_DIR="$PWD/work"
-+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
-diff -Naur pkgutils-5.35.0.original/pkgmk.in pkgutils-5.35.0/pkgmk.in
---- pkgutils-5.35.0.original/pkgmk.in	2010-06-26 18:46:59.000000000 +0200
-+++ pkgutils-5.35.0/pkgmk.in	2010-10-06 13:08:33.000000000 +0200
-@@ -20,6 +20,7 @@
- #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
- #  USA.
- #
-+#  Adjusted for NuTyX attapu by thierryn1 at hispeed dot ch
- 
- ##
- # error codes
-@@ -207,9 +208,14 @@
- }
- 
- make_footprint() {
-+if ! (echo $TARGET| grep "kernel" >/dev/null); then
- 	pkginfo --footprint $TARGET | \
- 		sed "s|\tlib/modules/`uname -r`/|\tlib/modules/<kernel-version>/|g" | \
- 		sort -k 3
-+else
-+	pkginfo --footprint $TARGET | sort -k 3
-+fi
-+
- }
- 
- check_md5sum() {
-@@ -294,13 +300,30 @@
- 
- 	cd $PKG
- 	
--	find . -type f -path "*/man/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
-+		TARGET=`readlink -n "$FILE"`
-+		TARGET="${TARGET##*/}"
-+		TARGET="${TARGET%%.gz}.gz"
-+		rm -f "$FILE"
-+		FILE="${FILE%%.gz}.gz"
-+		DIR=`dirname "$FILE"`
-+
-+		if [ -e "$DIR/$TARGET" ]; then
-+			ln -sf "$TARGET" "$FILE"
-+		fi
-+	done
-+	find . -type f -path "*/share/info/*" | while read FILE; do
-+		if [ "$FILE" = "${FILE%%.gz}" ]; then
-+			gzip -9 "$FILE"
-+		fi
-+	done
-+	find . -type l -path "*/share/info/*" | while read FILE; do
- 		TARGET=`readlink -n "$FILE"`
- 		TARGET="${TARGET##*/}"
- 		TARGET="${TARGET%%.gz}.gz"
-@@ -388,11 +411,17 @@
- 	
- 	if [ $? = 0 ]; then
- 		if [ "$PKGMK_NO_STRIP" = "no" ]; then
--			strip_files
-+			if ! (echo $TARGET| grep "kernel" >/dev/null); then
-+				strip_files
-+			fi
- 		fi
- 		
- 		compress_manpages
--		
-+
-+		if [ "$PKGMK_KEEP_LOCALES" == "no" ]; then
-+			remove_locale
-+		fi
-+	
- 		cd $PKG
- 		info "Build result:"
- 
-@@ -529,28 +558,45 @@
- print_help() {
- 	echo "usage: `basename $PKGMK_COMMAND` [options]"
- 	echo "options:"
--	echo "  -i,   --install             build and install package"
--	echo "  -u,   --upgrade             build and install package (as upgrade)"
--	echo "  -r,   --recursive           search for and build packages recursively"
--	echo "  -d,   --download            download missing source file(s)"
--	echo "  -do,  --download-only       do not build, only download missing source file(s)"
--	echo "  -eo,  --extract-only        do not build, only extract source file(s)"
--	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"
--	echo "  -ns,  --no-strip            do not strip executable binaries or libraries"
--	echo "  -f,   --force               build package even if it appears to be up to date"
--	echo "  -c,   --clean               remove package and downloaded files"
--	echo "  -kw,  --keep-work           keep temporary working directory"
--	echo "  -cf,  --config-file <file>  use alternative configuration file"
--	echo "  -v,   --version             print version and exit "
--	echo "  -h,   --help                print help and exit"
-+	echo "  -i,   --install             compile et installe le paquet"
-+	echo "  -u,   --upgrade             compile et installe le paquet  (met à jour)"
-+	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 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"
-+	echo "  -ns,  --no-strip            ne réduit pas les binairess ou librairies"
-+	echo "  -f,   --force               force la compilation même si le paquet est à jour"
-+	echo "  -c,   --clean               supprime le paquet et les sources"
-+	echo "  -kw,  --keep-work           garde les dossiers de travail"
-+	echo "	-kl,  --keep-locale         garde les autres locales que celles prédéfinies"
-+	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
-+	find . -type d -path "*/share/locale/*" | while read FILE; do
-+		if [ `basename $FILE` = $PKGMK_LOCALES ]; then
-+			DIR=`dirname "$FILE"`
-+			mv "$FILE" .
-+			rm -rf $DIR
-+			mkdir $DIR
-+			mv `basename "$FILE"` $DIR/
-+			break
-+		else
-+			rm -rf $FILE
-+		fi
-+ 
-+	done
- }
--
- parse_options() {
- 	while [ "$1" ]; do
- 		case $1 in
-@@ -589,6 +635,8 @@
- 				PKGMK_CLEAN="yes" ;;
- 			-kw|--keep-work)
- 				PKGMK_KEEP_WORK="yes" ;;
-+			-kl|--keep-locale)
-+				PKGMK_KEEP_LOCALES="yes" ;;
- 			-cf|--config-file)
- 				if [ ! "$2" ]; then
- 					echo "`basename $PKGMK_COMMAND`: option $1 requires an argument"
-@@ -620,7 +668,7 @@
- 		exit 0
- 	fi
- 	
--	for FILE in $PKGMK_PKGFILE $PKGMK_CONFFILE; do
-+	for FILE in $PKGMK_CONFFILE $PKGMK_PKGFILE; do
- 		if [ ! -f $FILE ]; then
- 			error "File '$FILE' not found."
- 			exit 1
-@@ -735,6 +783,8 @@
- PKGMK_CHECK_MD5SUM="no"
- PKGMK_NO_STRIP="no"
- PKGMK_CLEAN="no"
-+PKGMK_KEEP_LOCALES="no"
-+PKGMK_LOCALES="fr"
- 
- main "$@"
-