wok-next rev 20491
More packing...
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Tue Mar 13 02:04:32 2018 +0200 (2018-03-13) |
| parents | a54030a5b01b |
| children | 4c1ed6983d05 |
| files | fpc-bootstrap/receipt fpc/receipt libsdl2-ttf/receipt mate-screensaver/receipt palemoon/receipt plm2c/receipt pluma/receipt polipo/receipt portsentry/receipt postfixadmin/receipt proot/receipt psyco/receipt ptunnel/receipt pwauth/receipt pwnat/receipt qiv/receipt quesoglc/receipt quilt/receipt rcs/receipt redis/receipt reqflow/receipt rgzip/receipt rinetd/receipt rubix/receipt rzip/receipt sc/receipt sc/stuff/7.16.patch sc/stuff/patches/7.16.patch sc/stuff/patches/series scalpel/receipt screenlets/receipt sheerdns/receipt simh/receipt slitaz-configs/receipt slitaz-icons-faenza/receipt slitaz-icons-hydroxygen/receipt sozi/receipt sshttp/receipt stegsnow/receipt |
line diff
1.1 --- a/fpc-bootstrap/receipt Mon Mar 12 11:53:39 2018 +0100 1.2 +++ b/fpc-bootstrap/receipt Tue Mar 13 02:04:32 2018 +0200 1.3 @@ -1,38 +1,26 @@ 1.4 -# SliTaz package receipt. 1.5 +# SliTaz package receipt v2. 1.6 1.7 PACKAGE="fpc-bootstrap" 1.8 -VERSION="2.6.2" 1.9 +VERSION="2.6.2" # last 2.x.x version is 2.6.4, and it lacks arm and x86_64 archs 1.10 CATEGORY="development" 1.11 -SHORT_DESC="bootstrap to compile fpc." 1.12 +SHORT_DESC="Bootstrap to compile fpc" 1.13 MAINTAINER="slaxemulator@gmail.com" 1.14 LICENSE="GPL2 LGPL2.1" 1.15 +WEB_SITE="http://freepascal.org/" 1.16 + 1.17 +case "$ARCH" in 1.18 + arm*) BOOTSTRAP="arm-linux-ppcarm";; 1.19 + x86_64) BOOTSTRAP="x86_64-linux-ppcx64";; 1.20 + i?86) BOOTSTRAP="i386-linux-ppc386";; 1.21 +esac 1.22 TARBALL="$PACKAGE-$ARCH-$VERSION.bz2" 1.23 -WEB_SITE="http://freepascal.org/" 1.24 -BOOTSTRAP="i386-linux-ppc386" 1.25 WGET_URL="ftp://ftp.freepascal.org/pub/fpc/dist/$VERSION/bootstrap/$BOOTSTRAP.bz2" 1.26 1.27 -# Handle cross compilation. 1.28 -case "$ARCH" in 1.29 - arm*) 1.30 - BOOTSTRAP="arm-linux-ppcarm" 1.31 - WGET_URL="ftp://ftp.freepascal.org/pub/fpc/dist/$VERSION/bootstrap/$BOOTSTRAP.bz2" 1.32 - ;; 1.33 - x86_64) 1.34 - BOOTSTRAP="x86_64-linux-ppcx64" 1.35 - WGET_URL="ftp://ftp.freepascal.org/pub/fpc/dist/$VERSION/bootstrap/$BOOTSTRAP.bz2" 1.36 - ;; 1.37 -esac 1.38 +compile_rules() { 1.39 + [ -f $src/$TARBALL ] && bunzip2 -d $src/$TARBALL 1.40 + install -Dm 755 $src/${TARBALL%.bz2} $install/usr/bin/${BOOTSTRAP#*linux-} 1.41 +} 1.42 1.43 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.44 -genpkg_rules() 1.45 -{ 1.46 - mkdir -p $fs/usr/bin $WOK/$PACKAGE/tmp 1.47 - if [ -f $SOURCES_REPOSITORY/$TARBALL ]; then 1.48 - cp $SOURCES_REPOSITORY/$TARBALL $WOK/$PACKAGE/tmp 1.49 - fi 1.50 - mv $WOK/$PACKAGE/tmp/$TARBALL $WOK/$PACKAGE/tmp/$BOOTSTRAP.bz2 1.51 - [ -f $WOK/$PACKAGE/tmp/$BOOTSTRAP ] && rm -f $WOK/$PACKAGE/tmp/$BOOTSTRAP 1.52 - bunzip2 -d $WOK/$PACKAGE/tmp/$BOOTSTRAP.bz2 1.53 - cp -a $WOK/$PACKAGE/tmp/$BOOTSTRAP $fs/usr/bin/${BOOTSTRAP#*linux-} 1.54 - chmod +x $fs/usr/bin/${BOOTSTRAP#*linux-} 1.55 +genpkg_rules() { 1.56 + copy @std 1.57 }
2.1 --- a/fpc/receipt Mon Mar 12 11:53:39 2018 +0100 2.2 +++ b/fpc/receipt Tue Mar 13 02:04:32 2018 +0200 2.3 @@ -13,9 +13,19 @@ 2.4 2.5 BUILD_DEPENDS_arm="" 2.6 BUILD_DEPENDS="fpc-bootstrap" 2.7 +SPLIT="fpc-src fpc" 2.8 + 2.9 CROSS_BUGS="arm-slitaz-gnueabi-as: Command not found" 2.10 2.11 compile_rules() { 2.12 + sed -i 's|/man$|/share/man|' $src/install/man/Makefile # fix man install path 2.13 + 2.14 + case $ARCH in 2.15 + arm*) Arch='arm';; 2.16 + i?86) Arch='386';; 2.17 + x86_64) Arch='x64';; 2.18 + esac 2.19 + 2.20 case "$ARCH" in 2.21 arm*) 2.22 make crossinstall \ 2.23 @@ -25,42 +35,54 @@ 2.24 OPT=-dFPC_ARMEL \ 2.25 CROSSBINDIR=/cross/$ARCH/tools/bin \ 2.26 BINUTILSPREFIX=arm-slitaz-gnueabi- \ 2.27 - INSTALL_PREFIX=$DESTDIR/usr 2.28 + INSTALL_PREFIX=$install/usr 2.29 ;; 2.30 *) 2.31 - make NOGDB=1 build && 2.32 - make -j1 NOGDB=1 PREFIX=$DESTDIR/usr install 2.33 + make NOGDB=1 FPC=/usr/bin/ppc$Arch build && 2.34 + make -j1 NOGDB=1 FPC=/usr/bin/ppc$Arch PREFIX=$install/usr install 2.35 ;; 2.36 esac || return 1 2.37 2.38 # install package license 2.39 install -Dm 644 $src/fpcsrc/rtl/COPYING.FPC \ 2.40 - $DESTDIR/usr/share/licenses/fpc/COPYING.FPC 2.41 + $install/usr/share/licenses/fpc/COPYING.FPC 2.42 + 2.43 + # create symlink for compiler 2.44 + ln -s ../lib/fpc/$VERSION/ppc$Arch $install/usr/bin 2.45 + 2.46 + # config file 2.47 + # mkdir -p $install/etc 2.48 + # cp -a $install/usr/lib/fpc/$VERSION/samplecfg $install/etc/fpc.cfg 2.49 + 2.50 + # FPC sources 2.51 + mkdir -p $install/usr/lib/fpc 2.52 + cp -a $src/fpcsrc $install/usr/lib/fpc/src 2.53 } 2.54 2.55 genpkg_rules() { 2.56 - mkdir -p $fs/usr $fs/etc 2.57 - cp -a $install/usr/bin $fs/usr 2.58 - cp -a $install/usr/lib $fs/usr 2.59 - 2.60 - # create symlink for compiler 2.61 - ln -s /usr/lib/$PACKAGE/$VERSION/ppc386 $fs/usr/bin 2.62 - 2.63 - # config file 2.64 - #mkdir -p $fs/etc 2.65 - #cp -a $fs/usr/lib/fpc/$VERSION/samplecfg $fs/etc/fpc.cfg 2.66 - DEPENDS="ncurses" 2.67 - CONFIG_FILE="/etc/fpc.cfg" 2.68 - TAGS="compiler pascal" 2.69 + case $PACKAGE in 2.70 + fpc-src) 2.71 + copy /usr/lib/fpc/src/ 2.72 + CAT="development|sources requierd by the Lazarus IDE" 2.73 + ;; 2.74 + fpc) 2.75 + copy @std @rm 2.76 + DEPENDS="ncurses" 2.77 + CONFIG_FILE="/etc/fpc.cfg" 2.78 + TAGS="compiler pascal" 2.79 + ;; 2.80 + esac 2.81 } 2.82 2.83 post_install() { 2.84 - if [ ! -f "$1/etc/fpc.cfg" ]; then 2.85 + if [ ! -s "$1/etc/fpc.cfg" ]; then 2.86 chroot "$1/" fpcmkcfg > /etc/fpc.cfg 2.87 fi 2.88 2.89 # Fix units search path 2.90 - sed -i -e 's!^-Fu/units/$fpctarget!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget!' \ 2.91 + sed -i \ 2.92 + -e 's!^-Fu/units/$fpctarget!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget!' \ 2.93 -e 's!^-Fu/units/$fpctarget/*!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget/*!' \ 2.94 - -e 's!^-Fu/units/$fpctarget/rtl!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget/rtl!' "$1/etc/fpc.cfg" 2.95 + -e 's!^-Fu/units/$fpctarget/rtl!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget/rtl!' \ 2.96 + "$1/etc/fpc.cfg" 2.97 }
3.1 --- a/libsdl2-ttf/receipt Mon Mar 12 11:53:39 2018 +0100 3.2 +++ b/libsdl2-ttf/receipt Tue Mar 13 02:04:32 2018 +0200 3.3 @@ -12,11 +12,14 @@ 3.4 WGET_URL="http://www.libsdl.org/projects/SDL_ttf/release/$TARBALL" 3.5 3.6 BUILD_DEPENDS="freetype-dev libsdl2-dev xorg-libX11-dev xorg-libICE-dev \ 3.7 -mesa17-dev expat-dev" 3.8 +mesa17-dev expat-dev xorg-libxshmfence-dev" 3.9 SPLIT="libsdl2-ttf-dev" 3.10 3.11 compile_rules() { 3.12 - ./configure $CONFIGURE_ARGS && make && make install 3.13 + fix ld 3.14 + ./configure $CONFIGURE_ARGS && 3.15 + fix libtool && 3.16 + make && make install 3.17 } 3.18 3.19 genpkg_rules() {
4.1 --- a/mate-screensaver/receipt Mon Mar 12 11:53:39 2018 +0100 4.2 +++ b/mate-screensaver/receipt Tue Mar 13 02:04:32 2018 +0200 4.3 @@ -13,7 +13,7 @@ 4.4 4.5 BUILD_DEPENDS="mate-common xorg-libX11-dev xorg-libXScrnSaver-dev gtk+3-dev \ 4.6 dbus-glib-dev mate-desktop-dev mate-menus-dev xmlto xorg-libXext-dev \ 4.7 -mesa17-dev libmatekbd-dev libnotify-gtk3-dev expat-dev" 4.8 +mesa17-dev libmatekbd-dev libnotify-gtk3-dev expat-dev xorg-libxshmfence-dev" 4.9 SPLIT="mate-screensaver-dev" 4.10 4.11 compile_rules() {
5.1 --- a/palemoon/receipt Mon Mar 12 11:53:39 2018 +0100 5.2 +++ b/palemoon/receipt Tue Mar 13 02:04:32 2018 +0200 5.3 @@ -16,18 +16,21 @@ 5.4 BUILD_DEPENDS="autoconf213 gtk+-dev yasm zip unzip iw dbus-dev dbus-glib-dev \ 5.5 iw libpng16-dev gstreamer0 gstreamer0-dev gst0-plugins-base-dev gst0-plugins-base \ 5.6 libvpx-dev mesa17-dev virtualenv zlib-dev bzip2-dev python-dev \ 5.7 -xorg-pixman xorg-pixman-dev libffi libffi-dev libjpeg-turbo libjpeg-turbo-dev \ 5.8 +xorg-pixman xorg-pixman-dev libffi libffi-dev libjpeg-turbo-dev \ 5.9 xorg-libXt-dev" # sqlite sqlite-dev libevent libevent-dev 5.10 5.11 -# Rules to configure and make the package. 5.12 -compile_rules() 5.13 -{ 5.14 +compile_rules() { 5.15 + 5.16 find -type f | grep duckduckgo | xargs \ 5.17 sed -i 's|name="t" value="palemoon"|name="t" value="slitaz"|' 5.18 cp $stuff/mozconfig $src 5.19 + case $ARCH in 5.20 + x86_64) sed -i 's|i686|nocona|' $src/mozconfig;; 5.21 + esac 5.22 chmod -R +x build/autoconf/* python/* 5.23 find . -name '*.sh' -exec chmod +x {} \; 5.24 - export CFLAGS=${CFLAGS/486/686} && export CXXFLAGS=${CXXFLAGS/486/686} 5.25 + export CFLAGS=${CFLAGS/486/686} 5.26 + export CXXFLAGS=${CXXFLAGS/486/686} 5.27 export MOZBUILD_STATE_PATH="$src/mozbuild" 5.28 export MOZCONFIG="$src/mozconfig" 5.29 export CPPFLAGS="$CPPFLAGS" 5.30 @@ -45,9 +48,7 @@ 5.31 $install/usr/share/applications 5.32 } 5.33 5.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 5.35 -genpkg_rules() 5.36 -{ 5.37 +genpkg_rules() { 5.38 cp -a $install/* $fs 5.39 mkdir -p $fs/usr/share/pixmaps 5.40 rm -f /usr/lib/$PACKAGE/$PACKAGE-bin
6.1 --- a/plm2c/receipt Mon Mar 12 11:53:39 2018 +0100 6.2 +++ b/plm2c/receipt Tue Mar 13 02:04:32 2018 +0200 6.3 @@ -1,27 +1,24 @@ 6.4 -# SliTaz package receipt. 6.5 +# SliTaz package receipt v2. 6.6 6.7 PACKAGE="plm2c" 6.8 VERSION="1.02" 6.9 CATEGORY="development" 6.10 -SHORT_DESC="Convert PLM sources files to C language." 6.11 +SHORT_DESC="Convert PLM sources files to C language" 6.12 MAINTAINER="pascal.bellard@slitaz.org" 6.13 LICENSE="unknown" 6.14 +WEB_SITE="http://www.cpm.z80.de/source.html" 6.15 + 6.16 TARBALL="newplm.zip" 6.17 -WEB_SITE="http://www.cpm.z80.de/source.html" 6.18 WGET_URL="http://www.cpm.z80.de/download/$TARBALL" 6.19 6.20 -# Rules to configure and make the package. 6.21 -compile_rules() 6.22 -{ 6.23 +compile_rules() { 6.24 unzip PLM2C.ZIP 6.25 cd plm2c 6.26 sed -i '/strcat/d' misc.h 6.27 - make 6.28 + make && 6.29 + install -Dm 755 $src/plm2c/plm2c $install/usr/bin/plm2c 6.30 } 6.31 6.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 6.33 -genpkg_rules() 6.34 -{ 6.35 - mkdir -p $fs/usr/bin 6.36 - cp -a $src/plm2c/plm2c $fs/usr/bin 6.37 +genpkg_rules() { 6.38 + copy @std 6.39 }
7.1 --- a/pluma/receipt Mon Mar 12 11:53:39 2018 +0100 7.2 +++ b/pluma/receipt Tue Mar 13 02:04:32 2018 +0200 7.3 @@ -12,14 +12,17 @@ 7.4 WGET_URL="https://github.com/mate-desktop/pluma/archive/v$VERSION.tar.gz" 7.5 7.6 BUILD_DEPENDS="mate-common yelp-tools gtk-doc gobject-introspection-dev \ 7.7 -enchant-dev iso-codes gtk+3-dev gtksourceview3-dev libpeas-dev itstool" 7.8 +enchant-dev iso-codes gtk+3-dev gtksourceview3-dev libpeas-dev itstool \ 7.9 +xorg-libSM-dev" 7.10 SPLIT="pluma-dev pluma-plugins pluma" 7.11 7.12 compile_rules() { 7.13 + fix ld 7.14 ./autogen.sh \ 7.15 --sysconfdir=/etc \ 7.16 --localstatedir=/var \ 7.17 $CONFIGURE_ARGS && 7.18 + fix libtool && 7.19 make && 7.20 make install 7.21 }
8.1 --- a/polipo/receipt Mon Mar 12 11:53:39 2018 +0100 8.2 +++ b/polipo/receipt Tue Mar 13 02:04:32 2018 +0200 8.3 @@ -1,50 +1,43 @@ 8.4 -# SliTaz package receipt. 8.5 +# SliTaz package receipt v2. 8.6 8.7 PACKAGE="polipo" 8.8 VERSION="1.1.0" 8.9 CATEGORY="network" 8.10 -SHORT_DESC="Small and fast caching web proxy." 8.11 +SHORT_DESC="Small and fast caching web proxy" 8.12 MAINTAINER="paul@slitaz.org" 8.13 LICENSE="MIT" 8.14 +WEB_SITE="http://www.pps.jussieu.fr/~jch/software/polipo/" 8.15 + 8.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 8.17 -WEB_SITE="http://www.pps.jussieu.fr/~jch/software/polipo/" 8.18 WGET_URL="http://www.pps.univ-paris-diderot.fr/~jch/software/files/$PACKAGE/$TARBALL" 8.19 8.20 -DEPENDS="" 8.21 BUILD_DEPENDS="texinfo" 8.22 8.23 -# Rules to configure and make the package. 8.24 -compile_rules() 8.25 -{ 8.26 - cd $src 8.27 - make all 8.28 +compile_rules() { 8.29 + make all || return 1 8.30 + 8.31 + mkdir -p \ 8.32 + $install/usr/bin/ \ 8.33 + $install/etc/polipo/ \ 8.34 + $install/usr/share/polipo/www/doc/ 8.35 + cp -a $src/polipo $install/usr/bin 8.36 + cp -a $src/config.sample $install/etc/polipo/config 8.37 + cp -a $src/forbidden.sample $install/etc/polipo/forbidden 8.38 + cp -a $src/localindex.html $install/usr/share/polipo/www/index.html 8.39 + cp -a $src/html/* $install/usr/share/polipo/www/doc 8.40 } 8.41 8.42 -# Rules to gen a SliTaz package suitable for Tazpkg. 8.43 -genpkg_rules() 8.44 -{ 8.45 - mkdir -p $fs/usr/bin $fs/etc/polipo $fs/usr/share/polipo/www/doc 8.46 - cp -a $src/polipo $fs/usr/bin 8.47 - cp -a $src/config.sample $fs/etc/polipo/config 8.48 - cp -a $src/forbidden.sample $fs/etc/polipo/forbidden 8.49 - cp -a $src/localindex.html $fs/usr/share/polipo/www/index.html 8.50 - cp -a $src/html/* $fs/usr/share/polipo/www/doc 8.51 +genpkg_rules() { 8.52 + copy @std 8.53 } 8.54 8.55 -# Create a disk cache. 8.56 -post_install() 8.57 -{ 8.58 - echo -n "Creating disk cache..." 8.59 +# Create a disk cache. 8.60 +post_install() { 8.61 mkdir "$1/var/cache/polipo" 8.62 - chown tux.tux "$1/var/cache/polipo" 8.63 - status 8.64 -} 8.65 + chown tux.tux "$1/var/cache/polipo" # FIXME? tux? 8.66 +} 8.67 8.68 # Remove disk cache. 8.69 -post_remove() 8.70 -{ 8.71 - echo -n "Removing disk cache..." 8.72 +post_remove() { 8.73 rm -rf "$1/var/cache/polipo" 8.74 - status 8.75 -} 8.76 - 8.77 +}
9.1 --- a/portsentry/receipt Mon Mar 12 11:53:39 2018 +0100 9.2 +++ b/portsentry/receipt Tue Mar 13 02:04:32 2018 +0200 9.3 @@ -1,34 +1,29 @@ 9.4 -# SliTaz package receipt. 9.5 +# SliTaz package receipt v2. 9.6 9.7 PACKAGE="portsentry" 9.8 VERSION="1.2" 9.9 CATEGORY="network" 9.10 -SHORT_DESC="Portscan detection daemon." 9.11 +SHORT_DESC="Portscan detection daemon" 9.12 MAINTAINER="pascal.bellard@slitaz.org" 9.13 -TARBALL="$PACKAGE-$VERSION.tar.gz" 9.14 LICENSE="CCPL" 9.15 WEB_SITE="http://sentrytools.sourceforge.net/" 9.16 + 9.17 +TARBALL="$PACKAGE-$VERSION.tar.gz" 9.18 WGET_URL="$SF_MIRROR/sentrytools/$TARBALL" 9.19 9.20 -DEPENDS="" 9.21 -BUILD_DEPENDS="" 9.22 +compile_rules() { 9.23 + sed -i 's/dot $/&\\/' portsentry.c 9.24 + make linux || return 1 9.25 9.26 -# Rules to configure and make the package. 9.27 -compile_rules() 9.28 -{ 9.29 - sed -i 's/dot $/&\\/' portsentry.c 9.30 - make linux 9.31 -} 9.32 - 9.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 9.34 -genpkg_rules() 9.35 -{ 9.36 - mkdir -p $fs/usr/sbin $fs/etc/portsentry 9.37 - cp -a $src/portsentry $fs/usr/sbin 9.38 - cp -a $src/portsentry.conf $fs/etc/portsentry 9.39 - cat > $fs/etc/portsentry/portsentry.ignore.static <<EOT 9.40 + install -Dm 755 $src/portsentry $install/usr/sbin/portsentry 9.41 + install -Dm 644 $src/portsentry.conf $install/etc/portsentry/portsentry.conf 9.42 + cat > $install/etc/portsentry/portsentry.ignore.static <<EOT 9.43 127.0.0.1/32 9.44 192.168.0.0/16 9.45 10.0.0.0/8 9.46 EOT 9.47 } 9.48 + 9.49 +genpkg_rules() { 9.50 + copy @std 9.51 +}
10.1 --- a/postfixadmin/receipt Mon Mar 12 11:53:39 2018 +0100 10.2 +++ b/postfixadmin/receipt Tue Mar 13 02:04:32 2018 +0200 10.3 @@ -1,57 +1,54 @@ 10.4 -# SliTaz package receipt. 10.5 +# SliTaz package receipt v2. 10.6 10.7 PACKAGE="postfixadmin" 10.8 VERSION="2.3.5" 10.9 CATEGORY="network" 10.10 -SHORT_DESC="Postfix web administration." 10.11 +SHORT_DESC="Postfix web administration" 10.12 MAINTAINER="pascal.bellard@slitaz.org" 10.13 LICENSE="GPL" 10.14 +WEB_SITE="http://postfixadmin.sourceforge.net/" 10.15 + 10.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 10.17 -WEB_SITE="http://postfixadmin.sourceforge.net/" 10.18 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 10.19 -DEPENDS="php php-mysqli php-imap postfix mysql_or_postgresql" 10.20 10.21 -# Rules to configure and make the package. 10.22 -compile_rules() 10.23 -{ 10.24 - cd $src 10.25 +compile_rules() { 10.26 + mkdir -p \ 10.27 + $install/usr/share/postfixadmin \ 10.28 + $install/etc/postfixadmin \ 10.29 + $install/usr/share/doc/postfixadmin \ 10.30 + $install/usr/lib/postfixadmin 10.31 + 10.32 + cp -a $src/* $install/usr/share/postfixadmin/ 10.33 + 10.34 + mv $install/usr/share/postfixadmin/config.inc.php $install/etc/postfixadmin 10.35 + ln -s /etc/postfixadmin/config.inc.php \ 10.36 + $install/usr/share/postfixadmin/config.inc.php 10.37 + sed -i 's/false/true/' $install/etc/postfixadmin/config.inc.php 10.38 + 10.39 + # Remove unwanted files 10.40 + rm -rf $install/usr/share/postfixadmin/debian/ 10.41 + rm -rf $install/usr/share/postfixadmin/ADDITIONS/ 10.42 + 10.43 + # Move docs 10.44 + mv $install/usr/share/postfixadmin/*.TXT $install/usr/share/doc/postfixadmin/ 10.45 + mv $install/usr/share/postfixadmin/DOCUMENTS $install/usr/share/doc/postfixadmin/ 10.46 + mv $install/usr/share/postfixadmin/VIRTUAL_VACATION/ $install/usr/share/doc/postfixadmin/ 10.47 + mv $install/usr/share/postfixadmin/ADDITIONS/* $install/usr/lib/postfixadmin/ 10.48 + mv $install/usr/share/postfixadmin/VIRTUAL_VACATION/*.pl $install/usr/lib/postfixadmin/ 10.49 + 10.50 + chown -R root.root $install/usr/share/postfixadmin/ 10.51 } 10.52 10.53 -# Rules to gen a SliTaz package suitable for Tazpkg. 10.54 -genpkg_rules() 10.55 -{ 10.56 - mkdir -p $fs/usr/share/postfixadmin \ 10.57 - $fs/etc/postfixadmin \ 10.58 - $fs/usr/share/doc/postfixadmin \ 10.59 - $fs/usr/lib/postfixadmin 10.60 - 10.61 - cp -a $src/* $fs/usr/share/postfixadmin/ 10.62 - mv $fs/usr/share/postfixadmin/config.inc.php $fs/etc/postfixadmin 10.63 - ln -s /etc/postfixadmin/config.inc.php $fs/usr/share/postfixadmin/config.inc.php 10.64 - sed -i 's/false/true/' $fs/etc/postfixadmin/config.inc.php 10.65 - 10.66 - # Remove unwanted files 10.67 - rm -rf $fs/usr/share/postfixadmin/debian 10.68 - 10.69 - # Move docs 10.70 - mv $fs/usr/share/postfixadmin/*.TXT $fs/usr/share/doc/postfixadmin 10.71 - mv $fs/usr/share/postfixadmin/DOCUMENTS $fs/usr/share/doc/postfixadmin 10.72 - mv $fs/usr/share/postfixadmin/ADDITIONS/* $fs/usr/lib/postfixadmin 10.73 - mv $fs/usr/share/postfixadmin/VIRTUAL_VACATION/*.pl $fs/usr/lib/postfixadmin 10.74 - mv $fs/usr/share/postfixadmin/VIRTUAL_VACATION/ $fs/usr/share/doc/postfixadmin 10.75 - 10.76 - rm -rf $fs/usr/share/postfixadmin/ADDITIONS 10.77 - 10.78 - # Fix group 10.79 - chown -R root.root $fs/usr/share/postfixadmin/ 10.80 +genpkg_rules() { 10.81 + copy @std 10.82 + DEPENDS="php php-mysqli php-imap postfix mysql_or_postgresql" 10.83 } 10.84 10.85 -post_install() 10.86 -{ 10.87 +post_install() { 10.88 # Configure lighttpd server 10.89 if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then 10.90 if ! grep -q /usr/share/postfixadmin/ "$1/etc/lighttpd/lighttpd.conf"; then 10.91 - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/postfixadmin/" => "/usr/share/postfixadmin/",|g' -i "$1/etc/lighttpd/lighttpd.conf" 10.92 + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/postfixadmin/" => "/usr/share/postfixadmin/",|g' -i "$1/etc/lighttpd/lighttpd.conf" 10.93 if [ -z "$1" ]; then 10.94 # Start Web server. 10.95 /etc/init.d/lighttpd stop
11.1 --- a/proot/receipt Mon Mar 12 11:53:39 2018 +0100 11.2 +++ b/proot/receipt Tue Mar 13 02:04:32 2018 +0200 11.3 @@ -1,28 +1,25 @@ 11.4 -# SliTaz package receipt. 11.5 +# SliTaz package receipt v2. 11.6 11.7 PACKAGE="proot" 11.8 VERSION="3.2.2" 11.9 CATEGORY="misc" 11.10 -SHORT_DESC="User-space implementation of chroot, mount --bind, and binfmt_misc.." 11.11 +SHORT_DESC="User-space implementation of chroot, mount --bind, and binfmt_misc" 11.12 MAINTAINER="pascal.bellard@slitaz.org" 11.13 LICENSE="GPL2" 11.14 WEB_SITE="http://proot.me/" 11.15 + 11.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 11.17 WGET_URL="https://github.com/cedric-vincent/PRoot/archive/v$VERSION.tar.gz" 11.18 11.19 -DEPENDS="talloc" 11.20 -BUILD_DEPENDS="wget talloc-dev" 11.21 +BUILD_DEPENDS="talloc-dev" 11.22 11.23 -# Rules to configure and make the package. 11.24 -compile_rules() 11.25 -{ 11.26 +compile_rules() { 11.27 cd $src/src 11.28 - make 11.29 + make && 11.30 + install -Dm 755 $src/src/proot $install/usr/bin/proot 11.31 } 11.32 11.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 11.34 -genpkg_rules() 11.35 -{ 11.36 - mkdir -p $fs/usr/bin 11.37 - cp -a $src/src/proot $fs/usr/bin 11.38 +genpkg_rules() { 11.39 + copy @std 11.40 + DEPENDS="talloc" 11.41 }
12.1 --- a/psyco/receipt Mon Mar 12 11:53:39 2018 +0100 12.2 +++ b/psyco/receipt Tue Mar 13 02:04:32 2018 +0200 12.3 @@ -1,21 +1,20 @@ 12.4 -# SliTaz package receipt. 12.5 +# SliTaz package receipt v2. 12.6 12.7 PACKAGE="psyco" 12.8 VERSION="1.6" 12.9 CATEGORY="system-tools" 12.10 -SHORT_DESC="Module which can massively speed up the execution of any Python code." 12.11 +SHORT_DESC="Module which can massively speed up the execution of any Python code" 12.12 MAINTAINER="pankso@slitaz.org" 12.13 LICENSE="MIT" 12.14 +WEB_SITE="http://psyco.sourceforge.net/" 12.15 +HOST_ARCH="i486" # error: Sorry, non-32-bit platforms are not supported at all. 12.16 + 12.17 TARBALL="$PACKAGE-$VERSION-src.tar.gz" 12.18 -WEB_SITE="http://psyco.sourceforge.net/" 12.19 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 12.20 12.21 -DEPENDS="python" 12.22 BUILD_DEPENDS="python-dev" 12.23 12.24 -# Rules to configure and make the package. 12.25 -compile_rules() 12.26 -{ 12.27 +compile_rules() { 12.28 # Fix opcodes for python 2.7 12.29 sed -i -e 's/JUMP_IF_FALSE\([: )]\)/JUMP_IF_FALSE_OR_POP\1/' \ 12.30 -e 's/JUMP_IF_TRUE\([: )]\)/JUMP_IF_TRUE_OR_POP\1/' \ 12.31 @@ -23,9 +22,8 @@ 12.32 python setup.py install --root=$DESTDIR 12.33 } 12.34 12.35 -# Rules to gen a SliTaz package suitable for Tazpkg. 12.36 -genpkg_rules() 12.37 -{ 12.38 +genpkg_rules() { 12.39 mkdir -p $fs/usr 12.40 cp -a $install/usr/lib $fs/usr 12.41 + DEPENDS="python" 12.42 }
13.1 --- a/ptunnel/receipt Mon Mar 12 11:53:39 2018 +0100 13.2 +++ b/ptunnel/receipt Tue Mar 13 02:04:32 2018 +0200 13.3 @@ -1,4 +1,4 @@ 13.4 -# SliTaz package receipt. 13.5 +# SliTaz package receipt v2. 13.6 13.7 PACKAGE="ptunnel" 13.8 VERSION="0.72" 13.9 @@ -6,27 +6,23 @@ 13.10 SHORT_DESC="ptunnel tunnels TCP using ICMP echo request" 13.11 MAINTAINER="slaxemulator@gmail.com" 13.12 LICENSE="BSD" 13.13 -SOURCE="PingTunnel" 13.14 -TARBALL="$SOURCE-$VERSION.tar.gz" 13.15 WEB_SITE="http://www.cs.uit.no/~daniels/PingTunnel/" 13.16 + 13.17 +TARBALL="PingTunnel-$VERSION.tar.gz" 13.18 WGET_URL="$WEB_SITE/$TARBALL" 13.19 13.20 -DEPENDS="libpcap" 13.21 BUILD_DEPENDS="libpcap-dev" 13.22 13.23 -# Rules to configure and make the package. 13.24 -compile_rules() 13.25 -{ 13.26 - make CC=${HOST_SYSTEM}-gcc 13.27 +compile_rules() { 13.28 + make CC=${HOST_SYSTEM}-gcc && 13.29 + install -Dm 755 $src/ptunnel $install/usr/bin/ptunnel 13.30 } 13.31 13.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 13.33 -genpkg_rules() 13.34 -{ 13.35 - mkdir -p $fs/usr/bin 13.36 - cp -a $src/ptunnel $fs/usr/bin 13.37 +genpkg_rules() { 13.38 + copy @std 13.39 + DEPENDS="libpcap" 13.40 } 13.41 13.42 testsuite() { 13.43 - readelf -h ${src}/ptunnel 13.44 + readelf -h $src/ptunnel 13.45 }
14.1 --- a/pwauth/receipt Mon Mar 12 11:53:39 2018 +0100 14.2 +++ b/pwauth/receipt Tue Mar 13 02:04:32 2018 +0200 14.3 @@ -1,4 +1,4 @@ 14.4 -# SliTaz package receipt. 14.5 +# SliTaz package receipt v2. 14.6 14.7 PACKAGE="pwauth" 14.8 VERSION="2.3.10" 14.9 @@ -6,22 +6,16 @@ 14.10 SHORT_DESC="Support reasonably secure web auth using system password DB" 14.11 MAINTAINER="pankso@slitaz.org" 14.12 LICENSE="BSD" 14.13 +WEB_SITE="https://code.google.com/p/pwauth/" 14.14 + 14.15 TARBALL="$PACKAGE-$VERSION.tar.gz" 14.16 -WEB_SITE="https://code.google.com/p/pwauth/" 14.17 WGET_URL="https://pwauth.googlecode.com/files/$TARBALL" 14.18 14.19 -DEPENDS="" 14.20 -BUILD_DEPENDS="wget" 14.21 - 14.22 -# Rules to configure and make the package. 14.23 -compile_rules() 14.24 -{ 14.25 - cd $src && make 14.26 +compile_rules() { 14.27 + make && 14.28 + install -Dm 755 $src/pwauth $install/usr/bin/pwauth 14.29 } 14.30 14.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 14.32 -genpkg_rules() 14.33 -{ 14.34 - mkdir -p $fs/usr/bin 14.35 - cp -a $src/pwauth $fs/usr/bin 14.36 +genpkg_rules() { 14.37 + copy @std 14.38 }
15.1 --- a/pwnat/receipt Mon Mar 12 11:53:39 2018 +0100 15.2 +++ b/pwnat/receipt Tue Mar 13 02:04:32 2018 +0200 15.3 @@ -1,27 +1,26 @@ 15.4 -# SliTaz package receipt. 15.5 +# SliTaz package receipt v2. 15.6 15.7 PACKAGE="pwnat" 15.8 GITHASH="1d07c2eb53171733831c0cd01e4e96a3204ec446" # 8/9/14 15.9 VERSION=${GITHASH:0:7} 15.10 CATEGORY="network" 15.11 -SHORT_DESC="NAT Traversal utility." 15.12 +SHORT_DESC="NAT Traversal utility" 15.13 MAINTAINER="pascal.bellard@slitaz.org" 15.14 LICENSE="GPL3" 15.15 +WEB_SITE="http://samy.pl/pwnat" 15.16 + 15.17 TARBALL="$PACKAGE-$VERSION.zip" 15.18 -WEB_SITE="http://samy.pl/pwnat" 15.19 WGET_URL="https://github.com/samyk/pwnat/archive/$GITHASH.zip" 15.20 -TAGS="vpn nat traversal icmp tunnel" 15.21 15.22 -# Rules to configure and make the package. 15.23 -compile_rules() 15.24 -{ 15.25 - make 15.26 +compile_rules() { 15.27 + make || return 1 15.28 + 15.29 + install -Dm 755 $src/pwnat $install/usr/bin/pwnat 15.30 + 15.31 + cook_pick_docs README* C* 15.32 } 15.33 15.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 15.35 -genpkg_rules() 15.36 -{ 15.37 - mkdir -p $fs/usr/bin $install/usr/share/doc 15.38 - cp -a $src/pwnat $fs/usr/bin 15.39 - cp -a $src/README* $src/C* $install/usr/share/doc 15.40 +genpkg_rules() { 15.41 + copy @std 15.42 + TAGS="vpn nat traversal icmp tunnel" 15.43 }
16.1 --- a/qiv/receipt Mon Mar 12 11:53:39 2018 +0100 16.2 +++ b/qiv/receipt Tue Mar 13 02:04:32 2018 +0200 16.3 @@ -1,28 +1,25 @@ 16.4 -# SliTaz package receipt. 16.5 +# SliTaz package receipt v2. 16.6 + 16.7 PACKAGE="qiv" 16.8 VERSION="2.2.3" 16.9 CATEGORY="multimedia" 16.10 SHORT_DESC="Quick Image Viewer" 16.11 MAINTAINER="devl547@gmail.com" 16.12 LICENSE="GPL2" 16.13 +WEB_SITE="http://spiegl.de/qiv/" 16.14 + 16.15 TARBALL="$PACKAGE-$VERSION.tgz" 16.16 -WEB_SITE="http://spiegl.de/qiv/" 16.17 WGET_URL="$WEB_SITE/download/$TARBALL" 16.18 16.19 BUILD_DEPENDS="gtk+-dev imlib2-dev" 16.20 -DEPENDS="gtk+ imlib2" 16.21 16.22 -# Rules to configure and make the package. 16.23 -compile_rules() 16.24 -{ 16.25 - cd $src 16.26 +compile_rules() { 16.27 sed -i 's/MAGIC = -DHAVE_MAGIC/# MAGIC = -DHAVE_MAGIC/' Makefile 16.28 - make 16.29 + make && 16.30 + install -Dm 755 $src/qiv $install/usr/bin/qiv 16.31 } 16.32 16.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 16.34 -genpkg_rules() 16.35 -{ 16.36 - mkdir -p $fs/usr/bin 16.37 - cp -a $src/qiv $fs/usr/bin 16.38 +genpkg_rules() { 16.39 + copy @std 16.40 + DEPENDS="gtk+ imlib2" 16.41 }
17.1 --- a/quesoglc/receipt Mon Mar 12 11:53:39 2018 +0100 17.2 +++ b/quesoglc/receipt Tue Mar 13 02:04:32 2018 +0200 17.3 @@ -3,40 +3,35 @@ 17.4 PACKAGE="quesoglc" 17.5 VERSION="0.7.2" 17.6 CATEGORY="x-window" 17.7 -SHORT_DESC="The OpenGL Character Renderer (GLC) is a state machine that provides OpenGL programs with character rendering services via an application programming interface (API)." 17.8 +SHORT_DESC="The OpenGL Character Renderer (GLC) is a state machine that \ 17.9 +provides OpenGL programs with character rendering services via an application \ 17.10 +programming interface (API)" 17.11 MAINTAINER="slaxemulator@gmail.com" 17.12 LICENSE="LGPL2.1" 17.13 +WEB_SITE="http://quesoglc.sourceforge.net/" 17.14 + 17.15 TARBALL="$PACKAGE-$VERSION.tar.gz" 17.16 -WEB_SITE="http://quesoglc.sourceforge.net/" 17.17 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 17.18 17.19 BUILD_DEPENDS="freetype-dev fontconfig-dev freeglut-dev fribidi-dev \ 17.20 -mesa-dev expat-dev xorg-libXxf86vm-dev util-linux-uuid-dev xorg-libxcb-dev \ 17.21 -libxml2-dev xorg-libxshmfence-dev" 17.22 +mesa17-dev expat-dev xorg-libXxf86vm-dev util-linux-uuid-dev xorg-libxcb-dev \ 17.23 +libxml2-dev xorg-libxshmfence-dev libglu-mesa-dev" 17.24 SPLIT="quesoglc-dev" 17.25 17.26 -# Rules to configure and make the package. 17.27 -compile_rules() 17.28 -{ 17.29 - ./configure \ 17.30 - --prefix=/usr \ 17.31 - --infodir=/usr/share/info \ 17.32 - --mandir=/usr/share/man \ 17.33 - $CONFIGURE_ARGS && 17.34 +compile_rules() { 17.35 + ./configure $CONFIGURE_ARGS && 17.36 make && make DESTDIR=$DESTDIR install 17.37 } 17.38 17.39 -# Rules to gen a SliTaz package suitable for Tazpkg. 17.40 -genpkg_rules() 17.41 -{ 17.42 +genpkg_rules() { 17.43 case $PACKAGE in 17.44 quesoglc) 17.45 copy @std 17.46 - DEPENDS="freetype fontconfig freeglut fribidi mesa libglu-mesa expat xorg-libXxf86vm xorg-libxcb" 17.47 + DEPENDS="freetype fontconfig freeglut fribidi mesa17 libglu-mesa \ 17.48 + expat xorg-libXxf86vm xorg-libxcb" 17.49 ;; 17.50 quesoglc-dev) 17.51 copy @dev 17.52 - DEPENDS="quesoglc pkg-config" 17.53 ;; 17.54 esac 17.55 }
18.1 --- a/quilt/receipt Mon Mar 12 11:53:39 2018 +0100 18.2 +++ b/quilt/receipt Tue Mar 13 02:04:32 2018 +0200 18.3 @@ -1,31 +1,25 @@ 18.4 -# SliTaz package receipt. 18.5 +# SliTaz package receipt v2. 18.6 18.7 PACKAGE="quilt" 18.8 VERSION="0.64" 18.9 CATEGORY="development" 18.10 -SHORT_DESC="Easily manage large numbers of patches." 18.11 +SHORT_DESC="Easily manage large numbers of patches" 18.12 MAINTAINER="pascal.bellard@slitaz.org" 18.13 LICENSE="GPL2" 18.14 +WEB_SITE="http://savannah.nongnu.org/projects/quilt" 18.15 + 18.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 18.17 -WEB_SITE="http://savannah.nongnu.org/projects/quilt" 18.18 WGET_URL="http://download.savannah.gnu.org/releases/$PACKAGE/$TARBALL" 18.19 18.20 -DEPENDS="bash perl" 18.21 -BUILD_DEPENDS="diffutils" 18.22 +BUILD_DEPENDS="diffutils perl" 18.23 18.24 -# Rules to configure and make the package. 18.25 -compile_rules() 18.26 -{ 18.27 +compile_rules() { 18.28 ./configure --prefix=/usr $CONFIGURE_ARGS && 18.29 make && 18.30 make BUILD_ROOT=$DESTDIR install 18.31 } 18.32 18.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 18.34 -genpkg_rules() 18.35 -{ 18.36 - mkdir -p $fs/usr/share 18.37 - cp -a $install/usr/share/quilt $fs/usr/share/ 18.38 - cp -a $install/usr/bin $fs/usr/ 18.39 - cp -a $install/etc $fs/ 18.40 +genpkg_rules() { 18.41 + copy @std 18.42 + DEPENDS="bash perl" 18.43 }
19.1 --- a/rcs/receipt Mon Mar 12 11:53:39 2018 +0100 19.2 +++ b/rcs/receipt Tue Mar 13 02:04:32 2018 +0200 19.3 @@ -1,36 +1,33 @@ 19.4 -# SliTaz package receipt. 19.5 +# SliTaz package receipt v2. 19.6 19.7 PACKAGE="rcs" 19.8 VERSION="5.7" 19.9 CATEGORY="development" 19.10 -SHORT_DESC="GNU Revision Control System." 19.11 +SHORT_DESC="GNU Revision Control System" 19.12 MAINTAINER="pascal.bellard@slitaz.org" 19.13 LICENSE="GPL2" 19.14 +WEB_SITE="http://www.gnu.org/software/rcs/" 19.15 + 19.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 19.17 -WEB_SITE="http://www.gnu.org/software/rcs/" 19.18 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 19.19 -TAGS="cvs version-control versioning" 19.20 19.21 -DEPENDS="diffutils" 19.22 BUILD_DEPENDS="diffutils" 19.23 19.24 -# Rules to configure and make the package. 19.25 -compile_rules() 19.26 -{ 19.27 - cd $src 19.28 - # remove busybox/diff 19.29 - [ -L /usr/bin/diff ] && tazpkg get-install diffutils --forced 19.30 +compile_rules() { 19.31 sed -i 's,test -w a.d || cp /dev/null a.d 2>/dev/null,false,' \ 19.32 src/conf.sh 19.33 - ./configure --prefix=/usr $CONFIGURE_ARGS && 19.34 - make 19.35 + 19.36 + ./configure $CONFIGURE_ARGS && 19.37 + make || return 1 19.38 + 19.39 + mkdir -p $install/usr/bin/ 19.40 + for p in ci co ident merge rcs rcsclean rcsdiff rcsmerge rlog; do 19.41 + install -c $src/src/$p $install/usr/bin/ 19.42 + done 19.43 } 19.44 19.45 -# Rules to gen a SliTaz package suitable for Tazpkg. 19.46 -genpkg_rules() 19.47 -{ 19.48 - mkdir -p $fs/usr/bin 19.49 - for p in ci co ident merge rcs rcsclean rcsdiff rcsmerge rlog; do 19.50 - install -c $src/src/$p $fs/usr/bin 19.51 - done 19.52 +genpkg_rules() { 19.53 + copy @std 19.54 + DEPENDS="diffutils" 19.55 + TAGS="cvs version-control versioning" 19.56 }
20.1 --- a/redis/receipt Mon Mar 12 11:53:39 2018 +0100 20.2 +++ b/redis/receipt Tue Mar 13 02:04:32 2018 +0200 20.3 @@ -1,32 +1,34 @@ 20.4 -# SliTaz package receipt. 20.5 +# SliTaz package receipt v2. 20.6 20.7 PACKAGE="redis" 20.8 VERSION="2.8.19" 20.9 CATEGORY="database" 20.10 -SHORT_DESC="Redis is an open source, BSD licensed, advanced key-value cache and store" 20.11 +SHORT_DESC="Redis is an open source, BSD licensed, advanced key-value cache \ 20.12 +and store" 20.13 MAINTAINER="nneul@neulinger.org" 20.14 LICENSE="BSD" 20.15 +WEB_SITE="http://redis.io/" 20.16 + 20.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 20.18 -WEB_SITE="http://redis.io/" 20.19 WGET_URL="http://download.redis.io/releases/$TARBALL" 20.20 -TAGS="database" 20.21 + 20.22 BUILD_DEPENDS="libxslt" 20.23 20.24 -# Rules to configure and make the package. 20.25 -compile_rules() 20.26 -{ 20.27 - make PREFIX=/usr 20.28 +compile_rules() { 20.29 + make PREFIX=/usr || return 1 20.30 + 20.31 + mkdir -p \ 20.32 + $install/usr/bin \ 20.33 + $install/etc 20.34 + cp -a $src/src/redis-cli $install/usr/bin/ 20.35 + cp -a $src/src/redis-server $install/usr/bin/ 20.36 + cp -a $src/src/redis-benchmark $install/usr/bin/ 20.37 + cp -a $src/src/redis-check-dump $install/usr/bin/ 20.38 + cp -a $src/src/redis-check-aof $install/usr/bin/ 20.39 + cp -a $src/redis.conf $install/etc/ 20.40 } 20.41 20.42 -# Rules to gen a SliTaz package suitable for Tazpkg. 20.43 -genpkg_rules() 20.44 -{ 20.45 - mkdir -p $fs/usr/bin 20.46 - mkdir -p $fs/etc 20.47 - cp -a $src/src/redis-cli $fs/usr/bin 20.48 - cp -a $src/src/redis-server $fs/usr/bin 20.49 - cp -a $src/src/redis-benchmark $fs/usr/bin 20.50 - cp -a $src/src/redis-check-dump $fs/usr/bin 20.51 - cp -a $src/src/redis-check-aof $fs/usr/bin 20.52 - cp -a $src/redis.conf $fs/etc 20.53 +genpkg_rules() { 20.54 + copy @std 20.55 + TAGS="database" 20.56 }
21.1 --- a/reqflow/receipt Mon Mar 12 11:53:39 2018 +0100 21.2 +++ b/reqflow/receipt Tue Mar 13 02:04:32 2018 +0200 21.3 @@ -1,29 +1,25 @@ 21.4 -# SliTaz package receipt. 21.5 +# SliTaz package receipt v2. 21.6 21.7 PACKAGE="reqflow" 21.8 VERSION="1.2.1" 21.9 CATEGORY="office" 21.10 -SHORT_DESC="Tool for traceability of requirements across documents." 21.11 +SHORT_DESC="Tool for traceability of requirements across documents" 21.12 MAINTAINER="pascal.bellard@slitaz.org" 21.13 LICENSE="GPL2" 21.14 +WEB_SITE="http://goeb.github.io/reqflow/" 21.15 + 21.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 21.17 -WEB_SITE="http://goeb.github.io/reqflow/" 21.18 WGET_URL="https://github.com/goeb/reqflow/archive/v$VERSION.tar.gz" 21.19 21.20 -DEPENDS="zlib libzip libxml2 poppler pcre" 21.21 -BUILD_DEPENDS="wget zlib-dev libzip-dev libxml2-dev poppler-dev pcre-dev" 21.22 +BUILD_DEPENDS="zlib-dev libzip-dev libxml2-dev poppler-dev pcre-dev" 21.23 21.24 -# Rules to configure and make the package. 21.25 -compile_rules() 21.26 -{ 21.27 +compile_rules() { 21.28 CFLAGS=$(pkg-config --cflags libzip) 21.29 - make 2>&1 | sed 's/\.d: No such file/.d: no such file/' 21.30 + make && 21.31 + install -Dm 755 $src/req $install/usr/bin/req 21.32 } 21.33 21.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 21.35 -genpkg_rules() 21.36 -{ 21.37 - mkdir -p $fs/usr/bin 21.38 - cp -a $src/req $fs/usr/bin 21.39 +genpkg_rules() { 21.40 + copy @std 21.41 + DEPENDS="zlib libzip libxml2 poppler pcre" 21.42 } 21.43 -
22.1 --- a/rgzip/receipt Mon Mar 12 11:53:39 2018 +0100 22.2 +++ b/rgzip/receipt Tue Mar 13 02:04:32 2018 +0200 22.3 @@ -1,28 +1,23 @@ 22.4 -# SliTaz package receipt. 22.5 +# SliTaz package receipt v2. 22.6 22.7 PACKAGE="rgzip" 22.8 VERSION="0" 22.9 CATEGORY="system-tools" 22.10 -SHORT_DESC="Rsync friendly gzip." 22.11 +SHORT_DESC="Rsync friendly gzip" 22.12 MAINTAINER="pascal.bellard@slitaz.org" 22.13 LICENSE="GPL3" 22.14 +WEB_SITE="http://svana.org/kleptog/rgzip.html" 22.15 + 22.16 TARBALL="$PACKAGE.c" 22.17 -WEB_SITE="http://svana.org/kleptog/rgzip.html" 22.18 WGET_URL="http://svana.org/kleptog/$TARBALL" 22.19 -DEPENDS="busybox" # gzip 22.20 -TAGS="compression" 22.21 22.22 -# Rules to configure and make the package. 22.23 -compile_rules() 22.24 -{ 22.25 - cd $src 22.26 - make rgzip 22.27 +compile_rules() { 22.28 + make rgzip && 22.29 + install -Dm 755 $src/rgzip $install/usr/bin/rgzip 22.30 } 22.31 22.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 22.33 -genpkg_rules() 22.34 -{ 22.35 - mkdir -p $fs/usr/bin 22.36 - cp $src/rgzip $fs/usr/bin 22.37 +genpkg_rules() { 22.38 + copy @std 22.39 + DEPENDS="busybox" # gzip 22.40 + TAGS="compression" 22.41 } 22.42 -
23.1 --- a/rinetd/receipt Mon Mar 12 11:53:39 2018 +0100 23.2 +++ b/rinetd/receipt Tue Mar 13 02:04:32 2018 +0200 23.3 @@ -1,25 +1,21 @@ 23.4 -# SliTaz package receipt. 23.5 +# SliTaz package receipt v2. 23.6 23.7 PACKAGE="rinetd" 23.8 VERSION="0.62" 23.9 CATEGORY="network" 23.10 -SHORT_DESC="internet ''redirection server''." 23.11 +SHORT_DESC="Internet 'redirection server'" 23.12 MAINTAINER="pascal.bellard@slitaz.org" 23.13 LICENSE="GPL2" 23.14 +WEB_SITE="http://www.boutell.com/rinetd/" 23.15 + 23.16 TARBALL="$PACKAGE.tar.gz" 23.17 -WEB_SITE="http://www.boutell.com/rinetd/" 23.18 WGET_URL="${WEB_SITE}http/$TARBALL" 23.19 23.20 -# Rules to configure and make the package. 23.21 -compile_rules() 23.22 -{ 23.23 - make 23.24 +compile_rules() { 23.25 + make && 23.26 + install -Dm 755 $src/rinetd $install/usr/sbin/rinetd 23.27 } 23.28 23.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 23.30 -genpkg_rules() 23.31 -{ 23.32 - mkdir -p $fs/usr/sbin 23.33 - cp -a $src/rinetd $fs/usr/sbin 23.34 +genpkg_rules() { 23.35 + copy @std 23.36 } 23.37 -
24.1 --- a/rubix/receipt Mon Mar 12 11:53:39 2018 +0100 24.2 +++ b/rubix/receipt Tue Mar 13 02:04:32 2018 +0200 24.3 @@ -1,30 +1,27 @@ 24.4 -# SliTaz package receipt. 24.5 +# SliTaz package receipt v2. 24.6 24.7 PACKAGE="rubix" 24.8 VERSION="1.0.6" 24.9 CATEGORY="games" 24.10 -SHORT_DESC="A 3D rubiks cube game for X." 24.11 +SHORT_DESC="A 3D rubiks cube game for X" 24.12 MAINTAINER="pascal.bellard@slitaz.org" 24.13 LICENSE="PublicDomain" 24.14 +WEB_SITE="http://sed.free.fr/rubix" 24.15 + 24.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 24.17 -WEB_SITE="http://sed.free.fr/rubix" 24.18 WGET_URL="$WEB_SITE/$TARBALL" 24.19 24.20 -DEPENDS="xorg-libX11 xorg-libxcb xorg-libXau xorg-libXdmcp" 24.21 BUILD_DEPENDS="xorg-dev" 24.22 24.23 -# Rules to configure and make the package. 24.24 -compile_rules() 24.25 -{ 24.26 +compile_rules() { 24.27 ./configure \ 24.28 --prefix=/usr \ 24.29 $CONFIGURE_ARGS 24.30 - make 24.31 + make && 24.32 + install -Dm 755 $src/rubix $install/usr/bin/rubix 24.33 } 24.34 24.35 -# Rules to gen a SliTaz package suitable for Tazpkg. 24.36 -genpkg_rules() 24.37 -{ 24.38 - mkdir -p $fs/usr/bin 24.39 - cp -a $src/rubix $fs/usr/bin 24.40 +genpkg_rules() { 24.41 + copy @std 24.42 + DEPENDS="xorg-libX11 xorg-libxcb xorg-libXau xorg-libXdmcp" 24.43 }
25.1 --- a/rzip/receipt Mon Mar 12 11:53:39 2018 +0100 25.2 +++ b/rzip/receipt Tue Mar 13 02:04:32 2018 +0200 25.3 @@ -1,4 +1,4 @@ 25.4 -# SliTaz package receipt. 25.5 +# SliTaz package receipt v2. 25.6 25.7 PACKAGE="rzip" 25.8 VERSION="2.1" 25.9 @@ -6,26 +6,21 @@ 25.10 SHORT_DESC="A compression program designed for long distance redundencies" 25.11 MAINTAINER="pascal.bellard@slitaz.org" 25.12 LICENSE="GPL2" 25.13 +WEB_SITE="https://rzip.samba.org/" 25.14 + 25.15 TARBALL="$PACKAGE-$VERSION.tar.gz" 25.16 -WEB_SITE="https://rzip.samba.org/" 25.17 WGET_URL="${WEB_SITE}ftp/$PACKAGE/$TARBALL" 25.18 -TAGS="compression archive" 25.19 25.20 -DEPENDS="bzlib" 25.21 BUILD_DEPENDS="wget bzip2-dev" 25.22 25.23 -# Rules to configure and make the package. 25.24 -compile_rules() 25.25 -{ 25.26 - ./configure --prefix=/usr \ 25.27 - --sysconfdir=/etc \ 25.28 - $CONFIGURE_ARGS && 25.29 - make 25.30 +compile_rules() { 25.31 + ./configure $CONFIGURE_ARGS && 25.32 + make && 25.33 + install -Dm 755 $src/rzip $install/usr/bin/rzip 25.34 } 25.35 25.36 -# Rules to gen a SliTaz package suitable for Tazpkg. 25.37 -genpkg_rules() 25.38 -{ 25.39 - mkdir -p $fs/usr/bin 25.40 - cp -a $src/rzip $fs/usr/bin 25.41 +genpkg_rules() { 25.42 + copy @std 25.43 + DEPENDS="bzlib" 25.44 + TAGS="compression archive" 25.45 }
26.1 --- a/sc/receipt Mon Mar 12 11:53:39 2018 +0100 26.2 +++ b/sc/receipt Tue Mar 13 02:04:32 2018 +0200 26.3 @@ -1,31 +1,27 @@ 26.4 -# SliTaz package receipt. 26.5 +# SliTaz package receipt v2. 26.6 26.7 PACKAGE="sc" 26.8 VERSION="7.16" 26.9 CATEGORY="office" 26.10 -SHORT_DESC="Spreadsheet calculator." 26.11 +SHORT_DESC="Spreadsheet calculator" 26.12 MAINTAINER="paul@slitaz.org" 26.13 LICENSE="PublicDomain" 26.14 +WEB_SITE="http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/" 26.15 + 26.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 26.17 -WEB_SITE="http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/" 26.18 WGET_URL="http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/$TARBALL" 26.19 26.20 -DEPENDS="ncurses" 26.21 BUILD_DEPENDS="ncurses-dev bison m4" 26.22 26.23 -# Rules to configure and make the package. 26.24 -compile_rules() 26.25 -{ 26.26 - patch -p1 < $stuff/7.16.patch || return 1 26.27 - make 26.28 +compile_rules() { 26.29 + make || return 1 26.30 + 26.31 + for i in sc psc scqref; do 26.32 + install -Dm 755 $src/$i $install/usr/bin/$i 26.33 + done 26.34 } 26.35 26.36 -# Rules to gen a SliTaz package suitable for Tazpkg. 26.37 -genpkg_rules() 26.38 -{ 26.39 - mkdir -p $fs/usr/bin 26.40 - 26.41 - for i in sc psc scqref; do 26.42 - cp -a $src/$i $fs/usr/bin 26.43 - done 26.44 +genpkg_rules() { 26.45 + copy @std 26.46 + DEPENDS="ncurses" 26.47 }
27.1 --- a/sc/stuff/7.16.patch Mon Mar 12 11:53:39 2018 +0100 27.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 27.3 @@ -1,497 +0,0 @@ 27.4 ---- sc-7.16.orig/sc.h 27.5 -+++ sc-7.16/sc.h 27.6 -@@ -612,6 +612,9 @@ 27.7 - extern int rowlimit; 27.8 - extern int collimit; 27.9 - 27.10 -+void yankr(struct ent *v1, struct ent *v2); 27.11 -+ 27.12 -+ 27.13 - #if BSD42 || SYSIII 27.14 - 27.15 - #ifndef cbreak 27.16 ---- sc-7.16.orig/cmds.c 27.17 -+++ sc-7.16/cmds.c 27.18 -@@ -478,7 +478,7 @@ 27.19 - int i, qtmp; 27.20 - char buf[50]; 27.21 - struct frange *fr; 27.22 -- struct ent *obuf; 27.23 -+ struct ent *obuf=0; 27.24 - 27.25 - if ((fr = find_frange(currow, curcol))) 27.26 - rs = fr->or_right->row - currow + 1; 27.27 -@@ -535,7 +535,7 @@ 27.28 - int cs = maxcol - curcol + 1; 27.29 - int i, qtmp; 27.30 - char buf[50]; 27.31 -- struct ent *obuf; 27.32 -+ struct ent *obuf=0; 27.33 - 27.34 - if (cs - arg < 0) { 27.35 - cs = cs > 0 ? cs : 0; 27.36 -@@ -810,7 +810,7 @@ 27.37 - 27.38 - if (to_insert == 'r') { 27.39 - insertrow(numrows, 0); 27.40 -- if (fr = find_frange(currow, curcol)) 27.41 -+ if ((fr = find_frange(currow, curcol))) 27.42 - deltac = fr->or_left->col - mincol; 27.43 - else { 27.44 - for (i = 0; i < numrows; i++) 27.45 -@@ -2279,7 +2279,7 @@ 27.46 - ret->e.r.right.vp = lookat(newrow, newcol); 27.47 - ret->e.r.right.vf = e->e.r.right.vf; 27.48 - } else { 27.49 -- struct enode *temprange; 27.50 -+ struct enode *temprange=0; 27.51 - 27.52 - if (freeenodes) { 27.53 - ret = freeenodes; 27.54 -@@ -2337,8 +2337,7 @@ 27.55 - break; 27.56 - case 'f': 27.57 - case 'F': 27.58 -- if (range && ret->op == 'F' || 27.59 -- !range && ret->op == 'f') 27.60 -+ if ((range && ret->op == 'F') || (!range && ret->op == 'f')) 27.61 - Rdelta = Cdelta = 0; 27.62 - ret->e.o.left = copye(e->e.o.left, Rdelta, Cdelta, 27.63 - r1, c1, r2, c2, transpose); 27.64 -@@ -2798,7 +2797,7 @@ 27.65 - write_cells(register FILE *f, int r0, int c0, int rn, int cn, int dr, int dc) 27.66 - { 27.67 - register struct ent **pp; 27.68 -- int r, c, rs, cs, mf; 27.69 -+ int r, c, rs=0, cs=0, mf; 27.70 - char *dpointptr; 27.71 - 27.72 - mf = modflg; 27.73 -@@ -2861,12 +2860,12 @@ 27.74 - if ((plugin = findplugin(p+1, 'w')) != NULL) { 27.75 - if (!plugin_exists(plugin, strlen(plugin), save + 1)) { 27.76 - error("plugin not found"); 27.77 -- return; 27.78 -+ return -1; 27.79 - } 27.80 - *save = '|'; 27.81 - if ((strlen(save) + strlen(fname) + 20) > PATHLEN) { 27.82 - error("Path too long"); 27.83 -- return; 27.84 -+ return -1; 27.85 - } 27.86 - sprintf(save + strlen(save), " %s%d:", coltoa(c0), r0); 27.87 - sprintf(save + strlen(save), "%s%d \"%s\"", coltoa(cn), rn, fname); 27.88 -@@ -2883,13 +2882,14 @@ 27.89 - } 27.90 - #endif /* VMS */ 27.91 - 27.92 -- if (*fname == '\0') 27.93 -+ if (*fname == '\0'){ 27.94 - if (isatty(STDOUT_FILENO) || *curfile != '\0') 27.95 - fname = curfile; 27.96 - else { 27.97 - write_fd(stdout, r0, c0, rn, cn); 27.98 - return (0); 27.99 - } 27.100 -+ } 27.101 - 27.102 - #ifdef MSDOS 27.103 - namelen = 12; 27.104 -@@ -2981,12 +2981,12 @@ 27.105 - if ((plugin = findplugin(p+1, 'r')) != NULL) { 27.106 - if (!(plugin_exists(plugin, strlen(plugin), save + 1))) { 27.107 - error("plugin not found"); 27.108 -- return; 27.109 -+ return -1; 27.110 - } 27.111 - *save = '|'; 27.112 - if ((strlen(save) + strlen(fname) + 2) > PATHLEN) { 27.113 - error("Path too long"); 27.114 -- return; 27.115 -+ return -1; 27.116 - } 27.117 - sprintf(save + strlen(save), " \"%s\"", fname); 27.118 - eraseflg = 0; 27.119 ---- sc-7.16.orig/abbrev.c 27.120 -+++ sc-7.16/abbrev.c 27.121 -@@ -19,10 +19,15 @@ 27.122 - #include <stdio.h> 27.123 - #include <stdlib.h> 27.124 - #include <ctype.h> 27.125 -+#include <curses.h> 27.126 -+#include <unistd.h> 27.127 - #include "sc.h" 27.128 - 27.129 - static struct abbrev *abbr_base; 27.130 - 27.131 -+int are_abbrevs(void); 27.132 -+ 27.133 -+ 27.134 - void 27.135 - add_abbr(char *string) 27.136 - { 27.137 -@@ -87,7 +92,7 @@ 27.138 - } 27.139 - } 27.140 - 27.141 -- if (expansion == NULL) 27.142 -+ if (expansion == NULL){ 27.143 - if ((a = find_abbr(string, strlen(string), &prev))) { 27.144 - error("abbrev \"%s %s\"", a->abbr, a->exp); 27.145 - return; 27.146 -@@ -95,6 +100,7 @@ 27.147 - error("abreviation \"%s\" doesn't exist", string); 27.148 - return; 27.149 - } 27.150 -+ } 27.151 - 27.152 - if (find_abbr(string, strlen(string), &prev)) 27.153 - del_abbr(string); 27.154 -@@ -122,7 +128,7 @@ 27.155 - del_abbr(char *abbrev) 27.156 - { 27.157 - struct abbrev *a; 27.158 -- struct abbrev **prev; 27.159 -+ struct abbrev **prev=0; 27.160 - 27.161 - if (!(a = find_abbr(abbrev, strlen(abbrev), prev))) 27.162 - return; 27.163 ---- sc-7.16.orig/range.c 27.164 -+++ sc-7.16/range.c 27.165 -@@ -18,6 +18,8 @@ 27.166 - 27.167 - #include <stdio.h> 27.168 - #include <ctype.h> 27.169 -+#include <unistd.h> 27.170 -+#include <curses.h> 27.171 - #include "sc.h" 27.172 - 27.173 - static struct range *rng_base; 27.174 ---- sc-7.16.orig/vi.c 27.175 -+++ sc-7.16/vi.c 27.176 -@@ -17,6 +17,8 @@ 27.177 - #include <curses.h> 27.178 - #include <ctype.h> 27.179 - #include <stdlib.h> 27.180 -+#include <unistd.h> 27.181 -+#include <sys/wait.h> 27.182 - #include "sc.h" 27.183 - 27.184 - #if defined(REGCOMP) 27.185 -@@ -40,7 +42,7 @@ 27.186 - 27.187 - #define istext(a) (isalnum(a) || ((a) == '_')) 27.188 - 27.189 --#define bool int 27.190 -+/*#define bool int*/ 27.191 - #define true 1 27.192 - #define false 0 27.193 - 27.194 -@@ -667,8 +669,10 @@ 27.195 - static struct range *nextmatch; 27.196 - int len; 27.197 - 27.198 -- if (linelim > 0 && isalnum(line[linelim-1]) || line[linelim-1] == '_' || 27.199 -- (completethis && line[linelim-1] == ' ')) { 27.200 -+ if ((linelim > 0 && isalnum(line[linelim-1])) || 27.201 -+ line[linelim-1] == '_' || 27.202 -+ (completethis && line[linelim-1] == ' ')) { 27.203 -+ 27.204 - if (!completethis) { 27.205 - for (completethis = line + linelim - 1; isalnum(*completethis) || 27.206 - *completethis == '_'; completethis--) /* */; 27.207 -@@ -715,7 +719,7 @@ 27.208 - showdr() 27.209 - { 27.210 - int minsr, minsc, maxsr, maxsc; 27.211 -- char *p; 27.212 -+ /*char *p;*/ 27.213 - char r[12]; 27.214 - struct frange *fr = find_frange(currow, curcol); 27.215 - 27.216 -@@ -1566,7 +1570,7 @@ 27.217 - search_again(bool reverse) 27.218 - { 27.219 - int prev_match; 27.220 -- int found_it; 27.221 -+ int found_it=0; 27.222 - #if !defined(REGCOMP) && !defined(RE_COMP) && !defined(REGCMP) 27.223 - char *look_here; 27.224 - int do_next; 27.225 -@@ -1777,7 +1781,7 @@ 27.226 - static void 27.227 - match_paren() 27.228 - { 27.229 -- register int i; 27.230 -+ /*register int i;*/ 27.231 - int nest = 1; 27.232 - int tmp = linelim; 27.233 - 27.234 ---- sc-7.16.orig/vmtbl.c 27.235 -+++ sc-7.16/vmtbl.c 27.236 -@@ -16,6 +16,7 @@ 27.237 - # include <curses.h> 27.238 - #endif /* PSC */ 27.239 - 27.240 -+#include <unistd.h> 27.241 - #include "sc.h" 27.242 - 27.243 - /* 27.244 ---- sc-7.16.orig/Makefile 27.245 -+++ sc-7.16/Makefile 27.246 -@@ -32,7 +32,7 @@ 27.247 - 27.248 - # This is where the library file (tutorial) goes. 27.249 - #LIBDIR=/usr/local/share/$(name) # reno 27.250 --LIBDIR=${prefix}/lib/$(name) 27.251 -+LIBDIR=${prefix}/share/doc/$(name) 27.252 - LIBRARY=-DLIBDIR=\"${LIBDIR}\" 27.253 - 27.254 - # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up 27.255 ---- sc-7.16.orig/color.c 27.256 -+++ sc-7.16/color.c 27.257 -@@ -19,6 +19,7 @@ 27.258 - 27.259 - #include <curses.h> 27.260 - #include <ctype.h> 27.261 -+#include <unistd.h> 27.262 - #include "sc.h" 27.263 - 27.264 - /* a linked list of free [struct ent]'s, uses .next as the pointer */ 27.265 ---- sc-7.16.orig/frame.c 27.266 -+++ sc-7.16/frame.c 27.267 -@@ -18,6 +18,9 @@ 27.268 - 27.269 - #include <stdio.h> 27.270 - #include <ctype.h> 27.271 -+#include <stdlib.h> 27.272 -+#include <curses.h> 27.273 -+#include <unistd.h> 27.274 - #include "sc.h" 27.275 - 27.276 - static struct frange *frame_base; 27.277 ---- sc-7.16.orig/sc.c 27.278 -+++ sc-7.16/sc.c 27.279 -@@ -212,7 +212,7 @@ 27.280 - 27.281 - if (dbidx < 0) 27.282 - return; 27.283 -- if (p = delbuf[dbidx]) { 27.284 -+ if ((p = delbuf[dbidx])) { 27.285 - scxfree(delbuffmt[dbidx]); 27.286 - delbuffmt[dbidx] = NULL; 27.287 - } 27.288 -@@ -845,7 +845,7 @@ 27.289 - break; 27.290 - case 'C': 27.291 - color = !color; 27.292 -- if (has_colors()) 27.293 -+ if (has_colors()){ 27.294 - if (color) { 27.295 - attron(COLOR_PAIR(1)); 27.296 - bkgd(COLOR_PAIR(1) | ' '); 27.297 -@@ -853,6 +853,7 @@ 27.298 - attron(COLOR_PAIR(0)); 27.299 - bkgd(COLOR_PAIR(0) | ' '); 27.300 - } 27.301 -+ } 27.302 - error("Color %sabled.", color ? "en" : "dis"); 27.303 - break; 27.304 - case 'N': 27.305 ---- sc-7.16.orig/sort.c 27.306 -+++ sc-7.16/sort.c 27.307 -@@ -19,6 +19,8 @@ 27.308 - #include <stdio.h> 27.309 - #include <ctype.h> 27.310 - #include <stdlib.h> 27.311 -+#include <unistd.h> 27.312 -+#include <curses.h> 27.313 - #include "sc.h" 27.314 - 27.315 - int compare(const void *row1, const void *row2); 27.316 ---- sc-7.16.orig/xmalloc.c 27.317 -+++ sc-7.16/xmalloc.c 27.318 -@@ -4,11 +4,12 @@ 27.319 - */ 27.320 - 27.321 - #include <curses.h> 27.322 -+#include <stdlib.h> 27.323 - #include "sc.h" 27.324 - 27.325 --extern char *malloc(); 27.326 -+/* extern char *malloc(); 27.327 - extern char *realloc(); 27.328 --extern void free(); 27.329 -+extern void free(); */ 27.330 - void fatal(); 27.331 - 27.332 - #ifdef SYSV3 27.333 ---- sc-7.16.orig/screen.c 27.334 -+++ sc-7.16/screen.c 27.335 -@@ -234,11 +234,12 @@ 27.336 - i = stcol; 27.337 - lcols = 0; 27.338 - col = rescol + frcols; 27.339 -- if (fr && stcol >= fr->or_left->col) 27.340 -+ if (fr && stcol >= fr->or_left->col){ 27.341 - if (stcol < fr->ir_left->col) 27.342 - i = fr->or_left->col; 27.343 - else 27.344 - col += flcols; 27.345 -+ } 27.346 - for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && 27.347 - i < maxcols; i++) { 27.348 - lcols++; 27.349 -@@ -328,11 +329,12 @@ 27.350 - i = stcol; 27.351 - lcols = 0; 27.352 - col = rescol + frcols; 27.353 -- if (fr && stcol >= fr->or_left->col) 27.354 -+ if (fr && stcol >= fr->or_left->col){ 27.355 - if (stcol < fr->ir_left->col) 27.356 - i = fr->or_left->col; 27.357 - else 27.358 - col += flcols; 27.359 -+ } 27.360 - for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && 27.361 - i < maxcols; i++) { 27.362 - lcols++; 27.363 -@@ -377,11 +379,12 @@ 27.364 - i = strow; 27.365 - rows = 0; 27.366 - row = RESROW + fbrows; 27.367 -- if (fr && strow >= fr->or_left->row) 27.368 -+ if (fr && strow >= fr->or_left->row){ 27.369 - if (strow < fr->ir_left->row) 27.370 - i = fr->or_left->row; 27.371 - else 27.372 - row += ftrows; 27.373 -+ } 27.374 - for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; 27.375 - i++) { 27.376 - rows++; 27.377 -@@ -460,11 +463,12 @@ 27.378 - i = strow; 27.379 - rows = 0; 27.380 - row = RESROW + fbrows; 27.381 -- if (fr && strow >= fr->or_left->row) 27.382 -+ if (fr && strow >= fr->or_left->row){ 27.383 - if (strow < fr->ir_left->row) 27.384 - i = fr->or_left->row; 27.385 - else 27.386 - row += ftrows; 27.387 -+ } 27.388 - for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; 27.389 - i++) { 27.390 - rows++; 27.391 ---- sc-7.16.orig/lex.c 27.392 -+++ sc-7.16/lex.c 27.393 -@@ -34,6 +34,8 @@ 27.394 - #include <signal.h> 27.395 - #include <setjmp.h> 27.396 - #include <ctype.h> 27.397 -+#include <unistd.h> 27.398 -+#include <math.h> 27.399 - #include "sc.h" 27.400 - 27.401 - #ifdef NONOTIMEOUT 27.402 -@@ -107,7 +109,7 @@ 27.403 - yylex() 27.404 - { 27.405 - char *p = line + linelim; 27.406 -- int ret; 27.407 -+ int ret=0; 27.408 - static int isfunc = 0; 27.409 - static bool isgoto = 0; 27.410 - static bool colstate = 0; 27.411 -@@ -326,7 +328,7 @@ 27.412 - strcpy((char *)path, HomeDir); 27.413 - strcat((char *)path, "/.sc/plugins/"); 27.414 - strncat((char *)path, name, len); 27.415 -- if (fp = fopen((char *)path, "r")) { 27.416 -+ if ((fp = fopen((char *)path, "r"))) { 27.417 - fclose(fp); 27.418 - return 1; 27.419 - } 27.420 -@@ -334,7 +336,7 @@ 27.421 - strcpy((char *)path, LIBDIR); 27.422 - strcat((char *)path, "/plugins/"); 27.423 - strncat((char *)path, name, len); 27.424 -- if (fp = fopen((char *)path, "r")) { 27.425 -+ if ((fp = fopen((char *)path, "r"))) { 27.426 - fclose(fp); 27.427 - return 1; 27.428 - } 27.429 ---- sc-7.16.orig/interp.c 27.430 -+++ sc-7.16/interp.c 27.431 -@@ -1572,12 +1572,12 @@ 27.432 - copy(struct ent *dv1, struct ent *dv2, struct ent *v1, struct ent *v2) 27.433 - { 27.434 - struct ent *p; 27.435 -- struct ent *n; 27.436 -+/* struct ent *n;*/ 27.437 - static int minsr = -1, minsc = -1; 27.438 - static int maxsr = -1, maxsc = -1; 27.439 - int mindr, mindc; 27.440 - int maxdr, maxdc; 27.441 -- int vr, vc; 27.442 -+/* int vr, vc;*/ 27.443 - int r, c; 27.444 - int deltar, deltac; 27.445 - 27.446 -@@ -2066,7 +2066,7 @@ 27.447 - *line = '\0'; 27.448 - } 27.449 - } 27.450 -- if (!col_hidden[c]) 27.451 -+ if (!col_hidden[c]){ 27.452 - if (gs.g_type == G_STR) { 27.453 - if (p && p->label 27.454 - #if defined(REGCOMP) 27.455 -@@ -2099,6 +2099,7 @@ 27.456 - #endif 27.457 - #endif 27.458 - break; 27.459 -+ } 27.460 - if (r == endr && c == endc) { 27.461 - error("String not found"); 27.462 - #if defined(REGCOMP) 27.463 -@@ -2471,13 +2472,11 @@ 27.464 - int 27.465 - constant(register struct enode *e) 27.466 - { 27.467 -- return ( 27.468 -- e == NULL 27.469 -+ return e == NULL 27.470 - || e->op == O_CONST 27.471 - || e->op == O_SCONST 27.472 -- || e->op == 'm' && constant(e->e.o.left) 27.473 -- || ( 27.474 -- e->op != O_VAR 27.475 -+ || (e->op == 'm' && constant(e->e.o.left)) 27.476 -+ || (e->op != O_VAR 27.477 - && !(e->op & REDUCE) 27.478 - && constant(e->e.o.left) 27.479 - && constant(e->e.o.right) 27.480 -@@ -2491,9 +2490,7 @@ 27.481 - && e->op != LASTCOL 27.482 - && e->op != NUMITER 27.483 - && e->op != FILENAME 27.484 -- && optimize 27.485 -- ) 27.486 -- ); 27.487 -+ && optimize ); 27.488 - } 27.489 - 27.490 - void 27.491 ---- sc-7.16.orig/help.c 27.492 -+++ sc-7.16/help.c 27.493 -@@ -11,6 +11,7 @@ 27.494 - char *revision = "$Revision: 7.16 $"; 27.495 - #else 27.496 - #include <curses.h> 27.497 -+#include <unistd.h> 27.498 - #include "sc.h" 27.499 - #endif /* QREF */ 27.500 -
28.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 28.2 +++ b/sc/stuff/patches/7.16.patch Tue Mar 13 02:04:32 2018 +0200 28.3 @@ -0,0 +1,497 @@ 28.4 +--- sc-7.16.orig/sc.h 28.5 ++++ sc-7.16/sc.h 28.6 +@@ -612,6 +612,9 @@ 28.7 + extern int rowlimit; 28.8 + extern int collimit; 28.9 + 28.10 ++void yankr(struct ent *v1, struct ent *v2); 28.11 ++ 28.12 ++ 28.13 + #if BSD42 || SYSIII 28.14 + 28.15 + #ifndef cbreak 28.16 +--- sc-7.16.orig/cmds.c 28.17 ++++ sc-7.16/cmds.c 28.18 +@@ -478,7 +478,7 @@ 28.19 + int i, qtmp; 28.20 + char buf[50]; 28.21 + struct frange *fr; 28.22 +- struct ent *obuf; 28.23 ++ struct ent *obuf=0; 28.24 + 28.25 + if ((fr = find_frange(currow, curcol))) 28.26 + rs = fr->or_right->row - currow + 1; 28.27 +@@ -535,7 +535,7 @@ 28.28 + int cs = maxcol - curcol + 1; 28.29 + int i, qtmp; 28.30 + char buf[50]; 28.31 +- struct ent *obuf; 28.32 ++ struct ent *obuf=0; 28.33 + 28.34 + if (cs - arg < 0) { 28.35 + cs = cs > 0 ? cs : 0; 28.36 +@@ -810,7 +810,7 @@ 28.37 + 28.38 + if (to_insert == 'r') { 28.39 + insertrow(numrows, 0); 28.40 +- if (fr = find_frange(currow, curcol)) 28.41 ++ if ((fr = find_frange(currow, curcol))) 28.42 + deltac = fr->or_left->col - mincol; 28.43 + else { 28.44 + for (i = 0; i < numrows; i++) 28.45 +@@ -2279,7 +2279,7 @@ 28.46 + ret->e.r.right.vp = lookat(newrow, newcol); 28.47 + ret->e.r.right.vf = e->e.r.right.vf; 28.48 + } else { 28.49 +- struct enode *temprange; 28.50 ++ struct enode *temprange=0; 28.51 + 28.52 + if (freeenodes) { 28.53 + ret = freeenodes; 28.54 +@@ -2337,8 +2337,7 @@ 28.55 + break; 28.56 + case 'f': 28.57 + case 'F': 28.58 +- if (range && ret->op == 'F' || 28.59 +- !range && ret->op == 'f') 28.60 ++ if ((range && ret->op == 'F') || (!range && ret->op == 'f')) 28.61 + Rdelta = Cdelta = 0; 28.62 + ret->e.o.left = copye(e->e.o.left, Rdelta, Cdelta, 28.63 + r1, c1, r2, c2, transpose); 28.64 +@@ -2798,7 +2797,7 @@ 28.65 + write_cells(register FILE *f, int r0, int c0, int rn, int cn, int dr, int dc) 28.66 + { 28.67 + register struct ent **pp; 28.68 +- int r, c, rs, cs, mf; 28.69 ++ int r, c, rs=0, cs=0, mf; 28.70 + char *dpointptr; 28.71 + 28.72 + mf = modflg; 28.73 +@@ -2861,12 +2860,12 @@ 28.74 + if ((plugin = findplugin(p+1, 'w')) != NULL) { 28.75 + if (!plugin_exists(plugin, strlen(plugin), save + 1)) { 28.76 + error("plugin not found"); 28.77 +- return; 28.78 ++ return -1; 28.79 + } 28.80 + *save = '|'; 28.81 + if ((strlen(save) + strlen(fname) + 20) > PATHLEN) { 28.82 + error("Path too long"); 28.83 +- return; 28.84 ++ return -1; 28.85 + } 28.86 + sprintf(save + strlen(save), " %s%d:", coltoa(c0), r0); 28.87 + sprintf(save + strlen(save), "%s%d \"%s\"", coltoa(cn), rn, fname); 28.88 +@@ -2883,13 +2882,14 @@ 28.89 + } 28.90 + #endif /* VMS */ 28.91 + 28.92 +- if (*fname == '\0') 28.93 ++ if (*fname == '\0'){ 28.94 + if (isatty(STDOUT_FILENO) || *curfile != '\0') 28.95 + fname = curfile; 28.96 + else { 28.97 + write_fd(stdout, r0, c0, rn, cn); 28.98 + return (0); 28.99 + } 28.100 ++ } 28.101 + 28.102 + #ifdef MSDOS 28.103 + namelen = 12; 28.104 +@@ -2981,12 +2981,12 @@ 28.105 + if ((plugin = findplugin(p+1, 'r')) != NULL) { 28.106 + if (!(plugin_exists(plugin, strlen(plugin), save + 1))) { 28.107 + error("plugin not found"); 28.108 +- return; 28.109 ++ return -1; 28.110 + } 28.111 + *save = '|'; 28.112 + if ((strlen(save) + strlen(fname) + 2) > PATHLEN) { 28.113 + error("Path too long"); 28.114 +- return; 28.115 ++ return -1; 28.116 + } 28.117 + sprintf(save + strlen(save), " \"%s\"", fname); 28.118 + eraseflg = 0; 28.119 +--- sc-7.16.orig/abbrev.c 28.120 ++++ sc-7.16/abbrev.c 28.121 +@@ -19,10 +19,15 @@ 28.122 + #include <stdio.h> 28.123 + #include <stdlib.h> 28.124 + #include <ctype.h> 28.125 ++#include <curses.h> 28.126 ++#include <unistd.h> 28.127 + #include "sc.h" 28.128 + 28.129 + static struct abbrev *abbr_base; 28.130 + 28.131 ++int are_abbrevs(void); 28.132 ++ 28.133 ++ 28.134 + void 28.135 + add_abbr(char *string) 28.136 + { 28.137 +@@ -87,7 +92,7 @@ 28.138 + } 28.139 + } 28.140 + 28.141 +- if (expansion == NULL) 28.142 ++ if (expansion == NULL){ 28.143 + if ((a = find_abbr(string, strlen(string), &prev))) { 28.144 + error("abbrev \"%s %s\"", a->abbr, a->exp); 28.145 + return; 28.146 +@@ -95,6 +100,7 @@ 28.147 + error("abreviation \"%s\" doesn't exist", string); 28.148 + return; 28.149 + } 28.150 ++ } 28.151 + 28.152 + if (find_abbr(string, strlen(string), &prev)) 28.153 + del_abbr(string); 28.154 +@@ -122,7 +128,7 @@ 28.155 + del_abbr(char *abbrev) 28.156 + { 28.157 + struct abbrev *a; 28.158 +- struct abbrev **prev; 28.159 ++ struct abbrev **prev=0; 28.160 + 28.161 + if (!(a = find_abbr(abbrev, strlen(abbrev), prev))) 28.162 + return; 28.163 +--- sc-7.16.orig/range.c 28.164 ++++ sc-7.16/range.c 28.165 +@@ -18,6 +18,8 @@ 28.166 + 28.167 + #include <stdio.h> 28.168 + #include <ctype.h> 28.169 ++#include <unistd.h> 28.170 ++#include <curses.h> 28.171 + #include "sc.h" 28.172 + 28.173 + static struct range *rng_base; 28.174 +--- sc-7.16.orig/vi.c 28.175 ++++ sc-7.16/vi.c 28.176 +@@ -17,6 +17,8 @@ 28.177 + #include <curses.h> 28.178 + #include <ctype.h> 28.179 + #include <stdlib.h> 28.180 ++#include <unistd.h> 28.181 ++#include <sys/wait.h> 28.182 + #include "sc.h" 28.183 + 28.184 + #if defined(REGCOMP) 28.185 +@@ -40,7 +42,7 @@ 28.186 + 28.187 + #define istext(a) (isalnum(a) || ((a) == '_')) 28.188 + 28.189 +-#define bool int 28.190 ++/*#define bool int*/ 28.191 + #define true 1 28.192 + #define false 0 28.193 + 28.194 +@@ -667,8 +669,10 @@ 28.195 + static struct range *nextmatch; 28.196 + int len; 28.197 + 28.198 +- if (linelim > 0 && isalnum(line[linelim-1]) || line[linelim-1] == '_' || 28.199 +- (completethis && line[linelim-1] == ' ')) { 28.200 ++ if ((linelim > 0 && isalnum(line[linelim-1])) || 28.201 ++ line[linelim-1] == '_' || 28.202 ++ (completethis && line[linelim-1] == ' ')) { 28.203 ++ 28.204 + if (!completethis) { 28.205 + for (completethis = line + linelim - 1; isalnum(*completethis) || 28.206 + *completethis == '_'; completethis--) /* */; 28.207 +@@ -715,7 +719,7 @@ 28.208 + showdr() 28.209 + { 28.210 + int minsr, minsc, maxsr, maxsc; 28.211 +- char *p; 28.212 ++ /*char *p;*/ 28.213 + char r[12]; 28.214 + struct frange *fr = find_frange(currow, curcol); 28.215 + 28.216 +@@ -1566,7 +1570,7 @@ 28.217 + search_again(bool reverse) 28.218 + { 28.219 + int prev_match; 28.220 +- int found_it; 28.221 ++ int found_it=0; 28.222 + #if !defined(REGCOMP) && !defined(RE_COMP) && !defined(REGCMP) 28.223 + char *look_here; 28.224 + int do_next; 28.225 +@@ -1777,7 +1781,7 @@ 28.226 + static void 28.227 + match_paren() 28.228 + { 28.229 +- register int i; 28.230 ++ /*register int i;*/ 28.231 + int nest = 1; 28.232 + int tmp = linelim; 28.233 + 28.234 +--- sc-7.16.orig/vmtbl.c 28.235 ++++ sc-7.16/vmtbl.c 28.236 +@@ -16,6 +16,7 @@ 28.237 + # include <curses.h> 28.238 + #endif /* PSC */ 28.239 + 28.240 ++#include <unistd.h> 28.241 + #include "sc.h" 28.242 + 28.243 + /* 28.244 +--- sc-7.16.orig/Makefile 28.245 ++++ sc-7.16/Makefile 28.246 +@@ -32,7 +32,7 @@ 28.247 + 28.248 + # This is where the library file (tutorial) goes. 28.249 + #LIBDIR=/usr/local/share/$(name) # reno 28.250 +-LIBDIR=${prefix}/lib/$(name) 28.251 ++LIBDIR=${prefix}/share/doc/$(name) 28.252 + LIBRARY=-DLIBDIR=\"${LIBDIR}\" 28.253 + 28.254 + # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up 28.255 +--- sc-7.16.orig/color.c 28.256 ++++ sc-7.16/color.c 28.257 +@@ -19,6 +19,7 @@ 28.258 + 28.259 + #include <curses.h> 28.260 + #include <ctype.h> 28.261 ++#include <unistd.h> 28.262 + #include "sc.h" 28.263 + 28.264 + /* a linked list of free [struct ent]'s, uses .next as the pointer */ 28.265 +--- sc-7.16.orig/frame.c 28.266 ++++ sc-7.16/frame.c 28.267 +@@ -18,6 +18,9 @@ 28.268 + 28.269 + #include <stdio.h> 28.270 + #include <ctype.h> 28.271 ++#include <stdlib.h> 28.272 ++#include <curses.h> 28.273 ++#include <unistd.h> 28.274 + #include "sc.h" 28.275 + 28.276 + static struct frange *frame_base; 28.277 +--- sc-7.16.orig/sc.c 28.278 ++++ sc-7.16/sc.c 28.279 +@@ -212,7 +212,7 @@ 28.280 + 28.281 + if (dbidx < 0) 28.282 + return; 28.283 +- if (p = delbuf[dbidx]) { 28.284 ++ if ((p = delbuf[dbidx])) { 28.285 + scxfree(delbuffmt[dbidx]); 28.286 + delbuffmt[dbidx] = NULL; 28.287 + } 28.288 +@@ -845,7 +845,7 @@ 28.289 + break; 28.290 + case 'C': 28.291 + color = !color; 28.292 +- if (has_colors()) 28.293 ++ if (has_colors()){ 28.294 + if (color) { 28.295 + attron(COLOR_PAIR(1)); 28.296 + bkgd(COLOR_PAIR(1) | ' '); 28.297 +@@ -853,6 +853,7 @@ 28.298 + attron(COLOR_PAIR(0)); 28.299 + bkgd(COLOR_PAIR(0) | ' '); 28.300 + } 28.301 ++ } 28.302 + error("Color %sabled.", color ? "en" : "dis"); 28.303 + break; 28.304 + case 'N': 28.305 +--- sc-7.16.orig/sort.c 28.306 ++++ sc-7.16/sort.c 28.307 +@@ -19,6 +19,8 @@ 28.308 + #include <stdio.h> 28.309 + #include <ctype.h> 28.310 + #include <stdlib.h> 28.311 ++#include <unistd.h> 28.312 ++#include <curses.h> 28.313 + #include "sc.h" 28.314 + 28.315 + int compare(const void *row1, const void *row2); 28.316 +--- sc-7.16.orig/xmalloc.c 28.317 ++++ sc-7.16/xmalloc.c 28.318 +@@ -4,11 +4,12 @@ 28.319 + */ 28.320 + 28.321 + #include <curses.h> 28.322 ++#include <stdlib.h> 28.323 + #include "sc.h" 28.324 + 28.325 +-extern char *malloc(); 28.326 ++/* extern char *malloc(); 28.327 + extern char *realloc(); 28.328 +-extern void free(); 28.329 ++extern void free(); */ 28.330 + void fatal(); 28.331 + 28.332 + #ifdef SYSV3 28.333 +--- sc-7.16.orig/screen.c 28.334 ++++ sc-7.16/screen.c 28.335 +@@ -234,11 +234,12 @@ 28.336 + i = stcol; 28.337 + lcols = 0; 28.338 + col = rescol + frcols; 28.339 +- if (fr && stcol >= fr->or_left->col) 28.340 ++ if (fr && stcol >= fr->or_left->col){ 28.341 + if (stcol < fr->ir_left->col) 28.342 + i = fr->or_left->col; 28.343 + else 28.344 + col += flcols; 28.345 ++ } 28.346 + for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && 28.347 + i < maxcols; i++) { 28.348 + lcols++; 28.349 +@@ -328,11 +329,12 @@ 28.350 + i = stcol; 28.351 + lcols = 0; 28.352 + col = rescol + frcols; 28.353 +- if (fr && stcol >= fr->or_left->col) 28.354 ++ if (fr && stcol >= fr->or_left->col){ 28.355 + if (stcol < fr->ir_left->col) 28.356 + i = fr->or_left->col; 28.357 + else 28.358 + col += flcols; 28.359 ++ } 28.360 + for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && 28.361 + i < maxcols; i++) { 28.362 + lcols++; 28.363 +@@ -377,11 +379,12 @@ 28.364 + i = strow; 28.365 + rows = 0; 28.366 + row = RESROW + fbrows; 28.367 +- if (fr && strow >= fr->or_left->row) 28.368 ++ if (fr && strow >= fr->or_left->row){ 28.369 + if (strow < fr->ir_left->row) 28.370 + i = fr->or_left->row; 28.371 + else 28.372 + row += ftrows; 28.373 ++ } 28.374 + for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; 28.375 + i++) { 28.376 + rows++; 28.377 +@@ -460,11 +463,12 @@ 28.378 + i = strow; 28.379 + rows = 0; 28.380 + row = RESROW + fbrows; 28.381 +- if (fr && strow >= fr->or_left->row) 28.382 ++ if (fr && strow >= fr->or_left->row){ 28.383 + if (strow < fr->ir_left->row) 28.384 + i = fr->or_left->row; 28.385 + else 28.386 + row += ftrows; 28.387 ++ } 28.388 + for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; 28.389 + i++) { 28.390 + rows++; 28.391 +--- sc-7.16.orig/lex.c 28.392 ++++ sc-7.16/lex.c 28.393 +@@ -34,6 +34,8 @@ 28.394 + #include <signal.h> 28.395 + #include <setjmp.h> 28.396 + #include <ctype.h> 28.397 ++#include <unistd.h> 28.398 ++#include <math.h> 28.399 + #include "sc.h" 28.400 + 28.401 + #ifdef NONOTIMEOUT 28.402 +@@ -107,7 +109,7 @@ 28.403 + yylex() 28.404 + { 28.405 + char *p = line + linelim; 28.406 +- int ret; 28.407 ++ int ret=0; 28.408 + static int isfunc = 0; 28.409 + static bool isgoto = 0; 28.410 + static bool colstate = 0; 28.411 +@@ -326,7 +328,7 @@ 28.412 + strcpy((char *)path, HomeDir); 28.413 + strcat((char *)path, "/.sc/plugins/"); 28.414 + strncat((char *)path, name, len); 28.415 +- if (fp = fopen((char *)path, "r")) { 28.416 ++ if ((fp = fopen((char *)path, "r"))) { 28.417 + fclose(fp); 28.418 + return 1; 28.419 + } 28.420 +@@ -334,7 +336,7 @@ 28.421 + strcpy((char *)path, LIBDIR); 28.422 + strcat((char *)path, "/plugins/"); 28.423 + strncat((char *)path, name, len); 28.424 +- if (fp = fopen((char *)path, "r")) { 28.425 ++ if ((fp = fopen((char *)path, "r"))) { 28.426 + fclose(fp); 28.427 + return 1; 28.428 + } 28.429 +--- sc-7.16.orig/interp.c 28.430 ++++ sc-7.16/interp.c 28.431 +@@ -1572,12 +1572,12 @@ 28.432 + copy(struct ent *dv1, struct ent *dv2, struct ent *v1, struct ent *v2) 28.433 + { 28.434 + struct ent *p; 28.435 +- struct ent *n; 28.436 ++/* struct ent *n;*/ 28.437 + static int minsr = -1, minsc = -1; 28.438 + static int maxsr = -1, maxsc = -1; 28.439 + int mindr, mindc; 28.440 + int maxdr, maxdc; 28.441 +- int vr, vc; 28.442 ++/* int vr, vc;*/ 28.443 + int r, c; 28.444 + int deltar, deltac; 28.445 + 28.446 +@@ -2066,7 +2066,7 @@ 28.447 + *line = '\0'; 28.448 + } 28.449 + } 28.450 +- if (!col_hidden[c]) 28.451 ++ if (!col_hidden[c]){ 28.452 + if (gs.g_type == G_STR) { 28.453 + if (p && p->label 28.454 + #if defined(REGCOMP) 28.455 +@@ -2099,6 +2099,7 @@ 28.456 + #endif 28.457 + #endif 28.458 + break; 28.459 ++ } 28.460 + if (r == endr && c == endc) { 28.461 + error("String not found"); 28.462 + #if defined(REGCOMP) 28.463 +@@ -2471,13 +2472,11 @@ 28.464 + int 28.465 + constant(register struct enode *e) 28.466 + { 28.467 +- return ( 28.468 +- e == NULL 28.469 ++ return e == NULL 28.470 + || e->op == O_CONST 28.471 + || e->op == O_SCONST 28.472 +- || e->op == 'm' && constant(e->e.o.left) 28.473 +- || ( 28.474 +- e->op != O_VAR 28.475 ++ || (e->op == 'm' && constant(e->e.o.left)) 28.476 ++ || (e->op != O_VAR 28.477 + && !(e->op & REDUCE) 28.478 + && constant(e->e.o.left) 28.479 + && constant(e->e.o.right) 28.480 +@@ -2491,9 +2490,7 @@ 28.481 + && e->op != LASTCOL 28.482 + && e->op != NUMITER 28.483 + && e->op != FILENAME 28.484 +- && optimize 28.485 +- ) 28.486 +- ); 28.487 ++ && optimize ); 28.488 + } 28.489 + 28.490 + void 28.491 +--- sc-7.16.orig/help.c 28.492 ++++ sc-7.16/help.c 28.493 +@@ -11,6 +11,7 @@ 28.494 + char *revision = "$Revision: 7.16 $"; 28.495 + #else 28.496 + #include <curses.h> 28.497 ++#include <unistd.h> 28.498 + #include "sc.h" 28.499 + #endif /* QREF */ 28.500 +
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 29.2 +++ b/sc/stuff/patches/series Tue Mar 13 02:04:32 2018 +0200 29.3 @@ -0,0 +1,1 @@ 29.4 +-p1|7.16.patch
30.1 --- a/scalpel/receipt Mon Mar 12 11:53:39 2018 +0100 30.2 +++ b/scalpel/receipt Tue Mar 13 02:04:32 2018 +0200 30.3 @@ -1,26 +1,24 @@ 30.4 -# SliTaz package receipt. 30.5 +# SliTaz package receipt v2. 30.6 30.7 PACKAGE="scalpel" 30.8 VERSION="1.60" 30.9 CATEGORY="system-tools" 30.10 -SHORT_DESC="Frugal, high performance file carver." 30.11 +SHORT_DESC="Frugal, high performance file carver" 30.12 MAINTAINER="pascal.bellard@slitaz.org" 30.13 LICENSE="GPL2" 30.14 +WEB_SITE="http://www.digitalforensicssolutions.com/Scalpel" 30.15 + 30.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 30.17 -WEB_SITE="http://www.digitalforensicssolutions.com/Scalpel" 30.18 WGET_URL="$WEB_SITE/$TARBALL" 30.19 30.20 -# Rules to configure and make the package. 30.21 -compile_rules() 30.22 -{ 30.23 - cd $src && make 30.24 +compile_rules() { 30.25 + make || return 1 30.26 + 30.27 + install -Dm 755 $src/scalpel $install/usr/bin/scalpel 30.28 + install -Dm 644 $src/scalpel.conf $install/etc/scalpel.conf 30.29 } 30.30 30.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 30.32 -genpkg_rules() 30.33 -{ 30.34 - mkdir -p $fs/usr/bin $fs/etc 30.35 - cp -a $src/scalpel $fs/usr/bin 30.36 - cp -a $src/scalpel.conf $fs/etc 30.37 +genpkg_rules() { 30.38 + copy @std 30.39 } 30.40
31.1 --- a/screenlets/receipt Mon Mar 12 11:53:39 2018 +0100 31.2 +++ b/screenlets/receipt Tue Mar 13 02:04:32 2018 +0200 31.3 @@ -1,43 +1,35 @@ 31.4 -# SliTaz package receipt. 31.5 +# SliTaz package receipt v2. 31.6 31.7 PACKAGE="screenlets" 31.8 VERSION="0.1.6" 31.9 CATEGORY="system-tools" 31.10 -SHORT_DESC="Desktop widgets framework." 31.11 +SHORT_DESC="Desktop widgets framework" 31.12 MAINTAINER="pankso@slitaz.org" 31.13 LICENSE="GPL2" 31.14 +WEB_SITE="http://screenlets.org" 31.15 + 31.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 31.17 -WEB_SITE="http://screenlets.org" 31.18 WGET_URL="https://launchpad.net/screenlets/trunk/$VERSION/+download/$TARBALL" 31.19 31.20 -DEPENDS="python pygtk python-xdg beautifulsoup gnome-python-desktop \ 31.21 -dbus-python gnome-icon-theme" 31.22 -BUILD_DEPENDS="python-dev wget" 31.23 +BUILD_DEPENDS="python-dev gettext" 31.24 31.25 -# Rules to configure and make the package. 31.26 -compile_rules() 31.27 -{ 31.28 - python setup.py install --root=$install 31.29 +compile_rules() { 31.30 + python setup.py install --root=$install || return 1 31.31 + 31.32 + mkdir -p $install/etc/screenlets/ 31.33 + echo '/usr' > $install/etc/screenlets/prefix 31.34 } 31.35 31.36 -# Rules to gen a SliTaz package suitable for Tazpkg. 31.37 -genpkg_rules() 31.38 -{ 31.39 - mkdir -p $fs/usr/share/icons $fs/etc/screenlets 31.40 - cp -a $install/usr/bin $fs/usr 31.41 - cp -a $install/usr/lib $fs/usr 31.42 - cp -a $install/usr/share/screenlets* $fs/usr/share 31.43 - cp -a $install/usr/share/icons/hicolor $fs/usr/share/icons 31.44 - echo '/usr' > $fs/etc/screenlets/prefix 31.45 +genpkg_rules() { 31.46 + copy @std 31.47 + DEPENDS="python pygtk python-xdg beautifulsoup gnome-python-desktop \ 31.48 + dbus-python gnome-icon-theme" 31.49 } 31.50 31.51 -# Post install/remove commands for Tazpkg. 31.52 -post_install() 31.53 -{ 31.54 +post_install() { 31.55 chroot "$1/" /usr/bin/gdk-pixbuf-query-loaders --update-cache 31.56 } 31.57 31.58 -post_remove() 31.59 -{ 31.60 +post_remove() { 31.61 chroot "$1/" /usr/bin/gdk-pixbuf-query-loaders --update-cache 31.62 }
32.1 --- a/sheerdns/receipt Mon Mar 12 11:53:39 2018 +0100 32.2 +++ b/sheerdns/receipt Tue Mar 13 02:04:32 2018 +0200 32.3 @@ -1,33 +1,31 @@ 32.4 -# SliTaz package receipt. 32.5 +# SliTaz package receipt v2. 32.6 32.7 PACKAGE="sheerdns" 32.8 VERSION="1.0.3" 32.9 CATEGORY="network" 32.10 -SHORT_DESC="master DNS server." 32.11 +SHORT_DESC="Master DNS server" 32.12 MAINTAINER="pascal.bellard@slitaz.org" 32.13 LICENSE="GPL2" 32.14 +WEB_SITE="http://threading.2038bug.com/sheerdns/" 32.15 + 32.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 32.17 -WEB_SITE="http://threading.2038bug.com/sheerdns/" 32.18 WGET_URL="${WEB_SITE}$TARBALL" 32.19 -CONFIG_FILES="/var/sheerdns" 32.20 32.21 -# Rules to configure and make the package. 32.22 -compile_rules() 32.23 -{ 32.24 - mv $PACKAGE $src 2> /dev/null 32.25 +compile_rules() { 32.26 + mv $PACKAGE $src 2>/dev/null 32.27 cd $src 32.28 for i in $( cd $stuff ; ls *.u); do 32.29 [ -f done.$i ] && continue 32.30 patch -p0 < $stuff/$i 32.31 touch done.$i 32.32 done 32.33 - make 32.34 + make || return 1 32.35 + 32.36 + mkdir -p $install/usr/bin/ $install/var/sheerdns/ 32.37 + cp -a $src/sheerdns $src/sheerdnshash $install/usr/bin 32.38 } 32.39 32.40 -# Rules to gen a SliTaz package suitable for Tazpkg. 32.41 -genpkg_rules() 32.42 -{ 32.43 - mkdir -p $fs/usr/bin $fs/var/sheerdns 32.44 - cp -a $src/sheerdns $src/sheerdnshash $fs/usr/bin 32.45 +genpkg_rules() { 32.46 + copy @std 32.47 + CONFIG_FILES="/var/sheerdns/" 32.48 } 32.49 -
33.1 --- a/simh/receipt Mon Mar 12 11:53:39 2018 +0100 33.2 +++ b/simh/receipt Tue Mar 13 02:04:32 2018 +0200 33.3 @@ -1,28 +1,27 @@ 33.4 -# SliTaz package receipt. 33.5 +# SliTaz package receipt v2. 33.6 33.7 PACKAGE="simh" 33.8 VERSION="39-0" 33.9 CATEGORY="misc" 33.10 -SHORT_DESC="multi-system simulator." 33.11 +SHORT_DESC="Multi-system simulator" 33.12 MAINTAINER="pascal.bellard@slitaz.org" 33.13 LICENSE="GPL" 33.14 +WEB_SITE="http://simh.trailing-edge.com/" 33.15 + 33.16 TARBALL="${PACKAGE}v$VERSION.zip" 33.17 -WEB_SITE="http://simh.trailing-edge.com/" 33.18 WGET_URL="${WEB_SITE}sources/$TARBALL" 33.19 -TAGS="emulator PDP VAX Interdata Honeywell altair nova" 33.20 33.21 BUILD_DEPENDS="libpcap-dev" 33.22 33.23 -# Rules to configure and make the package. 33.24 -compile_rules() 33.25 -{ 33.26 +compile_rules() { 33.27 mkdir BIN 33.28 - make -j 1 33.29 + make -j1 || return 1 33.30 + 33.31 + mkdir -p $install/usr/bin/ 33.32 + cp -a $src/BIN/* $install/usr/bin/ 33.33 } 33.34 33.35 -# Rules to gen a SliTaz package suitable for Tazpkg. 33.36 -genpkg_rules() 33.37 -{ 33.38 - mkdir -p $fs/usr/bin 33.39 - cp -a $src/BIN/* $fs/usr/bin 33.40 +genpkg_rules() { 33.41 + copy @std 33.42 + TAGS="emulator PDP VAX Interdata Honeywell altair nova" 33.43 }
34.1 --- a/slitaz-configs/receipt Mon Mar 12 11:53:39 2018 +0100 34.2 +++ b/slitaz-configs/receipt Tue Mar 13 02:04:32 2018 +0200 34.3 @@ -16,17 +16,12 @@ 34.4 locale-ru locale-zh_CN gettext" 34.5 SPLIT="slitaz-themes slitaz-configs-base" 34.6 34.7 -# Rules to configure and make the package. 34.8 -compile_rules() 34.9 -{ 34.10 - case "$ARCH" in 34.11 - i?86) 34.12 - # xcompmgr produces visual glitches on the screen 34.13 - sed -i 's|xcompmgr|compton|' ob-menu/menu.xml.in 34.14 - make DESTDIR=$DESTDIR menu 34.15 - ln -s menu.en.xml $install/etc/xdg/openbox/menu.xml 34.16 - ;; 34.17 - esac 34.18 +compile_rules() { 34.19 + # xcompmgr produces visual glitches on the screen 34.20 + sed -i 's|xcompmgr|compton|' ob-menu/menu.xml.in 34.21 + make DESTDIR=$DESTDIR menu 34.22 + ln -s menu.en.xml $install/etc/xdg/openbox/menu.xml 34.23 + 34.24 find /usr/share/locale -type f -name 'slitaz*' 34.25 34.26 cp -a $src/rootfs/* $install 34.27 @@ -74,15 +69,19 @@ 34.28 chown -R root:root $install 34.29 } 34.30 34.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 34.32 -genpkg_rules() 34.33 -{ 34.34 +genpkg_rules() { 34.35 case $PACKAGE in 34.36 slitaz-configs) 34.37 # Special case for ARM since some (most) config files are in slitaz-arm repo. 34.38 # i486/arm common configs are provided by slitaz-configs-base. 34.39 case "$ARCH" in 34.40 - i?86) 34.41 + arm*) 34.42 + copy \ 34.43 + /usr/share/applications/ \ 34.44 + /usr/share/slitaz/ 34.45 + DEPENDS="slitaz-arm-configs ttf-dejavu slim" 34.46 + ;; 34.47 + *) 34.48 copy \ 34.49 /etc/skel/.gtkrc-2.0* \ 34.50 /etc/skel/.icons/ \ 34.51 @@ -106,12 +105,6 @@ 34.52 DEPENDS="slitaz-configs-base xorg-libXcomposite \ 34.53 xorg-libXdamage transset-df ttf-dejavu slim compton" 34.54 ;; 34.55 - arm) 34.56 - copy \ 34.57 - /usr/share/applications/ \ 34.58 - /usr/share/slitaz/ 34.59 - DEPENDS="slitaz-arm-configs ttf-dejavu slim" 34.60 - ;; 34.61 esac 34.62 34.63 CAT="base-system|for GUI systems"
35.1 --- a/slitaz-icons-faenza/receipt Mon Mar 12 11:53:39 2018 +0100 35.2 +++ b/slitaz-icons-faenza/receipt Tue Mar 13 02:04:32 2018 +0200 35.3 @@ -11,7 +11,6 @@ 35.4 BUILD_DEPENDS="faenza-icon-theme make-slitaz-icons" 35.5 SPLIT="slitaz-icons-faenza-dark" 35.6 35.7 -# Rules to compile and make the package. 35.8 compile_rules() { 35.9 # light theme ------------ 35.10 mksit.sh \ 35.11 @@ -46,16 +45,14 @@ 35.12 fi 35.13 done 35.14 35.15 - cp -f $f/16x16/apps/system-log-out.png $f/16x16/actions 35.16 +# cp -f $f/16x16/apps/system-log-out.png $f/16x16/actions 35.17 for d in 16x16/status 16x16/apps 48x48; do rm -r $f/$d; done 35.18 cp -f $stuff/index.theme $f 35.19 # Use 16x16 icon on 22x22 canvas: 35.20 cp $stuff/avatar-default-dark.png $f/22x22/status/avatar-default.png 35.21 } 35.22 35.23 -# Rules to gen a SliTaz package suitable for Tazpkg. 35.24 -genpkg_rules() 35.25 -{ 35.26 +genpkg_rules() { 35.27 case $PACKAGE in 35.28 slitaz-icons-faenza) 35.29 copy SliTaz-Faenza/
36.1 --- a/slitaz-icons-hydroxygen/receipt Mon Mar 12 11:53:39 2018 +0100 36.2 +++ b/slitaz-icons-hydroxygen/receipt Tue Mar 13 02:04:32 2018 +0200 36.3 @@ -10,16 +10,13 @@ 36.4 36.5 BUILD_DEPENDS="hydroxygen-iconset make-slitaz-icons" 36.6 36.7 -# Rules to compile and makethe package. 36.8 compile_rules() { 36.9 mksit.sh \ 36.10 -f /usr/share/icons/hydroxygen \ 36.11 - -t $fs/usr/share/icons/SliTaz-Hydroxygen \ 36.12 + -t $install/usr/share/icons/SliTaz-Hydroxygen \ 36.13 -opmax 36.14 } 36.15 36.16 -# Rules to gen a SliTaz package suitable for Tazpkg. 36.17 -genpkg_rules() 36.18 -{ 36.19 +genpkg_rules() { 36.20 copy @std 36.21 }
37.1 --- a/sozi/receipt Mon Mar 12 11:53:39 2018 +0100 37.2 +++ b/sozi/receipt Tue Mar 13 02:04:32 2018 +0200 37.3 @@ -1,27 +1,22 @@ 37.4 -# SliTaz package receipt. 37.5 +# SliTaz package receipt v2. 37.6 37.7 PACKAGE="sozi" 37.8 VERSION="12.09-27213249" 37.9 CATEGORY="graphics" 37.10 -SHORT_DESC="A small program that can play animated presentations." 37.11 +SHORT_DESC="A small program that can play animated presentations" 37.12 MAINTAINER="pascal.bellard@slitaz.org" 37.13 LICENSE="GPL3" 37.14 WEB_SITE="http://sozi.baierouge.fr/" 37.15 + 37.16 TARBALL="$PACKAGE-release-$VERSION.zip" 37.17 WGET_URL="https://github.com/downloads/senshu/Sozi/$TARBALL" 37.18 37.19 -DEPENDS="inkscape python pygtk python-lxml" 37.20 -BUILD_DEPENDS="wget" 37.21 - 37.22 -# Rules to configure and make the package. 37.23 -compile_rules() 37.24 -{ 37.25 - cd $src 37.26 +compile_rules() { 37.27 + mkdir -p $install/usr/share/inkscape/extensions/ 37.28 + cp -a $src/* $install/usr/share/inkscape/extensions/ 37.29 } 37.30 37.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 37.32 -genpkg_rules() 37.33 -{ 37.34 - mkdir -p $fs/usr/share/inkscape/extensions 37.35 - cp -a $src/* $fs/usr/share/inkscape/extensions/ 37.36 +genpkg_rules() { 37.37 + copy @std 37.38 + DEPENDS="inkscape python pygtk python-lxml" 37.39 }
38.1 --- a/sshttp/receipt Mon Mar 12 11:53:39 2018 +0100 38.2 +++ b/sshttp/receipt Tue Mar 13 02:04:32 2018 +0200 38.3 @@ -1,40 +1,40 @@ 38.4 -# SliTaz package receipt. 38.5 +# SliTaz package receipt v2. 38.6 38.7 PACKAGE="sshttp" 38.8 VERSION="0-35s2" 38.9 CATEGORY="network" 38.10 -SHORT_DESC="hiding a SSH server behind a HTTP server." 38.11 +SHORT_DESC="Hiding a SSH server behind a HTTP server" 38.12 MAINTAINER="pascal.bellard@slitaz.org" 38.13 LICENSE="BSD" 38.14 +WEB_SITE="https://github.com/stealth/$PACKAGE" 38.15 + 38.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 38.17 -WEB_SITE="https://github.com/stealth/$PACKAGE" 38.18 WGET_URL="$WEB_SITE/archive/$TARBALL" 38.19 -TAGS="ssh" 38.20 38.21 -BUILD_DEPENDS="wget libcap libcap-dev" 38.22 -DEPENDS="libcap gcc-lib-base" 38.23 +BUILD_DEPENDS="libcap-dev" 38.24 38.25 -# Rules to configure and make the package. 38.26 -compile_rules() 38.27 -{ 38.28 - make && cp README* $WOK/$PACKAGE/description.txt 38.29 +compile_rules() { 38.30 + make && 38.31 + install -Dm 755 $src/sshttpd $install/usr/sbin/sshttpd 38.32 } 38.33 38.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 38.35 -genpkg_rules() 38.36 -{ 38.37 - mkdir -p $fs/usr/sbin 38.38 - cp -a $src/sshttpd $fs/usr/sbin 38.39 +genpkg_rules() { 38.40 + copy @std 38.41 + DEPENDS="libcap gcc-lib-base" 38.42 + TAGS="ssh" 38.43 } 38.44 38.45 -# Pre and post install commands for Tazpkg. 38.46 -post_install() 38.47 -{ 38.48 - [ "$1" ] || zcat /proc/config.gz | grep -q ^CONFIG_NETFILTER_TPROXY= || cat <<EOT 38.49 +post_install() { 38.50 + [ -n "$1" ] || 38.51 + zcat /proc/config.gz | grep -q ^CONFIG_NETFILTER_TPROXY= || 38.52 + cat <<EOT 38.53 38.54 -CONFIG_NETFILTER_TPROXY not found in /proc/config.gz 38.55 -sshttp needs Linux IP_TRANSPARENT feature to work. 38.56 -You should rebuild your kernel with a new configuration. 38.57 + .----------------------------------------------------------. 38.58 + | CONFIG_NETFILTER_TPROXY not found in /proc/config.gz | 38.59 + |----------------------------------------------------------| 38.60 + | sshttp needs Linux IP_TRANSPARENT feature to work. | 38.61 + | You should rebuild your kernel with a new configuration. | 38.62 + '----------------------------------------------------------' 38.63 38.64 EOT 38.65 }
39.1 --- a/stegsnow/receipt Mon Mar 12 11:53:39 2018 +0100 39.2 +++ b/stegsnow/receipt Tue Mar 13 02:04:32 2018 +0200 39.3 @@ -1,26 +1,22 @@ 39.4 -# SliTaz package receipt. 39.5 +# SliTaz package receipt v2. 39.6 39.7 PACKAGE="stegsnow" 39.8 -SOURCE="snow" 39.9 VERSION="20130616" 39.10 CATEGORY="security" 39.11 -SHORT_DESC="The Steganographic Nature Of Whitespace." 39.12 +SHORT_DESC="The Steganographic Nature Of Whitespace" 39.13 MAINTAINER="pascal.bellard@slitaz.org" 39.14 LICENSE="Apache" 39.15 -TARBALL="$SOURCE-$VERSION.tar.gz" 39.16 WEB_SITE="http://www.darkside.com.au/snow" 39.17 + 39.18 +TARBALL="snow-$VERSION.tar.gz" 39.19 WGET_URL="$WEB_SITE/$TARBALL" 39.20 -TAGS="stenography" 39.21 39.22 -# Rules to configure and make the package. 39.23 -compile_rules() 39.24 -{ 39.25 - make 39.26 +compile_rules() { 39.27 + make && 39.28 + install -Dm 755 $src/snow $install/usr/bin/stegsnow 39.29 } 39.30 39.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 39.32 -genpkg_rules() 39.33 -{ 39.34 - mkdir -p $fs/usr/bin 39.35 - cp -a $src/snow $fs/usr/bin/stegsnow 39.36 +genpkg_rules() { 39.37 + copy @std 39.38 + TAGS="stenography" 39.39 }