diff options
author | tnut <thierryn1 at hispeed dot ch> | 2009-11-10 20:58:24 +0100 |
---|---|---|
committer | tnut <thierryn1 at hispeed dot ch> | 2009-11-10 20:58:24 +0100 |
commit | 19977eff173838f2485669620e30e24626777988 (patch) | |
tree | e85c22b0c3f0c8c952f9d9fe43e38decdecf81e3 /base | |
parent | 1f4bbcbdb81f54e00f89ecfa1b51a0bef62d9eba (diff) | |
download | nutyx-extra-19977eff173838f2485669620e30e24626777988.tar.gz nutyx-extra-19977eff173838f2485669620e30e24626777988.tar.bz2 nutyx-extra-19977eff173838f2485669620e30e24626777988.tar.xz nutyx-extra-19977eff173838f2485669620e30e24626777988.zip |
maj pkgutils#5.34.0-1
Diffstat (limited to 'base')
-rw-r--r-- | base/pkgutils/.md5sum | 2 | ||||
-rw-r--r-- | base/pkgutils/Pkgfile | 6 | ||||
-rw-r--r-- | base/pkgutils/nutyx-2009.1.patch~ | 197 | ||||
-rw-r--r-- | base/pkgutils/nutyx-2009.2.patch (renamed from base/pkgutils/nutyx-2009.1.patch) | 15 |
4 files changed, 7 insertions, 213 deletions
diff --git a/base/pkgutils/.md5sum b/base/pkgutils/.md5sum index 69d264a4a..32edcd588 100644 --- a/base/pkgutils/.md5sum +++ b/base/pkgutils/.md5sum @@ -1,2 +1,2 @@ -da25a4a23ad31353885181fb2b085308 nutyx-2009.1.patch +0698e4a88025eb5ad3558cee4963e6a3 nutyx-2009.2.patch 0fdbc780f6c7d70f36ebea85e84bb669 pkgutils-5.34.0.tar.gz diff --git a/base/pkgutils/Pkgfile b/base/pkgutils/Pkgfile index 1483ad9fb..b84fbaac0 100644 --- a/base/pkgutils/Pkgfile +++ b/base/pkgutils/Pkgfile @@ -6,13 +6,13 @@ name=pkgutils version=5.34.0 -release=1 +release=2 source=(http://crux.nu/files/$name-$version.tar.gz \ -nutyx-2009.1.patch) +nutyx-2009.2.patch) build () { cd $name-$version mkdir -p $PKG/usr/share -patch -Np1 -i ../nutyx-2009.1.patch +patch -Np1 -i ../nutyx-2009.2.patch make DESTDIR=$PKG install case `uname -m` in x86_64) diff --git a/base/pkgutils/nutyx-2009.1.patch~ b/base/pkgutils/nutyx-2009.1.patch~ deleted file mode 100644 index 7074de5a9..000000000 --- a/base/pkgutils/nutyx-2009.1.patch~ +++ /dev/null @@ -1,197 +0,0 @@ ---- 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 -@@ -20,6 +20,7 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - # USA. - # -+# Adjusted for NuTyX 2009 by thierryn1 at hispeed dot ch - - info() { - echo "=======> $1" -@@ -94,7 +95,7 @@ - LOCAL_FILENAME_PARTIAL="$LOCAL_FILENAME.partial" - DOWNLOAD_OPTS="--passive-ftp --no-directories --tries=3 --waitretry=3 \ - --directory-prefix=$PKGMK_SOURCE_DIR \ -- --output-document=$LOCAL_FILENAME_PARTIAL --no-check-certificate" -+ --output-document=$LOCAL_FILENAME_PARTIAL" - - if [ -f "$LOCAL_FILENAME_PARTIAL" ]; then - info "Partial download found, trying to resume" -@@ -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 @@ - - cd $PKG - -- find . -type f -path "*/man/man*/*" | while read FILE; do -+ find . -type f -path "*/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 "*/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" -@@ -375,6 +398,10 @@ - - compress_manpages - -+ if [ "$PKGMK_KEEP_LOCALES" == "no" ]; then -+ remove_locale -+ fi -+ - cd $PKG - info "Build result:" - tar czvvf $TARGET * -@@ -505,27 +532,44 @@ - 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 " -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 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 " -if, --ignore-footprint compile le paquet en ignorant la 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 -@@ -562,6 +606,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" -@@ -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 @@ - PKGMK_CHECK_MD5SUM="no" - PKGMK_NO_STRIP="no" - PKGMK_CLEAN="no" -+PKGMK_KEEP_LOCALES="no" -+PKGMK_LOCALES="fr" - - 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 @@ - # /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_PACKAGE_DIR="$PWD" --# PKGMK_WORK_DIR="$PWD/work" -+PKGMK_SOURCE_DIR="/srv/sources" -+PKGMK_PACKAGE_DIR="/srv/NuTyX" -+PKGMK_WORK_DIR="/tmp/work" - # PKGMK_DOWNLOAD="no" - # PKGMK_IGNORE_FOOTPRINT="no" - # PKGMK_NO_STRIP="no" - # PKGMK_WGET_OPTS="" -+PKGMK_LOCALES="fr" - - # End of file diff --git a/base/pkgutils/nutyx-2009.1.patch b/base/pkgutils/nutyx-2009.2.patch index bfc2fa2c5..ecf0a438d 100644 --- a/base/pkgutils/nutyx-2009.1.patch +++ b/base/pkgutils/nutyx-2009.2.patch @@ -4,19 +4,10 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, # USA. # -+# Adjusted for NuTyX 2009 by thierryn1 at hispeed dot ch ++# Adjusted for NuTyX 2009.1 by thierryn1 at hispeed dot ch info() { echo "=======> $1" -@@ -94,7 +95,7 @@ - LOCAL_FILENAME_PARTIAL="$LOCAL_FILENAME.partial" - DOWNLOAD_OPTS="--passive-ftp --no-directories --tries=3 --waitretry=3 \ - --directory-prefix=$PKGMK_SOURCE_DIR \ -- --output-document=$LOCAL_FILENAME_PARTIAL --no-check-certificate" -+ --output-document=$LOCAL_FILENAME_PARTIAL" - - if [ -f "$LOCAL_FILENAME_PARTIAL" ]; then - info "Partial download found, trying to resume" @@ -162,8 +163,13 @@ for FILE in ${source[@]}; do LOCAL_FILENAME=`get_filename $FILE` @@ -38,14 +29,14 @@ cd $PKG - find . -type f -path "*/man/man*/*" | while read FILE; do -+ find . -type f -path "*/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 "*/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" |