wok-next rev 8632
Automated merge with https://bitbucket.org/gokhlayeh/wok
| author | Antoine Bodin <gokhlayeh@slitaz.org> |
|---|---|
| date | Tue Feb 15 03:39:12 2011 +0100 (2011-02-15) |
| parents | 988633c23f81 822f56c3e541 |
| children | 6d307045afff a59735f53d66 |
| files |
line diff
1.1 --- a/gcc/receipt Mon Feb 14 18:17:28 2011 +0000 1.2 +++ b/gcc/receipt Tue Feb 15 03:39:12 2011 +0100 1.3 @@ -18,9 +18,9 @@ 1.4 cd $src 1.5 1.6 # GCC requires the GMP, MPFR and MPC packages. 1.7 - tazwok get-src mpfr --target=$PWD/mpfr 1.8 - tazwok get-src gmp --target=$PWD/gmp 1.9 - tazwok get-src mpc-library --target=$PWD/mpc 1.10 + tazwok get-src mpfr --target=$PWD/mpfr || { report close-bloc; return 1; } 1.11 + tazwok get-src gmp --target=$PWD/gmp || { report close-bloc; return 1; } 1.12 + tazwok get-src mpc-library --target=$PWD/mpc || { report close-bloc; return 1; } 1.13 1.14 report step "Running compilation" 1.15 1.16 @@ -38,7 +38,7 @@ 1.17 --without-ppl --without-cloog && 1.18 make && 1.19 make install 1.20 - } || return 1 1.21 + } || { report close-bloc; return 1; } 1.22 1.23 # See LFS for more detais about this. 1.24 ln -s libgcc.a `$BUILD_HOST-gcc -print-libgcc-file-name | \ 1.25 @@ -50,7 +50,7 @@ 1.26 { 1.27 report open-bloc 1.28 cd $src 1.29 - patch -Np1 -i ../stuff/gcc-$VERSION-startfiles_fix-1.patch 1.30 + patch -Np1 -i ../stuff/gcc-$VERSION-startfiles_fix-1.patch || { report close-bloc; return 1; } 1.31 1.32 # Details about theses lines are in LFS book. 1.33 sed 's@\./fixinc\.sh@-c true@' -i gcc/Makefile.in 1.34 @@ -74,9 +74,9 @@ 1.35 fi 1.36 1.37 # GCC requires the GMP, MPFR and MPC packages. 1.38 - tazwok get-src mpfr --target=$PWD/mpfr 1.39 - tazwok get-src gmp --target=$PWD/gmp 1.40 - tazwok get-src mpc-library --target=$PWD/mpc 1.41 + tazwok get-src mpfr --target=$PWD/mpfr || { report close-bloc; return 1; } 1.42 + tazwok get-src gmp --target=$PWD/gmp || { report close-bloc; return 1; } 1.43 + tazwok get-src mpc-library --target=$PWD/mpc || { report close-bloc; return 1; } 1.44 1.45 report step "Running compilation" 1.46 1.47 @@ -96,7 +96,7 @@ 1.48 --without-ppl --without-cloog && 1.49 make && 1.50 make install 1.51 - } || return 1 1.52 + } || { report close-bloc; return 1; } 1.53 ln -s gcc /tools/bin/cc 1.54 report close-bloc 1.55 }
2.1 --- a/libarchive/receipt Mon Feb 14 18:17:28 2011 +0000 2.2 +++ b/libarchive/receipt Tue Feb 15 03:39:12 2011 +0100 2.3 @@ -15,7 +15,6 @@ 2.4 compile_rules() 2.5 { 2.6 cd $src 2.7 - sed -i 's|acl/libacl.h|libacl.h|' tar/bsdtar_platform.h 2.8 ./configure \ 2.9 --prefix=/usr \ 2.10 --infodir=/usr/share/info \
3.1 --- a/libgudev-dev/receipt Mon Feb 14 18:17:28 2011 +0000 3.2 +++ b/libgudev-dev/receipt Tue Feb 15 03:39:12 2011 +0100 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="libgudev-dev" 3.7 -VERSION="165" 3.8 +VERSION="166" 3.9 CATEGORY="development" 3.10 SHORT_DESC="GObject-based wrapper library for libudev. (devel files)" 3.11 MAINTAINER="pankso@slitaz.org"
4.1 --- a/libgudev/receipt Mon Feb 14 18:17:28 2011 +0000 4.2 +++ b/libgudev/receipt Tue Feb 15 03:39:12 2011 +0100 4.3 @@ -1,7 +1,7 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="libgudev" 4.7 -VERSION="165" 4.8 +VERSION="166" 4.9 CATEGORY="development" 4.10 SHORT_DESC="GObject-based wrapper library for libudev." 4.11 MAINTAINER="gokhlayeh@slitaz.org"
5.1 --- a/libtaz/receipt Mon Feb 14 18:17:28 2011 +0000 5.2 +++ b/libtaz/receipt Tue Feb 15 03:39:12 2011 +0100 5.3 @@ -1,18 +1,24 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="libtaz" 5.7 -VERSION="0.0.5" 5.8 +VERSION="0.0.6" 5.9 CATEGORY="base-system" 5.10 SHORT_DESC="Slitaz generic library." 5.11 MAINTAINER="gokhlayeh@slitaz.org" 5.12 -#TARBALL="$PACKAGE-$VERSION.tar.gz" 5.13 -TARBALL="$VERSION.tar.bz2" 5.14 +TARBALL="$PACKAGE-$VERSION.tar.gz" 5.15 WEB_SITE="http://www.slitaz.org/" 5.16 -#WGET_URL="http://mirror.slitaz.org/sources/libtaz/$TARBALL" 5.17 -WGET_URL="http://hg.slitaz.org/libtaz/archive/$TARBALL" 5.18 +# Use bitbucket until tank is back. 5.19 +#WGET_URL="http://mirror.slitaz.org/sources/$PACKAGE/$TARBALL" 5.20 +BUILD_DEPENDS="wget" 5.21 +WGET_URL="https://bitbucket.org/gokhlayeh/$PACKAGE/get/$VERSION.tar.bz2" 5.22 TAGS="slitaz" 5.23 CONFIG_FILES="/etc/slitaz/slitaz.conf" 5.24 5.25 +compile_rules() 5.26 +{ 5.27 + : 5.28 +} 5.29 + 5.30 # Rules to gen a SliTaz package suitable for Tazpkg. 5.31 genpkg_rules() 5.32 {
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/mingw32-ada/receipt Tue Feb 15 03:39:12 2011 +0100 6.3 @@ -0,0 +1,19 @@ 6.4 +# SliTaz package receipt. 6.5 + 6.6 +PACKAGE="mingw32-ada" 6.7 +SOURCE="gcc-ada" 6.8 +VERSION="3.4.5-20060117-2" 6.9 +CATEGORY="development" 6.10 +SHORT_DESC="MinGW32 ada sources (empty package)." 6.11 +MAINTAINER="gokhlayeh@mailoo.org" 6.12 +TARBALL="$SOURCE-$VERSION-src.tar.gz" 6.13 +WEB_SITE="http://www.mingw.org/" 6.14 +MINGW32_URL="$SF_MIRROR/mingw" 6.15 +WGET_URL="$MINGW32_URL/$TARBALL" 6.16 + 6.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 6.18 +genpkg_rules() 6.19 +{ 6.20 + mkdir -p $fs/usr 6.21 +} 6.22 +
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/mingw32-g++/receipt Tue Feb 15 03:39:12 2011 +0100 7.3 @@ -0,0 +1,19 @@ 7.4 +# SliTaz package receipt. 7.5 + 7.6 +PACKAGE="mingw32-g++" 7.7 +SOURCE="gcc-g++" 7.8 +VERSION="3.4.5-20060117-2" 7.9 +CATEGORY="development" 7.10 +SHORT_DESC="MinGW32 c++ sources (empty package)." 7.11 +MAINTAINER="gokhlayeh@mailoo.org" 7.12 +TARBALL="$SOURCE-$VERSION-src.tar.gz" 7.13 +WEB_SITE="http://www.mingw.org/" 7.14 +MINGW32_URL="$SF_MIRROR/mingw" 7.15 +WGET_URL="$MINGW32_URL/$TARBALL" 7.16 + 7.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 7.18 +genpkg_rules() 7.19 +{ 7.20 + mkdir -p $fs/usr 7.21 +} 7.22 +
8.1 --- a/mingw32-gcc-c/receipt Mon Feb 14 18:17:28 2011 +0000 8.2 +++ b/mingw32-gcc-c/receipt Tue Feb 15 03:39:12 2011 +0100 8.3 @@ -1,14 +1,14 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="mingw32-gcc-c" 8.7 -SOURCE="gcc" 8.8 +SOURCE="gcc-core" 8.9 VERSION="3.4.5-20060117-2" 8.10 CATEGORY="development" 8.11 SHORT_DESC="MinGW32 gcc, for the C language only." 8.12 MAINTAINER="rcx@zoominternet.net" 8.13 DEPENDS="glibc-base mingw32-binutils mingw32-w32api-headers mingw32-runtime-headers" 8.14 BUILD_DEPENDS="slitaz-toolchain bison flex mingw32-binutils mingw32-runtime-headers mingw32-w32api-headers" 8.15 -TARBALL="$SOURCE-core-$VERSION-src.tar.gz" 8.16 +TARBALL="$SOURCE-$VERSION-src.tar.gz" 8.17 WEB_SITE="http://www.mingw.org/" 8.18 MINGW32_URL="$SF_MIRROR/mingw" 8.19 WGET_URL="$MINGW32_URL/$TARBALL"
9.1 --- a/mingw32-gcc/receipt Mon Feb 14 18:17:28 2011 +0000 9.2 +++ b/mingw32-gcc/receipt Tue Feb 15 03:39:12 2011 +0100 9.3 @@ -1,15 +1,18 @@ 9.4 # SliTaz package receipt. 9.5 9.6 PACKAGE="mingw32-gcc" 9.7 -SOURCE="gcc" 9.8 +SOURCE="gcc-core" 9.9 VERSION="3.4.5-20060117-2" 9.10 CATEGORY="development" 9.11 SHORT_DESC="MinGW32 gcc, for C, C++, and Ada." 9.12 MAINTAINER="rcx@zoominternet.net" 9.13 -DEPENDS="glibc-base mingw32-binutils mingw32-w32api-headers mingw32-runtime-headers mingw32-w32api mingw32-runtime" 9.14 -BUILD_DEPENDS="slitaz-toolchain bison flex mingw32-binutils mingw32-runtime-headers mingw32-w32api-headers mingw32-gcc-c mingw32-w32api mingw32-runtime" 9.15 +DEPENDS="glibc-base mingw32-binutils mingw32-w32api-headers \ 9.16 +mingw32-runtime-headers mingw32-w32api mingw32-runtime" 9.17 +BUILD_DEPENDS="slitaz-toolchain bison flex mingw32-binutils \ 9.18 +mingw32-runtime-headers mingw32-w32api-headers mingw32-gcc-c \ 9.19 +mingw32-w32api mingw32-runtime mingw32-g++ mingw32-ada" 9.20 PROVIDE="mingw32-gcc-c" 9.21 -TARBALL="$SOURCE-core-$VERSION-src.tar.gz" 9.22 +TARBALL="$SOURCE-$VERSION-src.tar.gz" 9.23 WEB_SITE="http://www.mingw.org/" 9.24 MINGW32_URL="$SF_MIRROR/mingw" 9.25 WGET_URL="$MINGW32_URL/$TARBALL" 9.26 @@ -28,34 +31,20 @@ 9.27 return 1 9.28 fi 9.29 9.30 - MINGW32_DIR="$PWD" 9.31 - MINGW32_CPP_TARBALL="$SOURCE-g++-$VERSION-src.tar.gz" 9.32 - MINGW32_ADA_TARBALL="$SOURCE-ada-$VERSION-src.tar.gz" 9.33 - 9.34 - for gcc_tgz in $MINGW32_CPP_TARBALL $MINGW32_ADA_TARBALL ; do 9.35 - # Download the additional language tarballs 9.36 - if [ ! -f "$SOURCES_REPOSITORY/$gcc_tgz" ] ; then 9.37 - cd $SOURCES_REPOSITORY 9.38 - download $MINGW32_URL/$gcc_tgz 9.39 - fi 9.40 - 9.41 - # Extract the additional language tarballs 9.42 - if [ -f "$SOURCES_REPOSITORY/$gcc_tgz" ] ; then 9.43 - cd $MINGW32_DIR 9.44 - echo "Extracting $gcc_tgz ..." 9.45 - tar xzf "$SOURCES_REPOSITORY/$gcc_tgz" 9.46 - else 9.47 - # Exit if file not found to avoid errors. 9.48 - echo -e "\nDownload of $gcc_tgz failed, exiting. Please check the URL.\n" 9.49 - return 1 9.50 - fi 9.51 + report open-bloc 9.52 + 9.53 + for s in mingw32-g++ mingw32-ada; do 9.54 + tazwok get-src $s --target=$PACKAGE-$VERSION && continue 9.55 + report close-bloc 9.56 + return 1 9.57 done 9.58 - 9.59 - cd $MINGW32_DIR 9.60 + 9.61 + report step "Running compilation" 9.62 9.63 rm -f -r $src/binutils 9.64 mkdir -p $SOURCE-$VERSION-build 9.65 cd $SOURCE-$VERSION-build 9.66 + { 9.67 $src/configure \ 9.68 --prefix=/usr \ 9.69 --libexecdir=/usr/lib \ 9.70 @@ -71,7 +60,9 @@ 9.71 --enable-sjlj-exceptions \ 9.72 $CONFIGURE_ARGS && 9.73 make -j 4 CFLAGS="-O2 -fomit-frame-pointer" LDFLAGS="-s" && 9.74 - make DESTDIR=$src/_pkg install 9.75 + make DESTDIR=$src/_pkg install && 9.76 + report close-bloc 9.77 + } || { report close-bloc; return 1; } 9.78 } 9.79 9.80 # Rules to gen a SliTaz package suitable for Tazpkg. 9.81 @@ -99,5 +90,5 @@ 9.82 # Rules to clean the package 9.83 clean_wok() 9.84 { 9.85 - rm -r $SOURCE-$VERSION-build 9.86 + rm -rf $SOURCE-$VERSION-build 9.87 }
10.1 --- a/scummvm/receipt Mon Feb 14 18:17:28 2011 +0000 10.2 +++ b/scummvm/receipt Tue Feb 15 03:39:12 2011 +0100 10.3 @@ -1,12 +1,11 @@ 10.4 # SliTaz package receipt. 10.5 10.6 PACKAGE="scummvm" 10.7 -VERSION="1.2.0" 10.8 +VERSION="1.2.1" 10.9 CATEGORY="games" 10.10 SHORT_DESC="A 'virtual machine' for several classic graphical point-and-click adventure games." 10.11 MAINTAINER="gokhlayeh@slitaz.org" 10.12 -DEPENDS="gcc-lib-base alsa-lib libmad libvorbis flac libsdl" 10.13 -BUILD_DEPENDS="alsa-lib-dev libmad-dev libvorbis-dev flac-dev libsdl-dev zlib-dev" 10.14 +DEPENDS="gcc-lib-base alsa-lib libmad libvorbis flac libsdl zlib" 10.15 TARBALL="$PACKAGE-$VERSION.tar.bz2" 10.16 WEB_SITE="http://www.scummvm.org/" 10.17 WGET_URL="http://downloads.sourceforge.net/sourceforge/$PACKAGE/$TARBALL" 10.18 @@ -16,14 +15,12 @@ 10.19 { 10.20 cd $src 10.21 ./configure \ 10.22 - --prefix=/usr \ 10.23 - --mandir=/usr/share/man \ 10.24 --datadir=/usr/games/scummvm \ 10.25 --backend=sdl --disable-debug \ 10.26 --with-mpeg2-prefix=/usr \ 10.27 --with-flac-prefix=/usr \ 10.28 --disable-fluidsynth && 10.29 - make -j 4 && make DESTDIR=$PWD/_pkg install 10.30 + make && make install 10.31 } 10.32 10.33 # Rules to gen a SliTaz package suitable for Tazpkg.
11.1 --- a/tazchroot/receipt Mon Feb 14 18:17:28 2011 +0000 11.2 +++ b/tazchroot/receipt Tue Feb 15 03:39:12 2011 +0100 11.3 @@ -1,18 +1,24 @@ 11.4 # SliTaz package receipt. 11.5 11.6 PACKAGE="tazchroot" 11.7 -VERSION="0.0.5" 11.8 +VERSION="0.0.6" 11.9 CATEGORY="base-system" 11.10 SHORT_DESC="Slitaz tool to manage chroot" 11.11 MAINTAINER="gokhlayeh@slitaz.org" 11.12 DEPENDS="libtaz" 11.13 -#TARBALL="$PACKAGE-$VERSION.tar.gz" 11.14 -TARBALL="$VERSION.tar.bz2" 11.15 +TARBALL="$PACKAGE-$VERSION.tar.gz" 11.16 WEB_SITE="http://www.slitaz.org/" 11.17 -#WGET_URL="http://mirror.slitaz.org/sources/tazchroot/$TARBALL" 11.18 -WGET_URL="http://hg.slitaz.org/tazchroot/archive/$TARBALL" 11.19 +# Use bitbucket until tank is back. 11.20 +#WGET_URL="http://mirror.slitaz.org/sources/$PACKAGE/$TARBALL" 11.21 +BUILD_DEPENDS="wget" 11.22 +WGET_URL="https://bitbucket.org/gokhlayeh/$PACKAGE/get/$VERSION.tar.bz2" 11.23 TAGS="slitaz" 11.24 11.25 +compile_rules() 11.26 +{ 11.27 + : 11.28 +} 11.29 + 11.30 # Rules to gen a SliTaz package suitable for Tazpkg. 11.31 genpkg_rules() 11.32 {
12.1 --- a/tazwok-experimental/receipt Mon Feb 14 18:17:28 2011 +0000 12.2 +++ b/tazwok-experimental/receipt Tue Feb 15 03:39:12 2011 +0100 12.3 @@ -1,7 +1,7 @@ 12.4 # SliTaz package receipt. 12.5 12.6 PACKAGE="tazwok-experimental" 12.7 -VERSION="0.0.5.6" 12.8 +VERSION="0.0.6.1" 12.9 CATEGORY="base-system" 12.10 SHORT_DESC="SliTaz sources and binaries packages cooker." 12.11 MAINTAINER="gokhlayeh@slitaz.org" 12.12 @@ -9,24 +9,49 @@ 12.13 SUGGESTED="tazchroot" 12.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 12.15 WEB_SITE="http://www.slitaz.org/" 12.16 -WGET_URL="http://mirror.slitaz.org/sources/tazwok-experimental/$TARBALL" 12.17 +# Use bitbucket until tank is back. 12.18 +#WGET_URL="http://mirror.slitaz.org/sources/$PACKAGE/$TARBALL" 12.19 +BUILD_DEPENDS="wget" 12.20 +WGET_URL="https://bitbucket.org/gokhlayeh/$PACKAGE/get/$VERSION.tar.bz2" 12.21 CONFIG_FILES="/etc/slitaz/tazwok.conf" 12.22 PROVIDE="tazwok" 12.23 TAGS="slitaz" 12.24 12.25 +compile_rules() 12.26 +{ 12.27 + : 12.28 +} 12.29 + 12.30 # Rules to gen a SliTaz package suitable for Tazpkg. 12.31 genpkg_rules() 12.32 { 12.33 mkdir -p $fs/usr/bin $fs/usr/share/doc/tazwok \ 12.34 - $fs/etc/slitaz 12.35 + $fs/etc/slitaz $fs/usr/share/slitaz/web-bb 12.36 # Copy Tazwok, doc and examples. 12.37 cp -a $src/tazwok $fs/usr/bin 12.38 + cp -a $src/update-repository $fs/usr/bin 12.39 chmod 755 $fs/usr/bin/tazwok 12.40 cp -a $src/doc/* $fs/usr/share/doc/tazwok 12.41 cp -a $src/applications $fs/usr/share 12.42 # Config file 12.43 cp -a $src/examples/tazwok.conf $fs/etc/slitaz 12.44 cp -a $src/examples/config.site $fs/etc 12.45 + # Webserver stuff 12.46 + cp -a $src/web/* $fs/usr/share/slitaz/web-bb 12.47 } 12.48 12.49 -TAZBB_NO_INSTALL="Not ready to be used on tank yet." 12.50 +post_install() 12.51 +{ 12.52 + echo -e "\\033[1;31mWARNING WARNING WARGNING 12.53 +You should run update-repository on all repositories you used with 12.54 +tazwok-experimental until there.This script change sources names, generate sources.list and modify 12.55 +logs to make you're repository consistent with last changes. 12.56 + 12.57 +Usage is: 12.58 +update-repository LOCAL_REPOSITORY 12.59 + 12.60 +Exemple: 12.61 +update-repository /home/slitaz/experimental 12.62 + 12.63 +Sorry for this ;)\\033[0m" 12.64 +}
13.1 --- a/udev-dev/receipt Mon Feb 14 18:17:28 2011 +0000 13.2 +++ b/udev-dev/receipt Tue Feb 15 03:39:12 2011 +0100 13.3 @@ -1,7 +1,7 @@ 13.4 # SliTaz package receipt. 13.5 13.6 PACKAGE="udev-dev" 13.7 -VERSION="165" 13.8 +VERSION="166" 13.9 CATEGORY="development" 13.10 SHORT_DESC="Udev devel file (libudev)." 13.11 MAINTAINER="pankso@slitaz.org"
14.1 --- a/udev/receipt Mon Feb 14 18:17:28 2011 +0000 14.2 +++ b/udev/receipt Tue Feb 15 03:39:12 2011 +0100 14.3 @@ -1,7 +1,7 @@ 14.4 # SliTaz package receipt. 14.5 14.6 PACKAGE="udev" 14.7 -VERSION="165" 14.8 +VERSION="166" 14.9 BUILD_WARNING="Install new udev package and rebuild hal" 14.10 CATEGORY="base-system" 14.11 SHORT_DESC="Udev creat automaticly right devices in /dev."