wok-next rev 9699

Be less entousiast and sed only 13 pkgs :-)
author Christophe Lincoln <pankso@slitaz.org>
date Sun May 08 00:40:27 2011 +0200 (2011-05-08)
parents fc20a2fab76c
children d1768332cee0
files accessx/receipt aiksaurus/receipt airpwn/receipt arj/receipt aufs/receipt broadcom-wl/receipt catalyst/receipt cdrdao/receipt cdrkit/receipt chkrootkit/receipt cinepaint/receipt clutter-gtk/receipt compcache/receipt
line diff
     1.1 --- a/accessx/receipt	Sat May 07 17:51:17 2011 +0000
     1.2 +++ b/accessx/receipt	Sun May 08 00:40:27 2011 +0200
     1.3 @@ -17,7 +17,7 @@
     1.4  	mv $PACKAGE $PACKAGE-$VERSION 2> /dev/null
     1.5  	cd $src
     1.6  	# Patch for deprecated <iostream.h>
     1.7 -	patch -p0 < ../stuff/accessx.diff || return 1
     1.8 +	patch -p0 < $stuff/accessx.diff || return 1
     1.9  	make
    1.10  }
    1.11  
     2.1 --- a/aiksaurus/receipt	Sat May 07 17:51:17 2011 +0000
     2.2 +++ b/aiksaurus/receipt	Sun May 08 00:40:27 2011 +0200
     2.3 @@ -15,7 +15,7 @@
     2.4  compile_rules()
     2.5  {
     2.6  	cd $src
     2.7 -	patch -Np0 -i ../stuff/aiksaurus-gcc44.patch
     2.8 +	patch -Np0 -i $stuff/aiksaurus-gcc44.patch
     2.9  	./configure --with-gtk &&
    2.10  	make && make -j1 DESTDIR=$DESTDIR install
    2.11  }
     3.1 --- a/airpwn/receipt	Sat May 07 17:51:17 2011 +0000
     3.2 +++ b/airpwn/receipt	Sun May 08 00:40:27 2011 +0200
     3.3 @@ -16,7 +16,7 @@
     3.4  {
     3.5  	cd $src
     3.6  	# Patch configure to link libcrypto
     3.7 -	patch -Np1 -i ../stuff/link-libcrypto.patch
     3.8 +	patch -Np1 -i $stuff/link-libcrypto.patch
     3.9  
    3.10  	# Fix airpwn files so we can use it with a Python version other than 2.4.
    3.11  	PYTHON_VERSION1=$(python -c 'import sys; print sys.version[:3]')
     4.1 --- a/arj/receipt	Sat May 07 17:51:17 2011 +0000
     4.2 +++ b/arj/receipt	Sun May 08 00:40:27 2011 +0200
     4.3 @@ -20,7 +20,7 @@
     4.4  	./configure --prefix=/usr --infodir=/usr/share/info \
     4.5  	--mandir=/usr/share/man $CONFIGURE_ARGS
     4.6  	cd ..
     4.7 -	busybox patch -p0 < ../stuff/fardata.u
     4.8 +	busybox patch -p0 < $stuff/fardata.u
     4.9  	make -k -j1
    4.10  	make DESTDIR=$PWD/_pkg install
    4.11  }
     5.1 --- a/aufs/receipt	Sat May 07 17:51:17 2011 +0000
     5.2 +++ b/aufs/receipt	Sun May 08 00:40:27 2011 +0200
     5.3 @@ -36,7 +36,7 @@
     5.4  	sed -i 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' \
     5.5  		config.mk || return 1
     5.6  
     5.7 -	#patch -Np1 -i ../stuff/aufs2-module-2.6.36.patch
     5.8 +	#patch -Np1 -i $stuff/aufs2-module-2.6.36.patch
     5.9  	#make KDIR=/usr/src/linux clean
    5.10  	# build, sed fixes are from gentoo portage build
    5.11  	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile
     6.1 --- a/broadcom-wl/receipt	Sat May 07 17:51:17 2011 +0000
     6.2 +++ b/broadcom-wl/receipt	Sun May 08 00:40:27 2011 +0200
     6.3 @@ -21,7 +21,7 @@
     6.4  	mv lib src Makefile $PACKAGE-$VERSION
     6.5  	cd $src
     6.6  	sed -i 's|linux/autoconf.h|generated/autoconf.h|' src/include/linuxver.h
     6.7 -	patch -Np1 -i ../stuff/semaphore.patch
     6.8 +	patch -Np1 -i $stuff/semaphore.patch
     6.9  	KBUILD_NOPEDANTIC=1 make -C /usr/src/linux M=`pwd`
    6.10  }
    6.11  
     7.1 --- a/catalyst/receipt	Sat May 07 17:51:17 2011 +0000
     7.2 +++ b/catalyst/receipt	Sun May 08 00:40:27 2011 +0200
     7.3 @@ -32,9 +32,9 @@
     7.4  		grep -rl linux/$i * | xargs sed -i "s|linux/$i|generated/$i|"
     7.5  	done
     7.6  	cd $src
     7.7 -	patch -Np1 -i ../stuff/makefile_compat.patch
     7.8 -	patch -Np1 -i ../stuff/$PACKAGE-${KERNEL_VERSION}.patch
     7.9 -	patch -Np1 -i ../stuff/sema_init.patch
    7.10 +	patch -Np1 -i $stuff/makefile_compat.patch
    7.11 +	patch -Np1 -i $stuff/$PACKAGE-${KERNEL_VERSION}.patch
    7.12 +	patch -Np1 -i $stuff/sema_init.patch
    7.13  	cd $src/common/lib/modules/fglrx/build_mod
    7.14  	cp $src/arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 . 
    7.15  	cp 2.6.x/Makefile .
     8.1 --- a/cdrdao/receipt	Sat May 07 17:51:17 2011 +0000
     8.2 +++ b/cdrdao/receipt	Sun May 08 00:40:27 2011 +0200
     8.3 @@ -25,7 +25,7 @@
     8.4  	grep -qs 'define u8' scsilib/libscg/scsi-linux-sg.c ||
     8.5  	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
     8.6  		scsilib/libscg/scsi-linux-sg.c
     8.7 -	patch -Np1 -i ../stuff/$PACKAGE-$VERSION-stat.patch || return 1
     8.8 +	patch -Np1 -i $stuff/$PACKAGE-$VERSION-stat.patch || return 1
     8.9  	./configure --prefix=/usr --with-lame &&
    8.10  	make &&
    8.11  	make DESTDIR=$PWD/_pkg install
     9.1 --- a/cdrkit/receipt	Sat May 07 17:51:17 2011 +0000
     9.2 +++ b/cdrkit/receipt	Sun May 08 00:40:27 2011 +0200
     9.3 @@ -17,7 +17,7 @@
     9.4  	cd $src
     9.5  	sed -i -e '/USE_MAGIC/d' -e '/(MAGICLIBS magic)/d' \
     9.6  		genisoimage/CMakeLists.txt
     9.7 -	#patch -p1 < ../stuff/$PACKAGE-1.1.9-glibc-2.10.patch || return 1
     9.8 +	#patch -p1 < $stuff/$PACKAGE-1.1.9-glibc-2.10.patch || return 1
     9.9  	#grep -qs 'define u8' libusal/scsi-linux-sg.c ||
    9.10  	#sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' libusal/scsi-linux-sg.c
    9.11  	make &&
    10.1 --- a/chkrootkit/receipt	Sat May 07 17:51:17 2011 +0000
    10.2 +++ b/chkrootkit/receipt	Sun May 08 00:40:27 2011 +0200
    10.3 @@ -13,7 +13,7 @@
    10.4  compile_rules()
    10.5  {
    10.6  	cd $src
    10.7 -	[ -f done.chkrootkit.u ] || patch -p1 < ../stuff/chkrootkit.u
    10.8 +	[ -f done.chkrootkit.u ] || patch -p1 < $stuff/chkrootkit.u
    10.9  	touch done.chkrootkit.u
   10.10  	make sense
   10.11  }
    11.1 --- a/cinepaint/receipt	Sat May 07 17:51:17 2011 +0000
    11.2 +++ b/cinepaint/receipt	Sun May 08 00:40:27 2011 +0200
    11.3 @@ -15,10 +15,10 @@
    11.4  compile_rules()
    11.5  {
    11.6  	cd $src
    11.7 -	patch -Np1 -i ../stuff/cinepaint-0.22.1-gcc43.patch
    11.8 -	patch -Np1 -i ../stuff/cinepaint-0.22-gcc44.patch
    11.9 -	patch -Np1 -i ../stuff/cinepaint-0.22.1-multiple_parameters_named.patch
   11.10 -	patch -Np0 -i ../stuff/cinepaint-0.22.1-ambiguousawake.patch
   11.11 +	patch -Np1 -i $stuff/cinepaint-0.22.1-gcc43.patch
   11.12 +	patch -Np1 -i $stuff/cinepaint-0.22-gcc44.patch
   11.13 +	patch -Np1 -i $stuff/cinepaint-0.22.1-multiple_parameters_named.patch
   11.14 +	patch -Np0 -i $stuff/cinepaint-0.22.1-ambiguousawake.patch
   11.15  find plug-ins/print -type f -exec \
   11.16      sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \;
   11.17  	# Fix insecure rpath
    12.1 --- a/clutter-gtk/receipt	Sat May 07 17:51:17 2011 +0000
    12.2 +++ b/clutter-gtk/receipt	Sun May 08 00:40:27 2011 +0200
    12.3 @@ -15,7 +15,7 @@
    12.4  compile_rules()
    12.5  {
    12.6  	cd $src
    12.7 -	patch -Np1 -i ../stuff/fix-gir.patch
    12.8 +	patch -Np1 -i $stuff/fix-gir.patch
    12.9  	sed -i -e 's/GTK_WIDGET_REALIZED/gtk_widget_get_realized/' \
   12.10  	       -e 's/GTK_WIDGET_VISIBLE/gtk_widget_get_visible/' \
   12.11  	       clutter-gtk/gtk-clutter-embed.c
    13.1 --- a/compcache/receipt	Sat May 07 17:51:17 2011 +0000
    13.2 +++ b/compcache/receipt	Sun May 08 00:40:27 2011 +0200
    13.3 @@ -8,52 +8,55 @@
    13.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    13.5  WEB_SITE="http://code.google.com/p/compcache/"
    13.6  WGET_URL="http://compcache.googlecode.com/files/$TARBALL"
    13.7 +
    13.8  DEPENDS="linux"
    13.9  BUILD_DEPENDS="lzma linux-module-headers"
   13.10  
   13.11  # Rules to configure and make the package.
   13.12  compile_rules()
   13.13  {
   13.14 -    
   13.15 -    KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
   13.16 -    cd $src
   13.17 -    
   13.18 -    # Fix build with kernel 2.6.34
   13.19 -    patch -p1 < ../stuff/compcache-0.6.2-linux-2.6.34.u || return 1
   13.20 -    
   13.21 -    find -name Makefile | xargs sed -i \
   13.22 +	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | \
   13.23 +		cut -d "=" -f2 | sed -e 's/"//g'`
   13.24 +	cd $src
   13.25 +	
   13.26 +	# Fix build with kernel 2.6.34
   13.27 +	patch -p1 < $stuff/compcache-0.6.2-linux-2.6.34.u || return 1
   13.28 +	
   13.29 +	find -name Makefile | xargs sed -i \
   13.30  		"s|/lib/modules/\$(shell uname -r)/build|/usr/src/linux|"
   13.31 -    make  KBUILD=/usr/src/linux KVER=$KERNEL_VERSION 
   13.32 +	make  KBUILD=/usr/src/linux KVER=$KERNEL_VERSION 
   13.33  }
   13.34  
   13.35  # Rules to gen a SliTaz package suitable for Tazpkg.
   13.36  genpkg_rules()
   13.37  {
   13.38 -    KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
   13.39 -    EXTRAVERSION=_$KERNEL_VERSION
   13.40 -    
   13.41 -    mkdir -p $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc \
   13.42 -    		$fs/etc/init.d \
   13.43 -    		$fs/usr/bin
   13.44 -    
   13.45 -    install -o root -m 644 $src/ramzswap.ko $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc
   13.46 -    cp -a $src/sub-projects/rzscontrol/rzscontrol $fs/usr/bin
   13.47 -    
   13.48 -    for i in $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc/*.ko ; do
   13.49 -        lzma e $i $i.gz && rm -f $i
   13.50 -    done
   13.51 -    install -o root -m 755 ./stuff/compcache $fs/etc/init.d/
   13.52 -    install -o root -m 644 ./stuff/compcache.conf $fs/etc/
   13.53 +	KERNEL_VERSION=$(grep  ^VERSION= $WOK/linux/receipt | \
   13.54 +		cut -d "=" -f2 | sed -e 's/"//g')
   13.55 +	EXTRAVERSION=_$KERNEL_VERSION
   13.56 +	
   13.57 +	mkdir -p $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc \
   13.58 +			$fs/etc/init.d \
   13.59 +			$fs/usr/bin
   13.60 +	
   13.61 +	install -o root -m 644 $src/ramzswap.ko \
   13.62 +		$fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc
   13.63 +	cp -a $src/sub-projects/rzscontrol/rzscontrol $fs/usr/bin
   13.64 +	
   13.65 +	for i in $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc/*.ko ; do
   13.66 +		lzma e $i $i.gz && rm -f $i
   13.67 +	done
   13.68 +	install -o root -m 755 $stuff/compcache $fs/etc/init.d/
   13.69 +	install -o root -m 644 $stuff/compcache.conf $fs/etc/
   13.70  }
   13.71  
   13.72  post_install()
   13.73  {
   13.74 -    echo "Processing post-install commands..."
   13.75 -    chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
   13.76 +	echo "Processing post-install commands..."
   13.77 +	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
   13.78  }
   13.79  
   13.80  post_remove()
   13.81  {
   13.82 -    echo "Processing post-remove commands..."
   13.83 -    chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
   13.84 +	echo "Processing post-remove commands..."
   13.85 +	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
   13.86  }