wok rev 8974
[q-z]*: use veriable
line diff
1.1 --- a/qt4/receipt Wed Mar 02 10:41:40 2011 +0100 1.2 +++ b/qt4/receipt Wed Mar 02 11:06:20 2011 +0100 1.3 @@ -29,8 +29,8 @@ 1.4 cd $src 1.5 1.6 # Already fixed upstream 1.7 - patch -Np1 -i ../stuff/fix-qtbug-15857.patch 1.8 - patch -Np1 -i ../stuff/add-postgresql9.patch 1.9 + patch -Np1 -i $stuff/fix-qtbug-15857.patch 1.10 + patch -Np1 -i $stuff/add-postgresql9.patch 1.11 1.12 ./configure -v \ 1.13 -prefix /usr \
2.1 --- a/rarian/receipt Wed Mar 02 10:41:40 2011 +0100 2.2 +++ b/rarian/receipt Wed Mar 02 11:06:20 2011 +0100 2.3 @@ -15,7 +15,7 @@ 2.4 compile_rules() 2.5 { 2.6 cd $src 2.7 - patch -p0 -i ../stuff/user-segfault.patch 2.8 + patch -p0 -i $stuff/user-segfault.patch 2.9 ./configure \ 2.10 --prefix=/usr \ 2.11 --infodir=/usr/share/info \
3.1 --- a/rawstudio/receipt Wed Mar 02 10:41:40 2011 +0100 3.2 +++ b/rawstudio/receipt Wed Mar 02 11:06:20 2011 +0100 3.3 @@ -16,7 +16,7 @@ 3.4 { 3.5 cd $src 3.6 export PKG_CONFIG_PATH="/usr/lib/pkgconfig" 3.7 - patch -p1 -i ../stuff/rawstudio-const.patch 3.8 + patch -p1 -i $stuff/rawstudio-const.patch 3.9 ./configure \ 3.10 --prefix=/usr \ 3.11 --infodir=/usr/share/info \
4.1 --- a/recorder/receipt Wed Mar 02 10:41:40 2011 +0100 4.2 +++ b/recorder/receipt Wed Mar 02 11:06:20 2011 +0100 4.3 @@ -15,7 +15,7 @@ 4.4 compile_rules() 4.5 { 4.6 cd $src 4.7 - cp ../stuff/Makefile Makefile 4.8 + cp $stuff/Makefile Makefile 4.9 make DESTDIR=$PWD/_pkg install 4.10 } 4.11
5.1 --- a/ruby/receipt Wed Mar 02 10:41:40 2011 +0100 5.2 +++ b/ruby/receipt Wed Mar 02 11:06:20 2011 +0100 5.3 @@ -16,7 +16,7 @@ 5.4 compile_rules() 5.5 { 5.6 cd $src 5.7 - patch -Np1 < ../stuff/openssl-1.0.patch 5.8 + patch -Np1 < $stuff/openssl-1.0.patch 5.9 ./configure --prefix=/usr --enable-shared --infodir=/usr/share/info --mandir=/usr/share/man $CONFIGURE_ARGS && 5.10 make -j 4 && 5.11 make DESTDIR=$PWD/_pkg install
6.1 --- a/sc/receipt Wed Mar 02 10:41:40 2011 +0100 6.2 +++ b/sc/receipt Wed Mar 02 11:06:20 2011 +0100 6.3 @@ -15,7 +15,7 @@ 6.4 compile_rules() 6.5 { 6.6 cd $src 6.7 - patch -p1 < ../stuff/7.16.patch || return 1 6.8 + patch -p1 < $stuff/7.16.patch || return 1 6.9 make 6.10 } 6.11
7.1 --- a/scim-pinyin/receipt Wed Mar 02 10:41:40 2011 +0100 7.2 +++ b/scim-pinyin/receipt Wed Mar 02 11:06:20 2011 +0100 7.3 @@ -19,7 +19,7 @@ 7.4 while read file; do 7.5 [ -f done.$file ] && continue 7.6 echo "Apply $file..." 7.7 - patch -p1 < ../stuff/$file || return 1 7.8 + patch -p1 < $stuff/$file || return 1 7.9 touch done.$file 7.10 done <<EOT 7.11 cstring-gcc43.patch
8.1 --- a/scim/receipt Wed Mar 02 10:41:40 2011 +0100 8.2 +++ b/scim/receipt Wed Mar 02 11:06:20 2011 +0100 8.3 @@ -17,7 +17,7 @@ 8.4 while read file; do 8.5 [ -f done.$file ] && continue 8.6 echo "Apply $file..." 8.7 - patch -p1 < ../stuff/$file || return 1 8.8 + patch -p1 < $stuff/$file || return 1 8.9 touch done.$file 8.10 done <<EOT 8.11 scim-glibc-2.10.patch
9.1 --- a/seamonkey/receipt Wed Mar 02 10:41:40 2011 +0100 9.2 +++ b/seamonkey/receipt Wed Mar 02 11:06:20 2011 +0100 9.3 @@ -16,9 +16,9 @@ 9.4 { 9.5 #mv mozilla $PACKAGE-$VERSION 2>/dev/null || exit 1 9.6 mv comm-1.9.1 $PACKAGE-$VERSION 2>/dev/null 9.7 - cp -a stuff/seamonkey.mozconfig $src/.mozconfig 9.8 + cp -a $stuff/seamonkey.mozconfig $src/.mozconfig 9.9 cd $src 9.10 - #patch -p1 -i ../stuff/google-breakpad.u || exit 1 9.11 + #patch -p1 -i $stuff/google-breakpad.u || exit 1 9.12 cat >> mozilla/layout/build/Makefile.in << "EOF" 9.13 ifdef MOZ_ENABLE_CANVAS 9.14 EXTRA_DSO_LDOPTS += $(XLDFLAGS) -lX11 -lXrender 9.15 @@ -39,10 +39,10 @@ 9.16 cp -a $_pkg/usr/bin/seamonkey $fs/usr/bin 9.17 cp -a $_pkg/usr/lib/seamonkey-* $fs/usr/lib 9.18 # Home page, bookmarks file and branding. 9.19 - cp -a stuff/bookmarks.html \ 9.20 + cp -a $stuff/bookmarks.html \ 9.21 $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile 9.22 # User preference. 9.23 - cp -a stuff/userChrome.css \ 9.24 + cp -a $stuff/userChrome.css \ 9.25 $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome 9.26 # Move default config to /etc/seamonkey (/usr maybe read-only) 9.27 mv -f $fs/usr/lib/$PACKAGE-$VERSION/defaults $fs/etc/$PACKAGE 9.28 @@ -52,7 +52,7 @@ 9.29 chown -R root.root $fs/etc 9.30 9.31 # Create default user preference file 9.32 - cp stuff/prefs.js $fs/etc/seamonkey/profile/prefs.js 9.33 + cp $stuff/prefs.js $fs/etc/seamonkey/profile/prefs.js 9.34 9.35 } 9.36
10.1 --- a/setserial/receipt Wed Mar 02 10:41:40 2011 +0100 10.2 +++ b/setserial/receipt Wed Mar 02 11:06:20 2011 +0100 10.3 @@ -17,7 +17,7 @@ 10.4 10.5 # http://bugs.gentoo.org/309883 10.6 # & remove warnings 10.7 - patch -p1 < ../stuff/setserial-2.17.u || return 1 10.8 + patch -p1 < $stuff/setserial-2.17.u || return 1 10.9 10.10 ./configure --prefix=/usr --infodir=/usr/share/info \ 10.11 --mandir=/usr/share/man $CONFIGURE_ARGS &&
11.1 --- a/sheerdns/receipt Wed Mar 02 10:41:40 2011 +0100 11.2 +++ b/sheerdns/receipt Wed Mar 02 11:06:20 2011 +0100 11.3 @@ -15,9 +15,9 @@ 11.4 { 11.5 mv $PACKAGE $src 2> /dev/null 11.6 cd $src 11.7 - for i in $( cd ../stuff ; ls *.u); do 11.8 + for i in $( cd $stuff ; ls *.u); do 11.9 [ -f done.$i ] && continue 11.10 - patch -p0 < ../stuff/$i 11.11 + patch -p0 < $stuff/$i 11.12 touch done.$i 11.13 done 11.14 make
12.1 --- a/slim/receipt Wed Mar 02 10:41:40 2011 +0100 12.2 +++ b/slim/receipt Wed Mar 02 11:06:20 2011 +0100 12.3 @@ -19,7 +19,7 @@ 12.4 compile_rules() 12.5 { 12.6 cd $src 12.7 - patch -p1 < ../stuff/NoPwdForCmd.patch || return 1 12.8 + patch -p1 < $stuff/NoPwdForCmd.patch || return 1 12.9 make && 12.10 make DESTDIR=$src/_pkg install 12.11 } 12.12 @@ -28,11 +28,11 @@ 12.13 genpkg_rules() 12.14 { 12.15 mkdir -p $fs/usr/share/slim 12.16 - cp -a stuff/themes $fs/usr/share/slim 12.17 + cp -a $stuff/themes $fs/usr/share/slim 12.18 cp -a $_pkg/usr/bin $fs/usr 12.19 12.20 # Config file and rc script. 12.21 - cp -a stuff/etc $fs 12.22 + cp -a $stuff/etc $fs 12.23 chown -R root.root $fs 12.24 } 12.25
13.1 --- a/speedtouch/receipt Wed Mar 02 10:41:40 2011 +0100 13.2 +++ b/speedtouch/receipt Wed Mar 02 11:06:20 2011 +0100 13.3 @@ -18,7 +18,7 @@ 13.4 while read file; do 13.5 [ -f done.$file ] && continue 13.6 echo "Apply $file..." 13.7 - patch -p1 < ../stuff/$PACKAGE-$VERSION-$file || return 1 13.8 + patch -p1 < $stuff/$PACKAGE-$VERSION-$file || return 1 13.9 touch done.$file 13.10 done <<EOT 13.11 gcc4.u
14.1 --- a/squashfs/receipt Wed Mar 02 10:41:40 2011 +0100 14.2 +++ b/squashfs/receipt Wed Mar 02 11:06:20 2011 +0100 14.3 @@ -17,7 +17,7 @@ 14.4 { 14.5 mv ${PACKAGE}${VERSION} $src 2> /dev/null 14.6 cd $src 14.7 - patch -Np1 -i ../stuff/xz.patch 14.8 + patch -Np1 -i $stuff/xz.patch 14.9 cd $src/squashfs-tools 14.10 #sed -i 's|#XZ_SUPPORT = 1|XZ_SUPPORT = 1|g' Makefile 14.11 mkdir -p ../_pkg/usr/sbin ../_pkg/sbin
15.1 --- a/squidguard/receipt Wed Mar 02 10:41:40 2011 +0100 15.2 +++ b/squidguard/receipt Wed Mar 02 11:06:20 2011 +0100 15.3 @@ -20,7 +20,7 @@ 15.4 # Security patches 15.5 while read patch_file; do 15.6 echo "Apply $patch_file" 15.7 - tar xvzf ../stuff/$patch_file || return 1 15.8 + tar xvzf $stuff/$patch_file || return 1 15.9 cp -a $(basename $patch_file .tar.gz)/* src 15.10 done <<EOT 15.11 squidGuard-1.4-patch-20091015.tar.gz
16.1 --- a/stardict/receipt Wed Mar 02 10:41:40 2011 +0100 16.2 +++ b/stardict/receipt Wed Mar 02 11:06:20 2011 +0100 16.3 @@ -15,8 +15,8 @@ 16.4 compile_rules() 16.5 { 16.6 cd $src 16.7 - patch -p1 < ../stuff/sigc++.patch || return 1 16.8 - patch -p1 < ../stuff/stardict_gcc43.patch || return 1 16.9 + patch -p1 < $stuff/sigc++.patch || return 1 16.10 + patch -p1 < $stuff/stardict_gcc43.patch || return 1 16.11 16.12 ./configure \ 16.13 --prefix=/usr \
17.1 --- a/stellarium/receipt Wed Mar 02 10:41:40 2011 +0100 17.2 +++ b/stellarium/receipt Wed Mar 02 11:06:20 2011 +0100 17.3 @@ -26,7 +26,7 @@ 17.4 mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications 17.5 cp -a $_pkg/usr/bin $fs/usr 17.6 cp -a $_pkg/usr/share/stellarium $fs/usr/share 17.7 - cp -a $WOK/$PACKAGE/stuff/stellarium.png $fs/usr/share/pixmaps 17.8 - cp -a $WOK/$PACKAGE/stuff/stellarium.desktop $fs/usr/share/applications 17.9 + cp -a $stuff/stellarium.png $fs/usr/share/pixmaps 17.10 + cp -a $stuff/stellarium.desktop $fs/usr/share/applications 17.11 } 17.12
18.1 --- a/supertux/receipt Wed Mar 02 10:41:40 2011 +0100 18.2 +++ b/supertux/receipt Wed Mar 02 11:06:20 2011 +0100 18.3 @@ -16,7 +16,7 @@ 18.4 compile_rules() 18.5 { 18.6 cd $src 18.7 - cp ../stuff/menu.h src 18.8 + cp $stuff/menu.h src 18.9 cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . 18.10 make && make DESTDIR=$PWD/_pkg install 18.11 }
19.1 --- a/syasokoban/receipt Wed Mar 02 10:41:40 2011 +0100 19.2 +++ b/syasokoban/receipt Wed Mar 02 11:06:20 2011 +0100 19.3 @@ -16,7 +16,7 @@ 19.4 { 19.5 cd $src 19.6 if [ ! -f gcc44.u.done ]; then 19.7 - patch -p0 < ../stuff/gcc44.u 19.8 + patch -p0 < $stuff/gcc44.u 19.9 touch gcc44.u.done 19.10 fi 19.11 make 19.12 @@ -27,7 +27,7 @@ 19.13 { 19.14 mkdir -p $fs/usr/bin $fs/usr/share/syasokoban $fs/usr/share/applications 19.15 cp -a $src/syasokoban $src/data $fs/usr/share/syasokoban 19.16 - cp -a stuff/sokoban.desktop $fs/usr/share/applications 19.17 - cp -a stuff/syasokoban $fs/usr/bin/syasokoban 19.18 + cp -a $stuff/sokoban.desktop $fs/usr/share/applications 19.19 + cp -a $stuff/syasokoban $fs/usr/bin/syasokoban 19.20 } 19.21
20.1 --- a/syslinux/receipt Wed Mar 02 10:41:40 2011 +0100 20.2 +++ b/syslinux/receipt Wed Mar 02 11:06:20 2011 +0100 20.3 @@ -17,10 +17,10 @@ 20.4 { 20.5 cd $src 20.6 # Do not try to build the Windows or DOS installers 20.7 - patch -p1 -i ../stuff/syslinux-dont-build-dos-windows-targets.patch 20.8 - cp ../stuff/tools/isohybrid.sh . 20.9 - cp ../stuff/tools/keytab-lilo.pl . 20.10 - cp ../stuff/extra/ifmem.c com32/modules 20.11 + patch -p1 -i $stuff/syslinux-dont-build-dos-windows-targets.patch 20.12 + cp $stuff/tools/isohybrid.sh . 20.13 + cp $stuff/tools/keytab-lilo.pl . 20.14 + cp $stuff/extra/ifmem.c com32/modules 20.15 grep -q ifmem.c32 com32/modules/Makefile || 20.16 sed -i 's/ifcpu64.c32/ifcpu64.c32 ifmem.c32/' com32/modules/Makefile 20.17 make -C com32 20.18 @@ -41,7 +41,7 @@ 20.19 cp -a $src/com32/modules/reboot.c32 $fs/boot/isolinux 20.20 cp -a $src/com32/modules/ifmem.c32 $fs/boot/isolinux 20.21 cp -a $src/modules/poweroff.com $fs/boot/isolinux 20.22 - cp stuff/*.cfg stuff/*.txt stuff/*.msg stuff/*.lss $fs/boot/isolinux 20.23 + cp $stuff/*.cfg $stuff/*.txt $stuff/*.msg $stuff/*.lss $fs/boot/isolinux 20.24 while read cfg kbd loc ; do 20.25 sed -e "s/^display/kbdmap $cfg.kbd\ndisplay/" \ 20.26 -e "s/^label/say Now using $kbd keyboard and $loc locale.\nlabel/" \
21.1 --- a/syslinux/stuff/tools/isohybrid.sh Wed Mar 02 10:41:40 2011 +0100 21.2 +++ b/syslinux/stuff/tools/isohybrid.sh Wed Mar 02 11:06:20 2011 +0100 21.3 @@ -19,21 +19,23 @@ 21.4 offset=0 21.5 partok=0 21.6 hd0=0 21.7 +always=0 21.8 21.9 while [ -n "$1" ]; do 21.10 - case "$1" in 21.11 - -ct*) hd0=2;; 21.12 - -e*|--e*) entry=$2; shift;; 21.13 - -f*) hd0=1;; 21.14 - -h) heads=$2; shift;; 21.15 - -i|--i*) id=$(($2)); shift;; 21.16 - -noh*) hd0=0;; 21.17 - -nop*) partok=0;; 21.18 - -o*|--o*) offset=$(($2)); shift;; 21.19 - -p*) partok=1;; 21.20 - -s) sectors=$2; shift;; 21.21 - -t*|--t*) partype=$(($2 & 255)); shift;; 21.22 - *) iso=$1;; 21.23 + case "${1/--/-}" in 21.24 + -a*) always=1;; 21.25 + -ct*) hd0=2;; 21.26 + -e*) entry=$2; shift;; 21.27 + -f*) hd0=1;; 21.28 + -h) heads=$2; shift;; 21.29 + -i*) id=$(($2)); shift;; 21.30 + -noh*) hd0=0;; 21.31 + -nop*) partok=0;; 21.32 + -o*) offset=$(($2)); shift;; 21.33 + -p*) partok=1;; 21.34 + -s) sectors=$2; shift;; 21.35 + -t*) partype=$(($2 & 255)); shift;; 21.36 + *) iso=$1;; 21.37 esac 21.38 shift 21.39 done 21.40 @@ -51,6 +53,7 @@ 21.41 --forcehd0 Assume we are loaded as disk ID 0 21.42 --ctrlhd0 Assume disk ID 0 if the Ctrl key is pressed 21.43 --partok Allow booting from within a partition 21.44 + --always Do not abort on errors 21.45 EOT 21.46 exit 1 21.47 fi 21.48 @@ -74,9 +77,9 @@ 21.49 # write a 32 bits data 21.50 store32() 21.51 { 21.52 - n=$2; i=4; while [ $i -ne 0 ]; do 21.53 + n=$2; for i in 1 2 3 4; do 21.54 printf '\\\\x%02X' $(($n & 255)) 21.55 - i=$(($i-1)); n=$(($n >> 8)) 21.56 + n=$(($n >> 8)) 21.57 done | xargs echo -en | ddq bs=1 conv=notrunc of=$iso seek=$(($1)) 21.58 } 21.59 21.60 @@ -99,7 +102,7 @@ 21.61 abort() 21.62 { 21.63 echo "$iso: $1" 21.64 - exit 1 21.65 + [ $always -eq 0 ] && exit 1 21.66 } 21.67 21.68 [ "$(readiso 17 7 23)" == "EL TORITO SPECIFICATION" ] ||
22.1 --- a/tcc/receipt Wed Mar 02 10:41:40 2011 +0100 22.2 +++ b/tcc/receipt Wed Mar 02 11:06:20 2011 +0100 22.3 @@ -17,7 +17,7 @@ 22.4 { 22.5 cd $src 22.6 if [ ! -f done.Makefile.u ]; then 22.7 - patch < ../stuff/Makefile.u || return 1 22.8 + patch < $stuff/Makefile.u || return 1 22.9 touch done.Makefile.u 22.10 fi 22.11 sed -i 's/cp -u/cp/' tests/Makefile
23.1 --- a/tiff/receipt Wed Mar 02 10:41:40 2011 +0100 23.2 +++ b/tiff/receipt Wed Mar 02 11:06:20 2011 +0100 23.3 @@ -20,7 +20,7 @@ 23.4 # allows context-dependent attackers to cause a denial of service 23.5 # (crash) via a crafted TIFF imag. 23.6 23.7 - patch -p1 -i ../stuff/libtiff-CVE-2009-2285.patch 23.8 + patch -p1 -i $stuff/libtiff-CVE-2009-2285.patch 23.9 ./configure --prefix=/usr --infodir=/usr/share/info \ 23.10 --mandir=/usr/share/man $CONFIGURE_ARGS && 23.11 make &&
24.1 --- a/tinyproxy/receipt Wed Mar 02 10:41:40 2011 +0100 24.2 +++ b/tinyproxy/receipt Wed Mar 02 11:06:20 2011 +0100 24.3 @@ -14,7 +14,7 @@ 24.4 compile_rules() 24.5 { 24.6 cd $src 24.7 - patch -Np1 -i ../stuff/no-docs-and-tests.diff 24.8 + patch -Np1 -i $stuff/no-docs-and-tests.diff 24.9 ./configure \ 24.10 --prefix=/usr \ 24.11 --infodir=/usr/share/info \ 24.12 @@ -35,6 +35,6 @@ 24.13 cp -a $_pkg/usr/sbin $fs/usr 24.14 cp -a $_pkg/usr/share/tinyproxy $fs/usr/share 24.15 cp -a $_pkg/etc/tinyproxy $fs/etc 24.16 - cp -a stuff/tinyproxy $fs/etc/init.d 24.17 + cp -a $stuff/tinyproxy $fs/etc/init.d 24.18 } 24.19
25.1 --- a/tuxmath/receipt Wed Mar 02 10:41:40 2011 +0100 25.2 +++ b/tuxmath/receipt Wed Mar 02 11:06:20 2011 +0100 25.3 @@ -19,7 +19,7 @@ 25.4 compile_rules() 25.5 { 25.6 cd $src 25.7 - patch -p1 -i ../stuff/SDL_extras.c.patch 25.8 + patch -p1 -i $stuff/SDL_extras.c.patch 25.9 ./configure \ 25.10 --prefix=/usr \ 25.11 --without-sdlpango \
26.1 --- a/urxvt/receipt Wed Mar 02 10:41:40 2011 +0100 26.2 +++ b/urxvt/receipt Wed Mar 02 11:06:20 2011 +0100 26.3 @@ -16,7 +16,7 @@ 26.4 compile_rules() 26.5 { 26.6 cd $src 26.7 - busybox patch -p0 -i ../stuff/gcc.u 26.8 + busybox patch -p0 -i $stuff/gcc.u 26.9 ./configure --prefix=/usr --infodir=/usr/share/info \ 26.10 --disable-perl --with-codesets='eu' \ 26.11 --mandir=/usr/share/man $CONFIGURE_ARGS && \
27.1 --- a/util-linux-ng/receipt Wed Mar 02 10:41:40 2011 +0100 27.2 +++ b/util-linux-ng/receipt Wed Mar 02 11:06:20 2011 +0100 27.3 @@ -19,9 +19,9 @@ 27.4 { 27.5 cd $src 27.6 # fix findmnt 27.7 - patch -p1 -i ../stuff/fix-findmnt.patch 27.8 + patch -p1 -i $stuff/fix-findmnt.patch 27.9 # fix cfdisk partition changing, included in next upstream release 27.10 - patch -p1 -i ../stuff/util-linux-ng-cfdisk.patch 27.11 + patch -p1 -i $stuff/util-linux-ng-cfdisk.patch 27.12 27.13 if ! grep 'tty:x:4:' /etc/group; then 27.14 addgroup -g 4 tty
28.1 --- a/visualboyadvance/receipt Wed Mar 02 10:41:40 2011 +0100 28.2 +++ b/visualboyadvance/receipt Wed Mar 02 11:06:20 2011 +0100 28.3 @@ -17,7 +17,7 @@ 28.4 compile_rules() 28.5 { 28.6 cd $src 28.7 - for i in ../stuff/$VERSION-*.patch; do 28.8 + for i in $stuff/$VERSION-*.patch; do 28.9 patch -Np0 < $i 28.10 done 28.11 ./configure \
29.1 --- a/vym/receipt Wed Mar 02 10:41:40 2011 +0100 29.2 +++ b/vym/receipt Wed Mar 02 11:06:20 2011 +0100 29.3 @@ -20,7 +20,7 @@ 29.4 make && 29.5 make INSTALL_ROOT=$PWD/_pkg install 29.6 mkdir -p $PWD/_pkg/usr/share/applications 29.7 - cp -f ../stuff/vym.desktop $PWD/_pkg/usr/share/applications 29.8 + cp -f $stuff/vym.desktop $PWD/_pkg/usr/share/applications 29.9 } 29.10 29.11 # Rules to gen a SliTaz package suitable for Tazpkg.
30.1 --- a/vzctl/receipt Wed Mar 02 10:41:40 2011 +0100 30.2 +++ b/vzctl/receipt Wed Mar 02 11:06:20 2011 +0100 30.3 @@ -23,7 +23,7 @@ 30.4 continue 30.5 fi 30.6 echo "Apply $patch_file" 30.7 - patch -p1 < ../stuff/$patch_file || return 1 30.8 + patch -p1 < $stuff/$patch_file || return 1 30.9 touch done.$patch_file 30.10 done <<EOT 30.11 vzctl-${VERSION}-Makefile.u
31.1 --- a/vzquota/receipt Wed Mar 02 10:41:40 2011 +0100 31.2 +++ b/vzquota/receipt Wed Mar 02 11:06:20 2011 +0100 31.3 @@ -21,7 +21,7 @@ 31.4 continue 31.5 fi 31.6 echo "Apply $patch_file" 31.7 - patch -p1 < ../stuff/$patch_file || return 1 31.8 + patch -p1 < $stuff/$patch_file || return 1 31.9 touch done.$patch_file 31.10 done <<EOT 31.11 vzquota-${VERSION}.u
32.1 --- a/wbar/receipt Wed Mar 02 10:41:40 2011 +0100 32.2 +++ b/wbar/receipt Wed Mar 02 11:06:20 2011 +0100 32.3 @@ -17,7 +17,7 @@ 32.4 compile_rules() 32.5 { 32.6 cd $src 32.7 - patch -p0 < ../stuff/gcc43_fixes.diff || return 1 32.8 + patch -p0 < $stuff/gcc43_fixes.diff || return 1 32.9 make && 32.10 mkdir -p _pkg/usr/share/wbar/iconpack _pkg/usr/bin && 32.11 cp wbar _pkg/usr/bin &&
33.1 --- a/weechat/receipt Wed Mar 02 10:41:40 2011 +0100 33.2 +++ b/weechat/receipt Wed Mar 02 11:06:20 2011 +0100 33.3 @@ -19,7 +19,7 @@ 33.4 while read file; do 33.5 [ -f done.$file ] && continue 33.6 echo "Apply $file..." 33.7 - patch -p1 < ../stuff/$file || return 1 33.8 + patch -p1 < $stuff/$file || return 1 33.9 touch done.$file 33.10 done <<EOT 33.11 weechat-implicit-function-declaration.patch
34.1 --- a/wine/receipt Wed Mar 02 10:41:40 2011 +0100 34.2 +++ b/wine/receipt Wed Mar 02 11:06:20 2011 +0100 34.3 @@ -19,7 +19,7 @@ 34.4 { 34.5 cd $src 34.6 34.7 - patch -p1 < ../stuff/wine-1.2-cdrom.c.u || return 1 34.8 + patch -p1 < $stuff/wine-1.2-cdrom.c.u || return 1 34.9 34.10 ./configure --prefix=/usr --infodir=/usr/share/info \ 34.11 --mandir=/usr/share/man $CONFIGURE_ARGS &&
35.1 --- a/xarchive/receipt Wed Mar 02 10:41:40 2011 +0100 35.2 +++ b/xarchive/receipt Wed Mar 02 11:06:20 2011 +0100 35.3 @@ -19,7 +19,7 @@ 35.4 cd $src 35.5 # patch tar-wrap for busybox tar option 35.6 [ -f done.slitaz-xarchive-wrappers-0.2.8-6.patch ] || \ 35.7 - patch -p1 -i ../stuff/slitaz-xarchive-wrappers-0.2.8-6.patch 35.8 + patch -p1 -i $stuff/slitaz-xarchive-wrappers-0.2.8-6.patch 35.9 touch done.slitaz-xarchive-wrappers-0.2.8-6.patch 35.10 35.11 ./configure --prefix=/usr --infodir=/usr/share/info \ 35.12 @@ -35,7 +35,7 @@ 35.13 mkdir -p $fs/usr/lib/xarchive/wrappers 35.14 cp -a $_pkg/usr/bin $fs/usr 35.15 sed -i 's|#!\s*/bin/bash|#!/bin/sh|' $_pkg/usr/lib/xarchive/wrappers/* 35.16 - cp stuff/slitaz-wrap.sh $fs/usr/lib/xarchive/wrappers 35.17 + cp $stuff/slitaz-wrap.sh $fs/usr/lib/xarchive/wrappers 35.18 strip -s $fs/usr/bin/* 35.19 } 35.20
36.1 --- a/xdg-utils/receipt Wed Mar 02 10:41:40 2011 +0100 36.2 +++ b/xdg-utils/receipt Wed Mar 02 11:06:20 2011 +0100 36.3 @@ -17,7 +17,7 @@ 36.4 while read file; do 36.5 [ -f done.$file ] && continue 36.6 echo "Apply $file..." 36.7 - patch -p1 < ../stuff/$file || return 1 36.8 + patch -p1 < $stuff/$file || return 1 36.9 touch done.$file 36.10 done <<EOT 36.11 xdg-open-chrome.patch
37.1 --- a/xfe/receipt Wed Mar 02 10:41:40 2011 +0100 37.2 +++ b/xfe/receipt Wed Mar 02 11:06:20 2011 +0100 37.3 @@ -16,7 +16,7 @@ 37.4 compile_rules() 37.5 { 37.6 cd $src 37.7 - patch -p 0 < ../stuff/gcc-4.patch || return 1 37.8 + patch -p 0 < $stuff/gcc-4.patch || return 1 37.9 ./configure \ 37.10 --prefix=/usr \ 37.11 --mandir=/usr/share/man \
38.1 --- a/xine-lib/receipt Wed Mar 02 10:41:40 2011 +0100 38.2 +++ b/xine-lib/receipt Wed Mar 02 11:06:20 2011 +0100 38.3 @@ -29,7 +29,7 @@ 38.4 grep -qs 'define u8' src/input/vcd/libcdio/_cdio_linux.c || 38.5 sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \ 38.6 src/input/vcd/libcdio/_cdio_linux.c 38.7 - patch -p0 < ../stuff/xine-lib-1.1.19-xvmc.patch 38.8 + patch -p0 < $stuff/xine-lib-1.1.19-xvmc.patch 38.9 ./configure \ 38.10 --prefix=/usr \ 38.11 --infodir=/usr/share/info \
39.1 --- a/xorg-xf86-input-evdev/receipt Wed Mar 02 10:41:40 2011 +0100 39.2 +++ b/xorg-xf86-input-evdev/receipt Wed Mar 02 11:06:20 2011 +0100 39.3 @@ -34,6 +34,6 @@ 39.4 cp -a $_pkg/usr/lib/X11/modules/input/*.so \ 39.5 $fs/usr/lib/X11/modules/input/ 39.6 mkdir -p $fs/etc/X11/xorg.conf.d 39.7 - cp -a stuff/*evdev.conf $fs/etc/X11/xorg.conf.d 39.8 + cp -a $stuff/*evdev.conf $fs/etc/X11/xorg.conf.d 39.9 } 39.10
40.1 --- a/xorg-xf86-input-evtouch/receipt Wed Mar 02 10:41:40 2011 +0100 40.2 +++ b/xorg-xf86-input-evtouch/receipt Wed Mar 02 11:06:20 2011 +0100 40.3 @@ -16,7 +16,7 @@ 40.4 compile_rules() 40.5 { 40.6 cd $src 40.7 - grep -qs dummy evtouch.c && patch -p1 < ../stuff/evtouch.u 40.8 + grep -qs dummy evtouch.c && patch -p1 < $stuff/evtouch.u 40.9 ./configure \ 40.10 --prefix=/usr \ 40.11 --sysconfdir=/etc \
41.1 --- a/xorg-xf86-input-microtouch/receipt Wed Mar 02 10:41:40 2011 +0100 41.2 +++ b/xorg-xf86-input-microtouch/receipt Wed Mar 02 11:06:20 2011 +0100 41.3 @@ -16,7 +16,7 @@ 41.4 compile_rules() 41.5 { 41.6 cd $src 41.7 - grep -qs axis_labels src/microtouch.c || patch -p0 < ../stuff/microtouch.u 41.8 + grep -qs axis_labels src/microtouch.c || patch -p0 < $stuff/microtouch.u 41.9 ./configure \ 41.10 --prefix=/usr \ 41.11 --sysconfdir=/etc \
42.1 --- a/xorg-xf86-input-mutouch/receipt Wed Mar 02 10:41:40 2011 +0100 42.2 +++ b/xorg-xf86-input-mutouch/receipt Wed Mar 02 11:06:20 2011 +0100 42.3 @@ -16,7 +16,7 @@ 42.4 compile_rules() 42.5 { 42.6 cd $src 42.7 - patch -p1 -i ../stuff/mutouch-1.2.1-abi.patch 42.8 + patch -p1 -i $stuff/mutouch-1.2.1-abi.patch 42.9 ./configure \ 42.10 --prefix=/usr \ 42.11 --sysconfdir=/etc \
43.1 --- a/xorg-xf86-input-synaptics/receipt Wed Mar 02 10:41:40 2011 +0100 43.2 +++ b/xorg-xf86-input-synaptics/receipt Wed Mar 02 11:06:20 2011 +0100 43.3 @@ -35,6 +35,6 @@ 43.4 cp -a $_pkg/usr/lib/X11/modules/input/*.so \ 43.5 $fs/usr/lib/X11/modules/input/ 43.6 mkdir -p $fs/etc/X11/xorg.conf.d 43.7 - cp -a stuff/*.conf $fs/etc/X11/xorg.conf.d 43.8 + cp -a $stuff/*.conf $fs/etc/X11/xorg.conf.d 43.9 } 43.10
44.1 --- a/xorg-xinit/receipt Wed Mar 02 10:41:40 2011 +0100 44.2 +++ b/xorg-xinit/receipt Wed Mar 02 11:06:20 2011 +0100 44.3 @@ -17,7 +17,7 @@ 44.4 compile_rules() 44.5 { 44.6 cd $src 44.7 - patch -Np1 -i ../stuff/06_move_serverauthfile_into_tmp.diff 44.8 + patch -Np1 -i $stuff/06_move_serverauthfile_into_tmp.diff 44.9 ./configure \ 44.10 --prefix=/usr \ 44.11 --mandir=/usr/share/man \ 44.12 @@ -31,7 +31,7 @@ 44.13 { 44.14 mkdir -p $fs/usr $fs/etc/X11/xinit 44.15 cp -a $_pkg/usr/bin $fs/usr 44.16 - cp -a stuff/xserverrc $fs/etc/X11/xinit/xserverrc 44.17 + cp -a $stuff/xserverrc $fs/etc/X11/xinit/xserverrc 44.18 } 44.19 44.20 pre_install()
45.1 --- a/xpat2/receipt Wed Mar 02 10:41:40 2011 +0100 45.2 +++ b/xpat2/receipt Wed Mar 02 11:06:20 2011 +0100 45.3 @@ -16,11 +16,11 @@ 45.4 cd $src 45.5 for i in xpat2.patch layout.patch ; do 45.6 [ -f done.$i ] && continue 45.7 - patch -p1 < ../stuff/$i 45.8 + patch -p1 < $stuff/$i 45.9 touch done.$i 45.10 done 45.11 cd src 45.12 - cp ../../stuff/Makefile . 45.13 + cp $stuff/Makefile . 45.14 make && 45.15 make DESTDIR=../_pkg install 45.16 } 45.17 @@ -31,7 +31,7 @@ 45.18 mkdir -p $fs/var/games/xpat2 45.19 cp -a $_pkg/usr $fs 45.20 mkdir -p $fs/usr/share/X11/app-defaults/ 45.21 - cp -a $src/../stuff/XPat.ad $fs/usr/share/X11/app-defaults/XPat 45.22 + cp -a $stuff/XPat.ad $fs/usr/share/X11/app-defaults/XPat 45.23 touch $fs/var/games/xpat2/xpat.log 45.24 chmod 666 $fs/var/games/xpat2/xpat.log 45.25 }
46.1 --- a/xtrkcad/receipt Wed Mar 02 10:41:40 2011 +0100 46.2 +++ b/xtrkcad/receipt Wed Mar 02 11:06:20 2011 +0100 46.3 @@ -22,7 +22,7 @@ 46.4 # Rules to configure and make the package. 46.5 compile_rules() 46.6 { 46.7 - XTRKCAD_STUFF=$PWD/stuff 46.8 + XTRKCAD_STUFF=$stuff 46.9 46.10 [ -d $PACKAGE-source-$VERSION ] && mv $PACKAGE-source-$VERSION $PACKAGE-$VERSION 46.11 cd $src
47.1 --- a/yasr/receipt Wed Mar 02 10:41:40 2011 +0100 47.2 +++ b/yasr/receipt Wed Mar 02 11:06:20 2011 +0100 47.3 @@ -14,7 +14,7 @@ 47.4 compile_rules() 47.5 { 47.6 cd $src/yasr 47.7 - patch -p0 < ../../stuff/yasr.patch || return 1 47.8 + patch -p0 < $stuff/yasr.patch || return 1 47.9 cd ../ 47.10 ./configure \ 47.11 --prefix=/usr
48.1 --- a/zsnes/receipt Wed Mar 02 10:41:40 2011 +0100 48.2 +++ b/zsnes/receipt Wed Mar 02 11:06:20 2011 +0100 48.3 @@ -16,7 +16,7 @@ 48.4 48.5 compile_rules() { 48.6 cd $src 48.7 - patch -p1 -i ../stuff/zsnes.patch 48.8 + patch -p1 -i $stuff/zsnes.patch 48.9 cd $src/src 48.10 ./configure --prefix=/usr \ 48.11 --x-libraries=/usr/lib \
49.1 --- a/zvbi/receipt Wed Mar 02 10:41:40 2011 +0100 49.2 +++ b/zvbi/receipt Wed Mar 02 11:06:20 2011 +0100 49.3 @@ -15,7 +15,7 @@ 49.4 compile_rules() 49.5 { 49.6 cd $src 49.7 - patch -Np1 -i ../stuff/fix-includes.patch 49.8 + patch -Np1 -i $stuff/fix-includes.patch 49.9 ./configure \ 49.10 --prefix=/usr \ 49.11 --infodir=/usr/share/info \