wok rev 6136

merge
author Christopher Rogers <slaxemulator@gmail.com>
date Tue Sep 07 14:17:30 2010 +0000 (2010-09-07)
parents 1ddb9a566a1e a62387bb254e
children 0ea0c9ea900a
files thunderbird-langpack-es/receipt
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/cd-discid/receipt	Tue Sep 07 14:17:30 2010 +0000
     1.3 @@ -0,0 +1,27 @@
     1.4 +# SliTaz package receipt.
     1.5 +
     1.6 +PACKAGE="cd-discid"
     1.7 +VERSION="1.1"
     1.8 +CATEGORY="multimedia"
     1.9 +SHORT_DESC="Utility to get CDDB discid information from a CD-ROM disc"
    1.10 +MAINTAINER="domcox@slitaz.org"
    1.11 +DEPENDS=""
    1.12 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.13 +WEB_SITE="http://linukz.org/cd-discid.shtml"
    1.14 +WGET_URL="http://linukz.org/download/$TARBALL"
    1.15 +TAGS="audio cd cddb"
    1.16 +
    1.17 +# Rules to configure and make the package.
    1.18 +compile_rules()
    1.19 +{
    1.20 +	cd $src
    1.21 +	make && make DESTDIR=$PWD/_pkg install
    1.22 +}
    1.23 +
    1.24 +# Rules to gen a SliTaz package suitable for Tazpkg.
    1.25 +genpkg_rules()
    1.26 +{
    1.27 +	mkdir -p $fs/usr
    1.28 +	cp -a $_pkg/usr/bin $fs/usr
    1.29 +}
    1.30 +
     2.1 --- a/clucene-dev/receipt	Tue Sep 07 14:16:20 2010 +0000
     2.2 +++ b/clucene-dev/receipt	Tue Sep 07 14:17:30 2010 +0000
     2.3 @@ -16,6 +16,6 @@
     2.4  	mkdir -p $fs/usr/lib $fs/usr/include
     2.5  	cp -a $_pkg/usr/include $fs/usr
     2.6  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
     2.7 -	cp -a $_pkg/usr/lib/CLucene $fs/usr/include
     2.8 +	cp -a $_pkg/usr/lib/CLucene $fs/usr/lib
     2.9  }
    2.10  
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/fbida/receipt	Tue Sep 07 14:17:30 2010 +0000
     3.3 @@ -0,0 +1,30 @@
     3.4 +# SliTaz package receipt.
     3.5 +
     3.6 +PACKAGE="fbida"
     3.7 +VERSION="2.07"
     3.8 +CATEGORY="utilites"
     3.9 +SHORT_DESC="A simple GTK+ disc burner"
    3.10 +MAINTAINER="devl547@gmail.com"
    3.11 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.12 +DEPENDS="libpng giflib tiff jpeg ttf-bitstream-vera libexif zlib \
    3.13 +curl"
    3.14 +BUILD_DEPENDS="libpng-dev giflib-dev tiff-dev jpeg-dev libexif-dev \
    3.15 +zlib-dev curl-dev"
    3.16 +WEB_SITE="http://linux.bytesex.org/fbida/"
    3.17 +WGET_URL="http://dl.bytesex.org/releases/$PACKAGE/$TARBALL"
    3.18 +
    3.19 +# Rules to configure and make the package.
    3.20 +compile_rules()
    3.21 +{
    3.22 +	cd $src
    3.23 +	make -j2
    3.24 +	make DESTDIR=$PWD/_pkg install
    3.25 +}
    3.26 +
    3.27 +# Rules to gen a SliTaz package suitable for Tazpkg.
    3.28 +genpkg_rules()
    3.29 +{
    3.30 +	mkdir -p $fs/usr
    3.31 +	cp -a $_pkg/usr/local/bin $fs/usr/
    3.32 +}
    3.33 +
     4.1 --- a/fbxkb/receipt	Tue Sep 07 14:16:20 2010 +0000
     4.2 +++ b/fbxkb/receipt	Tue Sep 07 14:17:30 2010 +0000
     4.3 @@ -2,7 +2,7 @@
     4.4  
     4.5  PACKAGE="fbxkb"
     4.6  VERSION="0.6"
     4.7 -CATEGORY="utilites"
     4.8 +CATEGORY="utilities"
     4.9  SHORT_DESC="fbxkb is NETWM compliant keyboard indicator and switcher."
    4.10  MAINTAINER="devl547@gmail.com"
    4.11  TARBALL="$PACKAGE-$VERSION.tgz"
     5.1 --- a/get-google-earth/receipt	Tue Sep 07 14:16:20 2010 +0000
     5.2 +++ b/get-google-earth/receipt	Tue Sep 07 14:17:30 2010 +0000
     5.3 @@ -5,6 +5,7 @@
     5.4  CATEGORY="non-free"
     5.5  SHORT_DESC="Get Google Earth."
     5.6  MAINTAINER="pascal.bellard@slitaz.org"
     5.7 +DEPENDS="bzip2 xfree86-base-fonts"
     5.8  WEB_SITE="http://earth.google.com/"
     5.9  TAGS="map visualization"
    5.10  
     6.1 --- a/lirc/receipt	Tue Sep 07 14:16:20 2010 +0000
     6.2 +++ b/lirc/receipt	Tue Sep 07 14:17:30 2010 +0000
     6.3 @@ -28,6 +28,9 @@
     6.4  	sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
     6.5  	sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.in
     6.6  
     6.7 +	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
     6.8 +	sed -i "s/uname -r/echo $KERNEL_VERSION-slitaz/g" configure
     6.9 +
    6.10  	./configure \
    6.11  		--prefix=/usr \
    6.12  		--with-x \
     7.1 --- a/rrdtool-dev/receipt	Tue Sep 07 14:16:20 2010 +0000
     7.2 +++ b/rrdtool-dev/receipt	Tue Sep 07 14:17:30 2010 +0000
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="rrdtool-dev"
     7.7 -VERSION="1.3.2"
     7.8 +VERSION="1.4.4"
     7.9  CATEGORY="development"
    7.10  SHORT_DESC="Data logging and graphing system for time series data, development file."
    7.11  MAINTAINER="pascal.bellard@slitaz.org"
     8.1 --- a/rrdtool-doc/receipt	Tue Sep 07 14:16:20 2010 +0000
     8.2 +++ b/rrdtool-doc/receipt	Tue Sep 07 14:17:30 2010 +0000
     8.3 @@ -1,7 +1,7 @@
     8.4  # SliTaz package receipt.
     8.5  
     8.6  PACKAGE="rrdtool-doc"
     8.7 -VERSION="1.3.2"
     8.8 +VERSION="1.4.4"
     8.9  CATEGORY="development"
    8.10  SHORT_DESC="Data logging and graphing system for time series data."
    8.11  MAINTAINER="pascal.bellard@slitaz.org"
     9.1 --- a/rrdtool-man/receipt	Tue Sep 07 14:16:20 2010 +0000
     9.2 +++ b/rrdtool-man/receipt	Tue Sep 07 14:17:30 2010 +0000
     9.3 @@ -1,7 +1,7 @@
     9.4  # SliTaz package receipt.
     9.5  
     9.6  PACKAGE="rrdtool-man"
     9.7 -VERSION="1.3.2"
     9.8 +VERSION="1.4.4"
     9.9  CATEGORY="development"
    9.10  SHORT_DESC="Data logging and graphing system for time series data."
    9.11  MAINTAINER="pascal.bellard@slitaz.org"
    10.1 --- a/rrdtool-perl/receipt	Tue Sep 07 14:16:20 2010 +0000
    10.2 +++ b/rrdtool-perl/receipt	Tue Sep 07 14:17:30 2010 +0000
    10.3 @@ -1,7 +1,7 @@
    10.4  # SliTaz package receipt.
    10.5  
    10.6  PACKAGE="rrdtool-perl"
    10.7 -VERSION="1.3.2"
    10.8 +VERSION="1.4.4"
    10.9  CATEGORY="development"
   10.10  SHORT_DESC="Perl bindings for rrdtool."
   10.11  MAINTAINER="pascal.bellard@slitaz.org"
    11.1 --- a/rrdtool-python/receipt	Tue Sep 07 14:16:20 2010 +0000
    11.2 +++ b/rrdtool-python/receipt	Tue Sep 07 14:17:30 2010 +0000
    11.3 @@ -1,7 +1,7 @@
    11.4  # SliTaz package receipt.
    11.5  
    11.6  PACKAGE="rrdtool-python"
    11.7 -VERSION="1.3.2"
    11.8 +VERSION="1.4.4"
    11.9  CATEGORY="development"
   11.10  SHORT_DESC="Python bindings for rrdtool."
   11.11  MAINTAINER="pascal.bellard@slitaz.org"
    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/rubyripper/receipt	Tue Sep 07 14:17:30 2010 +0000
    12.3 @@ -0,0 +1,43 @@
    12.4 +# SliTaz package receipt.
    12.5 +
    12.6 +PACKAGE="rubyripper"
    12.7 +VERSION="0.6.0"
    12.8 +CATEGORY="multimedia"
    12.9 +SHORT_DESC="A secure audio disc ripper"
   12.10 +MAINTAINER="domcox@slitaz.org"
   12.11 +DEPENDS="cd-discid cdparanoia-III flac normalize ruby"
   12.12 +SUGGESTED="ruby-gtk2 lame orgenc"
   12.13 +BUILD_DEPENDS="cd-discid cdparanoia-III lame normalize ruby vorbis-tools"
   12.14 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
   12.15 +WEB_SITE="http://code.google.com/p/rubyripper"
   12.16 +WGET_URL="http://rubyripper.googlecode.com/files/$TARBALL"
   12.17 +TAGS="audio cd ripper"
   12.18 +
   12.19 +# Rules to configure and make the package.
   12.20 +compile_rules()
   12.21 +{
   12.22 +	cd $src
   12.23 +	./configure \
   12.24 +		--prefix=/usr \
   12.25 +		--enable-gtk2 \
   12.26 +		--enable-cli \
   12.27 +		--enable-lang-all \
   12.28 +		&& make && make DESTDIR=$PWD/_pkg install
   12.29 +}
   12.30 +
   12.31 +# Rules to gen a SliTaz package suitable for Tazpkg.
   12.32 +genpkg_rules()
   12.33 +{
   12.34 +	mkdir -p $fs/usr 
   12.35 +	cp -a $_pkg/usr/bin $fs/usr
   12.36 +	cp -a $_pkg/usr/lib $fs/usr
   12.37 +	# desktop file
   12.38 +	mkdir -p $fs/usr/share/applications
   12.39 +	cp -a stuff/$PACKAGE.desktop $fs/usr/share/applications
   12.40 +	# icon
   12.41 +	mkdir -p $fs/usr/share/pixmaps
   12.42 +	cp -a stuff/$PACKAGE.png $fs/usr/share/pixmaps
   12.43 +	# launcher
   12.44 +	cp -a stuff/$PACKAGE $fs/usr/bin
   12.45 +}
   12.46 +
    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/rubyripper/stuff/rubyripper	Tue Sep 07 14:17:30 2010 +0000
    13.3 @@ -0,0 +1,10 @@
    13.4 +#!/bin/sh
    13.5 +#	Rubyripper launcher
    13.6 +#	(C) 2007-2010 SliTaz - GNU General Public License v3. 
    13.7 +
    13.8 +RUBY_GTK2_PC=$(/usr/bin/pkg-config --exists ruby-gtk2)
    13.9 +if [ $RUBY_GTK2_PC ]; then
   13.10 +	/usr/bin/rrip_gui
   13.11 +else
   13.12 +	/usr/bin/xterm -T "Rubyripper CLI" -e /usr/bin/rrip_cli
   13.13 +fi
    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/rubyripper/stuff/rubyripper.desktop	Tue Sep 07 14:17:30 2010 +0000
    14.3 @@ -0,0 +1,7 @@
    14.4 +[Desktop Entry]
    14.5 +Type=Application
    14.6 +Name=Rubyripper CD ripper
    14.7 +Comment=A Secure Audio Disc Ripper
    14.8 +Icon=rubyripper.png
    14.9 +Exec=rubyripper
   14.10 +Categories=Audio;AudioVideo;
    15.1 Binary file rubyripper/stuff/rubyripper.png has changed
    16.1 --- a/tazbb/stuff/tazbb	Tue Sep 07 14:16:20 2010 +0000
    16.2 +++ b/tazbb/stuff/tazbb	Tue Sep 07 14:17:30 2010 +0000
    16.3 @@ -29,7 +29,7 @@
    16.4  # Let tazbb finish is work and make sure needed files exist.
    16.5  if [ -f $LOCK_FILE ]; then
    16.6  	case $1 in
    16.7 -		usage|list-*|*block)
    16.8 +		usage|list-*|*block|check-receipt)
    16.9  			continue ;;
   16.10  		*)
   16.11  			echo -e "\nTazbb is already running and locked...\n"
   16.12 @@ -567,11 +567,12 @@
   16.13  {
   16.14  	WANTED=""
   16.15  	. $BUILD_WOK/$1/receipt
   16.16 -	if [ -n $WANTED ]; then
   16.17 +	if [ -n "$WANTED" ]; then
   16.18  		expected=$VERSION
   16.19  		VERSION=
   16.20  		. $BUILD_WOK/$WANTED/receipt
   16.21  		if [ "$VERSION" != "$expected" ]; then
   16.22 +			echo "$1: expected wanted version $expected, found $VERSION"
   16.23  			return 1
   16.24  		fi
   16.25  	fi
   16.26 @@ -902,7 +903,6 @@
   16.27  	cd - > /dev/null
   16.28  }
   16.29  
   16.30 -return_status=0
   16.31  case "$1" in
   16.32  	list-pkgs)
   16.33  		# List last cooked packages.
   16.34 @@ -1020,7 +1020,7 @@
   16.35  		check_variables $2 &&
   16.36  		check_wanted_version $2 &&
   16.37  		check_build_depends $2 ""
   16.38 -		return_status=$? ;;
   16.39 +		exit $? ;;
   16.40  	check-depends)
   16.41  		case "$2" in
   16.42  		wok)
   16.43 @@ -1057,4 +1057,4 @@
   16.44  echo "" > $DB_DIR/running
   16.45  rm -f $LOCK_FILE /tmp/files.list.tazbb$$
   16.46  
   16.47 -exit $return_status
   16.48 +exit 0
    17.1 --- a/thunderbird-langpack-en_GB/receipt	Tue Sep 07 14:16:20 2010 +0000
    17.2 +++ b/thunderbird-langpack-en_GB/receipt	Tue Sep 07 14:17:30 2010 +0000
    17.3 @@ -14,7 +14,7 @@
    17.4  compile_rules()
    17.5  {
    17.6  	cd $WOK/$PACKAGE
    17.7 -	LANG=`echo $PACKAGE | cut -d'-' -f3`
    17.8 +	LANG=`echo $PACKAGE | cut -d'-' -f3 |  tr '_' '-'`
    17.9  	# Get xpi
   17.10  	WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/linux-i686/xpi/$LANG.xpi"
   17.11  	if [ -e $LANG.xpi ]; then
    18.1 --- a/thunderbird-langpack-es/receipt	Tue Sep 07 14:16:20 2010 +0000
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,39 +0,0 @@
    18.4 -# SliTaz package receipt.
    18.5 -
    18.6 -PACKAGE="thunderbird-langpack-es"
    18.7 -VERSION="3.1.2"
    18.8 -CATEGORY="network"
    18.9 -SHORT_DESC="locale for mozilla thunderbird"
   18.10 -MAINTAINER="domcox@slitaz.org"
   18.11 -DEPENDS="thunderbird"
   18.12 -SOURCE="thunderbird"
   18.13 -WEB_SITE="www.mozillamessaging.com"
   18.14 -
   18.15 -
   18.16 -# Rules to configure and make the package.
   18.17 -compile_rules()
   18.18 -{
   18.19 -	cd $WOK/$PACKAGE
   18.20 -	LANG=`echo $PACKAGE | cut -d'-' -f3`
   18.21 -	# Get xpi
   18.22 -	WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/linux-i686/xpi/$LANG.xpi"
   18.23 -	if [ -e $LANG.xpi ]; then
   18.24 -		echo "Using current langpack ($LANG.xpi)"
   18.25 -	else
   18.26 -		echo "Downloading langpack ($LANG.xpi)"
   18.27 -		wget $WGET_URL
   18.28 -	fi
   18.29 -	# Uncompress
   18.30 -	echo -n "Uncompressing langpack ($LANG.xpi)"
   18.31 -	LANG_DIR="langpack-$LANG@thunderbird.mozilla.org"
   18.32 -	mkdir -p $LANG_DIR && unzip -oq $LANG.xpi -d $LANG_DIR
   18.33 -	status
   18.34 -}
   18.35 -
   18.36 -# Rules to gen a SliTaz package suitable for Tazpkg.
   18.37 -genpkg_rules()
   18.38 -{
   18.39 -	EXTDIR="$fs/usr/lib/$SOURCE-$VERSION/extensions"
   18.40 -	mkdir -p $EXTDIR
   18.41 -	cp -a $LANG_DIR $EXTDIR
   18.42 -}
    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/thunderbird-langpack-es_ES/receipt	Tue Sep 07 14:17:30 2010 +0000
    19.3 @@ -0,0 +1,39 @@
    19.4 +# SliTaz package receipt.
    19.5 +
    19.6 +PACKAGE="thunderbird-langpack-es_ES"
    19.7 +VERSION="3.1.2"
    19.8 +CATEGORY="network"
    19.9 +SHORT_DESC="locale for mozilla thunderbird"
   19.10 +MAINTAINER="domcox@slitaz.org"
   19.11 +DEPENDS="thunderbird"
   19.12 +SOURCE="thunderbird"
   19.13 +WEB_SITE="www.mozillamessaging.com"
   19.14 +
   19.15 +
   19.16 +# Rules to configure and make the package.
   19.17 +compile_rules()
   19.18 +{
   19.19 +	cd $WOK/$PACKAGE
   19.20 +	LANG=`echo $PACKAGE | cut -d'-' -f3 | tr '_' '-'`
   19.21 +	# Get xpi
   19.22 +	WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/linux-i686/xpi/$LANG.xpi"
   19.23 +	if [ -e $LANG.xpi ]; then
   19.24 +		echo "Using current langpack ($LANG.xpi)"
   19.25 +	else
   19.26 +		echo "Downloading langpack ($LANG.xpi)"
   19.27 +		wget $WGET_URL
   19.28 +	fi
   19.29 +	# Uncompress
   19.30 +	echo -n "Uncompressing langpack ($LANG.xpi)"
   19.31 +	LANG_DIR="langpack-$LANG@thunderbird.mozilla.org"
   19.32 +	mkdir -p $LANG_DIR && unzip -oq $LANG.xpi -d $LANG_DIR
   19.33 +	status
   19.34 +}
   19.35 +
   19.36 +# Rules to gen a SliTaz package suitable for Tazpkg.
   19.37 +genpkg_rules()
   19.38 +{
   19.39 +	EXTDIR="$fs/usr/lib/$SOURCE-$VERSION/extensions"
   19.40 +	mkdir -p $EXTDIR
   19.41 +	cp -a $LANG_DIR $EXTDIR
   19.42 +}
    20.1 --- a/thunderbird-langpack-pt_BR/receipt	Tue Sep 07 14:16:20 2010 +0000
    20.2 +++ b/thunderbird-langpack-pt_BR/receipt	Tue Sep 07 14:17:30 2010 +0000
    20.3 @@ -14,7 +14,7 @@
    20.4  compile_rules()
    20.5  {
    20.6  	cd $WOK/$PACKAGE
    20.7 -	LANG=`echo $PACKAGE | cut -d'-' -f3`
    20.8 +	LANG=`echo $PACKAGE | cut -d'-' -f3 | tr '_' '-'`
    20.9  	# Get xpi
   20.10  	WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/linux-i686/xpi/$LANG.xpi"
   20.11  	if [ -e $LANG.xpi ]; then
    21.1 --- a/thunderbird-langpack-pt_PT/receipt	Tue Sep 07 14:16:20 2010 +0000
    21.2 +++ b/thunderbird-langpack-pt_PT/receipt	Tue Sep 07 14:17:30 2010 +0000
    21.3 @@ -14,7 +14,7 @@
    21.4  compile_rules()
    21.5  {
    21.6  	cd $WOK/$PACKAGE
    21.7 -	LANG=`echo $PACKAGE | cut -d'-' -f3`
    21.8 +	LANG=`echo $PACKAGE | cut -d'-' -f3 | tr '_' '-'`
    21.9  	# Get xpi
   21.10  	WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/linux-i686/xpi/$LANG.xpi"
   21.11  	if [ -e $LANG.xpi ]; then