wok-next rev 20534

Clean default configure options when site script used.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Mar 30 19:31:50 2018 +0300 (2018-03-30)
parents c6072d05ef86
children 40978177e856
files GConf/receipt Xdialog/receipt a2ps/receipt alsa-tools/receipt amsn/receipt antinat/receipt apr-util/receipt asciidoc/receipt asterisk/receipt at-spi2-atk/receipt at-spi2-core/receipt atm-tools/receipt atril/receipt audacious/receipt audit/receipt avrdude/receipt awn/receipt backintime/receipt barnyard2/receipt bind/receipt bird/receipt blackbox/receipt blueman/receipt bluez/receipt bmon/receipt bogofilter/receipt brasero/receipt brisk-menu/receipt brscan/receipt burp/receipt c_icap/receipt cairo/receipt caja-dropbox/receipt caja-extensions/receipt caja/receipt ccid/receipt cherokee/receipt chillispot/receipt clamav/receipt clipit/receipt clutter/receipt collectd-apache/receipt collectd-bind/receipt collectd/receipt colord/receipt commoncpp2/receipt compiz-libcompizconfig/receipt compiz-plugins-extra/receipt compiz-plugins-main/receipt compiz-plugins-unsupported/receipt conky/receipt connman/receipt coova-chilli/receipt couchdb/receipt cups-filters/receipt cups/receipt cyrus-sasl/receipt dahdi-tools/receipt dansguardian/receipt davfs2/receipt dbus-glib/receipt dbus/receipt dcmtk/receipt dconf-editor/receipt dconf/receipt dhcp/receipt dhcp6/receipt dialog/receipt dillo/receipt directfb/receipt distcc/receipt djvulibre/receipt dovecot/receipt drbd-utils/receipt e2fsprogs/receipt ejabberd/receipt ekiga/receipt enchant/receipt engrampa/receipt enlightenment/receipt eom/receipt erlang/receipt esound/receipt etherape/receipt eudev/receipt evince/receipt exo/receipt fcron/receipt fdutils/receipt firejail/receipt florence/receipt fltk/receipt fontconfig/receipt foomatic-db-engine/receipt foomatic-db-nonfree/receipt foomatic-db/receipt foomatic-filters/receipt freeradius/receipt freetds/receipt freetype-infinality/receipt freetype/receipt freetype1/receipt ftp-proxy/receipt fuse3/receipt fwknop/receipt gadmin-antivirus/receipt gadmin-bind/receipt gadmin-dhcpd/receipt gadmin-httpd/receipt gadmin-openvpn-client/receipt gadmin-openvpn-server/receipt gadmin-proftpd/receipt gadmin-rsync/receipt gadmin-samba/receipt gadmin-sendmail/receipt gadmin-squid/receipt gadmin-sshd/receipt gamin/receipt garcon/receipt gcr/receipt gdal/receipt gecko-mediaplayer/receipt geoip/receipt gettext/receipt ghex/receipt gigolo/receipt gimp/receipt glib/receipt glibmm/receipt glusterfs/receipt gmime/receipt gnome-commander/receipt gnome-desktop/receipt gnome-doc-utils/receipt gnome-games/receipt gnome-keyring/receipt gnome-keyring3/receipt gnome-menus/receipt gnome-mime-data/receipt gnome-mplayer/receipt gnome-python/receipt gnome-vfs/receipt gnubg/receipt gnucash/receipt gobject-introspection/receipt gparted/receipt gputils/receipt grantlee/receipt gst0-plugins-bad/receipt gst0-plugins-base/receipt gst0-plugins-good/receipt gst0-plugins-ugly/receipt gst0-python/receipt gst1-plugins-good/receipt gstreamer0/receipt gsynaptics/receipt gtk+3/receipt gtk-xfce-engine/receipt gtkhash/receipt gtksourceview/receipt gtksourceview3/receipt gucharmap/receipt gutenprint/receipt gvfs/receipt gxine/receipt hal-info/receipt hal/receipt hplip/receipt icecast/receipt icewm/receipt icinga/receipt igmpproxy/receipt imagemagick/receipt imagemagick6/receipt imlib2/receipt ipkungfu/receipt irssi/receipt ivman/receipt jabberd2/receipt joe/receipt json-glib/receipt jwm/receipt kazehakase/receipt keepalived/receipt kino/receipt kismet/receipt knock/receipt krb5/receipt less/receipt libappindicator-gtk2/receipt libarchive/receipt libb2/receipt libbonobo/receipt libbonoboui/receipt libbytesize/receipt libdbusmenu-gtk2/receipt libdbusmenu-gtk3/receipt libdesktop-agnostic/receipt libfakekey/receipt libfm-extra/receipt libfm/receipt libgdiplus/receipt libglade/receipt libgnome-keyring/receipt libgnome-keyring3/receipt libgnome/receipt libgnomecanvasmm/receipt libgtkhtml/receipt libgudev/receipt libgusb/receipt libindicator-gtk2/receipt libindicator-gtk3/receipt libinput/receipt libirman/receipt libmatekbd/receipt libmatemixer/receipt libmateweather/receipt libmediainfo/receipt libnl/receipt liboil/receipt libpaper/receipt librsvg/receipt libsde-utils/receipt libsdl2-ttf/receipt libshout/receipt libtdb/receipt libtirpc/receipt libva-intel-driver/receipt libva/receipt libvdpau/receipt libxfce4ui/receipt libxfce4util/receipt libxkbcommon-wayland/receipt libxkbcommon/receipt libzen/receipt lightdm-gtk2-greeter/receipt lightdm-qt/receipt lightdm/receipt links-dfb/receipt links/receipt lirc/receipt littleutils/receipt log4c/receipt lxappearance-obconf/receipt lxappearance/receipt lxc/receipt lxde-common/receipt lxdm/receipt lxlauncher/receipt lxmenu-data/receipt lxpanel/receipt lxpolkit/receipt lxsession/receipt lynx/receipt man-db/receipt marco/receipt matchbox-desktop/receipt matchbox-window-manager/receipt mate-applets/receipt mate-backgrounds/receipt mate-calc/receipt mate-common/receipt mate-control-center/receipt mate-desktop/receipt mate-icon-theme-faenza/receipt mate-icon-theme/receipt mate-indicator-applet/receipt mate-media/receipt mate-menus/receipt mate-netbook/receipt mate-notification-daemon-gtk2/receipt mate-notification-daemon/receipt mate-panel/receipt mate-polkit/receipt mate-power-manager/receipt mate-screensaver/receipt mate-sensors-applet/receipt mate-session-manager/receipt mate-settings-daemon/receipt mate-system-monitor/receipt mate-terminal/receipt mate-themes/receipt mate-user-guide/receipt mate-user-share/receipt mate-utils/receipt mc/receipt mesa/receipt mesa12/receipt metacity/receipt minicom/receipt minidlna/receipt module-init-tools/receipt monkey/receipt mono/receipt moosefs/receipt moserial/receipt mosh/receipt motion/receipt mousepad/receipt mozo/receipt mozplugger/receipt mplayerplug-in/receipt mutt/receipt mygestures/receipt nagios-nrpe/receipt nagios-nsca/receipt nagios/receipt nano/receipt nbd/receipt ncftp/receipt ndisc6/receipt ndoutils/receipt netatalk/receipt network-manager/receipt notification-daemon-gtk2/receipt nss_ldap/receipt ntop/receipt openbox/receipt openldap/receipt openmpi/receipt opensc/receipt openssh/receipt openvas-client/receipt openvswitch/receipt orage/receipt p11-kit/receipt pam/receipt pam_krb5/receipt pam_ldap/receipt pam_mount/receipt pango/receipt pangox-compat/receipt parole/receipt parted/receipt partimage/receipt pce/receipt pcmanfm/receipt pdnsd/receipt pekwm/receipt perdition/receipt php/receipt pluma/receipt plymouth/receipt pm-utils/receipt poedit/receipt polkit/receipt poppler/receipt privoxy/receipt proftpd/receipt proxychains-ng/receipt pulseaudio/receipt pygtk/receipt pygtksourceview/receipt python-caja/receipt qemu-light/receipt qemu/receipt qt4-base/receipt quota/receipt radiusclient-ng/receipt radvd/receipt rarian/receipt ristretto/receipt rsnapshot/receipt rust-musl/receipt sagan-mysql/receipt sagan-pgsql/receipt sagan/receipt samba/receipt sane-backends/receipt sarg/receipt scim/receipt sgml-common/receipt shadow/receipt silc-server/receipt siproxd/receipt slang/receipt smartmontools/receipt speech-dispatcher/receipt speedtouch/receipt speedtouch/stuff/patches/series speedtouch/stuff/patches/speedtouch-1.3.1-gcc4.u speedtouch/stuff/speedtouch-1.3.1-gcc4.u spice-protocol/receipt splashutils/receipt squid/receipt squidclamav/receipt squidguard/receipt srcpd/receipt sshguard/receipt ssmtp/receipt stardict/receipt startup-notification/receipt sudo/receipt system-tools-backends/receipt systemd/receipt thermald/receipt thunar-vfs/receipt thunar-volman/receipt thunar/receipt tig/receipt tinc/receipt tinyproxy/receipt tor/receipt tslib/receipt tumbler/receipt tuxtype/receipt udev/receipt udisks/receipt udisks2-kitless/receipt udisks2/receipt uget/receipt unbound/receipt unfs3/receipt unixODBC/receipt upower/receipt vde2/receipt visualboyadvance/receipt vnstat/receipt vte-gtk2/receipt vte/receipt waterline-plugin-multiload/receipt waterline/receipt wbar2/receipt webalizer/receipt webalizer/stuff/webalizer weston/receipt wget/receipt wyrd/receipt xdg-user-dirs/receipt xfburn/receipt xfce-utils/receipt xfce4-appfinder/receipt xfce4-battery-plugin/receipt xfce4-dev-tools/receipt xfce4-dict/receipt xfce4-icon-theme/receipt xfce4-mixer/receipt xfce4-notifyd/receipt xfce4-panel/receipt xfce4-power-manager/receipt xfce4-screenshooter/receipt xfce4-session/receipt xfce4-settings/receipt xfce4-taskmanager/receipt xfce4-terminal/receipt xfce4-volumed/receipt xfconf/receipt xfdesktop/receipt xfmedia/receipt xfmpc/receipt xfprint/receipt xfwm4/receipt xorg-bdftopcf/receipt xorg-bigreqsproto/receipt xorg-bitmap/receipt xorg-cf-files/receipt xorg-compositeproto/receipt xorg-damageproto/receipt xorg-dmxproto/receipt xorg-dri2proto/receipt xorg-dri3proto/receipt xorg-encodings/receipt xorg-evieext/receipt xorg-fixesproto/receipt xorg-font-adobe-100dpi/receipt xorg-font-adobe-75dpi/receipt xorg-font-adobe-utopia-100dpi/receipt xorg-font-adobe-utopia-75dpi/receipt xorg-font-adobe-utopia-type1/receipt xorg-font-alias/receipt xorg-font-arabic-misc/receipt xorg-font-bh-100dpi/receipt xorg-font-bh-75dpi/receipt xorg-font-bh-lucidatypewriter-100dpi/receipt xorg-font-bh-lucidatypewriter-75dpi/receipt xorg-font-bh-ttf/receipt xorg-font-bh-type1/receipt xorg-font-bitstream-100dpi/receipt xorg-font-bitstream-75dpi/receipt xorg-font-bitstream-type1/receipt xorg-font-cronyx-cyrillic/receipt xorg-font-cursor-misc/receipt xorg-font-daewoo-misc/receipt xorg-font-dec-misc/receipt xorg-font-ibm-type1/receipt xorg-font-isas-misc/receipt xorg-font-jis-misc/receipt xorg-font-micro-misc/receipt xorg-font-misc-cyrillic/receipt xorg-font-misc-ethiopic/receipt xorg-font-misc-meltho/receipt xorg-font-misc-misc/receipt xorg-font-mutt-misc/receipt xorg-font-schumacher-misc/receipt xorg-font-screen-cyrillic/receipt xorg-font-sony-misc/receipt xorg-font-sun-misc/receipt xorg-font-util/receipt xorg-font-winitzki-cyrillic/receipt xorg-font-xfree86-type1/receipt xorg-fontcacheproto/receipt xorg-fontsproto/receipt xorg-fonttosfnt/receipt xorg-fslsfonts/receipt xorg-fstobdf/receipt xorg-gccmakedep/receipt xorg-glproto/receipt xorg-iceauth/receipt xorg-imake/receipt xorg-inputproto/receipt xorg-kbproto/receipt xorg-libFS/receipt xorg-libICE/receipt xorg-libSM/receipt xorg-libX11/receipt xorg-libXScrnSaver/receipt xorg-libXau/receipt xorg-libXaw/receipt xorg-libXaw3d/receipt xorg-libXcomposite/receipt xorg-libXcursor/receipt xorg-libXdamage/receipt xorg-libXdmcp/receipt xorg-libXext/receipt xorg-libXfixes/receipt xorg-libXfont/receipt xorg-libXfont2/receipt xorg-libXfontcache/receipt xorg-libXft/receipt xorg-libXi/receipt xorg-libXinerama/receipt xorg-libXmu/receipt xorg-libXp/receipt xorg-libXpm/receipt xorg-libXrandr/receipt xorg-libXrender/receipt xorg-libXres/receipt xorg-libXt/receipt xorg-libXtst/receipt xorg-libXv/receipt xorg-libXvMC/receipt xorg-libXxf86dga/receipt xorg-libXxf86misc/receipt xorg-libXxf86vm/receipt xorg-libdmx/receipt xorg-libfontenc/receipt xorg-liblbxutil/receipt xorg-libpciaccess/receipt xorg-libxcb/receipt xorg-libxkbfile/receipt xorg-libxshmfence/receipt xorg-luit/receipt xorg-makedepend/receipt xorg-mkfontdir/receipt xorg-mkfontscale/receipt xorg-oclock/receipt xorg-pixman/receipt xorg-presentproto/receipt xorg-printproto/receipt xorg-randrproto/receipt xorg-recordproto/receipt xorg-renderproto/receipt xorg-resourceproto/receipt xorg-rgb/receipt xorg-scrnsaverproto/receipt xorg-server-light/receipt xorg-server/receipt xorg-sessreg/receipt xorg-setxkbmap/receipt xorg-showfont/receipt xorg-smproxy/receipt xorg-twm/receipt xorg-util-macros/receipt xorg-videoproto/receipt xorg-x11perf/receipt xorg-xauth/receipt xorg-xbacklight/receipt xorg-xbitmaps/receipt xorg-xcalc/receipt xorg-xcb-proto/receipt xorg-xcb-util-cursor/receipt xorg-xcb-util-image/receipt xorg-xcb-util-keysyms/receipt xorg-xcb-util-renderutil/receipt xorg-xcb-util-wm/receipt xorg-xcb-util/receipt xorg-xclipboard/receipt xorg-xclock/receipt xorg-xcmiscproto/receipt xorg-xcmsdb/receipt xorg-xcompmgr/receipt xorg-xcursor-themes/receipt xorg-xcursorgen/receipt xorg-xdpyinfo/receipt xorg-xdriinfo/receipt xorg-xedit/receipt xorg-xev/receipt xorg-xextproto/receipt xorg-xeyes/receipt xorg-xf86-input-acecad/receipt xorg-xf86-input-elographics/receipt xorg-xf86-input-evdev/receipt xorg-xf86-input-fpit/receipt xorg-xf86-input-hyperpen/receipt xorg-xf86-input-joystick/receipt xorg-xf86-input-keyboard/receipt xorg-xf86-input-libinput/receipt xorg-xf86-input-mouse/receipt xorg-xf86-input-mutouch/receipt xorg-xf86-input-penmount/receipt xorg-xf86-input-synaptics/receipt xorg-xf86-input-vmmouse/receipt xorg-xf86-input-void/receipt xorg-xf86-input-wacom/receipt xorg-xf86-video-amdgpu/receipt xorg-xf86-video-ast/receipt xorg-xf86-video-ati/receipt xorg-xf86-video-chips/receipt xorg-xf86-video-cirrus/receipt xorg-xf86-video-fbdev/receipt xorg-xf86-video-fbturbo/receipt xorg-xf86-video-geode/receipt xorg-xf86-video-glint/receipt xorg-xf86-video-i740/receipt xorg-xf86-video-intel/receipt xorg-xf86-video-mach64/receipt xorg-xf86-video-neomagic/receipt xorg-xf86-video-nouveau/receipt xorg-xf86-video-nv/receipt xorg-xf86-video-omap/receipt xorg-xf86-video-openchrome/receipt xorg-xf86-video-qxl/receipt xorg-xf86-video-r128/receipt xorg-xf86-video-rendition/receipt xorg-xf86-video-s3virge/receipt xorg-xf86-video-savage/receipt xorg-xf86-video-siliconmotion/receipt xorg-xf86-video-sis/receipt xorg-xf86-video-sisusb/receipt xorg-xf86-video-suncg14/receipt xorg-xf86-video-suncg3/receipt xorg-xf86-video-suncg6/receipt xorg-xf86-video-sunffb/receipt xorg-xf86-video-sunleo/receipt xorg-xf86-video-suntcx/receipt xorg-xf86-video-tdfx/receipt xorg-xf86-video-trident/receipt xorg-xf86-video-vesa/receipt xorg-xf86-video-vmware/receipt xorg-xf86bigfontproto/receipt xorg-xf86dgaproto/receipt xorg-xf86driproto/receipt xorg-xf86miscproto/receipt xorg-xf86rushproto/receipt xorg-xf86vidmodeproto/receipt xorg-xfd/receipt xorg-xfontsel/receipt xorg-xfs/receipt xorg-xfsinfo/receipt xorg-xgamma/receipt xorg-xhost/receipt xorg-xineramaproto/receipt xorg-xinit/receipt xorg-xinput/receipt xorg-xkbcomp/receipt xorg-xkbevd/receipt xorg-xkbprint/receipt xorg-xkbutils/receipt xorg-xkeyboard-config/receipt xorg-xkill/receipt xorg-xload/receipt xorg-xlsatoms/receipt xorg-xlsclients/receipt xorg-xlsfonts/receipt xorg-xmag/receipt xorg-xmessage/receipt xorg-xmodmap/receipt xorg-xpr/receipt xorg-xprop/receipt xorg-xproto/receipt xorg-xrandr/receipt xorg-xrdb/receipt xorg-xrefresh/receipt xorg-xset/receipt xorg-xsetmode/receipt xorg-xsetpointer/receipt xorg-xsetroot/receipt xorg-xsm/receipt xorg-xtrans/receipt xorg-xvidtune/receipt xorg-xvinfo/receipt xorg-xwd/receipt xorg-xwininfo/receipt xorg-xwud/receipt xrdp/receipt xterm/receipt yaws/receipt zenity-gtk2/receipt zoneminder/receipt
line diff
     1.1 --- a/GConf/receipt	Tue Mar 27 12:50:45 2018 +0200
     1.2 +++ b/GConf/receipt	Fri Mar 30 19:31:50 2018 +0300
     1.3 @@ -17,24 +17,16 @@
     1.4  
     1.5  compile_rules() {
     1.6  	./configure \
     1.7 -		--sysconfdir=/etc \
     1.8  		--libexecdir=/usr/lib/GConf \
     1.9  		$CONFIGURE_ARGS &&
    1.10 -	make && make install
    1.11 +	make &&
    1.12 +	make install
    1.13  }
    1.14  
    1.15  genpkg_rules() {
    1.16  	case $PACKAGE in
    1.17  		GConf)
    1.18 -			mkdir -p  $fs/usr/lib $fs/usr/share
    1.19 -			cp -a $install/usr/lib/GConf $fs/usr/lib
    1.20 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.21 -			cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
    1.22 -			rm $fs/usr/lib/GConf/2/*.*a
    1.23 -			cp -a $install/usr/bin $fs/usr
    1.24 -			cp -a $install/etc $fs
    1.25 -			cp -a $install/usr/share/dbus-1 $fs/usr/share
    1.26 -			cp -a $install/usr/share/polkit-1 $fs/usr/share
    1.27 +			copy @std
    1.28  			DEPENDS="glibc-base glib dbus dbus-glib expat libxml2 zlib polkit \
    1.29  			orbit2 atk cairo gtk+ fontconfig freetype pango xorg-pixman \
    1.30  			libpng16 xorg-libX11 xorg-libXau xorg-libXcomposite \
    1.31 @@ -42,17 +34,7 @@
    1.32  			xorg-libXfixes xorg-libXinerama xorg-libXrender"
    1.33  			;;
    1.34  		*-dev)
    1.35 -			mkdir -p  $fs/usr/lib/GConf/2/
    1.36 -			cp -a $install/usr/lib/GConf/2/*.*a $fs/usr/lib/GConf/2
    1.37 -			cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.38 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.39 -
    1.40 -			mkdir -p $fs/usr/share
    1.41 -			cp -a $install/usr/share/aclocal $fs/usr/share
    1.42 -			cp -a $install/usr/share/sgml $fs/usr/share
    1.43 -			cp -a $install/usr/share/gir-1.0 $fs/usr/share
    1.44 -
    1.45 -			cp -a $install/usr/include $fs/usr
    1.46 +			copy @dev
    1.47  			DEPENDS="GConf orbit2-dev"
    1.48  			;;
    1.49  	esac
     2.1 --- a/Xdialog/receipt	Tue Mar 27 12:50:45 2018 +0200
     2.2 +++ b/Xdialog/receipt	Fri Mar 30 19:31:50 2018 +0300
     2.3 @@ -1,39 +1,31 @@
     2.4 -# SliTaz package receipt.
     2.5 +# SliTaz package receipt v2.
     2.6  
     2.7  PACKAGE="Xdialog"
     2.8  VERSION="2.3.1"
     2.9  CATEGORY="x-window"
    2.10 -SHORT_DESC="Like 'dialog' or 'cdialog', but for X using GTK+."
    2.11 +SHORT_DESC="Like 'dialog' or 'cdialog', but for X using GTK+"
    2.12  MAINTAINER="rcx@zoominternet.net"
    2.13  LICENSE="GPL2"
    2.14 +WEB_SITE="http://xdialog.free.fr/"
    2.15 +
    2.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.17 -WEB_SITE="http://xdialog.free.fr/"
    2.18  WGET_URL="http://xdialog.free.fr/$TARBALL"
    2.19  
    2.20 -DEPENDS="glibc-base glib expat zlib fontconfig freetype gtk+ atk \
    2.21 -cairo pango xorg-pixman libpng16 xorg-libxcb xorg-xcb-util xorg-libX11 xorg-libXau \
    2.22 -xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
    2.23 -xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrender"
    2.24  BUILD_DEPENDS="autoconf automake m4 gettext gtk+-dev"
    2.25  
    2.26 -# Rules to configure and make the package.
    2.27 -compile_rules()
    2.28 -{
    2.29 +compile_rules() {
    2.30  	autoconf  &&
    2.31  	./configure \
    2.32  		--with-gtk2 \
    2.33 -		--prefix=/usr \
    2.34 -		--sysconfdir=/etc \
    2.35 -		--mandir=/usr/share/man \
    2.36 -		--infodir=/usr/share/info \
    2.37 -		$CONFIGURE_ARGS  &&
    2.38 -	make  &&
    2.39 +		$CONFIGURE_ARGS &&
    2.40 +	make &&
    2.41  	make DESTDIR=$DESTDIR install
    2.42  }
    2.43  
    2.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
    2.45 -genpkg_rules()
    2.46 -{
    2.47 -	mkdir -p $fs/usr
    2.48 -	cp -a $install/usr/bin $fs/usr
    2.49 +genpkg_rules() {
    2.50 +	copy @std
    2.51 +	DEPENDS="glibc-base glib expat zlib fontconfig freetype gtk+ atk cairo pango \
    2.52 +	xorg-pixman libpng16 xorg-libxcb xorg-xcb-util xorg-libX11 xorg-libXau \
    2.53 +	xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext \
    2.54 +	xorg-libXfixes xorg-libXinerama xorg-libXrender"
    2.55  }
     3.1 --- a/a2ps/receipt	Tue Mar 27 12:50:45 2018 +0200
     3.2 +++ b/a2ps/receipt	Fri Mar 30 19:31:50 2018 +0300
     3.3 @@ -1,32 +1,30 @@
     3.4 -# SliTaz package receipt.
     3.5 +# SliTaz package receipt v2.
     3.6  
     3.7  PACKAGE="a2ps"
     3.8  VERSION="4.14"
     3.9  CATEGORY="office"
    3.10 -SHORT_DESC="Any to PostScript filter."
    3.11 +SHORT_DESC="Any to PostScript filter"
    3.12  MAINTAINER="pascal.bellard@slitaz.org"
    3.13  LICENSE="GPL3"
    3.14 +WEB_SITE="http://www.gnu.org/software/a2ps/"
    3.15 +
    3.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.17 -WEB_SITE="http://www.gnu.org/software/a2ps/"
    3.18  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    3.19 -TAGS="ps print convert"
    3.20  
    3.21  BUILD_DEPENDS="gperf"
    3.22  
    3.23 -# Rules to configure and make the package.
    3.24 -compile_rules()
    3.25 -{
    3.26 +compile_rules() {
    3.27  	# Be busybox sort compatible
    3.28  	sed -i 's/+0 -1/-k 1,2/' afm/make_fonts_map.sh
    3.29 -	./configure --sysconfdir=/etc $CONFIGURE_ARGS &&
    3.30 +
    3.31 +	./configure $CONFIGURE_ARGS &&
    3.32  	make 2>&1 | grep -v fonts.map.new &&
    3.33 -	make install
    3.34 +	make install || return 1
    3.35 +
    3.36 +	sed -i 's/^FileCommand/#FileCommand/' $install/etc/a2ps.cfg
    3.37  }
    3.38  
    3.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
    3.40 -genpkg_rules()
    3.41 -{
    3.42 -	cp -a $install/* $fs
    3.43 -	rm -rf $fs/usr/lib $fs/usr/include $fs/usr/share/man $fs/usr/share/info
    3.44 -	sed -i 's/^FileCommand/#FileCommand/' $fs/etc/a2ps.cfg
    3.45 +genpkg_rules() {
    3.46 +	copy @std
    3.47 +	TAGS="ps print convert"
    3.48  }
     4.1 --- a/alsa-tools/receipt	Tue Mar 27 12:50:45 2018 +0200
     4.2 +++ b/alsa-tools/receipt	Fri Mar 30 19:31:50 2018 +0300
     4.3 @@ -25,7 +25,6 @@
     4.4  #COOKOPTS="!menus"
     4.5  
     4.6  compile_rules() {
     4.7 -	fix ld
     4.8  	for i in *; do
     4.9  		case $i in
    4.10  			Makefile|gitcompile|qlo10k1) continue;;
     5.1 --- a/amsn/receipt	Tue Mar 27 12:50:45 2018 +0200
     5.2 +++ b/amsn/receipt	Fri Mar 30 19:31:50 2018 +0300
     5.3 @@ -19,7 +19,6 @@
     5.4  COOKOPTS="!pngz" # some png are really gif, and many problems with palette
     5.5  
     5.6  compile_rules() {
     5.7 -	fix ld
     5.8  	./configure \
     5.9  		--prefix=/usr \
    5.10  		--with-tcl=/usr/lib \
     6.1 --- a/antinat/receipt	Tue Mar 27 12:50:45 2018 +0200
     6.2 +++ b/antinat/receipt	Fri Mar 30 19:31:50 2018 +0300
     6.3 @@ -15,23 +15,16 @@
     6.4  BUILD_DEPENDS="gfortran expat-dev"
     6.5  SPLIT="antinat-dev"
     6.6  
     6.7 -# Rules to configure and make the package.
     6.8 -compile_rules()
     6.9 -{
    6.10 -	./configure \
    6.11 -		--sysconfdir=/etc \
    6.12 -		--localstatedir=/var \
    6.13 -		$CONFIGURE_ARGS &&
    6.14 +compile_rules() {
    6.15 +	./configure $CONFIGURE_ARGS &&
    6.16  	make &&
    6.17 -	make install
    6.18 +	make install || return 1
    6.19  
    6.20  	# make file readable for web interface, revert file permissions in post-install
    6.21  	chmod a+r $install/etc/antinat.xml
    6.22  }
    6.23  
    6.24 -# Rules to gen a SliTaz package suitable for Tazpkg.
    6.25 -genpkg_rules()
    6.26 -{
    6.27 +genpkg_rules() {
    6.28  	case $PACKAGE in
    6.29  		antinat)
    6.30  			copy @std var/
     7.1 --- a/apr-util/receipt	Tue Mar 27 12:50:45 2018 +0200
     7.2 +++ b/apr-util/receipt	Fri Mar 30 19:31:50 2018 +0300
     7.3 @@ -18,7 +18,6 @@
     7.4  apr-dbm-gdbm apr-util-dev"
     7.5  
     7.6  compile_rules() {
     7.7 -	fix ld &&
     7.8  	./configure \
     7.9  		--prefix=/usr \
    7.10  		--with-apr=/usr \
     8.1 --- a/asciidoc/receipt	Tue Mar 27 12:50:45 2018 +0200
     8.2 +++ b/asciidoc/receipt	Fri Mar 30 19:31:50 2018 +0300
     8.3 @@ -1,4 +1,4 @@
     8.4 -# SliTaz package receipt.
     8.5 +# SliTaz package receipt v2.
     8.6  
     8.7  PACKAGE="asciidoc"
     8.8  VERSION="8.6.9"
     8.9 @@ -11,23 +11,16 @@
    8.10  TARBALL="$PACKAGE-$VERSION.tar.gz"
    8.11  WGET_URL="$SF_MIRROR/asciidoc/$TARBALL"
    8.12  
    8.13 -DEPENDS="python"
    8.14  BUILD_DEPENDS="python"
    8.15  
    8.16 -# Rules to configure and make the package.
    8.17 -compile_rules()
    8.18 -{
    8.19 -	./configure \
    8.20 -		--sysconfdir=/etc \
    8.21 -		--docdir=/usr/share/doc/asciidoc-$VERSION \
    8.22 -		$CONFIGURE_ARGS &&
    8.23 +compile_rules() {
    8.24 +	./configure $CONFIGURE_ARGS &&
    8.25  	make &&
    8.26  	make install &&
    8.27  	make DESTDIR=$install docs
    8.28  }
    8.29  
    8.30 -# Rules to gen a SliTaz package suitable for Tazpkg.
    8.31 -genpkg_rules()
    8.32 -{
    8.33 -	copy etc/ bin/
    8.34 +genpkg_rules() {
    8.35 +	copy @std
    8.36 +	DEPENDS="python"
    8.37  }
     9.1 --- a/asterisk/receipt	Tue Mar 27 12:50:45 2018 +0200
     9.2 +++ b/asterisk/receipt	Fri Mar 30 19:31:50 2018 +0300
     9.3 @@ -51,8 +51,6 @@
     9.4  	mkdir -p $DESTDIR/usr/bin
     9.5  #	export CXXFLAGS="$CXXFLAGS -fPIC"
     9.6  	./configure \
     9.7 -		--prefix=/usr \
     9.8 -		--sysconfdir=/etc \
     9.9  		--without-pwlib \
    9.10  		--with-dahdi=$WOK/dahdi/$(ls $WOK/dahdi/taz) \
    9.11  		--with-tonezone \
    10.1 --- a/at-spi2-atk/receipt	Tue Mar 27 12:50:45 2018 +0200
    10.2 +++ b/at-spi2-atk/receipt	Fri Mar 30 19:31:50 2018 +0300
    10.3 @@ -17,10 +17,10 @@
    10.4  SPLIT="at-spi2-atk-dev"
    10.5  
    10.6  compile_rules() {
    10.7 -	fix ld
    10.8  	./configure $CONFIGURE_ARGS &&
    10.9  	fix libtool &&
   10.10 -	make && make install
   10.11 +	make &&
   10.12 +	make install
   10.13  }
   10.14  
   10.15  genpkg_rules() {
    11.1 --- a/at-spi2-core/receipt	Tue Mar 27 12:50:45 2018 +0200
    11.2 +++ b/at-spi2-core/receipt	Fri Mar 30 19:31:50 2018 +0300
    11.3 @@ -17,10 +17,7 @@
    11.4  SPLIT="at-spi2-core-dev"
    11.5  
    11.6  compile_rules() {
    11.7 -	fix ld
    11.8 -	./configure \
    11.9 -		--sysconfdir=/etc \
   11.10 -		$CONFIGURE_ARGS &&
   11.11 +	./configure $CONFIGURE_ARGS &&
   11.12  	fix libtool &&
   11.13  	make &&
   11.14  	make install
    12.1 --- a/atm-tools/receipt	Tue Mar 27 12:50:45 2018 +0200
    12.2 +++ b/atm-tools/receipt	Fri Mar 30 19:31:50 2018 +0300
    12.3 @@ -14,19 +14,13 @@
    12.4  BUILD_DEPENDS="perl"
    12.5  SPLIT="atm-tools-dev"
    12.6  
    12.7 -# Rules to configure and make the package.
    12.8 -compile_rules()
    12.9 -{
   12.10 -	./configure \
   12.11 -		--sysconfdir=/etc \
   12.12 -		$CONFIGURE_ARGS &&
   12.13 +compile_rules() {
   12.14 +	./configure $CONFIGURE_ARGS &&
   12.15  	make -j1 &&
   12.16  	make -j1 DESTDIR=$DESTDIR install
   12.17  }
   12.18  
   12.19 -# Rules to gen a SliTaz package suitable for Tazpkg.
   12.20 -genpkg_rules()
   12.21 -{
   12.22 +genpkg_rules() {
   12.23  	case $PACKAGE in
   12.24  		atm-tools)
   12.25  			copy @std
    13.1 --- a/atril/receipt	Tue Mar 27 12:50:45 2018 +0200
    13.2 +++ b/atril/receipt	Fri Mar 30 19:31:50 2018 +0300
    13.3 @@ -19,8 +19,6 @@
    13.4  
    13.5  compile_rules() {
    13.6  	./autogen.sh \
    13.7 -		--sysconfdir=/etc \
    13.8 -		--localstatedir=/var \
    13.9  		$CONFIGURE_ARGS &&
   13.10  	make &&
   13.11  	make install
    14.1 --- a/audacious/receipt	Tue Mar 27 12:50:45 2018 +0200
    14.2 +++ b/audacious/receipt	Fri Mar 30 19:31:50 2018 +0300
    14.3 @@ -22,7 +22,6 @@
    14.4  		qt) SET_ARGS='--disable-gtk --enable-qt';;
    14.5  	esac
    14.6  
    14.7 -	fix ld
    14.8  	./configure \
    14.9  		--with-buildstamp='SliTaz GNU/Linux' \
   14.10  		$SET_ARGS \
    15.1 --- a/audit/receipt	Tue Mar 27 12:50:45 2018 +0200
    15.2 +++ b/audit/receipt	Fri Mar 30 19:31:50 2018 +0300
    15.3 @@ -12,19 +12,14 @@
    15.4  WGET_URL="${WEB_SITE}$TARBALL"
    15.5  
    15.6  BUILD_DEPENDS="python-dev openldap-dev coreutils-file-format swig"
    15.7 -SPLIT="audit-python audit-dev"
    15.8 +SPLIT="audit-python audit audit-dev"
    15.9  
   15.10 -# Rules to configure and make the package.
   15.11 -compile_rules()
   15.12 -{
   15.13 +compile_rules() {
   15.14  	./configure \
   15.15 -		--prefix=/usr \
   15.16 -		--sysconfdir=/etc \
   15.17 -		--localstatedir=/var \
   15.18  		--sbindir=/sbin \
   15.19  		$CONFIGURE_ARGS &&
   15.20  	make &&
   15.21 -	make DESTDIR=$DESTDIR install &&
   15.22 +	make DESTDIR=$DESTDIR install || return 1
   15.23  
   15.24  	# make files readable for the web interface; fix permissions later in post_install
   15.25  	chmod 755 $install/etc/audisp/plugins.d/
   15.26 @@ -33,20 +28,17 @@
   15.27  	-type f -exec chmod o+r '{}' \;
   15.28  }
   15.29  
   15.30 -# Rules to gen a SliTaz package suitable for Tazpkg.
   15.31 -genpkg_rules()
   15.32 -{
   15.33 +genpkg_rules() {
   15.34  	case $PACKAGE in
   15.35 -		audit)
   15.36 -			copy @std
   15.37 -			rm -r $fs/usr/lib/python*
   15.38 -			DEPENDS="openssl libldap"
   15.39 -			;;
   15.40  		audit-python)
   15.41  			copy *.py site-packages/*.so
   15.42  			CAT="misc|Python bindings"
   15.43  			DEPENDS="audit python"
   15.44  			;;
   15.45 +		audit)
   15.46 +			copy @std @rm
   15.47 +			DEPENDS="openssl libldap"
   15.48 +			;;
   15.49  		*-dev)
   15.50  			copy @dev
   15.51  			;;
    16.1 --- a/avrdude/receipt	Tue Mar 27 12:50:45 2018 +0200
    16.2 +++ b/avrdude/receipt	Fri Mar 30 19:31:50 2018 +0300
    16.3 @@ -1,32 +1,29 @@
    16.4 -# SliTaz package receipt.
    16.5 +# SliTaz package receipt v2.
    16.6  
    16.7  PACKAGE="avrdude"
    16.8  VERSION="6.3"
    16.9  CATEGORY="electronics"
   16.10 -SHORT_DESC="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers"
   16.11 +SHORT_DESC="Download/upload/manipulate the ROM and EEPROM contents of AVR \
   16.12 +microcontrollers"
   16.13  MAINTAINER="psychomaniak@xakep.ru"
   16.14  LICENSE="GPL"
   16.15  WEB_SITE="http://www.nongnu.org/avrdude/"
   16.16 +
   16.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
   16.18  WGET_URL="http://download.savannah.gnu.org/releases/$PACKAGE/$TARBALL"
   16.19  
   16.20 -DEPENDS="libftdi libusb-compat libusb readline elfutils"
   16.21  BUILD_DEPENDS="$DEPENDS libusb-compat-dev libusb-dev libftdi-dev elfutils-dev \
   16.22  readline-dev udev-dev"
   16.23  
   16.24 -# Rules to configure and make the package.
   16.25 -compile_rules()
   16.26 -{
   16.27 +compile_rules() {
   16.28  	./configure \
   16.29 -		--mandir=/usr/share/man \
   16.30 -		--prefix=/usr \
   16.31 -		--sysconfdir=/etc \
   16.32 -		--enable-linuxgpio
   16.33 -	make && make install
   16.34 +		--enable-linuxgpio \
   16.35 +		&&
   16.36 +	make &&
   16.37 +	make install
   16.38  }
   16.39  
   16.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
   16.41 -genpkg_rules()
   16.42 -{
   16.43 -        cp -a $install/* $fs
   16.44 +genpkg_rules() {
   16.45 +	copy @std
   16.46 +	DEPENDS="libftdi libusb-compat libusb readline elfutils"
   16.47  }
    17.1 --- a/awn/receipt	Tue Mar 27 12:50:45 2018 +0200
    17.2 +++ b/awn/receipt	Fri Mar 30 19:31:50 2018 +0300
    17.3 @@ -22,9 +22,9 @@
    17.4  compile_rules() {
    17.5  	./autogen.sh &&
    17.6  	./configure \
    17.7 -		--sysconfdir=/etc \
    17.8  		--with-desktop=agnostic \
    17.9  		$CONFIGURE_ARGS &&
   17.10 +	fix libtool &&
   17.11  	make &&
   17.12  	make  install || return 1
   17.13  
   17.14 @@ -32,7 +32,6 @@
   17.15  	install -m755 $stuff/awn-autostart $install/usr/bin
   17.16  }
   17.17  
   17.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
   17.19  genpkg_rules() {
   17.20  	case $PACKAGE in
   17.21  		awn)
    18.1 --- a/backintime/receipt	Tue Mar 27 12:50:45 2018 +0200
    18.2 +++ b/backintime/receipt	Fri Mar 30 19:31:50 2018 +0300
    18.3 @@ -1,30 +1,31 @@
    18.4 -# SliTaz package receipt.
    18.5 +# SliTaz package receipt v2.
    18.6  
    18.7  PACKAGE="backintime"
    18.8  VERSION="1.0.8"
    18.9  CATEGORY="network"
   18.10 -SHORT_DESC="A simple backup tool for linux."
   18.11 +SHORT_DESC="A simple backup tool for Linux"
   18.12  MAINTAINER="pascal.bellard@slitaz.org"
   18.13  LICENSE="GPL2"
   18.14  WEB_SITE="http://backintime.le-web.org/"
   18.15 +
   18.16  TARBALL="$PACKAGE-${VERSION}_src.tar.gz"
   18.17  WGET_URL="http://backintime.le-web.org/download/$PACKAGE/$TARBALL"
   18.18 -TAGS="backup"
   18.19  
   18.20 -DEPENDS="python rsync"
   18.21 -BUILD_DEPENDS="$DEPENDS meld perl gettext-tools" # python-glade2 python-gnome2
   18.22 +BUILD_DEPENDS="python rsync meld perl gettext-tools" # python-glade2 python-gnome2
   18.23  
   18.24 -# Rules to configure and make the package.
   18.25 -compile_rules()
   18.26 -{
   18.27 +compile_rules() {
   18.28  	cd $src/common
   18.29 -	./configure --prefix=/usr --sysconfdir=/etc $CONFIGURE_ARGS &&
   18.30 -	make && make DESTDIR=$DESTDIR install
   18.31 +	# site script isn't used
   18.32 +	./configure \
   18.33 +		--prefix=/usr \
   18.34 +		--sysconfdir=/etc \
   18.35 +		$CONFIGURE_ARGS &&
   18.36 +	make &&
   18.37 +	make DESTDIR=$DESTDIR install
   18.38  }
   18.39  
   18.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
   18.41 -genpkg_rules()
   18.42 -{
   18.43 -	cp -a $install/* $fs
   18.44 -	rm -r $fs/usr/share/doc $fs/usr/share/man
   18.45 +genpkg_rules() {
   18.46 +	copy @std
   18.47 +	DEPENDS="python rsync"
   18.48 +	TAGS="backup"
   18.49  }
    19.1 --- a/barnyard2/receipt	Tue Mar 27 12:50:45 2018 +0200
    19.2 +++ b/barnyard2/receipt	Fri Mar 30 19:31:50 2018 +0300
    19.3 @@ -1,4 +1,4 @@
    19.4 -# SliTaz package receipt.
    19.5 +# SliTaz package receipt v2.
    19.6  
    19.7  PACKAGE="barnyard2"
    19.8  VERSION="1.9"
    19.9 @@ -7,46 +7,37 @@
   19.10  MAINTAINER="erjo@slitaz.org"
   19.11  LICENSE="GPL2"
   19.12  WEB_SITE="http://www.securixlive.com/barnyard2/"
   19.13 +
   19.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
   19.15  WGET_URL="http://www.securixlive.com/download/barnyard2/$TARBALL"
   19.16  
   19.17 -DEPENDS="libpcap"
   19.18  BUILD_DEPENDS="libpcap-dev"
   19.19  
   19.20 -# Rules to configure and make the package.
   19.21 -compile_rules()
   19.22 -{
   19.23 +compile_rules() {
   19.24  	./configure \
   19.25  		--sysconfdir=/etc/barnyard2 \
   19.26  		$CONFIGURE_ARGS &&
   19.27 -	make && make install
   19.28 +	make &&
   19.29 +	make install || return 1
   19.30 +
   19.31 +	mkdir -p $install/var/log/barnyard2/
   19.32  }
   19.33  
   19.34 -# Rules to gen a SliTaz package suitable for Tazpkg.
   19.35 -genpkg_rules()
   19.36 -{
   19.37 -	cp -a $install/* $fs
   19.38 -	mkdir -p $fs/var/log/barnyard2
   19.39 +genpkg_rules() {
   19.40 +	copy @std
   19.41 +	DEPENDS="libpcap"
   19.42  }
   19.43  
   19.44 -# Post install commands
   19.45 -post_install()
   19.46 -{
   19.47 -	[ -z "$quiet" ] && echo
   19.48 -
   19.49 +post_install() {
   19.50  	# addgroup snort if needed
   19.51  	if ! grep -q 'snort:' "$1/etc/group"; then
   19.52 -		action 'Adding group Snort...'
   19.53  		chroot "$1/" /bin/addgroup snort
   19.54 -		status
   19.55  	fi
   19.56  
   19.57  	# adduser snort if needed
   19.58  	if ! grep -q 'snort:' "$1/etc/passwd"; then
   19.59 -		action 'Adding user Snort...'
   19.60  		chroot "$1/" /bin/adduser -s /bin/false -h /dev/null \
   19.61  			-g "Snort Daemon user" -H -D -S -G snort snort
   19.62 -		status
   19.63  	fi
   19.64  
   19.65  	chroot "$1/" chown snort.snort /var/log/barnyard2
    20.1 --- a/bind/receipt	Tue Mar 27 12:50:45 2018 +0200
    20.2 +++ b/bind/receipt	Fri Mar 30 19:31:50 2018 +0300
    20.3 @@ -7,8 +7,6 @@
    20.4  MAINTAINER="pascal.bellard@slitaz.org"
    20.5  LICENSE="MPL2"
    20.6  WEB_SITE="http://www.isc.org/downloads/BIND/"
    20.7 -TAZPANEL_DAEMON="edit::/etc/bind/named.conf|man|options|web::$WEB_SITE"
    20.8 -TAGS="DNS daemon"
    20.9  
   20.10  TARBALL="$PACKAGE-$VERSION.tar.gz"
   20.11  WGET_URL="http://ftp.isc.org/isc/bind9/$VERSION/$TARBALL"
   20.12 @@ -16,20 +14,19 @@
   20.13  BUILD_DEPENDS="libtool libcap-dev openssl-dev perl krb5-dev readline-dev"
   20.14  SPLIT="bind-client libbind bind-dev"
   20.15  
   20.16 -# Rules to configure and make the package.
   20.17 -compile_rules()
   20.18 -{
   20.19 +compile_rules() {
   20.20  	mkdir -p $DESTDIR/etc/bind
   20.21 +
   20.22  	./configure \
   20.23  		--sysconfdir=/etc/bind \
   20.24 -		--localstatedir=/var \
   20.25  		--enable-threads \
   20.26  		--disable-static \
   20.27  		--with-libtool \
   20.28  		--with-openssl \
   20.29  		--with-randomdev=/dev/urandom \
   20.30  		$CONFIGURE_ARGS &&
   20.31 -	make && make DESTDIR=$DESTDIR install &&
   20.32 +	make &&
   20.33 +	make DESTDIR=$DESTDIR install || return 1
   20.34  
   20.35  	LD_LIBRARY_PATH=$DESTDIR/usr/lib \
   20.36  	$DESTDIR/usr/bin/dig ns . @a.root-servers.net. > $DESTDIR/etc/bind/db.root
   20.37 @@ -44,14 +41,14 @@
   20.38  	cp dnssec ipv6 migrat* options rfc-compliance roadmap sdb $docdir/misc
   20.39  }
   20.40  
   20.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
   20.42 -genpkg_rules()
   20.43 -{
   20.44 +genpkg_rules() {
   20.45  	case $PACKAGE in
   20.46  		bind)
   20.47  			CONFIG_FILES="/etc/bind/"
   20.48  			copy etc/ sbin/
   20.49  			DEPENDS="libbind attr openssl perl"
   20.50 +			TAZPANEL_DAEMON="edit::/etc/bind/named.conf|man|options|web::$WEB_SITE"
   20.51 +			TAGS="DNS daemon"
   20.52  			;;
   20.53  		bind-client)
   20.54  			copy bin/; rm $fs/usr/bin/bind9-config
   20.55 @@ -69,9 +66,7 @@
   20.56  	esac
   20.57  }
   20.58  
   20.59 -# Post message when installing.
   20.60 -post_install_bind()
   20.61 -{
   20.62 +post_install_bind() {
   20.63  	mkdir -p "$1/var/cache/bind"
   20.64  
   20.65  	localnets="192.168.0.0/16; 127.0.0.1;"
    21.1 --- a/bird/receipt	Tue Mar 27 12:50:45 2018 +0200
    21.2 +++ b/bird/receipt	Fri Mar 30 19:31:50 2018 +0300
    21.3 @@ -1,35 +1,26 @@
    21.4 -# SliTaz package receipt.
    21.5 +# SliTaz package receipt v2.
    21.6  
    21.7  PACKAGE="bird"
    21.8  VERSION="1.6.3"
    21.9  CATEGORY="network"
   21.10 -SHORT_DESC="internet routing daemon"
   21.11 +SHORT_DESC="Internet routing daemon"
   21.12  MAINTAINER="allan316@gmail.com"
   21.13  LICENSE="GPL2"
   21.14 +WEB_SITE="http://bird.network.cz"
   21.15 +
   21.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   21.17 -WEB_SITE="http://bird.network.cz"
   21.18  WGET_URL="ftp://bird.network.cz/pub/$PACKAGE/$TARBALL"
   21.19 -TAGS="route routing daemon"
   21.20  
   21.21 -DEPENDS="readline ncurses"
   21.22  BUILD_DEPENDS="flex bison readline-dev ncurses-dev"
   21.23  
   21.24 -# Rules to configure and make the package.
   21.25 -compile_rules()
   21.26 -{
   21.27 -	./configure \
   21.28 -		--prefix=/usr \
   21.29 -		--sysconfdir=/etc \
   21.30 -		--localstatedir=/var \
   21.31 -		$CONFIGURE_ARGS &&
   21.32 -	make && make DESTDIR=$DESTDIR install
   21.33 +compile_rules() {
   21.34 +	./configure $CONFIGURE_ARGS &&
   21.35 +	make &&
   21.36 +	make DESTDIR=$DESTDIR install
   21.37  }
   21.38  
   21.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
   21.40 -genpkg_rules()
   21.41 -{
   21.42 -	mkdir -p $fs/usr
   21.43 -	cp -a $install/usr/sbin $fs/usr
   21.44 -	cp -a $install/etc $fs
   21.45 -	cp -a $install/var $fs
   21.46 +genpkg_rules() {
   21.47 +	copy @std
   21.48 +	DEPENDS="readline ncurses"
   21.49 +	TAGS="route routing daemon"
   21.50  }
    22.1 --- a/blackbox/receipt	Tue Mar 27 12:50:45 2018 +0200
    22.2 +++ b/blackbox/receipt	Fri Mar 30 19:31:50 2018 +0300
    22.3 @@ -1,4 +1,4 @@
    22.4 -# SliTaz package receipt.
    22.5 +# SliTaz package receipt v2.
    22.6  
    22.7  PACKAGE="blackbox"
    22.8  VERSION="0.70.1"
    22.9 @@ -7,36 +7,29 @@
   22.10  MAINTAINER="devl547@gmail.com"
   22.11  LICENSE="MIT"
   22.12  WEB_SITE="http://blackboxwm.sourceforge.net/"
   22.13 +
   22.14  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   22.15  WGET_URL="$SF_MIRROR/blackboxwm/$TARBALL"
   22.16 -TAGS="window-manager"
   22.17  
   22.18 -DEPENDS="xorg-libXt xorg-libXft"
   22.19  BUILD_DEPENDS="xorg-libXt-dev xorg-libXft-dev xorg-xextproto libxml2-dev"
   22.20  
   22.21  # TODO: modify tazx for blackbox so it will creat a correct ~/.xinitrc
   22.22  # to let user use the wm via slim/F1 or by default with 'tazx blackbox'.
   22.23  
   22.24 -# Rules to configure and make the package.
   22.25 -compile_rules()
   22.26 -{
   22.27 +compile_rules() {
   22.28  	patch -p1 < $stuff/blackbox-0.70.1-gcc-4.3.patch
   22.29  	patch -p0 < $stuff/blackbox-0.70.1-asneeded.patch
   22.30  	patch -p1 < $stuff/textpropertytostring-unconditional.patch
   22.31  
   22.32  	./configure \
   22.33 -		--sysconfdir=/etc \
   22.34  		--libexecdir=/usr/bin \
   22.35 -		--mandir=/usr/share/man \
   22.36 -	$CONFIGURE_ARGS &&
   22.37 +		$CONFIGURE_ARGS &&
   22.38  	make &&
   22.39  	make DESTDIR=$DESTDIR install
   22.40  }
   22.41  
   22.42 -# Rules to gen a SliTaz package suitable for Tazpkg.
   22.43 -genpkg_rules()
   22.44 -{
   22.45 -	mkdir -p $fs/usr/share
   22.46 -	cp -a $install/usr/bin $fs/usr
   22.47 -	cp -a $install/usr/share/blackbox $fs/usr/share
   22.48 +genpkg_rules() {
   22.49 +	copy @std
   22.50 +	DEPENDS="xorg-libXt xorg-libXft"
   22.51 +	TAGS="window-manager"
   22.52  }
    23.1 --- a/blueman/receipt	Tue Mar 27 12:50:45 2018 +0200
    23.2 +++ b/blueman/receipt	Fri Mar 30 19:31:50 2018 +0300
    23.3 @@ -1,43 +1,30 @@
    23.4 -# SliTaz package receipt.
    23.5 +# SliTaz package receipt v2.
    23.6  
    23.7  PACKAGE="blueman"
    23.8  VERSION="1.10"
    23.9  CATEGORY="system-tools"
   23.10 -SHORT_DESC="Easy to use GTK+ Bluetooth Manager."
   23.11 +SHORT_DESC="Easy to use GTK+ Bluetooth Manager"
   23.12  MAINTAINER="pankso@slitaz.org"
   23.13  LICENSE="GPL3"
   23.14  WEB_SITE="https://github.com/blueman-project/blueman"
   23.15 +
   23.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   23.17  WGET_URL="http://download.tuxfamily.org/blueman/$TARBALL"
   23.18  
   23.19 -DEPENDS="linux-bluetooth bluez python pygtk libnotify notify-python python-pyrex \
   23.20 -startup-notification util-linux-uuid dbus dbus-python"
   23.21  BUILD_DEPENDS="bluez-dev python-dev pygtk-dev notify-python libnotify-dev \
   23.22  python-pyrex startup-notification-dev util-linux-uuid-dev dbus-dev \
   23.23  dbus-python-dev intltool libtool notify-python xorg-xcb-util-dev"
   23.24  
   23.25 -# Rules to configure and make the package.
   23.26 -compile_rules()
   23.27 -{
   23.28 +compile_rules() {
   23.29  	./configure \
   23.30 -		--prefix=/usr \
   23.31 -		--sysconfdir=/etc \
   23.32  		--libexecdir=/usr/lib/$PACKAGE \
   23.33  		$CONFIGURE_ARGS &&
   23.34 -	make && make install
   23.35 +	make &&
   23.36 +	make install
   23.37  }
   23.38  
   23.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
   23.40 -genpkg_rules()
   23.41 -{
   23.42 -	mkdir -p $fs/usr/share/pixmaps
   23.43 -	cp -a $install/usr/bin $fs/usr
   23.44 -	cp -a $install/usr/lib $fs/usr
   23.45 -	cp -a $install/usr/share/blueman $fs/usr/share
   23.46 -	cp -a $install/usr/share/hal $fs/usr/share
   23.47 -	cp -a $install/usr/share/dbus-1 $fs/usr/share
   23.48 -	cp -a $install/usr/share/PolicyKit $fs/usr/share
   23.49 -	cp -a $install/usr/share/icons/hicolor/32x32/apps/*.png \
   23.50 -		$fs/usr/share/pixmaps
   23.51 -	cp -a $install/etc $fs
   23.52 +genpkg_rules() {
   23.53 +	copy @std
   23.54 +	DEPENDS="linux-bluetooth bluez python pygtk libnotify notify-python \
   23.55 +	python-pyrex startup-notification util-linux-uuid dbus dbus-python"
   23.56  }
    24.1 --- a/bluez/receipt	Tue Mar 27 12:50:45 2018 +0200
    24.2 +++ b/bluez/receipt	Fri Mar 30 19:31:50 2018 +0300
    24.3 @@ -7,27 +7,23 @@
    24.4  MAINTAINER="pankso@slitaz.org"
    24.5  LICENSE="GPL2"
    24.6  WEB_SITE="http://www.bluez.org/"
    24.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/bluez.html"
    24.8  
    24.9  TARBALL="$PACKAGE-$VERSION.tar.xz"
   24.10  WGET_URL="http://www.kernel.org/pub/linux/bluetooth/$TARBALL"
   24.11  
   24.12 -BUILD_DEPENDS="alsa-lib-dev dbus-dev glib-dev libusb-dev libusb-compat"
   24.13 +#BUILD_DEPENDS="alsa-lib-dev dbus-dev glib-dev libusb-dev libusb-compat"
   24.14 +BUILD_DEPENDS="glib-dev dbus-dev eudev-dev libical-dev readline-dev"
   24.15  SPLIT="bluez-tools bluez-tools-experimental bluez bluez-dev"
   24.16  
   24.17 -BUILD_DEPENDS="glib-dev dbus-dev eudev-dev libical-dev readline-dev"
   24.18 -
   24.19 -# Rules to configure and make the package.
   24.20 -compile_rules()
   24.21 -{
   24.22 -	# http://www.linuxfromscratch.org/blfs/view/stable/general/bluez.html
   24.23 +compile_rules() {
   24.24  	./configure \
   24.25 -		--sysconfdir=/etc \
   24.26 -		--localstatedir=/var \
   24.27  		--enable-library \
   24.28  		--disable-systemd \
   24.29  		--enable-experimental \
   24.30  		$CONFIGURE_ARGS &&
   24.31 -	make && make install || return 1
   24.32 +	make &&
   24.33 +	make install || return 1
   24.34  
   24.35  	mkdir -p $install/usr/sbin
   24.36  	ln -svf ../libexec/bluetooth/bluetoothd $install/usr/sbin
   24.37 @@ -35,16 +31,12 @@
   24.38  	mkdir -p $install/etc/bluetooth
   24.39  	cp src/main.conf $install/etc/bluetooth
   24.40  
   24.41 -	docdir="$install/usr/share/doc/$PACKAGE-$VERSION"
   24.42 -	mkdir -p $docdir
   24.43 -	cp doc/*.txt $docdir
   24.44 +	cook_pick_docs doc/*.txt
   24.45  
   24.46  	cp $stuff/*.conf $install/etc/bluetooth/
   24.47  }
   24.48  
   24.49 -# Rules to gen a SliTaz package suitable for Tazpkg.
   24.50 -genpkg_rules()
   24.51 -{
   24.52 +genpkg_rules() {
   24.53  	case $PACKAGE in
   24.54  		bluez-tools)
   24.55  			copy bccmd bluemoon ciptool hciattach hciconfig hcidump hcitool \
    25.1 --- a/bmon/receipt	Tue Mar 27 12:50:45 2018 +0200
    25.2 +++ b/bmon/receipt	Fri Mar 30 19:31:50 2018 +0300
    25.3 @@ -1,4 +1,4 @@
    25.4 -# SliTaz package receipt.
    25.5 +# SliTaz package receipt v2.
    25.6  
    25.7  PACKAGE="bmon"
    25.8  VERSION="4.0"
    25.9 @@ -6,28 +6,24 @@
   25.10  SHORT_DESC="bandwidth monitor and rate estimator"
   25.11  MAINTAINER="pascal.bellard@slitaz.org"
   25.12  LICENSE="MIT"
   25.13 +WEB_SITE="https://github.com/tgraf/bmon"
   25.14 +
   25.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
   25.16 -WEB_SITE="https://github.com/tgraf/bmon"
   25.17  WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
   25.18  
   25.19 -DEPENDS="libnl ncurses"
   25.20  BUILD_DEPENDS="wget autoconf automake libconfuse glib libnl-dev ncurses-dev"
   25.21  
   25.22 -# Rules to configure and make the package.
   25.23 -compile_rules()
   25.24 -{
   25.25 +compile_rules() {
   25.26  	./autogen.sh
   25.27 -	./configure --prefix=/usr \
   25.28 -		--sysconfdir=/etc \
   25.29 -		$CONFIGURE_ARGS &&
   25.30 +	./configure $CONFIGURE_ARGS &&
   25.31  	make &&
   25.32 -	make DESTDIR=$DESTDIR install
   25.33 +	make DESTDIR=$DESTDIR install || return 1
   25.34 +
   25.35 +	mkdir -p $install/etc/
   25.36 +	mv $install/usr/share/doc/bmon/examples/bmon.conf $install/etc/
   25.37  }
   25.38  
   25.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
   25.40 -genpkg_rules()
   25.41 -{
   25.42 -	mkdir -p $fs/usr $fs/etc
   25.43 -	cp -a $install/usr/share/doc/bmon/examples/bmon.conf $fs/etc
   25.44 -	cp -a $install/usr/bin $fs/usr
   25.45 +genpkg_rules() {
   25.46 +	copy @std
   25.47 +	DEPENDS="libnl ncurses"
   25.48  }
    26.1 --- a/bogofilter/receipt	Tue Mar 27 12:50:45 2018 +0200
    26.2 +++ b/bogofilter/receipt	Fri Mar 30 19:31:50 2018 +0300
    26.3 @@ -1,36 +1,31 @@
    26.4 -# SliTaz package receipt.
    26.5 +# SliTaz package receipt v2.
    26.6  
    26.7  PACKAGE="bogofilter"
    26.8  VERSION="1.2.4"
    26.9  CATEGORY="network"
   26.10 -SHORT_DESC="Mail filter that classifies mail as spam or ham."
   26.11 +SHORT_DESC="Mail filter that classifies mail as spam or ham"
   26.12  MAINTAINER="pankso@slitaz.org"
   26.13  LICENSE="GPL2 GPL3"
   26.14 +WEB_SITE="http://bogofilter.sourceforge.net/"
   26.15 +
   26.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   26.17 -WEB_SITE="http://bogofilter.sourceforge.net/"
   26.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   26.19 -TAGS="mail email filter spam C"
   26.20  
   26.21 -DEPENDS="sqlite3 gsl"
   26.22  BUILD_DEPENDS="sqlite3-dev"
   26.23  
   26.24 -# Rules to configure and make the package.
   26.25 -compile_rules()
   26.26 -{
   26.27 -	cd $src
   26.28 -	./configure --with-database=sqlite3 \
   26.29 -		--prefix=/usr --sysconfdir=/etc/bogofilter \
   26.30 -		--infodir=/usr/share/info \
   26.31 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
   26.32 +compile_rules() {
   26.33 +	./configure \
   26.34 +		--with-database=sqlite3 \
   26.35 +		--sysconfdir=/etc/bogofilter \
   26.36 +		$CONFIGURE_ARGS &&
   26.37  	make &&
   26.38 -	make DESTDIR=$DESTDIR install
   26.39 +	make DESTDIR=$DESTDIR install || return 1
   26.40 +
   26.41 +	chmod +x $install/usr/bin/bf_*
   26.42  }
   26.43  
   26.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
   26.45 -genpkg_rules()
   26.46 -{
   26.47 -	mkdir -p $fs/usr
   26.48 -	cp -a $install/usr/bin $fs/usr
   26.49 -	cp -a $install/etc $fs
   26.50 -	chmod +x $fs/usr/bin/bf_*
   26.51 +genpkg_rules() {
   26.52 +	copy @std
   26.53 +	DEPENDS="sqlite3 gsl"
   26.54 +	TAGS="mail email filter spam C"
   26.55  }
    27.1 --- a/brasero/receipt	Tue Mar 27 12:50:45 2018 +0200
    27.2 +++ b/brasero/receipt	Fri Mar 30 19:31:50 2018 +0300
    27.3 @@ -13,9 +13,9 @@
    27.4  DEPENDS="glib gtk+ GConf gstreamer0 gst0-plugins-base libxml2 libunique \
    27.5  dbus-glib cdrdao dvd+rw-tools libcanberra libvorbis libogg"
    27.6  BUILD_DEPENDS="glib-dev gtk+-dev GConf-dev gstreamer0-dev gst0-plugins-base-dev \
    27.7 -libxml2-dev libunique-dev dbus-glib-dev gnome-doc-utils-dev xorg-libxcb-dev \
    27.8 +libxml2-dev libunique-dev dbus-glib-dev gnome-doc-utils xorg-libxcb-dev \
    27.9  libpthread-stubs xorg-xcb-util-dev orbit2-dev dbus-dev libcanberra-dev \
   27.10 -gnome-doc-utils libxml2-python libvorbis-dev libogg-dev util-linux-uuid-dev \
   27.11 +libxml2-python libvorbis-dev libogg-dev util-linux-uuid-dev \
   27.12  intltool libtool"
   27.13  
   27.14  # Rules to configure and make the package.
    28.1 --- a/brisk-menu/receipt	Tue Mar 27 12:50:45 2018 +0200
    28.2 +++ b/brisk-menu/receipt	Fri Mar 30 19:31:50 2018 +0300
    28.3 @@ -16,9 +16,8 @@
    28.4  
    28.5  compile_rules() {
    28.6  	./autogen.sh \
    28.7 -		--sysconfdir=/etc \
    28.8 -		--localstatedir=/var \
    28.9  		$CONFIGURE_ARGS &&
   28.10 +	fix libtool &&
   28.11  	make &&
   28.12  	make install
   28.13  }
    29.1 --- a/brscan/receipt	Tue Mar 27 12:50:45 2018 +0200
    29.2 +++ b/brscan/receipt	Fri Mar 30 19:31:50 2018 +0300
    29.3 @@ -16,15 +16,10 @@
    29.4  
    29.5  compile_rules() {
    29.6  	cd $src/brscan
    29.7 -	./configure \
    29.8 -		--prefix=/usr \
    29.9 -		--infodir=/usr/share/info \
   29.10 -		--sysconfdir=/etc \
   29.11 -		--localstatedir=/var \
   29.12 -		--mandir=/usr/share/man \
   29.13 -		$CONFIGURE_ARGS || return 1
   29.14 +	./configure $CONFIGURE_ARGS || return 1
   29.15  	sed -i '/mk_package/d' Makefile
   29.16 -	make -j1 && {
   29.17 +	make -j1 &&
   29.18 +	{
   29.19  		cd ..
   29.20  		mkdir -p $DESTDIR
   29.21  		cp -a brscan $DESTDIR
    30.1 --- a/burp/receipt	Tue Mar 27 12:50:45 2018 +0200
    30.2 +++ b/burp/receipt	Fri Mar 30 19:31:50 2018 +0300
    30.3 @@ -1,4 +1,4 @@
    30.4 -# SliTaz package receipt.
    30.5 +# SliTaz package receipt v2.
    30.6  
    30.7  PACKAGE="burp"
    30.8  VERSION="1.3.10"
    30.9 @@ -7,27 +7,22 @@
   30.10  MAINTAINER="pascal.bellard@slitaz.org"
   30.11  LICENSE="GPL3"
   30.12  WEB_SITE="http://burp.grke.net/"
   30.13 +
   30.14  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   30.15  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   30.16  
   30.17 -DEPENDS="acl openssl attr popt ncurses zlib bzlib gcc-lib-base"
   30.18  BUILD_DEPENDS="librsync acl-dev openssl-dev attr-dev popt-dev ncurses-dev \
   30.19  bzip2-dev zlib-dev"
   30.20  
   30.21 -# Rules to configure and make the package.
   30.22 -compile_rules()
   30.23 -{
   30.24 -	./configure --prefix=/usr \
   30.25 +compile_rules() {
   30.26 +	./configure \
   30.27  		--sbindir=/usr/sbin \
   30.28 -		--sysconfdir=/etc \
   30.29 -		--mandir=/usr/share/man \
   30.30 -		--infodir=/usr/share/info \
   30.31  		$CONFIGURE_ARGS &&
   30.32 -	make && make DESTDIR=$DESTDIR install
   30.33 +	make &&
   30.34 +	make DESTDIR=$DESTDIR install
   30.35  }
   30.36  
   30.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
   30.38 -genpkg_rules()
   30.39 -{
   30.40 -	cp -a $install/* $fs
   30.41 +genpkg_rules() {
   30.42 +	copy @std
   30.43 +	DEPENDS="acl openssl attr popt ncurses zlib bzlib gcc-lib-base"
   30.44  }
    31.1 --- a/c_icap/receipt	Tue Mar 27 12:50:45 2018 +0200
    31.2 +++ b/c_icap/receipt	Fri Mar 30 19:31:50 2018 +0300
    31.3 @@ -15,13 +15,12 @@
    31.4  SPLIT="c_icap-dev"
    31.5  
    31.6  compile_rules() {
    31.7 -	sed -i '/sysconfdir=/ s|^|#|' /etc/slitaz/cook.site # default sysconfdir=/etc
    31.8 -
    31.9  	./configure \
   31.10  		--sysconfdir=/etc/c-icap \
   31.11  		--enable-large-files \
   31.12  		$CONFIGURE_ARGS &&
   31.13 -	make && make install || return 1
   31.14 +	make &&
   31.15 +	make install || return 1
   31.16  
   31.17  	mkdir -p $install/etc/init.d/ $install/var/log/c-icap/
   31.18  	install -m755 $stuff/c-icapd $install/etc/init.d
    32.1 --- a/cairo/receipt	Tue Mar 27 12:50:45 2018 +0200
    32.2 +++ b/cairo/receipt	Fri Mar 30 19:31:50 2018 +0300
    32.3 @@ -31,7 +31,6 @@
    32.4  		*)  SET_ARGS='--disable-gl';;
    32.5  	esac
    32.6  
    32.7 -	fix ld
    32.8  	./configure \
    32.9  		--disable-silent-rules \
   32.10  		--enable-xcb \
    33.1 --- a/caja-dropbox/receipt	Tue Mar 27 12:50:45 2018 +0200
    33.2 +++ b/caja-dropbox/receipt	Fri Mar 30 19:31:50 2018 +0300
    33.3 @@ -16,9 +16,8 @@
    33.4  
    33.5  compile_rules() {
    33.6  	./autogen.sh \
    33.7 -		--sysconfdir=/etc \
    33.8 -		--localstatedir=/var \
    33.9  		$CONFIGURE_ARGS &&
   33.10 +	fix libtool &&
   33.11  	make &&
   33.12  	make install
   33.13  }
    34.1 --- a/caja-extensions/receipt	Tue Mar 27 12:50:45 2018 +0200
    34.2 +++ b/caja-extensions/receipt	Fri Mar 30 19:31:50 2018 +0300
    34.3 @@ -17,9 +17,8 @@
    34.4  
    34.5  compile_rules() {
    34.6  	./autogen.sh \
    34.7 -		--sysconfdir=/etc \
    34.8 -		--localstatedir=/var \
    34.9  		$CONFIGURE_ARGS &&
   34.10 +	fix libtool &&
   34.11  	make &&
   34.12  	make install
   34.13  }
    35.1 --- a/caja/receipt	Tue Mar 27 12:50:45 2018 +0200
    35.2 +++ b/caja/receipt	Fri Mar 30 19:31:50 2018 +0300
    35.3 @@ -17,9 +17,6 @@
    35.4  
    35.5  compile_rules() {
    35.6  	./autogen.sh \
    35.7 -		--sysconfdir=/etc \
    35.8 -		--localstatedir=/var \
    35.9 -		\
   35.10  		--disable-packagekit \
   35.11  		--disable-update-mimedb \
   35.12  		--disable-icon-update \
    36.1 --- a/ccid/receipt	Tue Mar 27 12:50:45 2018 +0200
    36.2 +++ b/ccid/receipt	Fri Mar 30 19:31:50 2018 +0300
    36.3 @@ -1,51 +1,49 @@
    36.4 -# SliTaz package receipt.
    36.5 +# SliTaz package receipt v2.
    36.6  
    36.7  PACKAGE="ccid"
    36.8  VERSION="1.4.8"
    36.9  CATEGORY="base-system"
   36.10 -SHORT_DESC="Chip/Smart Card Interface Devices driver."
   36.11 +SHORT_DESC="Chip/Smart Card Interface Devices driver"
   36.12  MAINTAINER="pascal.bellard@slitaz.org"
   36.13  LICENSE="LGPL2.1"
   36.14  WEB_SITE="http://pcsclite.alioth.debian.org/"
   36.15 +
   36.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   36.17  WGET_URL="https://alioth.debian.org/frs/download.php/3768/$TARBALL"
   36.18  
   36.19 -DEPENDS="libusb pcsc-lite"
   36.20  BUILD_DEPENDS="wget pcsc-lite-dev libusb-dev perl"
   36.21  
   36.22 -# Rules to configure and make the package.
   36.23 -compile_rules()
   36.24 -{
   36.25 -	cd $src
   36.26 -	./configure --prefix=/usr \
   36.27 -		--sysconfdir=/etc \
   36.28 +compile_rules() {
   36.29 +	./configure \
   36.30  		--enable-usbdropdir=/usr/lib/pcsc/drivers \
   36.31  		--enable-twinserial \
   36.32  		$CONFIGURE_ARGS &&
   36.33 -	make && make DESTDIR=$DESTDIR install &&
   36.34 -	make DESTDIR=$DESTDIR -C src install_ccidtwin
   36.35 +	make &&
   36.36 +	make DESTDIR=$DESTDIR install &&
   36.37 +	make DESTDIR=$DESTDIR -C src install_ccidtwin || return 1
   36.38 +
   36.39 +	mkdir -p \
   36.40 +		$install/etc/udev/rules.d/ \
   36.41 +		$install/usr/bin/ \
   36.42 +		$install/usr/sbin/
   36.43 +	cp  $src/src/92_pcscd_ccid.rules                               $install/etc/udev/rules.d/
   36.44 +	cp  $src/contrib/RSA_SecurID/RSA_SecurID_getpasswd             $install/usr/bin/
   36.45 +	cp  $src/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch $install/usr/sbin/
   36.46 +
   36.47 +	mv  $install/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist \
   36.48 +		$install/etc/libccid_Info.plist
   36.49 +	ln -s       /etc/libccid_Info.plist \
   36.50 +		$install/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist
   36.51  }
   36.52  
   36.53 -# Rules to gen a SliTaz package suitable for Tazpkg.
   36.54 -genpkg_rules()
   36.55 -{
   36.56 -	mkdir -p $fs/etc/udev/rules.d/ $fs/usr/bin $fs/usr/sbin
   36.57 -	cp -a $install/* $fs/
   36.58 -	cp $src/src/92_pcscd_ccid.rules $fs/etc/udev/rules.d/
   36.59 -	mv $fs/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist \
   36.60 -		$fs/etc/libccid_Info.plist
   36.61 -	ln -s /etc/libccid_Info.plist \
   36.62 -		$fs/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist
   36.63 -	cp $src/contrib/RSA_SecurID/RSA_SecurID_getpasswd $fs/usr/bin
   36.64 -	cp $src/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch $fs/usr/sbin
   36.65 +genpkg_rules() {
   36.66 +	copy @std
   36.67 +	DEPENDS="libusb pcsc-lite"
   36.68  }
   36.69  
   36.70 -post_install()
   36.71 -{
   36.72 -	# addgroup pcscd if needed                                                                                                                
   36.73 +# addgroup pcscd if needed
   36.74 +post_install() {
   36.75  	if ! grep -q pcscd "$1/etc/group"; then
   36.76 -		echo -n "Adding group pcscd..."
   36.77  		chroot "$1/" addgroup pcscd
   36.78 -		status
   36.79  	fi
   36.80  }
    37.1 --- a/cherokee/receipt	Tue Mar 27 12:50:45 2018 +0200
    37.2 +++ b/cherokee/receipt	Fri Mar 30 19:31:50 2018 +0300
    37.3 @@ -6,69 +6,62 @@
    37.4  SHORT_DESC="A very fast, fiexible and easy to configure Web Server."
    37.5  MAINTAINER="slaxemulator@gmail.com"
    37.6  LICENSE="GPL2"
    37.7 +WEB_SITE="http://www.cherokee-project.com/"
    37.8 +
    37.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
   37.10 -WEB_SITE="http://www.cherokee-project.com/"
   37.11  WGET_URL="http://www.cherokee-project.com/download/${VERSION%.*}/$VERSION/$TARBALL"
   37.12  
   37.13 -BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl-dev openldap-dev python-dev pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake"
   37.14 +BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl-dev openldap-dev python-dev \
   37.15 +pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake"
   37.16  SPLIT="cherokee cherokee-dev cherokee-doc"
   37.17  
   37.18 -# Rules to configure and make the package.
   37.19 -compile_rules()
   37.20 -{
   37.21 +compile_rules() {
   37.22  	# Update deprecated symbols of ffmpeg
   37.23  	sed -i 's|hdl->avformat->file_size|avio_size(hdl->avformat)|' cherokee/handler_streaming.c
   37.24 -	
   37.25 +
   37.26  	# Use subdirectory for logs
   37.27  	sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
   37.28  
   37.29  	autoreconf -v
   37.30 -	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   37.31 -		--with-wwwroot=/var/www/cherokee --disable-static \
   37.32 -		--with-wwwuser=www --with-wwwgroup=www \
   37.33 +	./configure \
   37.34 +		--prefix=/usr \
   37.35 +		--sysconfdir=/etc \
   37.36 +		--localstatedir=/var \
   37.37 +		--with-wwwroot=/var/www/cherokee \
   37.38 +		--disable-static \
   37.39 +		--with-wwwuser=www \
   37.40 +		--with-wwwgroup=www \
   37.41  		--enable-os-string="SliTaz" \
   37.42  		$CONFIGURE_ARGS &&
   37.43 -	make && make DESTDIR=$DESTDIR install && {
   37.44 -	install -D -m644 pam.d_cherokee $DESTDIR/etc/pam.d/$PACKAGE
   37.45 -	chown -R www:www $DESTDIR/var/lib/$PACKAGE/graphs
   37.46 -	python -m compileall $DESTDIR
   37.47 -	python -O -m compileall $DESTDIR
   37.48 -	mkdir -p $DESTDIR/var/log/$PACKAGE $DESTDIR/etc/logrotate.d
   37.49 -	chown -R www:www $DESTDIR/var/log/$PACKAGE
   37.50 -	cp -a $stuff/$PACKAGE.logrotate $DESTDIR/etc/logrotate.d/$PACKAGE
   37.51 -	}
   37.52 +	make &&
   37.53 +	make DESTDIR=$DESTDIR install || return 1
   37.54 +
   37.55 +	install -Dm644 pam.d_cherokee $install/etc/pam.d/cherokee
   37.56 +	chown -R www:www $install/var/lib/cherokee/graphs
   37.57 +	python    -m compileall $install
   37.58 +	python -O -m compileall $install
   37.59 +
   37.60 +	install -d -o80 -u80 $install/var/log/cherokee
   37.61 +
   37.62 +	install -Dm644 $stuff/cherokee.logrotate $install/etc/logrotate.d/cherokee
   37.63 +	install -Dm755 $stuff/cherokee           $install/etc/init.d/cherokee
   37.64  }
   37.65  
   37.66 -# Rules to gen a SliTaz package suitable for Tazpkg.
   37.67 -genpkg_rules()
   37.68 -{
   37.69 +genpkg_rules() {
   37.70  	case $PACKAGE in
   37.71 -	cherokee)
   37.72 -		PROVIDE="lighttpd"
   37.73 -		DEPENDS="pcre cyrus-sasl openssl python libmysqlclient \
   37.74 +		cherokee)
   37.75 +			copy @std
   37.76 +			DEPENDS="pcre cyrus-sasl openssl python libmysqlclient \
   37.77  			libldap ffmpeg"
   37.78 -		mkdir -p $fs/usr/lib/cherokee $fs/usr/share $fs/etc/init.d
   37.79 -		cp -a $install/usr/bin $fs/usr
   37.80 -		cp -a $install/usr/sbin $fs/usr
   37.81 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
   37.82 -		cp -a $install/usr/lib/cherokee/*.so* $fs/usr/lib/cherokee
   37.83 -		cp -a $install/usr/share/cherokee $fs/usr/share
   37.84 -		cp -a $install/var $fs
   37.85 -		cp -a $install/etc $fs
   37.86 -		cp -a $stuff/cherokee $fs/etc/init.d
   37.87 -		;;
   37.88 -	cherokee-dev)
   37.89 -		mkdir -p $fs/usr/lib/cherokee $fs/usr/share
   37.90 -		cp -a $install/usr/lib/*.*a $fs/usr/lib
   37.91 -		cp -a $install/usr/lib/cherokee/*.*a $fs/usr/lib/cherokee
   37.92 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   37.93 -		cp -a $install/usr/share/aclocal $fs/usr/share
   37.94 -		;;
   37.95 -	cherokee-doc)
   37.96 -		CAT="misc|Docs for cherokee"
   37.97 -		DEPENDS="cherokee"
   37.98 -		mkdir -p $fs/usr/share
   37.99 -		cp -a $install/usr/share/doc $fs/usr/share
  37.100 -		;;
  37.101 +			PROVIDE="lighttpd"
  37.102 +			;;
  37.103 +		cherokee-dev)
  37.104 +			copy @dev
  37.105 +			;;
  37.106 +		cherokee-doc)
  37.107 +			copy doc/
  37.108 +			CAT="misc|documentation"
  37.109 +			DEPENDS="cherokee"
  37.110 +			;;
  37.111  	esac
  37.112  }
    38.1 --- a/chillispot/receipt	Tue Mar 27 12:50:45 2018 +0200
    38.2 +++ b/chillispot/receipt	Fri Mar 30 19:31:50 2018 +0300
    38.3 @@ -1,34 +1,30 @@
    38.4 -# SliTaz package receipt.
    38.5 +# SliTaz package receipt v2.
    38.6  
    38.7  PACKAGE="chillispot"
    38.8  VERSION="1.1.0"
    38.9  CATEGORY="network"
   38.10 -SHORT_DESC="Captive portal or wireless LAN access point controller."
   38.11 +SHORT_DESC="Captive portal or wireless LAN access point controller"
   38.12  MAINTAINER="pascal.bellard@slitaz.org"
   38.13  LICENSE="GPL2"
   38.14 +WEB_SITE="http://www.chillispot.info/"
   38.15 +
   38.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   38.17 -WEB_SITE="http://www.chillispot.info/"
   38.18  WGET_URL="${WEB_SITE}download/$TARBALL"
   38.19 -CONFIG_FILES="/etc/chilli.conf"
   38.20  
   38.21  BUILD_DEPENDS="gfortran"
   38.22  
   38.23 -# Rules to configure and make the package.
   38.24 -compile_rules()
   38.25 -{
   38.26 -	cd $src
   38.27 +compile_rules() {
   38.28  	sed -i 's/) defined (/) || defined (/' src/tun.c
   38.29 -	./configure --prefix=/usr --infodir=/usr/share/info \
   38.30 -	--sysconfdir=/etc --mandir=/usr/share/man $CONFIGURE_ARGS && \
   38.31 -	make && make DESTDIR=$DESTDIR install
   38.32 +
   38.33 +	./configure $CONFIGURE_ARGS &&
   38.34 +	make &&
   38.35 +	make DESTDIR=$DESTDIR install || return 1
   38.36 +
   38.37 +	install -Dm644 $src/doc/chilli.conf $install/etc/chilli.conf
   38.38 +	install -Dm755 $stuff/chilli        $install/etc/init.d/chilli
   38.39  }
   38.40  
   38.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
   38.42 -genpkg_rules()
   38.43 -{
   38.44 -	mkdir -p $fs/usr $fs/etc/init.d $fs/var/lib/chilli/
   38.45 -	cp -a $install/usr/sbin $fs/usr
   38.46 -	cp $src/doc/chilli.conf $fs/etc
   38.47 -	cp $stuff/chilli $fs/etc/init.d
   38.48 +genpkg_rules() {
   38.49 +	copy @std
   38.50 +	CONFIG_FILES="/etc/chilli.conf"
   38.51  }
   38.52 -
    39.1 --- a/clamav/receipt	Tue Mar 27 12:50:45 2018 +0200
    39.2 +++ b/clamav/receipt	Fri Mar 30 19:31:50 2018 +0300
    39.3 @@ -27,7 +27,6 @@
    39.4  	adduser -s /bin/false -H -D -u 64 clamav
    39.5  
    39.6  	./configure \
    39.7 -		--prefix=/usr \
    39.8  		--sysconfdir=/etc/clamav \
    39.9  		--with-dbdir=/var/lib/clamav \
   39.10  		--with-iconv=no \
   39.11 @@ -62,13 +61,7 @@
   39.12  			TAGS="antivirus"
   39.13  			;;
   39.14  		*-dev)
   39.15 -			mkdir -p $fs/usr/lib \
   39.16 -				$fs/usr/bin
   39.17 -
   39.18 -			cp -a $install/usr/include $fs/usr
   39.19 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   39.20 -			cp -a $install/usr/lib/*.*a $fs/usr/lib
   39.21 -			cp -a $install/usr/bin/clamav-config $fs/usr/bin
   39.22 +			copy @dev
   39.23  			;;
   39.24  	esac
   39.25  }
    40.1 --- a/clipit/receipt	Tue Mar 27 12:50:45 2018 +0200
    40.2 +++ b/clipit/receipt	Fri Mar 30 19:31:50 2018 +0300
    40.3 @@ -1,4 +1,4 @@
    40.4 -# SliTaz package receipt.
    40.5 +# SliTaz package receipt v2.
    40.6  
    40.7  PACKAGE="clipit"
    40.8  VERSION="1.4.2"
    40.9 @@ -7,15 +7,13 @@
   40.10  MAINTAINER="al.bobylev@gmail.com"
   40.11  LICENSE="GPL3"
   40.12  WEB_SITE="http://clipit.rspwn.com/"
   40.13 +
   40.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
   40.15  WGET_URL="$SF_MIRROR/gtkclipit/Version%201/$TARBALL"
   40.16  
   40.17 -DEPENDS="gtk+"
   40.18  BUILD_DEPENDS="gtk+-dev intltool"
   40.19  
   40.20 -# Rules to configure and make the package.
   40.21 -compile_rules()
   40.22 -{
   40.23 +compile_rules() {
   40.24  	# fix subcategory for cascade menu
   40.25  	sed -i 's|Categories=.*|Categories=GTK;Utility;TextTools;|' \
   40.26  		$src/data/clipit.desktop.in
   40.27 @@ -23,16 +21,12 @@
   40.28  	sed -i 's|clipit-trayicon|edit-paste|' $src/data/clipit*.desktop.in
   40.29  	sed -i 's|clipit-trayicon|edit-paste|' $src/src/main.c
   40.30  
   40.31 -	./configure \
   40.32 -		--sysconfdir=/etc \
   40.33 -		$CONFIGURE_ARGS &&
   40.34 +	./configure $CONFIGURE_ARGS &&
   40.35  	make &&
   40.36  	make install
   40.37  }
   40.38  
   40.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
   40.40 -genpkg_rules()
   40.41 -{
   40.42 -	cp -a $install/* $fs
   40.43 -	rm -rf $fs/usr/share/icons $fs/usr/share/locale $fs/usr/share/man
   40.44 +genpkg_rules() {
   40.45 +	copy @std
   40.46 +	DEPENDS="gtk+"
   40.47  }
    41.1 --- a/clutter/receipt	Tue Mar 27 12:50:45 2018 +0200
    41.2 +++ b/clutter/receipt	Fri Mar 30 19:31:50 2018 +0300
    41.3 @@ -18,11 +18,11 @@
    41.4  
    41.5  compile_rules() {
    41.6  	./configure \
    41.7 -		--sysconfdir=/etc \
    41.8  		--enable-introspection \
    41.9  		--enable-egl-backend \
   41.10  		$CONFIGURE_ARGS &&
   41.11 -	make && make install || return 1
   41.12 +	make &&
   41.13 +	make install || return 1
   41.14  
   41.15  	ln -s clutter-1.0.pc $install/usr/lib/pkgconfig/clutter.pc
   41.16  }
    42.1 --- a/collectd-apache/receipt	Tue Mar 27 12:50:45 2018 +0200
    42.2 +++ b/collectd-apache/receipt	Fri Mar 30 19:31:50 2018 +0300
    42.3 @@ -1,4 +1,4 @@
    42.4 -# SliTaz package receipt.
    42.5 +# SliTaz package receipt v2.
    42.6  
    42.7  PACKAGE="collectd-apache"
    42.8  VERSION="5.1.0"
    42.9 @@ -7,31 +7,25 @@
   42.10  SHORT_DESC="Apache plugin for Collectd"
   42.11  MAINTAINER="erjo@slitaz.org"
   42.12  LICENSE="GPL2"
   42.13 +WEB_SITE="http://collectd.org"
   42.14 +
   42.15  TARBALL="$SOURCE-$VERSION.tar.gz"
   42.16 -WEB_SITE="http://collectd.org"
   42.17  WGET_URL="http://collectd.org/files/$TARBALL"
   42.18 -#CONFIG_FILES="/etc/collectd/collectd.conf"
   42.19  
   42.20 -DEPENDS="libcurl apache"
   42.21  BUILD_DEPENDS="curl-dev"
   42.22  
   42.23 -# Rules to configure and make the package.
   42.24 -compile_rules()
   42.25 -{
   42.26 +compile_rules() {
   42.27  	./configure \
   42.28 -		--prefix=/usr \
   42.29 -		--localstatedir=/var \
   42.30  		--enable-apache \
   42.31  		--disable-all-plugins \
   42.32  		--sysconfdir=/etc/collectd \
   42.33  		$CONFIGURE_ARGS &&
   42.34 -	make && make DESTDIR=$DESTDIR install
   42.35 +	make &&
   42.36 +	make DESTDIR=$DESTDIR install
   42.37  }
   42.38  
   42.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
   42.40 -genpkg_rules()
   42.41 -{
   42.42 -	mkdir -p $fs/usr/lib/collectd
   42.43 -
   42.44 -	cp -a $install/usr/lib/collectd/*.so* $fs/usr/lib/collectd
   42.45 +genpkg_rules() {
   42.46 +	copy @std
   42.47 +	DEPENDS="libcurl apache"
   42.48 +	#CONFIG_FILES="/etc/collectd/collectd.conf"
   42.49  }
    43.1 --- a/collectd-bind/receipt	Tue Mar 27 12:50:45 2018 +0200
    43.2 +++ b/collectd-bind/receipt	Fri Mar 30 19:31:50 2018 +0300
    43.3 @@ -1,37 +1,33 @@
    43.4 -# SliTaz package receipt.
    43.5 +# SliTaz package receipt v2.
    43.6  
    43.7  PACKAGE="collectd-bind"
    43.8 -SOURCE="collectd"
    43.9  VERSION="4.7.0"
   43.10  CATEGORY="network"
   43.11  SHORT_DESC="Apache plugin for Collectd"
   43.12  MAINTAINER="erjo@slitaz.org"
   43.13  LICENSE="GPL2"
   43.14 -DEPENDS="libcurl libxml2"
   43.15 +WEB_SITE="http://collectd.org"
   43.16 +
   43.17 +SOURCE="collectd"
   43.18 +TARBALL="$SOURCE-$VERSION.tar.gz"
   43.19 +# WGET_URL ???
   43.20 +
   43.21  BUILD_DEPENDS="libcurl curl-dev libxml2 libxml2-dev"
   43.22 -TARBALL="$SOURCE-$VERSION.tar.gz"
   43.23 -WEB_SITE="http://collectd.org"
   43.24 -#CONFIG_FILES="/etc/collectd/collectd.conf"
   43.25  
   43.26 -# Rules to configure and make the package.
   43.27 -compile_rules()
   43.28 -{
   43.29 +compile_rules() {
   43.30  	sed -i 's/ipt_error_target/ipt2_error_target/' src/libiptc/libiptc.c
   43.31 +
   43.32  	./configure \
   43.33 -		--prefix=/usr \
   43.34 -		--localstatedir=/var \
   43.35  		--enable-bind \
   43.36  		--disable-all-plugins \
   43.37  		--sysconfdir=/etc/collectd \
   43.38  		$CONFIGURE_ARGS &&
   43.39 -	make && make DESTDIR=$DESTDIR install
   43.40 +	make &&
   43.41 +	make DESTDIR=$DESTDIR install
   43.42  }
   43.43  
   43.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
   43.45 -genpkg_rules()
   43.46 -{
   43.47 -	mkdir -p $fs/usr/lib/collectd
   43.48 -
   43.49 -	cp -a $install/usr/lib/collectd/bind.so* $fs/usr/lib/collectd
   43.50 +genpkg_rules() {
   43.51 +	copy bind.so*
   43.52 +	DEPENDS="libcurl libxml2"
   43.53 +	#CONFIG_FILES="/etc/collectd/collectd.conf"
   43.54  }
   43.55 -
    44.1 --- a/collectd/receipt	Tue Mar 27 12:50:45 2018 +0200
    44.2 +++ b/collectd/receipt	Fri Mar 30 19:31:50 2018 +0300
    44.3 @@ -6,21 +6,18 @@
    44.4  SHORT_DESC="System Statistics Collection Daemon"
    44.5  MAINTAINER="erjo@slitaz.org"
    44.6  LICENSE="GPL2"
    44.7 +WEB_SITE="http://collectd.org"
    44.8 +
    44.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
   44.10 -WEB_SITE="http://collectd.org"
   44.11  WGET_URL="http://collectd.org/files/$TARBALL"
   44.12 -CONFIG_FILES="/etc/collectd/collectd.conf"
   44.13  
   44.14  BUILD_DEPENDS="slitaz-toolchain rrdtool-dev perl"
   44.15  SPLIT="collectd collectd-dev"
   44.16  
   44.17 -# Rules to configure and make the package.
   44.18 -compile_rules()
   44.19 -{
   44.20 +compile_rules() {
   44.21  	sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' src/*.c configure*
   44.22 +
   44.23  	./configure \
   44.24 -		--prefix=/usr \
   44.25 -		--localstatedir=/var \
   44.26  		--enable-interface \
   44.27  		--enable-load \
   44.28  		--enable-cpu \
   44.29 @@ -32,39 +29,24 @@
   44.30  		--with-librrdtool=/usr/include \
   44.31  		--disable-all-plugins \
   44.32  		--sysconfdir=/etc/collectd \
   44.33 -		--localstatedir=/var \
   44.34  		$CONFIGURE_ARGS &&
   44.35 -	make && make DESTDIR=$DESTDIR install
   44.36 +	make &&
   44.37 +	make DESTDIR=$DESTDIR install || return 1
   44.38 +
   44.39 +	# Add init script and fixes
   44.40 +	install -Dm755 $stuff/collectd $install/etc/init.d/collectd
   44.41 +	chmod 0644 $install/etc/collectd/*
   44.42  }
   44.43  
   44.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
   44.45 -genpkg_rules()
   44.46 -{
   44.47 +genpkg_rules() {
   44.48  	case $PACKAGE in
   44.49 -	collectd)
   44.50 -		DEPENDS="rrdtool perl"
   44.51 -		mkdir -p $fs/usr/lib/collectd \
   44.52 -			$fs/usr/share \
   44.53 -			$fs/etc/init.d
   44.54 -	
   44.55 -		cp -a $install/etc $fs/
   44.56 -		cp -a $install/var $fs/
   44.57 -		cp -a $install/usr/share/collectd $fs/usr/share
   44.58 -		cp -a $install/usr/bin $fs/usr
   44.59 -		cp -a $install/usr/sbin $fs/usr
   44.60 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
   44.61 -		cp -a $install/usr/lib/collectd/*.so $fs/usr/lib/collectd
   44.62 -		cp -a $install/usr/lib/perl5 $fs/usr/lib
   44.63 -	
   44.64 -		# Add init script and fixes
   44.65 -		install -g root -o root -m 0755 $stuff/collectd $fs/etc/init.d
   44.66 -		chmod 0644 $fs/etc/collectd/*
   44.67 -		;;
   44.68 -	collectd-dev)
   44.69 -		mkdir -p $fs/usr/lib
   44.70 -		cp -a $install/usr/include $fs/usr
   44.71 -		cp -a $install/usr/lib/*.*a $fs/usr/lib
   44.72 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   44.73 -		;;
   44.74 +		collectd)
   44.75 +			copy @std
   44.76 +			DEPENDS="rrdtool perl"
   44.77 +			CONFIG_FILES="/etc/collectd/collectd.conf"
   44.78 +			;;
   44.79 +		collectd-dev)
   44.80 +			copy @dev
   44.81 +			;;
   44.82  	esac
   44.83  }
    45.1 --- a/colord/receipt	Tue Mar 27 12:50:45 2018 +0200
    45.2 +++ b/colord/receipt	Fri Mar 30 19:31:50 2018 +0300
    45.3 @@ -23,10 +23,7 @@
    45.4  			-G colord -s /bin/false -D colord
    45.5  	fi
    45.6  
    45.7 -	fix ld
    45.8  	./configure \
    45.9 -		--sysconfdir=/etc \
   45.10 -		--localstatedir=/var \
   45.11  		--with-daemon-user=colord \
   45.12  		--enable-vala \
   45.13  		--enable-systemd-login=no \
   45.14 @@ -36,7 +33,8 @@
   45.15  		--with-systemdsystemunitdir=no \
   45.16  		$CONFIGURE_ARGS &&
   45.17  	fix libtool &&
   45.18 -	make && make install
   45.19 +	make &&
   45.20 +	make install
   45.21  }
   45.22  
   45.23  genpkg_rules() {
    46.1 --- a/commoncpp2/receipt	Tue Mar 27 12:50:45 2018 +0200
    46.2 +++ b/commoncpp2/receipt	Fri Mar 30 19:31:50 2018 +0300
    46.3 @@ -16,26 +16,20 @@
    46.4  
    46.5  compile_rules() {
    46.6  	sed -i -e '50 a\#include <sys/stat.h>' inc/cc++/applog.h
    46.7 -	./configure \
    46.8 -		--sysconfdir=/etc \
    46.9 -		$CONFIGURE_ARGS &&
   46.10 -	make && make install
   46.11 +
   46.12 +	./configure $CONFIGURE_ARGS &&
   46.13 +	make &&
   46.14 +	make install
   46.15  }
   46.16  
   46.17  genpkg_rules() {
   46.18  	case $PACKAGE in
   46.19  		commoncpp2)
   46.20 -			mkdir -p $fs/usr/lib
   46.21 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
   46.22 +			copy @std
   46.23  			DEPENDS="glibc-base gcc-lib-base zlib"
   46.24  			;;
   46.25  		*-dev)
   46.26 -			mkdir -p $fs/usr/lib $fs/usr/share
   46.27 -			cp -a $install/usr/lib/*.*a $fs/usr/lib
   46.28 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   46.29 -			cp -a $install/usr/bin $fs/usr
   46.30 -			cp -a $install/usr/include $fs/usr
   46.31 -			cp -a $install/usr/share/aclocal $fs/usr/share
   46.32 +			copy @dev
   46.33  			;;
   46.34  	esac
   46.35  }
    47.1 --- a/compiz-libcompizconfig/receipt	Tue Mar 27 12:50:45 2018 +0200
    47.2 +++ b/compiz-libcompizconfig/receipt	Fri Mar 30 19:31:50 2018 +0300
    47.3 @@ -16,26 +16,19 @@
    47.4  SPLIT="compiz-libcompizconfig-dev"
    47.5  
    47.6  compile_rules() {
    47.7 -	./configure --sysconfdir=/etc
    47.8 -	make && make install
    47.9 +	./configure &&
   47.10 +	make &&
   47.11 +	make install
   47.12  }
   47.13  
   47.14  genpkg_rules() {
   47.15  	case $PACKAGE in
   47.16  		compiz-libcompizconfig)
   47.17 -			mkdir -p $fs/usr/lib $fs/usr/share
   47.18 -			cp -a $install/etc $fs
   47.19 -			cp -a $install/usr/lib/compiz* $fs/usr/lib
   47.20 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
   47.21 -			cp -a $install/usr/share/compiz $fs/usr/share
   47.22 -			find $fs -name 'lib*a' -delete
   47.23 +			copy @std
   47.24  			DEPENDS="compiz-core protobuf glib libxml2"
   47.25  			;;
   47.26  		*-dev)
   47.27 -			mkdir -p $fs/usr/lib $fs/usr/share
   47.28 -			cp -a $install/usr/include $fs/usr
   47.29 -			cp -a $install/usr/lib $fs/usr
   47.30 -			find $fs -name '*so*' -delete
   47.31 +			copy @dev
   47.32  			;;
   47.33  	esac
   47.34  }
    48.1 --- a/compiz-plugins-extra/receipt	Tue Mar 27 12:50:45 2018 +0200
    48.2 +++ b/compiz-plugins-extra/receipt	Fri Mar 30 19:31:50 2018 +0300
    48.3 @@ -24,10 +24,10 @@
    48.4  		wget -O $SRC/$EXTRA_SOURCE_FILES $WGET_URL2
    48.5  	patch -p1 -i $SRC/$EXTRA_SOURCE_FILES
    48.6  
    48.7 -	fix ld
    48.8  	./configure $CONFIGURE_ARGS &&
    48.9  	fix libtool &&
   48.10 -	make && make install
   48.11 +	make &&
   48.12 +	make install
   48.13  }
   48.14  
   48.15  genpkg_rules() {
    49.1 --- a/compiz-plugins-main/receipt	Tue Mar 27 12:50:45 2018 +0200
    49.2 +++ b/compiz-plugins-main/receipt	Fri Mar 30 19:31:50 2018 +0300
    49.3 @@ -19,10 +19,10 @@
    49.4  SPLIT="compiz-plugins-main-dev"
    49.5  
    49.6  compile_rules() {
    49.7 -	fix ld
    49.8  	./configure $CONFIGURE_ARGS &&
    49.9  	fix libtool &&
   49.10 -	make && make install
   49.11 +	make &&
   49.12 +	make install
   49.13  }
   49.14  
   49.15  genpkg_rules() {
    50.1 --- a/compiz-plugins-unsupported/receipt	Tue Mar 27 12:50:45 2018 +0200
    50.2 +++ b/compiz-plugins-unsupported/receipt	Fri Mar 30 19:31:50 2018 +0300
    50.3 @@ -19,10 +19,10 @@
    50.4  SPLIT="compiz-plugins-unsupported-dev"
    50.5  
    50.6  compile_rules() {
    50.7 -	fix ld
    50.8  	./configure $CONFIGURE_ARGS &&
    50.9  	fix libtool &&
   50.10 -	make && make install
   50.11 +	make &&
   50.12 +	make install
   50.13  }
   50.14  
   50.15  genpkg_rules() {
    51.1 --- a/conky/receipt	Tue Mar 27 12:50:45 2018 +0200
    51.2 +++ b/conky/receipt	Fri Mar 30 19:31:50 2018 +0300
    51.3 @@ -18,21 +18,20 @@
    51.4  
    51.5  compile_rules() {
    51.6  	./configure \
    51.7 -		--prefix=/usr \
    51.8 -		--sysconfdir=/etc \
    51.9  		--enable-wlan \
   51.10  		--enable-lua \
   51.11  		--enable-imlib2 \
   51.12  		$CONFIGURE_ARGS &&
   51.13 -	make && make install
   51.14 +	fix libtool &&
   51.15 +	make &&
   51.16 +	make install || return 1
   51.17 +
   51.18 +	install -Dm644 $stuff/conky.conf    $install/etc/conky/conky.conf
   51.19 +	install -Dm644 $stuff/conky.desktop $install/etc/xdg/autostart/conky.desktop
   51.20  }
   51.21  
   51.22  genpkg_rules() {
   51.23 -	mkdir -p $fs/usr $fs/etc/conky $fs/etc/xdg/autostart
   51.24 -	cp -a $install/usr/bin $fs/usr
   51.25 -	cp -f $install/etc/conky/conky_no_x11.conf $fs/etc/conky
   51.26 -	cp -a $stuff/conky.conf $fs/etc/conky
   51.27 -	cp -a $stuff/conky.desktop $fs/etc/xdg/autostart
   51.28 +	copy @std
   51.29  	DEPENDS="expat fontconfig freetype glib xorg-libX11 xorg-libXau \
   51.30  	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libxcb \
   51.31  	xorg-libXft xorg-libXrender zlib ncurses wireless_tools imlib2"
    52.1 --- a/connman/receipt	Tue Mar 27 12:50:45 2018 +0200
    52.2 +++ b/connman/receipt	Fri Mar 30 19:31:50 2018 +0300
    52.3 @@ -6,8 +6,9 @@
    52.4  SHORT_DESC="Daemon for managing internet connections"
    52.5  MAINTAINER="slaxemulator@gmail.com"
    52.6  LICENSE="GPL2"
    52.7 +WEB_SITE="http://connman.net/"
    52.8 +
    52.9  TARBALL="$PACKAGE-$VERSION.tar.xz"
   52.10 -WEB_SITE="http://connman.net/"
   52.11  WGET_URL="http://linux-kernel.uio.no/pub/linux/network/$PACKAGE/$TARBALL"
   52.12  
   52.13  BUILD_DEPENDS="glib-dev dbus-dev iptables-dev iptables gnutls-dev libnl-dev
   52.14 @@ -15,18 +16,11 @@
   52.15  bluez-dev ppp-dev"
   52.16  SPLIT="connman connman-dev connman-tools"
   52.17  
   52.18 -# Rules to configure and make the package.
   52.19 -compile_rules()
   52.20 -{
   52.21 +compile_rules() {
   52.22  	# add dependency on libncurses.so,
   52.23  	sed -i 's/-lreadline/-lreadline -lncurses/' Makefile.in
   52.24 -	cd $src
   52.25 +
   52.26  	./configure \
   52.27 -		--prefix=/usr \
   52.28 -		--sysconfdir=/etc \
   52.29 -		--localstatedir=/var \
   52.30 -		--infodir=/usr/share/info \
   52.31 -		--mandir=/usr/share/man \
   52.32  		--disable-gtk-doc \
   52.33  		--disable-neard \
   52.34  		--enable-polkit \
   52.35 @@ -36,80 +30,55 @@
   52.36  		--enable-client \
   52.37  		--enable-test \
   52.38  		$CONFIGURE_ARGS &&
   52.39 -	make && make DESTDIR=$DESTDIR install
   52.40 +	make &&
   52.41 +	make DESTDIR=$DESTDIR install || return 1
   52.42 +
   52.43 +	mkdir -p $install/usr/sbin/
   52.44 +	install -m755 $src/client/connmanctl $install/usr/sbin/
   52.45 +	install -m755 $src/tools/*-test      $install/usr/sbin/
   52.46 +	install -m755 $src/tools/*-tool      $install/usr/sbin/
   52.47 +	install -m755 $src/tools/*-unit      $install/usr/sbin/
   52.48 +	install -m755 $src/tools/wispr       $install/usr/sbin/
   52.49 +	# python tools
   52.50 +	install -m755 $src/test/*            $install/usr/sbin/
   52.51  }
   52.52  
   52.53 -# Rules to gen a SliTaz package suitable for Tazpkg.
   52.54 -genpkg_rules()
   52.55 -{
   52.56 +genpkg_rules() {
   52.57  	case $PACKAGE in
   52.58 -	connman)
   52.59 -		DEPENDS="glib dbus iptables gnutls libnl libgcrypt udev \
   52.60 +		connman)
   52.61 +			copy @std
   52.62 +			rm -r $fs/usr/sbin/; copy connman-vpnd connmand # split other -> dev
   52.63 +			DEPENDS="glib dbus iptables gnutls libnl libgcrypt udev \
   52.64  			wpa_supplicant dbus-helper"
   52.65 -		SUGGESTED="xl2tpd pptpclient openvpn"
   52.66 -		# dbus conf
   52.67 -		mkdir -p $fs/etc
   52.68 -		cp -a $install/etc/dbus-1 $fs/etc
   52.69 -		# conman exec
   52.70 -		mkdir -p $fs/usr
   52.71 -		cp -a $install/usr/sbin $fs/usr
   52.72 -		# libs
   52.73 -		mkdir -p $fs/usr/lib/connman/plugins-vpn
   52.74 -		cp -a $install/usr/lib/connman/plugins-vpn/*.so \
   52.75 -			$fs/usr/lib/connman/plugins-vpn
   52.76 -		# vpn scripts
   52.77 -		mkdir -p $fs/usr/lib/connman/scripts
   52.78 -		cp -a $install/usr/lib/connman/scripts $fs/usr/lib/connman
   52.79 -		# share
   52.80 -		cp -a $install/usr/share $fs/usr
   52.81 -		# init script
   52.82 -		cp -a $stuff/etc $fs
   52.83 -		;;
   52.84 -	connman-dev)
   52.85 -		CAT="network|Daemon for managing internet connections, dev files."
   52.86 -		# vpn
   52.87 -		mkdir -p $fs/usr/lib/connman/plugins-vpn
   52.88 -		cp -a $install/usr/lib/connman/plugins-vpn/*a \
   52.89 -			$fs/usr/lib/connman/plugins-vpn
   52.90 -		# include
   52.91 -		cp -a $install/usr/include $fs/usr
   52.92 -		# pkg-config
   52.93 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   52.94 -		# test tools
   52.95 -		mkdir -p $fs/usr/sbin
   52.96 -		install -Dm755 $src/tools/*-test $fs/usr/sbin
   52.97 -		install -Dm755 $src/tools/*-tool $fs/usr/sbin
   52.98 -		install -Dm755 $src/tools/*-unit $fs/usr/sbin
   52.99 -		install -Dm755 $src/tools/wispr $fs/usr/sbin
  52.100 -		# python tools
  52.101 -		install -Dm755 $src/test/* $fs/usr/sbin
  52.102 -		;;
  52.103 -	connman-tools)
  52.104 -		CAT="network|Daemon for managing internet connections, dev tools."
  52.105 -		DEPENDS="readline ncurses"
  52.106 -		# client
  52.107 -	        mkdir -p $fs/usr/sbin
  52.108 -		install -Dm755 $src/client/connmanctl  $fs/usr/sbin
  52.109 -		;;
  52.110 +			SUGGESTED="xl2tpd pptpclient openvpn"
  52.111 +			;;
  52.112 +		connman-tools)
  52.113 +			copy connmanctl
  52.114 +			CAT="network|dev tools"
  52.115 +			DEPENDS="readline ncurses"
  52.116 +			;;
  52.117 +		connman-dev)
  52.118 +			copy @dev @std @rm
  52.119 +			;;
  52.120  	esac
  52.121  }
  52.122  
  52.123 -# Pre and post remove commands for Tazpkg
  52.124 -post_install_connman()
  52.125 -{
  52.126 +post_install_connman() {
  52.127  	if ! grep -qs ^CONNMAND_OPTIONS "$1/etc/daemons.conf"; then
  52.128 -		echo '# Connman daemon options.' >> "$1/etc/daemons.conf"
  52.129 -		echo 'CONNMAND_OPTIONS=""' >> "$1/etc/daemons.conf"
  52.130 -		echo '' >> "$1/etc/daemons.conf"
  52.131 +		cat >> "$1/etc/daemons.conf" <<EOT
  52.132 +
  52.133 +# Connman daemon options.
  52.134 +CONNMAND_OPTIONS=""
  52.135 +
  52.136 +EOT
  52.137  	fi
  52.138  	if [ -z "$1" -a -s /etc/network.conf ]; then
  52.139  		/etc/init.d/connman start || /etc/init.d/connman restart
  52.140  	fi
  52.141  }
  52.142  
  52.143 -pre_remove_connman()
  52.144 -{
  52.145 +pre_remove_connman() {
  52.146  	if [ -z "$1" ]; then
  52.147 -		/etc/init.d/connman stop 2> /dev/null
  52.148 +		/etc/init.d/connman stop 2>/dev/null
  52.149  	fi
  52.150  }
    53.1 --- a/coova-chilli/receipt	Tue Mar 27 12:50:45 2018 +0200
    53.2 +++ b/coova-chilli/receipt	Fri Mar 30 19:31:50 2018 +0300
    53.3 @@ -18,11 +18,6 @@
    53.4  	sed -i 's|return -1; safe_close|return -1;\n safe_close|' src/redir.c
    53.5  	sed -i 's|if (.\(safe_write.*\)) /. error ./|\1|' src/garden.c
    53.6  	./configure \
    53.7 -		--prefix=/usr \
    53.8 -		--mandir=/usr/share/man \
    53.9 -		--infodir=/usr/share/info \
   53.10 -		--sysconfdir=/etc \
   53.11 -		--localstatedir=/var \
   53.12  		--enable-largelimits \
   53.13  		--enable-binstatusfile \
   53.14  		--enable-statusfile \
   53.15 @@ -55,19 +50,11 @@
   53.16  genpkg_rules() {
   53.17  	case $PACKAGE in
   53.18  		coova-chilli)
   53.19 -			mkdir -p $fs/usr/lib/coova-chilli
   53.20 -			cp -a $install/usr/lib/coova-chilli/*.so* $fs/usr/lib/
   53.21 -			cp -a $install/usr/lib/*.so* $fs/usr/lib/
   53.22 -			cp -a $install/usr/sbin $fs/usr/
   53.23 -			cp -a $install/etc $fs/
   53.24 +			copy @std
   53.25  			DEPENDS="openssl curl libidn"
   53.26  			;;
   53.27  		*-dev)
   53.28 -			mkdir -p $fs/usr/lib/coova-chilli
   53.29 -			cp -a $install/usr/lib/coova-chilli/*a $fs/usr/lib/
   53.30 -			cp -a $install/usr/lib/*a $fs/usr/lib/
   53.31 -			cp -a $install/usr/lib/python $fs/usr/lib/
   53.32 -			cp -a $install/usr/include $fs/usr/
   53.33 +			copy @dev
   53.34  			;;
   53.35  	esac
   53.36  }
    54.1 --- a/couchdb/receipt	Tue Mar 27 12:50:45 2018 +0200
    54.2 +++ b/couchdb/receipt	Fri Mar 30 19:31:50 2018 +0300
    54.3 @@ -1,96 +1,70 @@
    54.4 -# SliTaz package receipt.
    54.5 +# SliTaz package receipt v2.
    54.6  
    54.7  PACKAGE="couchdb"
    54.8  VERSION="1.2.0"
    54.9  SOURCE="apache-couchdb"
   54.10  CATEGORY="development"
   54.11 -SHORT_DESC="Apache CouchDB is document-oriented database."
   54.12 +SHORT_DESC="Apache CouchDB is document-oriented database"
   54.13  MAINTAINER="claudinei@slitaz.org"
   54.14  LICENSE="Apache"
   54.15 +WEB_SITE="http://couchdb.apache.org"
   54.16 +
   54.17  TARBALL="$SOURCE-$VERSION.tar.gz"
   54.18 -WEB_SITE="http://couchdb.apache.org"
   54.19  APACHE_MIRROR="http://mirrors.dedipower.com/ftp.apache.org/"
   54.20  WGET_URL="$APACHE_MIRROR/$PACKAGE/releases/$VERSION/$TARBALL"
   54.21  
   54.22 -DEPENDS="erlang icu openssl util-linux-getopt spidermonkey libcurl curl"
   54.23  BUILD_DEPENDS="erlang openssl-dev spidermonkey-dev curl-dev icu-dev"
   54.24  
   54.25 -# Rules to configure and make the package.
   54.26 -compile_rules()
   54.27 -{
   54.28 +compile_rules() {
   54.29  	./configure \
   54.30 -		--prefix=/usr \
   54.31 -		--sysconfdir=/etc \
   54.32  		--with-js-include=/usr/include/js \
   54.33 -		--localstatedir=/var \
   54.34 -		--infodir=/usr/share/info \
   54.35 -		--mandir=/usr/share/man \
   54.36  		$CONFIGURE_ARGS &&
   54.37 -	make && make DESTDIR=$DESTDIR install
   54.38 +	make &&
   54.39 +	make DESTDIR=$DESTDIR install
   54.40  }
   54.41  
   54.42 -# Rules to gen a SliTaz package suitable for Tazpkg.
   54.43 -genpkg_rules()
   54.44 -{
   54.45 -	mkdir -p $fs/usr/share $fs/etc
   54.46 -	cp -a $install/usr/bin $fs/usr
   54.47 -	cp -a $install/usr/lib $fs/usr
   54.48 -	cp -a $install/usr/share/couchdb $fs/usr/share
   54.49 -	cp -a $install/var $fs
   54.50 -	cp -a $install/etc/couchdb $fs/etc
   54.51 -	cp -a $install/etc/default/couchdb $fs/etc/couchdb
   54.52 -	cp -a $install/etc/init.d $fs/etc
   54.53 -	cp -a $install/etc/logrotate.d $fs/etc
   54.54 +genpkg_rules() {
   54.55 +	copy @std
   54.56  	sed -i	-e 's|/etc/default/couchdb|/etc/couchdb/couchdb|' \
   54.57  		-e 's,.*case,[ -d /var/run/couchdb ] || mkdir -p /var/run/couchdb\n&,' \
   54.58  			$fs/etc/init.d/couchdb
   54.59 +	DEPENDS="erlang icu openssl util-linux-getopt spidermonkey libcurl curl"
   54.60  }
   54.61  
   54.62 -# Pre install commands for tazpkg
   54.63  # See if couchdb is already installed and, just in case, stop it
   54.64 -pre_install()
   54.65 -{
   54.66 -	INIT_FILE="/etc/init.d/$PACKAGE"
   54.67 +pre_install() {
   54.68 +	INIT_FILE="/etc/init.d/couchdb"
   54.69  	[ -f "$1$INIT_FILE" ] && chroot "$1/" $INIT_FILE stop
   54.70  }
   54.71  
   54.72 -# Post install commands for tazpkg
   54.73  # Create couchdb user and group
   54.74 -post_install()
   54.75 -{
   54.76 -	LIBDIR="/var/lib/$PACKAGE"
   54.77 -	ETCDIR="/etc/$PACKAGE"
   54.78 -	LOGDIR="/var/log/$PACKAGE"
   54.79 -	RUNDIR="/var/run/$PACKAGE"
   54.80 +post_install() {
   54.81 +	LIBDIR="/var/lib/couchdb"
   54.82 +	ETCDIR="/etc/couchdb"
   54.83 +	LOGDIR="/var/log/couchdb"
   54.84 +	RUNDIR="/var/run/couchdb"
   54.85  
   54.86 -	grep -q "$PACKAGE" "$1/etc/group" || chroot "$1/" addgroup -S $PACKAGE
   54.87 +	grep -q "couchdb" "$1/etc/group" || chroot "$1/" addgroup -S couchdb
   54.88  
   54.89 -	grep -q "$PACKAGE" "$1/etc/passwd" || chroot "$1/" adduser -S -D -H \
   54.90 -	  -h $LIBDIR -G $PACKAGE -s /bin/sh -g "CouchDB Administrator" $PACKAGE
   54.91 +	grep -q "couchdb" "$1/etc/passwd" || chroot "$1/" adduser -S -D -H \
   54.92 +	  -h $LIBDIR -G couchdb -s /bin/sh -g "CouchDB Administrator" couchdb
   54.93  
   54.94  	for DIR in $LIBDIR $ETCDIR $LOGDIR $RUNDIR; do
   54.95 -		chroot "$1/" chown -R $PACKAGE:$PACKAGE $DIR &&
   54.96 +		chroot "$1/" chown -R couchdb:couchdb $DIR
   54.97  		chroot "$1/" chmod -R 0770 $DIR
   54.98  	done
   54.99  }
  54.100  
  54.101 -# Pre and post remove commands for Tazpkg.
  54.102 -pre_remove()
  54.103 -{
  54.104 -	INIT_FILE="/etc/init.d/$PACKAGE"
  54.105 +pre_remove() {
  54.106 +	INIT_FILE="/etc/init.d/couchdb"
  54.107  	[ -f "$1$INIT_FILE" ] && chroot "$1/" $INIT_FILE stop
  54.108  }
  54.109  
  54.110 -post_remove()
  54.111 -{
  54.112 -	LIBDIR="/var/lib/$PACKAGE"
  54.113 -	ETCDIR="/etc/$PACKAGE"
  54.114 -	LOGDIR="/var/log/$PACKAGE"
  54.115 -	RUNDIR="/var/run/$PACKAGE"
  54.116 -
  54.117 -	chroot "$1/" deluser $PACKAGE
  54.118 -
  54.119 -	for DIR in $LIBDIR $ETCDIR $LOGDIR $RUNDIR; do
  54.120 -		rm -rf "$1$DIR"
  54.121 -	done
  54.122 +post_remove() {
  54.123 +	chroot "$1/" deluser couchdb
  54.124 +	rm -rf \
  54.125 +		"$1/var/lib/couchdb" \
  54.126 +		"$1/etc/couchdb" \
  54.127 +		"$1/var/log/couchdb" \
  54.128 +		"$1/var/run/couchdb"
  54.129  }
    55.1 --- a/cups-filters/receipt	Tue Mar 27 12:50:45 2018 +0200
    55.2 +++ b/cups-filters/receipt	Fri Mar 30 19:31:50 2018 +0300
    55.3 @@ -18,28 +18,25 @@
    55.4  
    55.5  compile_rules() {
    55.6  	./configure \
    55.7 -		--sysconfdir=/etc \
    55.8 -		--localstatedir=/var \
    55.9  		--without-rcdir \
   55.10  		--disable-static \
   55.11  		--disable-avahi \
   55.12  		--with-gs-path=/usr/bin/gs \
   55.13  		--with-pdftops-path=/usr/bin/gs \
   55.14 -		--docdir=/usr/share/doc/cups-filters-$VERSION \
   55.15  		$CONFIGURE_ARGS &&
   55.16 -	make && make install
   55.17 +	make &&
   55.18 +	make install
   55.19  }
   55.20  
   55.21  genpkg_rules() {
   55.22  	case $PACKAGE in
   55.23  		cups-filters)
   55.24 -			copy etc/ bin/ sbin/ cups/ ppd/ *.so*
   55.25 -			# rm -rf $fs/usr/share/cups/ppdc
   55.26 +			copy @std
   55.27  			DEPENDS="cups dbus fontconfig freetype glib ijs lcms2 libcups \
   55.28  			libgnutls libjpeg-turbo libpng16 poppler qpdf tiff zlib"
   55.29  			;;
   55.30  		*-dev)
   55.31 -			copy *.h *.la *.pc
   55.32 +			copy @dev
   55.33  			;;
   55.34  	esac
   55.35  }
    56.1 --- a/cups/receipt	Tue Mar 27 12:50:45 2018 +0200
    56.2 +++ b/cups/receipt	Fri Mar 30 19:31:50 2018 +0300
    56.3 @@ -13,9 +13,14 @@
    56.4  
    56.5  BUILD_DEPENDS="automake libusb-dev zlib-dev acl-dev dbus-dev gnutls-dev perl \
    56.6  python pam pam-dev"
    56.7 -SPLIT="libcups cups cups-pam cups-doc cups-dev"
    56.8 +SPLIT="libcups cups cups-pam:pam cups-doc cups-dev"
    56.9  
   56.10  compile_rules() {
   56.11 +	case $SET in
   56.12 +		'')  SET_ARGS='--disable-pam';;
   56.13 +		pam) SET_ARGS='--enable-pam';;
   56.14 +	esac
   56.15 +
   56.16  	# gid 19 suggested by the BLFS is in use in SliTaz (by cdrom group),
   56.17  	# using 23 instead
   56.18  	addgroup -g 23 lpadmin
   56.19 @@ -31,69 +36,53 @@
   56.20  
   56.21  	CC=gcc \
   56.22  	./configure \
   56.23 -		--sysconfdir=/etc \
   56.24  		--libdir=/usr/lib \
   56.25 -		--localstatedir=/var \
   56.26 -		--disable-pam \
   56.27  		--disable-systemd \
   56.28  		--with-rcdir=/tmp/cupsinit \
   56.29  		--with-system-groups=lpadmin \
   56.30  		--with-docdir=/usr/share/doc/cups-$VERSION \
   56.31 +		$SET_ARGS \
   56.32  		$CONFIGURE_ARGS &&
   56.33  	make &&
   56.34  	make BUILDROOT=$install install || return 1
   56.35  
   56.36 -	cd $src-pam
   56.37 -	CC=gcc \
   56.38 -	./configure \
   56.39 -		--sysconfdir=/etc \
   56.40 -		--libdir=/usr/lib \
   56.41 -		--localstatedir=/var \
   56.42 -		--enable-pam \
   56.43 -		--disable-systemd \
   56.44 -		--with-rcdir=/tmp/cupsinit \
   56.45 -		--with-system-groups=lpadmin \
   56.46 -		--with-docdir=/usr/share/doc/cups-$VERSION \
   56.47 -		$CONFIGURE_ARGS &&
   56.48 -	make &&
   56.49 -	make BUILDROOT=$install-pam install || return 1
   56.50 +	rm -rf $install/tmp &&
   56.51  
   56.52 -	for inst in $install $install-pam ; do
   56.53 -		rm -rf $inst/tmp &&
   56.54 +	ln -svnf ../doc/cups-$VERSION $install/usr/share/cups/doc-$VERSION
   56.55  
   56.56 -		ln -svnf ../doc/cups-$VERSION $inst/usr/share/cups/doc-$VERSION
   56.57 +	echo "ServerName /var/run/cups/cups.sock" > $install/etc/cups/client.conf
   56.58  
   56.59 -		echo "ServerName /var/run/cups/cups.sock" > $inst/etc/cups/client.conf &&
   56.60 +	sed -i 's|hostname:9100|&\n\n    parallel:/dev/usb/lp0|' \
   56.61 +		$install/usr/share/cups/templates/choose-uri.tmpl
   56.62 +	sed -i 's|htmlview|browser|'    $install/usr/share/applications/cups.desktop
   56.63 +	sed -i 's|^#Group .*|Group lp|' $install/etc/cups/cups-files.conf
   56.64  
   56.65 -		sed -i 's|hostname:9100|&\n\n    parallel:/dev/usb/lp0|' \
   56.66 -			$inst/usr/share/cups/templates/choose-uri.tmpl &&
   56.67 -		sed -i 's|htmlview|browser|' $inst/usr/share/applications/cups.desktop &&
   56.68 -		sed -i 's|^#Group .*|Group lp|' $inst/etc/cups/cups-files.conf &&
   56.69 +	# Daemon script
   56.70 +	cp -a $stuff/etc $install
   56.71 +	chown -R root:root $install/etc
   56.72 +	# TazPanel link
   56.73 +	cp -a $stuff/var $install
   56.74 +	chown -R root:root $install/var
   56.75  
   56.76 -		# Daemon script
   56.77 -		cp -a $stuff/etc $inst &&
   56.78 -		chown -R root:root $inst/etc &&
   56.79 -		# TazPanel link
   56.80 -		cp -a $stuff/var $inst &&
   56.81 -		chown -R root:root $inst/var &&
   56.82 +	# Install ssl directory where to store the certs, solves some samba issues
   56.83 +	install -dm700 -g lp $install/etc/cups/ssl
   56.84  
   56.85 -		# Install ssl directory where to store the certs, solves some samba issues
   56.86 -		install -dm700 -g lp $inst/etc/cups/ssl &&
   56.87 +	# Install some more configuration files that will get filled by cupsd
   56.88 +	touch $install/etc/cups/printers.conf
   56.89 +	touch $install/etc/cups/classes.conf
   56.90 +	touch $install/etc/cups/subscriptions.conf
   56.91 +	chgrp -R lp $install/etc/cups
   56.92  
   56.93 -		# Install some more configuration files that will get filled by cupsd
   56.94 -		touch $inst/etc/cups/printers.conf &&
   56.95 -		touch $inst/etc/cups/classes.conf &&
   56.96 -		touch $inst/etc/cups/subscriptions.conf &&
   56.97 -		chgrp -R lp $inst/etc/cups &&
   56.98 +	# Comment out unnecessary PageLogFormat entry
   56.99 +	sed -i -e 's:PageLogFormat:#PageLogFormat:' $install/etc/cups/cupsd.conf*
  56.100  
  56.101 -		# Comment out unnecessary PageLogFormat entry
  56.102 -		sed -i -e 's:PageLogFormat:#PageLogFormat:' $inst/etc/cups/cupsd.conf* &&
  56.103 -
  56.104 -		# Change files permissions to be accessible via web interface - will be
  56.105 -		# fixed in post_install
  56.106 -		chmod -c o+r $inst/etc/cups/* $inst/usr/sbin/cupsd \
  56.107 -		$inst/usr/lib/cups/backend/ipp $inst/usr/lib/cups/backend/lpd
  56.108 -	done
  56.109 +	# Change files permissions to be accessible via web interface - will be
  56.110 +	# fixed in post_install
  56.111 +	chmod -c o+r \
  56.112 +		$install/etc/cups/* \
  56.113 +		$install/usr/sbin/cupsd \
  56.114 +		$install/usr/lib/cups/backend/ipp \
  56.115 +		$install/usr/lib/cups/backend/lpd
  56.116  }
  56.117  
  56.118  genpkg_rules() {
  56.119 @@ -111,7 +100,6 @@
  56.120  			TAGS="printer printing"
  56.121  			;;
  56.122  		cups-pam)
  56.123 -			install=$install-pam \
  56.124  			copy @std
  56.125  			rm -f $fs/usr/lib/libcups.so*
  56.126  			CAT="system-tools|with PAM support"
    57.1 --- a/cyrus-sasl/receipt	Tue Mar 27 12:50:45 2018 +0200
    57.2 +++ b/cyrus-sasl/receipt	Fri Mar 30 19:31:50 2018 +0300
    57.3 @@ -29,17 +29,16 @@
    57.4  	esac
    57.5  
    57.6  	./configure \
    57.7 -		--sysconfdir=/etc \
    57.8  		--with-dbpath=/var/lib/sasl/sasldb2 \
    57.9  		--with-saslauthd=/var/run/saslauthd \
   57.10  		--with-devrandom=/dev/urandom \
   57.11  		--with-openssl \
   57.12  		$SET_ARGS \
   57.13  		$CONFIGURE_ARGS &&
   57.14 -	make && make install || return 1
   57.15 +	make &&
   57.16 +	make install || return 1
   57.17  
   57.18 -	cp -a $stuff/etc $install
   57.19 -	chown -R root:root $inst/etc
   57.20 +	install -Dm755 $stuff/etc/init.d/cyrus-sasl $install/etc/init.d/cyrus-sasl
   57.21  
   57.22  	cook_pick_docs doc/*.html doc/*.txt doc/ONEWS doc/TODO \
   57.23  		saslauthd/LDAP_SASLAUTHD
    58.1 --- a/dahdi-tools/receipt	Tue Mar 27 12:50:45 2018 +0200
    58.2 +++ b/dahdi-tools/receipt	Fri Mar 30 19:31:50 2018 +0300
    58.3 @@ -3,27 +3,19 @@
    58.4  PACKAGE="dahdi-tools"
    58.5  VERSION="2.11.1"
    58.6  CATEGORY="network"
    58.7 -SHORT_DESC="Digium Asterisk Hardware Device Interface userland tools."
    58.8 +SHORT_DESC="Digium Asterisk Hardware Device Interface"
    58.9  MAINTAINER="pascal.bellard@slitaz.org"
   58.10  LICENSE="GPL2"
   58.11 +WEB_SITE="http://www.asterisk.org/"
   58.12 +
   58.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
   58.14 -WEB_SITE="http://www.asterisk.org/"
   58.15  WGET_URL="http://downloads.asterisk.org/pub/telephony/$PACKAGE/releases/$TARBALL"
   58.16 -CONFIG_FILES="/etc/dahdi/"
   58.17  
   58.18 -DEPENDS="libusb-compat newt libpri dahdi-perl"
   58.19  BUILD_DEPENDS="dahdi-linux-dev ppp-dev newt-dev libpri-dev gtk+-dev file"
   58.20 -SPLIT="dahdi-tools dahdi-dev dahdi-man dahdi-perl dahdi-ppp"
   58.21 +SPLIT="dahdi-man dahdi-perl dahdi-ppp dahdi-dev dahdi-tools"
   58.22  
   58.23 -# Rules to gen a SliTaz package suitable for Tazpkg.
   58.24 -compile_rules()
   58.25 -{
   58.26 -	./configure \
   58.27 -		--prefix=/usr \
   58.28 -		--sysconfdir=/etc \
   58.29 -		--exec-prefix=/usr \
   58.30 -		--mandir=/usr/share/man \
   58.31 -		$CONFIGURE_ARGS 2>&1 | grep -v conftest &&
   58.32 +compile_rules() {
   58.33 +	./configure $CONFIGURE_ARGS &&
   58.34  	make &&
   58.35  	make -C ppp &&
   58.36  	make DESTDIR=$DESTDIR install &&
   58.37 @@ -31,42 +23,33 @@
   58.38  	make DESTDIR=$DESTDIR config
   58.39  }
   58.40  
   58.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
   58.42 -genpkg_rules()
   58.43 -{
   58.44 +genpkg_rules() {
   58.45  	case $PACKAGE in
   58.46 -	dahdi-tools)
   58.47 -		mkdir -p $fs/etc $fs/usr/lib $fs/usr/share
   58.48 -		cp -a $install/etc/dahdi $fs/etc
   58.49 -		cp -a $install/usr/sbin $fs/usr
   58.50 -		cp -a $install/usr/lib/lib*.so* $fs/usr/lib
   58.51 -		cp -a $install/usr/share/dahdi $fs/usr/share
   58.52 -		;;
   58.53 -	dahdi-dev)
   58.54 -		CAT="development|Digium Asterisk Hardware Device Interface development files."
   58.55 -		PROVIDE="zaptel-dev"
   58.56 -		DEPENDS="dahdi-linux-dev"
   58.57 -		mkdir -p $fs/usr/lib
   58.58 -		cp -a $install/usr/lib/lib*.a $fs/usr/lib
   58.59 -		cp -a $install/usr/include $fs/usr
   58.60 -		;;
   58.61 -	dahdi-man)
   58.62 -		CAT="network|Digium Asterisk Hardware Device Interface man pages."
   58.63 -		mkdir -p $fs/usr/share
   58.64 -		cp -a $install/usr/share/man $fs/usr/share
   58.65 -		;;
   58.66 -	dahdi-perl)
   58.67 -		CAT="development|Digium Asterisk Hardware Device Interface PERL modules."
   58.68 -		PROVIDE="zaptel-perl"
   58.69 -		DEPENDS="perl"
   58.70 -		mkdir -p $fs/usr/lib
   58.71 -		cp -a $install/usr/lib/perl* $fs/usr/lib
   58.72 -		;;
   58.73 -	dahdi-ppp)
   58.74 -		CAT="network|Digium Asterisk Hardware Device Interface PPP plugin."
   58.75 -		DEPENDS="ppp"
   58.76 -		mkdir -p $fs/usr/lib
   58.77 -		cp -a $install/usr/lib/pppd $fs/usr/lib
   58.78 -		;;
   58.79 +		dahdi-man)
   58.80 +			copy man/
   58.81 +			CAT="network|man pages"
   58.82 +			;;
   58.83 +		dahdi-perl)
   58.84 +			copy *.pm
   58.85 +			CAT="development|PERL modules"
   58.86 +			DEPENDS="perl"
   58.87 +			PROVIDE="zaptel-perl"
   58.88 +			;;
   58.89 +		dahdi-ppp)
   58.90 +			copy dahdi.so
   58.91 +			CAT="network|PPP plugin"
   58.92 +			DEPENDS="ppp"
   58.93 +			;;
   58.94 +		dahdi-dev)
   58.95 +			copy @dev
   58.96 +			DEPENDS="dahdi-linux-dev"
   58.97 +			PROVIDE="zaptel-dev"
   58.98 +			;;
   58.99 +		dahdi-tools)
  58.100 +			copy @std @rm
  58.101 +			CAT="network|userland tools"
  58.102 +			DEPENDS="libusb-compat newt libpri dahdi-perl"
  58.103 +			CONFIG_FILES="/etc/dahdi/"
  58.104 +			;;
  58.105  	esac
  58.106  }
    59.1 --- a/dansguardian/receipt	Tue Mar 27 12:50:45 2018 +0200
    59.2 +++ b/dansguardian/receipt	Fri Mar 30 19:31:50 2018 +0300
    59.3 @@ -1,4 +1,4 @@
    59.4 -# SliTaz package receipt.
    59.5 +# SliTaz package receipt v2.
    59.6  
    59.7  PACKAGE="dansguardian"
    59.8  VERSION="2.10.1.1"
    59.9 @@ -6,40 +6,29 @@
   59.10  SHORT_DESC="Web content filter"
   59.11  MAINTAINER="erjo@slitaz.org"
   59.12  LICENSE="GPL2"
   59.13 +WEB_SITE="https://web.archive.org/web/20170722001531/http://dansguardian.org:80/"
   59.14 +
   59.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
   59.16 -WEB_SITE="http://dansguardian.org/"
   59.17  WGET_URL="http://dansguardian.org/downloads/2/Stable/$TARBALL"
   59.18 -SUGGESTED="clamav"
   59.19  
   59.20  BUILD_DEPENDS="pcre-dev zlib-dev"
   59.21 -DEPENDS="squid"
   59.22  
   59.23 -# Rules to configure and make the package.
   59.24 -compile_rules()
   59.25 -{
   59.26 -	cd $src
   59.27 +compile_rules() {
   59.28  	./configure \
   59.29 -		--prefix=/usr \
   59.30 -		--localstatedir=/var \
   59.31 -		--sysconfdir=/etc \
   59.32  		--enable-fancydm=no \
   59.33  		--with-proxyuser=nobody \
   59.34  		--with-proxygroup=nogroup \
   59.35  		$CONFIGURE_ARGS &&
   59.36 -	make && make DESTDIR=$DESTDIR install
   59.37 +	make &&
   59.38 +	make DESTDIR=$DESTDIR install
   59.39  }
   59.40  
   59.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
   59.42 -genpkg_rules()
   59.43 -{
   59.44 -	mkdir -p $fs/usr/sbin $fs/usr/share
   59.45 -	cp -a $install/usr/sbin $fs/usr
   59.46 -	cp -a $install/usr/share/${PACKAGE} $fs/usr/share
   59.47 -	cp -a $install/var $fs/
   59.48 -	cp -a $install/etc $fs/
   59.49 +genpkg_rules() {
   59.50 +	copy @std
   59.51 +	DEPENDS="squid"
   59.52 +	SUGGESTED="clamav"
   59.53  }
   59.54  
   59.55 -post_install()
   59.56 -{
   59.57 +post_install() {
   59.58  	chown nobody.nogroup "$1/var/log/dansguardian"
   59.59  }
    60.1 --- a/davfs2/receipt	Tue Mar 27 12:50:45 2018 +0200
    60.2 +++ b/davfs2/receipt	Fri Mar 30 19:31:50 2018 +0300
    60.3 @@ -1,36 +1,31 @@
    60.4 -# SliTaz package receipt.
    60.5 +# SliTaz package receipt v2.
    60.6  
    60.7  PACKAGE="davfs2"
    60.8  VERSION="1.5.4"
    60.9  CATEGORY="network"
   60.10 -SHORT_DESC="Remote collaborative authoring of Web resources."
   60.11 +SHORT_DESC="Remote collaborative authoring of Web resources"
   60.12  MAINTAINER="pascal.bellard@slitaz.org"
   60.13  LICENSE="GPL3"
   60.14 +WEB_SITE="http://savannah.nongnu.org/projects/$PACKAGE"
   60.15 +
   60.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   60.17 -WEB_SITE="http://savannah.nongnu.org/projects/$PACKAGE"
   60.18  WGET_URL="http://download.savannah.gnu.org/releases/$PACKAGE/$TARBALL"
   60.19 -CONFIG_FILES="/etc/davfs2"
   60.20  
   60.21 -DEPENDS="openssl libkrb5 krb5 expat neon zlib libcomerr3"
   60.22  BUILD_DEPENDS="openssl-dev krb5-dev krb5 expat-dev neon-dev"
   60.23  
   60.24 -# Rules to configure and make the package.
   60.25 -compile_rules()
   60.26 -{
   60.27 -	./configure --prefix=/usr --infodir=/usr/share/info \
   60.28 -	--sysconfdir=/etc --mandir=/usr/share/man $CONFIGURE_ARGS &&
   60.29 +compile_rules() {
   60.30 +	./configure $CONFIGURE_ARGS &&
   60.31  	make &&
   60.32  	make DESTDIR=$DESTDIR install
   60.33  }
   60.34  
   60.35 -# Rules to gen a SliTaz package suitable for Tazpkg.
   60.36 -genpkg_rules()
   60.37 -{
   60.38 -	mkdir -p $fs/usr
   60.39 -	cp -a $install/usr/sbin $fs/usr
   60.40 -	cp -a $install/etc $fs
   60.41 -	sed -i -e 's/# dav_user/dav_user/' \
   60.42 -	       -e 's/# dav_group/dav_group/' \
   60.43 -	       -e 's/ davfs2 / www /' \
   60.44 -	       $fs/etc/davfs2/davfs2.conf
   60.45 +genpkg_rules() {
   60.46 +	copy @std
   60.47 +	sed \
   60.48 +		-e 's/# dav_user/dav_user/' \
   60.49 +		-e 's/# dav_group/dav_group/' \
   60.50 +		-e 's/ davfs2 / www /' \
   60.51 +		-i $fs/etc/davfs2/davfs2.conf
   60.52 +	DEPENDS="openssl libkrb5 krb5 expat neon zlib libcomerr3"
   60.53 +	CONFIG_FILES="/etc/davfs2/"
   60.54  }
    61.1 --- a/dbus-glib/receipt	Tue Mar 27 12:50:45 2018 +0200
    61.2 +++ b/dbus-glib/receipt	Fri Mar 30 19:31:50 2018 +0300
    61.3 @@ -21,9 +21,7 @@
    61.4  		arm*) export ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes} ;;
    61.5  	esac
    61.6  
    61.7 -	fix ld
    61.8  	./configure \
    61.9 -		--sysconfdir=/etc \
   61.10  		--disable-static \
   61.11  		--disable-bash-completion \
   61.12  		$CONFIGURE_ARGS || return 1
   61.13 @@ -35,7 +33,8 @@
   61.14  	esac
   61.15  
   61.16  	fix libtool
   61.17 -	make && make install
   61.18 +	make &&
   61.19 +	make install
   61.20  }
   61.21  
   61.22  genpkg_rules() {
    62.1 --- a/dbus/receipt	Tue Mar 27 12:50:45 2018 +0200
    62.2 +++ b/dbus/receipt	Fri Mar 30 19:31:50 2018 +0300
    62.3 @@ -19,19 +19,17 @@
    62.4  compile_rules() {
    62.5  	# temporarily: --disable-xml-docs
    62.6  	./configure \
    62.7 -		--sysconfdir=/etc \
    62.8 -		--localstatedir=/var \
    62.9  		--disable-doxygen-docs \
   62.10  		--disable-xml-docs \
   62.11  		--disable-static \
   62.12 -		--docdir=/usr/share/doc/dbus-$VERSION \
   62.13  		--with-console-auth-dir=/run/console/ \
   62.14  		--with-system-pid-file=/run/dbus/pid \
   62.15  		--with-system-socket=/run/dbus/system_bus_socket \
   62.16  		--disable-systemd \
   62.17  		--without-systemdsystemunitdir \
   62.18  		$CONFIGURE_ARGS &&
   62.19 -	make && make -j1 install || return 1
   62.20 +	make &&
   62.21 +	make -j1 install || return 1
   62.22  
   62.23  	# Init script
   62.24  	cp -a $stuff/etc $install
   62.25 @@ -42,9 +40,7 @@
   62.26  	cp doc/introspect.* $install/usr/share/xml/docbook/stylesheet/dbus
   62.27  }
   62.28  
   62.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
   62.30 -genpkg_rules()
   62.31 -{
   62.32 +genpkg_rules() {
   62.33  	case $PACKAGE in
   62.34  		dbus-helper)
   62.35  			copy dbus-daemon-launch-helper
   62.36 @@ -69,11 +65,9 @@
   62.37  	# Go for echoing on configuration files if any messagebus user
   62.38  	# was found.
   62.39  	if ! grep -qs 'messagebus' "$1/etc/passwd"; then
   62.40 -		action 'Adding user: messagebus...'
   62.41  		chroot "$1/" addgroup -g25 -S messagebus
   62.42  		chroot "$1/" adduser -h/var/run/dbus -S -D -u25 -G messagebus \
   62.43  			-g"D-Bus Message Daemon User" messagebus
   62.44 -		status
   62.45  	fi
   62.46  	if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"; then
   62.47  		action 'Configuring %s/etc/daemons.conf...' "$1"
    63.1 --- a/dcmtk/receipt	Tue Mar 27 12:50:45 2018 +0200
    63.2 +++ b/dcmtk/receipt	Fri Mar 30 19:31:50 2018 +0300
    63.3 @@ -6,39 +6,30 @@
    63.4  SHORT_DESC="The DICOM Toolkit"
    63.5  MAINTAINER="pascal.bellard@slitaz.org"
    63.6  LICENSE="other"
    63.7 +WEB_SITE="http://dicom.offis.de/dcmtk"
    63.8 +
    63.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
   63.10 -WEB_SITE="http://dicom.offis.de/dcmtk"
   63.11  WGET_URL="ftp://dicom.offis.de/pub/dicom/offis/software/$PACKAGE/$PACKAGE${VERSION//./}/$TARBALL"
   63.12  
   63.13  BUILD_DEPENDS="libxml2-dev tiff-dev libpng16-dev zlib-dev libwrap-dev"
   63.14  SPLIT="dcmtk dcmtk-dev"
   63.15  
   63.16 -# Rules to configure and make the package.
   63.17 -compile_rules()
   63.18 -{
   63.19 -	./configure --prefix=/usr \
   63.20 +compile_rules() {
   63.21 +	./configure \
   63.22  		--sysconfdir=/etc/dcmtk \
   63.23 -		--mandir=/usr/share/man \
   63.24  		$CONFIGURE_ARGS &&
   63.25 -	make -j 1 &&
   63.26 +	make -j1 &&
   63.27  	make DESTDIR=$DESTDIR install
   63.28  }
   63.29  
   63.30 -# Rules to gen a SliTaz package suitable for Tazpkg.
   63.31 -genpkg_rules()
   63.32 -{
   63.33 +genpkg_rules() {
   63.34  	case $PACKAGE in
   63.35 -	dcmtk)
   63.36 -		DEPENDS="libxml2 tiff libpng16 libwrap"
   63.37 -		cp -a $install/* $fs/
   63.38 -		;;
   63.39 -	dcmtk-dev)
   63.40 -		CAT="development|development files"
   63.41 -		MAINTAINER="pascal.bellard@slitaz.org"
   63.42 -		DEPENDS="dcmtk"
   63.43 -		mkdir -p $fs/usr/include/dcmtk $fs/usr/lib
   63.44 -		cp -a $src/*/include/dcmtk/* $fs/usr/include/dcmtk
   63.45 -		cp -a $src/*/*/*a $fs/usr/lib
   63.46 -		;;
   63.47 +		dcmtk)
   63.48 +			copy @std
   63.49 +			DEPENDS="libxml2 tiff libpng16 libwrap"
   63.50 +			;;
   63.51 +		*-dev)
   63.52 +			copy @dev
   63.53 +			;;
   63.54  	esac
   63.55  }
    64.1 --- a/dconf-editor/receipt	Tue Mar 27 12:50:45 2018 +0200
    64.2 +++ b/dconf-editor/receipt	Fri Mar 30 19:31:50 2018 +0300
    64.3 @@ -18,9 +18,7 @@
    64.4  	# sdft can't process keywords
    64.5  	sed -i '/_Keywords=/d' editor/ca.desrt.dconf-editor.desktop.in.in
    64.6  
    64.7 -	./configure \
    64.8 -		--sysconfdir=/etc \
    64.9 -		$CONFIGURE_ARGS &&
   64.10 +	./configure $CONFIGURE_ARGS &&
   64.11  	make &&
   64.12  	make install
   64.13  }
    65.1 --- a/dconf/receipt	Tue Mar 27 12:50:45 2018 +0200
    65.2 +++ b/dconf/receipt	Fri Mar 30 19:31:50 2018 +0300
    65.3 @@ -16,9 +16,7 @@
    65.4  SPLIT="dconf-dev"
    65.5  
    65.6  compile_rules() {
    65.7 -	./configure \
    65.8 -		--sysconfdir=/etc \
    65.9 -		$CONFIGURE_ARGS &&
   65.10 +	./configure $CONFIGURE_ARGS &&
   65.11  	make &&
   65.12  	make install
   65.13  }
    66.1 --- a/dhcp/receipt	Tue Mar 27 12:50:45 2018 +0200
    66.2 +++ b/dhcp/receipt	Fri Mar 30 19:31:50 2018 +0300
    66.3 @@ -15,9 +15,7 @@
    66.4  SPLIT="dhcp-client dhcp-relay dhcp-dev"
    66.5  SIBLINGS="dhcp6"
    66.6  
    66.7 -# Rules to configure and make the package.
    66.8 -compile_rules()
    66.9 -{
   66.10 +compile_rules() {
   66.11  	grep -q MYEOL includes/dhctoken.h ||
   66.12  	sed -i "s/SEMI/MYEOL = '\\\\n',\n\tQUESTION = '?',\n\t&/" \
   66.13  		includes/dhctoken.h
   66.14 @@ -25,18 +23,16 @@
   66.15  
   66.16  	./configure \
   66.17  		--disable-dhcpv6 \
   66.18 -		--sysconfdir=/etc \
   66.19  		$CONFIGURE_ARGS &&
   66.20 -	make && make DESTDIR=$DESTDIR install
   66.21 +	make &&
   66.22 +	make DESTDIR=$DESTDIR install || return 1
   66.23  
   66.24  	mkdir -p $install/etc/init.d
   66.25  	cp $stuff/dhcpd $install/etc/init.d
   66.26  	cp $src/client/scripts/linux $install/etc/dhclient-script
   66.27  }
   66.28  
   66.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
   66.30 -genpkg_rules()
   66.31 -{
   66.32 +genpkg_rules() {
   66.33  	case $PACKAGE in
   66.34  		dhcp)
   66.35  			copy dhcpd.conf dhcpd
   66.36 @@ -56,4 +52,3 @@
   66.37  		*-dev) copy @dev;;
   66.38  	esac
   66.39  }
   66.40 -
    67.1 --- a/dhcp6/receipt	Tue Mar 27 12:50:45 2018 +0200
    67.2 +++ b/dhcp6/receipt	Fri Mar 30 19:31:50 2018 +0300
    67.3 @@ -15,27 +15,22 @@
    67.4  SPLIT="dhcp6-client dhcp6-relay dhcp6-dev"
    67.5  SIBLINGS="dhcp"
    67.6  
    67.7 -# Rules to configure and make the package.
    67.8 -compile_rules()
    67.9 -{
   67.10 +compile_rules() {
   67.11  	grep -q MYEOL includes/dhctoken.h ||
   67.12  	sed -i "s/SEMI/MYEOL = '\\\\n',\n\tQUESTION = '?',\n\t&/" \
   67.13  		includes/dhctoken.h
   67.14  	sed -i 's/== NOERROR/== (isc_result_t) NOERROR/' server/ddns.c
   67.15  
   67.16 -	./configure \
   67.17 -		--sysconfdir=/etc \
   67.18 -		$CONFIGURE_ARGS &&
   67.19 -	make && make DESTDIR=$DESTDIR install
   67.20 +	./configure $CONFIGURE_ARGS &&
   67.21 +	make &&
   67.22 +	make DESTDIR=$DESTDIR install || return 1
   67.23  
   67.24  	mkdir -p $install/etc/init.d
   67.25 -	cp $WOK/dhcp/stuff/dhcpd $install/etc/init.d
   67.26 +	cp $WOK/dhcp/stuff/dhcpd     $install/etc/init.d
   67.27  	cp $src/client/scripts/linux $install/etc/dhclient-script
   67.28  }
   67.29  
   67.30 -# Rules to gen a SliTaz package suitable for Tazpkg.
   67.31 -genpkg_rules()
   67.32 -{
   67.33 +genpkg_rules() {
   67.34  	case $PACKAGE in
   67.35  		dhcp6)
   67.36  			copy dhcpd.conf dhcpd
   67.37 @@ -58,4 +53,3 @@
   67.38  		*-dev) copy @dev;;
   67.39  	esac
   67.40  }
   67.41 -
    68.1 --- a/dialog/receipt	Tue Mar 27 12:50:45 2018 +0200
    68.2 +++ b/dialog/receipt	Fri Mar 30 19:31:50 2018 +0300
    68.3 @@ -16,17 +16,15 @@
    68.4  
    68.5  compile_rules() {
    68.6  	./configure \
    68.7 -		--prefix=/usr \
    68.8 -		--sysconfdir=/etc \
    68.9  		--with-ncursesw \
   68.10  		--enable-nls \
   68.11  		--enable-widec \
   68.12  		$CONFIGURE_ARGS &&
   68.13 -	make && make DESTDIR=$DESTDIR install || return 1
   68.14 +	make &&
   68.15 +	make DESTDIR=$DESTDIR install || return 1
   68.16  
   68.17  	# Config file.
   68.18 -	mkdir -p $install/etc
   68.19 -	cp $stuff/dialogrc $install/etc
   68.20 +	install -Dm644 $stuff/dialogrc $install/etc/dialogrc
   68.21  }
   68.22  
   68.23  genpkg_rules() {
    69.1 --- a/dillo/receipt	Tue Mar 27 12:50:45 2018 +0200
    69.2 +++ b/dillo/receipt	Fri Mar 30 19:31:50 2018 +0300
    69.3 @@ -1,36 +1,31 @@
    69.4 -# SliTaz package receipt.
    69.5 +# SliTaz package receipt v2.
    69.6  
    69.7  PACKAGE="dillo"
    69.8  VERSION="3.0.4"
    69.9  CATEGORY="network"
   69.10 -SHORT_DESC="Light and fast web browse using FLTK."
   69.11 +SHORT_DESC="Light and fast web browse using FLTK"
   69.12  MAINTAINER="pankso@slitaz.org"
   69.13  LICENSE="GPL3"
   69.14 +WEB_SITE="http://www.dillo.org/"
   69.15 +
   69.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   69.17 -WEB_SITE="http://www.dillo.org/"
   69.18  WGET_URL="http://www.dillo.org/download/$TARBALL"
   69.19 -TAGS="web-browser"
   69.20  
   69.21 -DEPENDS="fltk libpng16 jpeg zlib openssl xorg-libX11 gcc-lib-base"
   69.22  BUILD_DEPENDS="fltk-dev libpng16-dev jpeg-dev zlib-dev openssl-dev \
   69.23  xorg-libX11-dev"
   69.24  
   69.25 -# Rules to configure and make the package.
   69.26 -compile_rules()
   69.27 -{
   69.28 +compile_rules() {
   69.29  	patch -p0 < $stuff/fltk-1.3.3.u
   69.30  	cp -f $stuff/pixmaps.slitaz.h src/pixmaps.h &&
   69.31 +
   69.32  	./configure \
   69.33 -		--sysconfdir=/etc \
   69.34 -		--prefix=/usr \
   69.35  		--enable-ssl \
   69.36  		$CONFIGURE_ARGS &&
   69.37 -	make && make install
   69.38 +	make &&
   69.39 +	make install
   69.40  }
   69.41  
   69.42 -# Rules to gen a SliTaz package suitable for Tazpkg.
   69.43 -genpkg_rules()
   69.44 -{
   69.45 +genpkg_rules() {
   69.46  	mkdir -p $fs/usr/lib $fs/usr/share
   69.47  	cp -a $install/usr/bin $fs/usr
   69.48  	cp -a $install/usr/lib/dillo $fs/usr/lib
   69.49 @@ -43,4 +38,6 @@
   69.50  	# Dillo version for user agent string
   69.51  	sed -i s"/_dillo_version_/$VERSION/" $fs/etc/dillo/dillorc
   69.52  	chown -R root.root $fs
   69.53 +	DEPENDS="fltk libpng16 jpeg zlib openssl xorg-libX11 gcc-lib-base"
   69.54 +	TAGS="web-browser"
   69.55  }
    70.1 --- a/directfb/receipt	Tue Mar 27 12:50:45 2018 +0200
    70.2 +++ b/directfb/receipt	Fri Mar 30 19:31:50 2018 +0300
    70.3 @@ -3,62 +3,47 @@
    70.4  PACKAGE="directfb"
    70.5  VERSION="1.4.3"
    70.6  CATEGORY="system-tools"
    70.7 -SHORT_DESC="Thin library that provides hardware graphics acceleration."
    70.8 +SHORT_DESC="Thin library that provides hardware graphics acceleration"
    70.9  MAINTAINER="pankso@slitaz.org"
   70.10  LICENSE="LGPL2.1"
   70.11 +WEB_SITE="http://www.directfb.org/"
   70.12 +
   70.13  SOURCE="DirectFB"
   70.14  TARBALL="$SOURCE-$VERSION.tar.gz"
   70.15 -WEB_SITE="http://www.directfb.org/"
   70.16  WGET_URL="http://www.directfb.org/downloads/Core/$SOURCE-${VERSION%.*}/$TARBALL"
   70.17  
   70.18 +BUILD_DEPENDS_arm="libpng12-dev jpeg-dev freetype-dev"
   70.19  BUILD_DEPENDS="libpng12-dev jpeg-dev freetype-dev tslib-dev perl"
   70.20  SPLIT="directfb-dev"
   70.21  
   70.22 -# Handle cross compilation.
   70.23 -case "$ARCH" in
   70.24 -	arm) 
   70.25 -		BUILD_DEPENDS="libpng12-dev jpeg-dev freetype-dev"
   70.26 -		ARCH_ARGS="--with-gfxdrivers=none --disable-x11"
   70.27 -		export LDFLAGS="$LDFLAGS -L/cross/arm/sysroot/usr/lib"
   70.28 -		export CPPFLAGS="$CPPFLAGS -I/cross/arm/sysroot/usr/include" ;;
   70.29 -esac
   70.30  
   70.31 -# Handle SliTaz arch installation.
   70.32 -case "$SLITAZ_ARCH" in
   70.33 -	arm) DEPENDS="libpng12 libjpeg freetype zlib" ;;
   70.34 -esac
   70.35 -
   70.36 -# Rules to configure and make the package.
   70.37 -compile_rules()
   70.38 -{
   70.39 +compile_rules() {
   70.40 +	case "$ARCH" in
   70.41 +		arm)
   70.42 +			ARCH_ARGS="--with-gfxdrivers=none --disable-x11"
   70.43 +			export LDFLAGS="$LDFLAGS -L/cross/arm/sysroot/usr/lib"
   70.44 +			export CPPFLAGS="$CPPFLAGS -I/cross/arm/sysroot/usr/include"
   70.45 +			;;
   70.46 +	esac
   70.47  	./configure \
   70.48 -		--prefix=/usr \
   70.49 -		--sysconfdir=/etc \
   70.50  		--with-dither-rgb16=none \
   70.51 -		$CONFIGURE_ARGS $ARCH_ARGS &&
   70.52 -	make && make DESTDIR=$DESTDIR install
   70.53 +		$ARCH_ARGS \
   70.54 +		$CONFIGURE_ARGS &&
   70.55 +	make &&
   70.56 +	make DESTDIR=$DESTDIR install
   70.57  }
   70.58  
   70.59 -# Rules to gen a SliTaz package suitable for Tazpkg.
   70.60 -genpkg_rules()
   70.61 -{
   70.62 +genpkg_rules() {
   70.63  	case $PACKAGE in
   70.64 -	directfb)
   70.65 -		DEPENDS="libpng12 libjpeg freetype tslib zlib"
   70.66 -		mkdir -p $fs/usr/lib $fs/usr/share
   70.67 -		cp -a $install/usr/bin $fs/usr
   70.68 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
   70.69 -		cp -a $install/usr/lib/directfb-* $fs/usr/lib
   70.70 -		cp -a $install/usr/share/directfb-* $fs/usr/share
   70.71 -		find $fs/usr/lib -name "*.*a" -exec rm '{}' \;
   70.72 -		;;
   70.73 -	directfb-dev)
   70.74 -		mkdir -p $fs/usr/lib
   70.75 -		cp -a $install/usr/include $fs/usr
   70.76 -		cp -a $install/usr/lib/*.*a $fs/usr/lib
   70.77 -		cp -a $install/usr/lib/directfb-* $fs/usr/lib
   70.78 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   70.79 -		find $fs/usr/lib -name "*.so*" -exec rm '{}' \;
   70.80 -		;;
   70.81 +		directfb)
   70.82 +			copy @std
   70.83 +			DEPENDS="libpng12 libjpeg freetype tslib zlib"
   70.84 +			case "$SLITAZ_ARCH" in
   70.85 +				arm) DEPENDS="libpng12 libjpeg freetype zlib" ;;
   70.86 +			esac
   70.87 +			;;
   70.88 +		*-dev)
   70.89 +			copy @dev
   70.90 +			;;
   70.91  	esac
   70.92  }
    71.1 --- a/distcc/receipt	Tue Mar 27 12:50:45 2018 +0200
    71.2 +++ b/distcc/receipt	Fri Mar 30 19:31:50 2018 +0300
    71.3 @@ -18,19 +18,18 @@
    71.4  compile_rules() {
    71.5  	export CFLAGS="-Wno-error=unused-but-set-variable -Wno-unused-local-typedefs"
    71.6  	./configure \
    71.7 -		--prefix=/usr \
    71.8 -		--sysconfdir=/etc \
    71.9 -		--mandir=/usr/share/man \
   71.10  		--with-gnome \
   71.11  		--with-gtk \
   71.12  		$CONFIGURE_ARGS &&
   71.13 -	make && make DESTDIR=$DESTDIR install
   71.14 +	make &&
   71.15 +	make DESTDIR=$DESTDIR install
   71.16  }
   71.17  
   71.18  genpkg_rules() {
   71.19  	case $PACKAGE in
   71.20  		distcc)
   71.21 -			mkdir -p $fs/usr \
   71.22 +			mkdir -p \
   71.23 +				$fs/usr \
   71.24  				$fs/var/log/distccd \
   71.25  				$fs/etc/init.d
   71.26  
    72.1 --- a/djvulibre/receipt	Tue Mar 27 12:50:45 2018 +0200
    72.2 +++ b/djvulibre/receipt	Fri Mar 30 19:31:50 2018 +0300
    72.3 @@ -16,9 +16,7 @@
    72.4  SPLIT="djvulibre-dev"
    72.5  
    72.6  compile_rules() {
    72.7 -	./configure \
    72.8 -		--sysconfdir=/etc \
    72.9 -		$CONFIGURE_ARGS &&
   72.10 +	./configure $CONFIGURE_ARGS &&
   72.11  	make &&
   72.12  	make install
   72.13  }
   72.14 @@ -26,17 +24,11 @@
   72.15  genpkg_rules() {
   72.16  	case $PACKAGE in
   72.17  		djvulibre)
   72.18 -			mkdir -p $fs/usr/lib $fs/usr/share
   72.19 -			cp -a $install/usr/lib/*so* $fs/usr/lib
   72.20 -			cp -a $install/usr/bin $fs/usr
   72.21 -			cp -a $install/usr/share/djvu $fs/usr/share
   72.22 +			copy @std
   72.23  			DEPENDS="gcc-lib-base tiff jpeg libpng12"
   72.24  			;;
   72.25  		*-dev)
   72.26 -			mkdir -p $fs/usr/lib
   72.27 -			cp -a $install/usr/include $fs/usr
   72.28 -			cp -a $install/usr/lib/*a $fs/usr/lib
   72.29 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   72.30 +			copy @dev
   72.31  			;;
   72.32  	esac
   72.33  }
    73.1 --- a/dovecot/receipt	Tue Mar 27 12:50:45 2018 +0200
    73.2 +++ b/dovecot/receipt	Fri Mar 30 19:31:50 2018 +0300
    73.3 @@ -1,26 +1,22 @@
    73.4 -# SliTaz package receipt.
    73.5 +# SliTaz package receipt v2.
    73.6  
    73.7  PACKAGE="dovecot"
    73.8  VERSION="2.1.6"
    73.9  CATEGORY="network"
   73.10 -SHORT_DESC="Dovecot IMAP and POP3 Server."
   73.11 +SHORT_DESC="Dovecot IMAP and POP3 Server"
   73.12  MAINTAINER="l.lemarinel@gmail.com"
   73.13  LICENSE="LGPL2.1"
   73.14 +WEB_SITE="http://dovecot.org"
   73.15 +
   73.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   73.17 -WEB_SITE="http://dovecot.org"
   73.18  WGET_URL="http://www.dovecot.org/releases/${VERSION:0:3}/$TARBALL"
   73.19  
   73.20 -DEPENDS="openssl libcap openldap pam postgresql libmysqlclient"
   73.21  BUILD_DEPENDS="openssl-dev libcap-dev openldap-dev \
   73.22 - libmysqlclient mysql-dev sqlite3-dev pam-dev postgresql-dev"
   73.23 +libmysqlclient mysql-dev sqlite3-dev pam-dev postgresql-dev"
   73.24  
   73.25 -# Rules to configure and make the package.
   73.26 -compile_rules()
   73.27 -{
   73.28 -	cd $src
   73.29 -	./configure  --prefix=/usr \
   73.30 +compile_rules() {
   73.31 +	./configure \
   73.32  		--sysconfdir=/etc/dovecot \
   73.33 -		--localstatedir=/var \
   73.34  		--libexecdir=/usr/lib/$PACKAGE \
   73.35  		--with-ssl=openssl \
   73.36  		--with-ldap=plugin \
   73.37 @@ -30,24 +26,20 @@
   73.38  		--with-sqlite \
   73.39  		$CONFIGURE_ARGS &&
   73.40  	make &&
   73.41 -	make DESTDIR=$DESTDIR install
   73.42 -	
   73.43 +	make DESTDIR=$DESTDIR install || return 1
   73.44 +
   73.45 +	install -Dm755 $stuff/init.d/dovecot $install/etc/init.d/dovecot
   73.46  }
   73.47  
   73.48 -# Rules to gen a SliTaz package suitable for Tazpkg.
   73.49 -genpkg_rules()
   73.50 -{
   73.51 +genpkg_rules() {
   73.52  	mkdir -p $fs/usr/lib \
   73.53  		$fs/var/log/dovecot \
   73.54  		$fs/etc/ssl/misc
   73.55 -		
   73.56 -	
   73.57 +
   73.58  	cp -a $install/usr/sbin $fs/usr
   73.59  	cp -a $install/usr/bin $fs/usr
   73.60  	cp -a $install/usr/lib $fs/usr
   73.61  	cp -a $install/etc $fs/
   73.62 -	
   73.63 -	cp -pa $stuff/init.d $fs/etc
   73.64  
   73.65  	#cp -pa $fs/etc/dovecot/dovecot-example.conf $fs/etc/dovecot/dovecot.conf
   73.66  	cp -pa $install/usr/share/doc/dovecot/example-config/* $fs/etc/dovecot/
   73.67 @@ -55,68 +47,57 @@
   73.68  	#cp -pa $src/doc/example-config/conf.d/*.ext $fs/etc/dovecot/conf.d
   73.69  	cp -pa $src/doc/*.cnf $fs/etc/ssl
   73.70  	cp -pa $src/doc/mkcert.sh $fs/etc/ssl/misc/dovmkcert.sh
   73.71 -	
   73.72 +
   73.73  	# Remove archive file *.*a
   73.74  	find $fs -name "*.*a" -exec rm -f {} \;
   73.75 -	
   73.76 +
   73.77  	# Fix perms
   73.78  	chmod 755 $fs/etc/ssl/misc/*
   73.79 -	
   73.80 +
   73.81  	# Customising config.
   73.82  	sed -i -e "s/^#default_vsz_limit.*/default_vsz_limit = 50M/" \
   73.83  		$fs/etc/dovecot/conf.d/10-master.conf
   73.84  
   73.85  	sed -i -e "s!^#log_path =.*!log_path = /var/log/dovecot/dovecot.log!" \
   73.86  		$fs/etc/dovecot/conf.d/10-logging.conf
   73.87 -	
   73.88 +
   73.89  	sed -i -e "s/^#listen.*/listen = */" \
   73.90  		$fs/etc/dovecot/dovecot.conf
   73.91  
   73.92  	# Unsafe, see CVE-2014-3566 POODLE
   73.93  	sed -i -e "s/^#ssl_protocols =.*/ssl_protocols = !SSLv2 !SSLv3/" \
   73.94  		$fs/etc/dovecot/conf.d/10-ssl.conf
   73.95 +	DEPENDS="openssl libcap openldap pam postgresql libmysqlclient"
   73.96  }
   73.97  
   73.98 -#nd post install commands for Tazpkg.
   73.99 -post_install()
  73.100 -{
  73.101 -	local user
  73.102 -	local group
  73.103 -	
  73.104 -	user=dovecot
  73.105 -	group=dovecot
  73.106 -	
  73.107 +post_install() {
  73.108 +	local user=dovecot group=dovecot
  73.109 +
  73.110  	if ! grep -q $user "$1/etc/passwd"; then
  73.111 -		echo -n "Adding user/group $user..."
  73.112  		chroot "$1/" addgroup -g 76 -S $group
  73.113 -		chroot "$1/" adduser -u 76 -S -D -H -G $group $user
  73.114 -		chroot "$1/" adduser -u 74 -S -D -H -G nogroup dovenull 
  73.115 -		status
  73.116 +		chroot "$1/" adduser  -u 76 -S -D -H -G $group  $user
  73.117 +		chroot "$1/" adduser  -u 74 -S -D -H -G nogroup dovenull
  73.118  	fi
  73.119 -	
  73.120  
  73.121  	# Set perms for files and directories
  73.122 -	chroot "$1/" chown -R ${user}.${group} /var/log/${user} \
  73.123 +	chroot "$1/" chown -R $user:$group /var/log/dovecot
  73.124  
  73.125 -	cat <<EOF
  73.126 -----
  73.127 -To start $PACKAGE server you can run :
  73.128 +	[ -n "$quiet" } || cat <<EOF
  73.129  
  73.130 -    /etc/init.d/$PACKAGE start
  73.131 -
  73.132 -Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf
  73.133 -----
  73.134 +	.------------------------------------------------.
  73.135 +	| To start dovecot server you can run:           |
  73.136 +	|   /etc/init.d/dovecot start                    |
  73.137 +	|                                                |
  73.138 +	| Or add dovecot to RUN_DAEMONS in /etc/rcS.conf |
  73.139 +	'------------------------------------------------'
  73.140  EOF
  73.141  }
  73.142  
  73.143  
  73.144 -post_remove()
  73.145 -{
  73.146 -	echo "Removing stalled files..."
  73.147 -	test -d "$1/var/log/dovecot" && rm -rf "$1/var/log/dovecot"
  73.148 -	test -d "$1/var/run/dovecot" && rm -rf "$1/var/run/dovecot"
  73.149 -	
  73.150 -	echo "Removing user/group daemon"
  73.151 -	chroot "$1/" deluser dovecot 
  73.152 +post_remove() {
  73.153 +	[ -d "$1/var/log/dovecot" ] && rm -rf "$1/var/log/dovecot"
  73.154 +	[ -d "$1/var/run/dovecot" ] && rm -rf "$1/var/run/dovecot"
  73.155 +
  73.156 +	chroot "$1/" deluser dovecot
  73.157  	chroot "$1/" deluser dovenull
  73.158  }
    74.1 --- a/drbd-utils/receipt	Tue Mar 27 12:50:45 2018 +0200
    74.2 +++ b/drbd-utils/receipt	Fri Mar 30 19:31:50 2018 +0300
    74.3 @@ -1,30 +1,24 @@
    74.4 -# SliTaz package receipt.
    74.5 +# SliTaz package receipt v2.
    74.6  
    74.7  PACKAGE="drbd-utils"
    74.8  VERSION="8.9.1"
    74.9  CATEGORY="system-tools"
   74.10 -SHORT_DESC="DRBD is a block device to build high availability clusters."
   74.11 +SHORT_DESC="DRBD is a block device to build high availability clusters"
   74.12  MAINTAINER="pascal.bellard@slitaz.org"
   74.13  LICENSE="GPL2"
   74.14 +WEB_SITE="http://drbd.linbit.com/"
   74.15 +
   74.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   74.17 -WEB_SITE="http://drbd.linbit.com/"
   74.18  WGET_URL="http://oss.linbit.com/drbd/$TARBALL"
   74.19  
   74.20  BUILD_DEPENDS="flex libxslt"
   74.21  
   74.22 -# Rules to configure and make the package.
   74.23 -compile_rules()
   74.24 -{
   74.25 -	./configure --prefix=/usr \
   74.26 -		--sysconfdir=/etc \
   74.27 -		--localstatedir=/var \
   74.28 -		$CONFIGURE_ARGS &&
   74.29 +compile_rules() {
   74.30 +	./configure $CONFIGURE_ARGS &&
   74.31  	make &&
   74.32  	make DESTDIR=$DESTDIR install
   74.33  }
   74.34  
   74.35 -# Rules to gen a SliTaz package suitable for Tazpkg.
   74.36 -genpkg_rules()
   74.37 -{
   74.38 -	cp -a $install/* $fs/
   74.39 +genpkg_rules() {
   74.40 +	copy @std
   74.41  }
    75.1 --- a/e2fsprogs/receipt	Tue Mar 27 12:50:45 2018 +0200
    75.2 +++ b/e2fsprogs/receipt	Fri Mar 30 19:31:50 2018 +0300
    75.3 @@ -19,11 +19,11 @@
    75.4  
    75.5  compile_rules() {
    75.6  	sed -i -e 's:\[\.-\]::' tests/filter.sed
    75.7 -	mkdir ../build && cd ../build
    75.8 +	mkdir build
    75.9 +	cd    build
   75.10  
   75.11  	$src/configure \
   75.12  		--bindir=/bin \
   75.13 -		--sysconfdir=/etc \
   75.14  		--with-root-prefix="" \
   75.15  		--enable-elf-shlibs \
   75.16  		--disable-libblkid \
   75.17 @@ -31,7 +31,9 @@
   75.18  		--disable-uuidd \
   75.19  		--disable-fsck \
   75.20  		$CONFIGURE_ARGS &&
   75.21 -	make && make install && make install-libs || return 1
   75.22 +	make &&
   75.23 +	make install &&
   75.24 +	make install-libs || return 1
   75.25  
   75.26  	for i in libcom_err libe2p libext2fs libss; do
   75.27  		chmod u+w $install/usr/lib/$i.a
    76.1 --- a/ejabberd/receipt	Tue Mar 27 12:50:45 2018 +0200
    76.2 +++ b/ejabberd/receipt	Fri Mar 30 19:31:50 2018 +0300
    76.3 @@ -1,39 +1,31 @@
    76.4 -# SliTaz package receipt.
    76.5 +# SliTaz package receipt v2.
    76.6  
    76.7  PACKAGE="ejabberd"
    76.8  VERSION="2.1.6"
    76.9  CATEGORY="network"
   76.10 -SHORT_DESC="Jabber/XMPP instant messaging server (real-time communication)."
   76.11 +SHORT_DESC="Jabber/XMPP instant messaging server (real-time communication)"
   76.12  MAINTAINER="pascal.bellard@slitaz.org"
   76.13  LICENSE="GPL2"
   76.14 +WEB_SITE="http://www.ejabberb.im/"
   76.15 +
   76.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   76.17 -WEB_SITE="http://www.ejabberb.im/"
   76.18  WGET_URL="http://www.process-one.net/downloads/$PACKAGE/$VERSION/$TARBALL"
   76.19 -CONFIG_FILES="/etc/ejabberd"
   76.20 -TAGS="im instant-messaging server"
   76.21  
   76.22 -DEPENDS="erlang expat openssl zlib"
   76.23  BUILD_DEPENDS="erlang expat-dev openssl-dev zlib-dev"
   76.24  
   76.25 -# Rules to configure and make the package.
   76.26 -compile_rules()
   76.27 -{
   76.28 +compile_rules() {
   76.29  	cd $src/src
   76.30 -	./configure --prefix=/usr \
   76.31 -		--infodir=/usr/share/info \
   76.32 -		--mandir=/usr/share/man \
   76.33 -		--sysconfdir=/etc \
   76.34 -		--localstatedir=/var \
   76.35 -		$CONFIGURE_ARGS &&
   76.36 +	./configure $CONFIGURE_ARGS &&
   76.37  	make &&
   76.38 -	make DESTDIR=$DESTDIR install
   76.39 +	make DESTDIR=$DESTDIR install || return 1
   76.40 +
   76.41 +	mkdir -p                    $install/etc/init.d/
   76.42 +	ln -s /usr/sbin/ejabberdctl $install/etc/init.d/ejabberd
   76.43  }
   76.44  
   76.45 -# Rules to gen a SliTaz package suitable for Tazpkg.
   76.46 -genpkg_rules()
   76.47 -{
   76.48 -	mkdir -p $fs/etc/init.d
   76.49 -	cp -a $install/* $fs
   76.50 -	ln -s /usr/sbin/ejabberdctl $fs/etc/init.d/ejabberd
   76.51 +genpkg_rules() {
   76.52 +	copy @std
   76.53 +	DEPENDS="erlang expat openssl zlib"
   76.54 +	CONFIG_FILES="/etc/ejabberd"
   76.55 +	TAGS="im instant-messaging server"
   76.56  }
   76.57 -
    77.1 --- a/ekiga/receipt	Tue Mar 27 12:50:45 2018 +0200
    77.2 +++ b/ekiga/receipt	Fri Mar 30 19:31:50 2018 +0300
    77.3 @@ -1,48 +1,44 @@
    77.4 -# SliTaz package receipt.
    77.5 +# SliTaz package receipt v2.
    77.6  
    77.7  PACKAGE="ekiga"
    77.8  VERSION="3.2.6"
    77.9  CATEGORY="network"
   77.10 -SHORT_DESC="SIP and H.323 compatible VoIP telephony and video conferencing."
   77.11 +SHORT_DESC="SIP and H.323 compatible VoIP telephony and video conferencing"
   77.12  MAINTAINER="pascal.bellard@slitaz.org"
   77.13  LICENSE="GPL2"
   77.14 +WEB_SITE="http://www.ekiga.org/"
   77.15 +
   77.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   77.17 -WEB_SITE="http://www.ekiga.org/"
   77.18 -WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
   77.19 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   77.20  
   77.21  BUILD_DEPENDS="opal-dev opal ptlib-dev ptlib gtk+-dev intltool libsigc++ \
   77.22  libsigc++-dev openssl-dev libsdl-dev libunixODBC dbus-dev dbus-glib-dev \
   77.23  libxml2-dev file"
   77.24 -DEPENDS="opal ptlib cyrus-sasl openssl libsdl libunixODBC dbus \
   77.25 -dbus-glib expat gtk+ libsigc++ libxml2 xorg-libXdamage"
   77.26 -TAGS="telephony"
   77.27  
   77.28 -# Rules to configure and make the package.
   77.29 -compile_rules()
   77.30 -{
   77.31 -	cd $src
   77.32 +compile_rules() {
   77.33  	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11 -lXext -lpt"
   77.34  	sed -i 's/CXXFLAGS="-g -O2"/CXXFLAGS="-g -fexceptions -O2"/' configure
   77.35 -	./configure --prefix=/usr --sysconfdir=/etc \
   77.36 -	--libexecdir=/usr/bin --mandir=/usr/share/man \
   77.37 -	--with-boost-libdir=/usr/lib \
   77.38 -	--disable-gnome --disable-gconf --disable-eds --disable-notify \
   77.39 -	--disable-xv --disable-avahi --disable-scrollkeeper --disable-gdu \
   77.40 -	--disable-ldap \
   77.41 -	$CONFIGURE_ARGS &&
   77.42 +
   77.43 +	./configure \
   77.44 +		--libexecdir=/usr/bin \
   77.45 +		--with-boost-libdir=/usr/lib \
   77.46 +		--disable-gnome \
   77.47 +		--disable-gconf \
   77.48 +		--disable-eds \
   77.49 +		--disable-notify \
   77.50 +		--disable-xv \
   77.51 +		--disable-avahi \
   77.52 +		--disable-scrollkeeper \
   77.53 +		--disable-gdu \
   77.54 +		--disable-ldap \
   77.55 +		$CONFIGURE_ARGS &&
   77.56  	make $MAKEFLAGS &&
   77.57  	make DESTDIR=$DESTDIR install
   77.58  }
   77.59  
   77.60 -# Rules to gen a SliTaz package suitable for Tazpkg.
   77.61 -genpkg_rules()
   77.62 -{
   77.63 -	mkdir -p $fs/usr/share
   77.64 -	cp -a $install/etc $fs
   77.65 -	cp -a $install/usr/bin $fs/usr
   77.66 -	cp -a $install/usr/share/sounds $fs/usr/share
   77.67 -	cp -a $install/usr/share/icons $fs/usr/share
   77.68 -	cp -a $install/usr/share/pixmaps $fs/usr/share
   77.69 -	cp -a $install/usr/share/dbus-1 $fs/usr/share
   77.70 -	cp -a $install/usr/share/applications $fs/usr/share
   77.71 +genpkg_rules() {
   77.72 +	copy @std
   77.73 +	DEPENDS="opal ptlib cyrus-sasl openssl libsdl libunixODBC dbus \
   77.74 +	dbus-glib expat gtk+ libsigc++ libxml2 xorg-libXdamage"
   77.75 +	TAGS="telephony"
   77.76  }
    78.1 --- a/enchant/receipt	Tue Mar 27 12:50:45 2018 +0200
    78.2 +++ b/enchant/receipt	Fri Mar 30 19:31:50 2018 +0300
    78.3 @@ -16,8 +16,10 @@
    78.4  SPLIT="enchant-aspell enchant-hunspell enchant enchant-dev"
    78.5  
    78.6  compile_rules() {
    78.7 -	fix ld &&
    78.8 -	./configure $CONFIGURE_ARGS && fix libtool && make && make install
    78.9 +	./configure $CONFIGURE_ARGS &&
   78.10 +	fix libtool &&
   78.11 +	make &&
   78.12 +	make install
   78.13  }
   78.14  
   78.15  genpkg_rules() {
    79.1 --- a/engrampa/receipt	Tue Mar 27 12:50:45 2018 +0200
    79.2 +++ b/engrampa/receipt	Fri Mar 30 19:31:50 2018 +0300
    79.3 @@ -17,11 +17,9 @@
    79.4  
    79.5  compile_rules() {
    79.6  	./autogen.sh \
    79.7 -		--sysconfdir=/etc \
    79.8 -		--localstatedir=/var \
    79.9 -		\
   79.10  		--disable-packagekit \
   79.11  		$CONFIGURE_ARGS &&
   79.12 +	fix libtool &&
   79.13  	make &&
   79.14  	make install
   79.15  }
    80.1 --- a/enlightenment/receipt	Tue Mar 27 12:50:45 2018 +0200
    80.2 +++ b/enlightenment/receipt	Fri Mar 30 19:31:50 2018 +0300
    80.3 @@ -5,50 +5,46 @@
    80.4  CATEGORY="x-window"
    80.5  SHORT_DESC="Enlightenment window manager (E17)"
    80.6  MAINTAINER="pankso@slitaz.org"
    80.7 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    80.8  LICENSE="BSD"
    80.9  WEB_SITE="http://www.enlightenment.org/"
   80.10 +
   80.11 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   80.12  WGET_URL="http://download.enlightenment.org/releases/$TARBALL"
   80.13 -TAGS="e enlightenment window-manager"
   80.14 +
   80.15 +BUILD_DEPENDS_arm="eet-dev evas-dev ecore-dev eeze-dev emotion-dev efreet-dev \
   80.16 +edbus-dev libelementary elementary-dev edje-dev ethumb-dev eio-dev \
   80.17 +alsa-lib-dev xorg-xcb-util-keysyms-dev bluez-dev connman-dev pam-dev"
   80.18 +BUILD_DEPENDS="eet-dev evas-dev ecore-dev eeze-dev emotion-dev efreet-dev \
   80.19 +edbus-dev libelementary elementary-dev edje-dev ethumb-dev eio-dev \
   80.20 +alsa-lib-dev xorg-xcb-util-keysyms-dev bluez-dev connman-dev pam-dev pm-utils"
   80.21 +SPLIT="enlightenment enlightenment-pam enlightenment-backgrounds"
   80.22  
   80.23  LOCALES="cs da de el es fr fr_CH hu it pl pt pt_BR ru sl sv zh_CN zh_TW"
   80.24 -BUILD_DEPENDS="eet-dev evas-dev ecore-dev eeze-dev emotion-dev efreet-dev \
   80.25 -edbus-dev libelementary elementary-dev edje-dev ethumb-dev eio-dev \
   80.26 -alsa-lib-dev xorg-xcb-util-keysyms-dev bluez-dev connman-dev pam-dev"
   80.27 -SPLIT="enlightenment enlightenment-pam enlightenment-backgrounds"
   80.28  
   80.29 -case "$ARCH" in
   80.30 -	i?86) BUILD_DEPENDS="$BUILD_DEPENDS pm-utils" ;;
   80.31 -esac
   80.32 -
   80.33 -# Rules to configure and make the package.
   80.34 -compile_rules()
   80.35 -{
   80.36 +compile_rules() {
   80.37  	cp -a $src $src-pam
   80.38  	export CFLAGS="$CFLAGS -fvisibility=hidden"
   80.39  	export LDFLAGS="$LDFLAGS -fvisibility=hidden"
   80.40  	./configure \
   80.41 -		--sysconfdir=/etc \
   80.42  		--disable-connman \
   80.43  		--disable-enlightenment-menu \
   80.44  		--disable-doc \
   80.45  		--build=${ARCH}-slitaz-gnulinux \
   80.46  		$CONFIGURE_ARGS &&
   80.47 -	make $MAKEFLAGS && make install || return 1
   80.48 +	make $MAKEFLAGS &&
   80.49 +	make install || return 1
   80.50  
   80.51  	cd $src-pam
   80.52  	./configure \
   80.53 -		--sysconfdir=/etc \
   80.54  		--disable-mount-hal \
   80.55  		--disable-doc \
   80.56  		--build=${ARCH}-slitaz-gnulinux \
   80.57  		$CONFIGURE_ARGS &&
   80.58 -	make $MAKEFLAGS && make DESTDIR=$DESTDIR-pam install
   80.59 +	make $MAKEFLAGS &&
   80.60 +	make DESTDIR=$DESTDIR-pam install
   80.61  }
   80.62  
   80.63 -# Rules to gen a SliTaz package suitable for Tazpkg.
   80.64 -genpkg_rules()
   80.65 -{
   80.66 +genpkg_rules() {
   80.67  	case $PACKAGE in
   80.68  	enlightenment|enlightenment-pam)
   80.69  		DEPENDS="eet evas ecore eeze emotion efreet edbus edje \
   80.70 @@ -88,10 +84,10 @@
   80.71  			$fs/usr/share/enlightenment/data/backgrounds
   80.72  		;;
   80.73  	esac
   80.74 +	TAGS="e enlightenment window-manager"
   80.75  }
   80.76  
   80.77 -post_install_enlightenment()
   80.78 -{
   80.79 +post_install_enlightenment() {
   80.80  	res=$(grep ^session < "$1/etc/slim.conf" | sed s/"sessions. *"// \
   80.81  		| sed s/,e17//)
   80.82  	# Adding WM to SLIM available sessions.
   80.83 @@ -103,16 +99,14 @@
   80.84  	fi
   80.85  }
   80.86  
   80.87 -post_remove_enlightenment()
   80.88 -{
   80.89 +post_remove_enlightenment() {
   80.90  	# Remove WM from SLIM available sessions.
   80.91  	if grep -q enlightenment "$1/etc/slim.conf"; then
   80.92  		sed -i s/enlightenment,// "$1/etc/slim.conf"
   80.93  	fi
   80.94  }
   80.95  
   80.96 -post_install_enlightenment_pam()
   80.97 -{
   80.98 +post_install_enlightenment_pam() {
   80.99  	res=$(grep ^session < "$1/etc/slim.conf" | sed s/"sessions. *"// \
  80.100  		| sed s/,e17//)
  80.101  	# Adding WM to SLIM available sessions.
  80.102 @@ -124,8 +118,7 @@
  80.103  	fi
  80.104  }
  80.105  
  80.106 -post_remove_enlightenment_pam()
  80.107 -{
  80.108 +post_remove_enlightenment_pam() {
  80.109  	# Remove WM from SLIM available sessions.
  80.110  	if grep -q enlightenment "$1/etc/slim.conf"; then
  80.111  		sed -i s/enlightenment,// "$1/etc/slim.conf"
    81.1 --- a/eom/receipt	Tue Mar 27 12:50:45 2018 +0200
    81.2 +++ b/eom/receipt	Fri Mar 30 19:31:50 2018 +0300
    81.3 @@ -19,9 +19,8 @@
    81.4  
    81.5  compile_rules() {
    81.6  	./autogen.sh \
    81.7 -		--sysconfdir=/etc \
    81.8 -		--localstatedir=/var \
    81.9  		$CONFIGURE_ARGS &&
   81.10 +	fix libtool &&
   81.11  	make &&
   81.12  	make install
   81.13  }
    82.1 --- a/erlang/receipt	Tue Mar 27 12:50:45 2018 +0200
    82.2 +++ b/erlang/receipt	Fri Mar 30 19:31:50 2018 +0300
    82.3 @@ -1,36 +1,32 @@
    82.4 -# SliTaz package receipt.
    82.5 +# SliTaz package receipt v2.
    82.6  
    82.7  PACKAGE="erlang"
    82.8  VERSION="R15B01"
    82.9  CATEGORY="development"
   82.10 -SHORT_DESC="Erlang programming language."
   82.11 +SHORT_DESC="Erlang programming language"
   82.12  MAINTAINER="pascal.bellard@slitaz.org"
   82.13  LICENSE="other"
   82.14 +WEB_SITE="http://$PACKAGE.org/"
   82.15 +
   82.16  SOURCE="otp_src"
   82.17  TARBALL="${SOURCE}_$VERSION.tar.gz"
   82.18 -WEB_SITE="http://$PACKAGE.org/"
   82.19  WGET_URL="${WEB_SITE}download/$TARBALL"
   82.20  
   82.21 -DEPENDS="ncurses openssl libunixODBC"
   82.22  BUILD_DEPENDS="perl ncurses-dev openssl-dev unixODBC-dev icedtea6-jdk"
   82.23  
   82.24 -# Rules to configure and make the package.
   82.25 -compile_rules()
   82.26 -{
   82.27 +compile_rules() {
   82.28  	export LANG=C
   82.29  	sed -i 's|./Install|sh -x Install|' Makefile*
   82.30 -	
   82.31 -	./configure \
   82.32 -		--prefix=/usr \
   82.33 -		--sysconfdir=/etc \
   82.34 -		--mandir=/usr/share/man \
   82.35 -		--infodir=/usr/share/info \
   82.36 -		$CONFIGURE_ARGS &&
   82.37 +
   82.38 +	./configure $CONFIGURE_ARGS &&
   82.39  	make -j 1 &&
   82.40  	make -j 1 INSTALL_PREFIX=$DESTDIR install || return 1
   82.41 -	
   82.42 -	for i in $DESTDIR/usr/lib/erlang/*/bin/erl $DESTDIR/usr/lib/erlang/bin/erl \
   82.43 -		 $DESTDIR/usr/lib/erlang/*/bin/start $DESTDIR/usr/lib/erlang/bin/start
   82.44 +
   82.45 +	for i in \
   82.46 +		$DESTDIR/usr/lib/erlang/*/bin/erl \
   82.47 +		$DESTDIR/usr/lib/erlang/bin/erl \
   82.48 +		$DESTDIR/usr/lib/erlang/*/bin/start \
   82.49 +		$DESTDIR/usr/lib/erlang/bin/start
   82.50  	do
   82.51  		sed -i 's|^ROOTDIR=.*$|ROOTDIR=/usr/lib/erlang|' $i
   82.52  	done
   82.53 @@ -39,8 +35,7 @@
   82.54  	done
   82.55  }
   82.56  
   82.57 -# Rules to gen a SliTaz package suitable for Tazpkg.
   82.58 -genpkg_rules()
   82.59 -{
   82.60 -	cp -a $install/usr $fs
   82.61 +genpkg_rules() {
   82.62 +	copy @std
   82.63 +	DEPENDS="ncurses openssl libunixODBC"
   82.64  }
    83.1 --- a/esound/receipt	Tue Mar 27 12:50:45 2018 +0200
    83.2 +++ b/esound/receipt	Fri Mar 30 19:31:50 2018 +0300
    83.3 @@ -15,9 +15,8 @@
    83.4  SPLIT="esound-dev"
    83.5  
    83.6  compile_rules() {
    83.7 -	./configure \
    83.8 -		--sysconfdir=/etc \
    83.9 -		$CONFIGURE_ARGS &&
   83.10 +	./configure $CONFIGURE_ARGS &&
   83.11 +	fix libtool &&
   83.12  	make &&
   83.13  	make DESTDIR=$install install
   83.14  }
   83.15 @@ -25,19 +24,12 @@
   83.16  genpkg_rules() {
   83.17  	case $PACKAGE in
   83.18  		esound)
   83.19 -			mkdir -p $fs/usr/lib
   83.20 -			cp -a $install/usr/bin $fs/usr
   83.21 -			cp -a $install/etc $fs
   83.22 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
   83.23 +			copy @std
   83.24  			DEPENDS="audiofile alsa-lib"
   83.25  			TAGS="audio sound"
   83.26  			;;
   83.27  		*-dev)
   83.28 -			mkdir -p $fs/usr/lib
   83.29 -			cp -a $install/usr/include $fs/usr
   83.30 -			cp -a $install/usr/lib/*.la $fs/usr/lib
   83.31 -			cp -a $install/usr/lib/*.a $fs/usr/lib
   83.32 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   83.33 +			copy @dev
   83.34  			;;
   83.35  	esac
   83.36  }
    84.1 --- a/etherape/receipt	Tue Mar 27 12:50:45 2018 +0200
    84.2 +++ b/etherape/receipt	Fri Mar 30 19:31:50 2018 +0300
    84.3 @@ -1,51 +1,39 @@
    84.4 -# SliTaz package receipt.
    84.5 +# SliTaz package receipt v2.
    84.6  
    84.7  PACKAGE="etherape"
    84.8  VERSION="0.9.14"
    84.9  CATEGORY="network"
   84.10 -SHORT_DESC="A graphical network monitor and visualization tool."
   84.11 +SHORT_DESC="A graphical network monitor and visualization tool"
   84.12  MAINTAINER="hackdorte@sapo.pt"
   84.13  LICENSE="GPL2"
   84.14 +WEB_SITE="http://etherape.sourceforge.net"
   84.15 +
   84.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   84.17 -WEB_SITE="http://etherape.sourceforge.net"
   84.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   84.19 -TAGS="ip monitoring network tcp vlan wlan"
   84.20 -
   84.21 -DEPENDS="gtk+ libglade libgnome libpcap libgnomeui libltdl \
   84.22 -openssl libxslt libgnome-keyring util-linux-uuid"
   84.23  
   84.24  BUILD_DEPENDS="gcc glib-dev glibc-dev libglade-dev libgnome-dev gtk+-dev \
   84.25 -libgnomeui-dev libpcap-dev gnome-doc-utils-dev openssl-dev libxslt-dev \
   84.26 +libgnomeui-dev libpcap-dev gnome-doc-utils openssl-dev libxslt-dev \
   84.27  ossp-uuid-dev"
   84.28  
   84.29 -# Rules to configure and make the package.
   84.30 -compile_rules()
   84.31 -{
   84.32 -./configure \
   84.33 -  --prefix=/usr \
   84.34 -  --libdir=/usr/lib \
   84.35 -  --sysconfdir=/etc \
   84.36 -  --localstatedir=/var/state/$PACKAGE-$VERSION \
   84.37 -  --mandir=/usr/share/man \
   84.38 -  --docdir=/usr/share/doc/$PACKAGE-$VERSION \
   84.39 -  --build=$ARCH-slitaz-linux \
   84.40 -  --disable-scrollkeeper
   84.41 -  make && make DESTDIR=$DESTDIR install
   84.42 +compile_rules() {
   84.43 +	./configure \
   84.44 +		--libdir=/usr/lib \
   84.45 +		--localstatedir=/var/state/$PACKAGE-$VERSION \
   84.46 +		--disable-scrollkeeper \
   84.47 +		$CONFIGURE_ARGS &&
   84.48 +	make &&
   84.49 +	make DESTDIR=$DESTDIR install || return 1
   84.50 +
   84.51 +	# The SliTaz use Tazbox.
   84.52 +	sed -i 's/^Exec=.*/Exec=tazbox su dbus-launch etherape/' \
   84.53 +		$install/usr/share/applications/etherape.desktop
   84.54 +
   84.55 +	# TODO: check, looks like ${localstatedir} is a bit weird
   84.56  }
   84.57  
   84.58 -# Rules to gen a SliTaz package suitable for Tazpkg.
   84.59 -genpkg_rules()
   84.60 -{
   84.61 -  mkdir -p $fs/usr/bin
   84.62 -  cp -a $install/usr/bin/* $fs/usr/bin
   84.63 -
   84.64 -  mkdir -p $fs/usr/share
   84.65 -  cp -a $install/usr/share/* $fs/usr/share
   84.66 +genpkg_rules() {
   84.67 +	copy @std
   84.68 +	DEPENDS="gtk+ libglade libgnome libpcap libgnomeui libltdl \
   84.69 +	openssl libxslt libgnome-keyring util-linux-uuid"
   84.70 +	TAGS="ip monitoring network tcp vlan wlan"
   84.71  }
   84.72 -
   84.73 -post_install() 
   84.74 -{
   84.75 -  # The SliTaz use Tazbox.
   84.76 -  sed -i 's/^Exec=.*/Exec=tazbox su dbus-launch etherape/' \
   84.77 -  $1/usr/share/applications/etherape.desktop
   84.78 -}
    85.1 --- a/eudev/receipt	Tue Mar 27 12:50:45 2018 +0200
    85.2 +++ b/eudev/receipt	Fri Mar 30 19:31:50 2018 +0300
    85.3 @@ -29,7 +29,6 @@
    85.4  		--bindir=/sbin \
    85.5  		--sbindir=/sbin \
    85.6  		--libdir=/usr/lib \
    85.7 -		--sysconfdir=/etc \
    85.8  		--libexecdir=/lib \
    85.9  		--with-rootprefix= \
   85.10  		--with-rootlibdir=/lib \
   85.11 @@ -39,7 +38,7 @@
   85.12  		--enable-kmod \
   85.13  		$CONFIGURE_ARGS &&
   85.14  	make &&
   85.15 -	make install
   85.16 +	make install || return 1
   85.17  
   85.18  	cp $stuff/*.rules $install/etc/udev/rules.d
   85.19  	cp -a $stuff/udev/* $install/lib/udev
    86.1 --- a/evince/receipt	Tue Mar 27 12:50:45 2018 +0200
    86.2 +++ b/evince/receipt	Fri Mar 30 19:31:50 2018 +0300
    86.3 @@ -11,7 +11,7 @@
    86.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    86.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
    86.6  
    86.7 -BUILD_DEPENDS="gnome-doc-utils-dev docbook-xml libxml2-dev \
    86.8 +BUILD_DEPENDS="gnome-doc-utils docbook-xml libxml2-dev \
    86.9  gnome-icon-theme gtk+-dev intltool lcms-dev util-linux-uuid-dev \
   86.10  poppler-dev tiff-dev dbus-glib-dev xorg-dev lcms2-dev"
   86.11  SPLIT="evince-dev"
   86.12 @@ -42,9 +42,8 @@
   86.13  			TAGS="viewer pdf tiff ps postscript dvi"
   86.14  			DEPENDS="lcms poppler tiff dbus-glib glib util-linux-uuid"
   86.15  			;;
   86.16 -		evince-dev)
   86.17 +		*-dev)
   86.18  			copy @dev
   86.19 -			DEPENDS="evince gnome-doc-utils"
   86.20  			;;
   86.21  	esac
   86.22  }
    87.1 --- a/exo/receipt	Tue Mar 27 12:50:45 2018 +0200
    87.2 +++ b/exo/receipt	Fri Mar 30 19:31:50 2018 +0300
    87.3 @@ -15,10 +15,7 @@
    87.4  SPLIT="exo-tools exo-dev"
    87.5  
    87.6  compile_rules() {
    87.7 -	fix ld
    87.8  	./configure \
    87.9 -		--sysconfdir=/etc \
   87.10 -		--localstatedir=/var \
   87.11  		--disable-debug \
   87.12  		--disable-gtk-doc \
   87.13  		$CONFIGURE_ARGS &&
    88.1 --- a/fcron/receipt	Tue Mar 27 12:50:45 2018 +0200
    88.2 +++ b/fcron/receipt	Fri Mar 30 19:31:50 2018 +0300
    88.3 @@ -1,4 +1,4 @@
    88.4 -# SliTaz package receipt.
    88.5 +# SliTaz package receipt v2.
    88.6  
    88.7  PACKAGE="fcron"
    88.8  VERSION="3.0.4"
    88.9 @@ -6,21 +6,15 @@
   88.10  SHORT_DESC="Periodical command scheduler"
   88.11  MAINTAINER="erjo@slitaz.org"
   88.12  LICENSE="GPL"
   88.13 +WEB_SITE="http://fcron.free.fr/"
   88.14 +
   88.15  TARBALL="$PACKAGE-$VERSION.src.tar.gz"
   88.16 -WEB_SITE="http://fcron.free.fr/"
   88.17  WGET_URL="http://fcron.free.fr/archives/$TARBALL"
   88.18 -TAGS="cron scheduler"
   88.19  
   88.20 -DEPENDS=""
   88.21  BUILD_DEPENDS="perl"
   88.22  
   88.23 -# Rules to configure and make the package.
   88.24 -compile_rules()
   88.25 -{
   88.26 +compile_rules() {
   88.27  	./configure \
   88.28 -		--prefix=/usr \
   88.29 -		--sysconfdir=/etc \
   88.30 -		--localstatedir=/var \
   88.31  		--without-sendmail \
   88.32  		--with-username=nobody \
   88.33  		--with-groupname=nogroup \
   88.34 @@ -31,18 +25,13 @@
   88.35  		--with-editor=/bin/vi \
   88.36  		--with-sysfcrontab=yes \
   88.37  		$CONFIGURE_ARGS &&
   88.38 -	make && make -j1 DESTDIR=$DESTDIR install
   88.39 +	make &&
   88.40 +	make -j1 DESTDIR=$DESTDIR install || return 1
   88.41 +
   88.42 +	install -Dm755 $stuff/fcron $install/etc/init.d/fcron
   88.43  }
   88.44  
   88.45 -# Rules to gen a SliTaz package suitable for Tazpkg.
   88.46 -genpkg_rules()
   88.47 -{
   88.48 -	mkdir -p $fs/usr/ $fs/etc/init.d
   88.49 -
   88.50 -	cp -a $install/usr/bin $fs/usr
   88.51 -	cp -a $install/usr/sbin/fcron $fs/usr/bin
   88.52 -	cp -a $install/var $fs
   88.53 -	cp -a $install/etc $fs
   88.54 -
   88.55 -	cp -a stuff/fcron $fs/etc/init.d
   88.56 +genpkg_rules() {
   88.57 +	copy @std
   88.58 +	TAGS="cron scheduler"
   88.59  }
    89.1 --- a/fdutils/receipt	Tue Mar 27 12:50:45 2018 +0200
    89.2 +++ b/fdutils/receipt	Fri Mar 30 19:31:50 2018 +0300
    89.3 @@ -1,32 +1,30 @@
    89.4 -# SliTaz package receipt.
    89.5 +# SliTaz package receipt v2.
    89.6  
    89.7  PACKAGE="fdutils"
    89.8  VERSION="5.5"
    89.9  CATEGORY="system-tools"
   89.10 -SHORT_DESC="Utilities for configuring and formatting floppy."
   89.11 +SHORT_DESC="Utilities for configuring and formatting floppy"
   89.12  MAINTAINER="pascal.bellard@slitaz.org"
   89.13  LICENSE="GPL2"
   89.14 +WEB_SITE="http://www.fdutils.linux.lu/"
   89.15 +
   89.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   89.17 -WEB_SITE="http://www.fdutils.linux.lu/"
   89.18  WGET_URL="$WEB_SITE$TARBALL"
   89.19 -TAGS="floppy formatter"
   89.20  
   89.21 -DEPENDS=""
   89.22  BUILD_DEPENDS="flex"
   89.23  
   89.24 -# Rules to configure and make the package.
   89.25 -compile_rules()
   89.26 -{
   89.27 +compile_rules() {
   89.28  	mkdir -p $DESTDIR/etc
   89.29 -	sed -i -e "s|^bindir.*|bindir = $DESTDIR/usr/bin|" \
   89.30 +	sed \
   89.31 +		-e "s|^bindir.*|bindir = $DESTDIR/usr/bin|" \
   89.32  		-e "s|^sysconfdir.*|sysconfdir = $DESTDIR/etc|" \
   89.33 -			src/Makefile*
   89.34 +		-i src/Makefile*
   89.35 +
   89.36  	./configure $CONFIGURE_ARGS &&
   89.37  	make DESTDIR=$DESTDIR install-prog
   89.38  }
   89.39  
   89.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
   89.41 -genpkg_rules()
   89.42 -{	
   89.43 -	cp -a $install/* $fs
   89.44 +genpkg_rules() {
   89.45 +	copy @std
   89.46 +	TAGS="floppy formatter"
   89.47  }
    90.1 --- a/firejail/receipt	Tue Mar 27 12:50:45 2018 +0200
    90.2 +++ b/firejail/receipt	Fri Mar 30 19:31:50 2018 +0300
    90.3 @@ -1,4 +1,4 @@
    90.4 -# SliTaz package receipt.
    90.5 +# SliTaz package receipt v2.
    90.6  
    90.7  PACKAGE="firejail"
    90.8  VERSION="0.9.34"
    90.9 @@ -6,29 +6,19 @@
   90.10  SHORT_DESC="A SUID sandbox program"
   90.11  MAINTAINER="pascal.bellard@slitaz.org"
   90.12  LICENSE="GPL2"
   90.13 +WEB_SITE="https://l3net.wordpress.com/projects/firejail/"
   90.14 +
   90.15  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   90.16 -WEB_SITE="https://l3net.wordpress.com/projects/firejail/"
   90.17  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   90.18  
   90.19  BUILD_DEPENDS="linux-api-headers"
   90.20  
   90.21 -# Rules to configure and make the package.
   90.22 -compile_rules()
   90.23 -{
   90.24 -	./configure --prefix=/usr \
   90.25 -		--sysconfdir=/etc \
   90.26 -		--localstatedir=/var \
   90.27 -		--mandir=/usr/share/man \
   90.28 -		$CONFIGURE_ARGS &&
   90.29 +compile_rules() {
   90.30 +	./configure $CONFIGURE_ARGS &&
   90.31  	make &&
   90.32  	make DESTDIR=$DESTDIR install
   90.33  }
   90.34  
   90.35 -# Rules to gen a SliTaz package suitable for Tazpkg.
   90.36 -genpkg_rules()
   90.37 -{
   90.38 -	mkdir -p $fs/usr
   90.39 -	cp -a $install/usr/bin $fs/usr
   90.40 -	cp -a $install/usr/lib $fs/usr
   90.41 -	cp -a $install/etc $fs
   90.42 +genpkg_rules() {
   90.43 +	copy @std
   90.44  }
    91.1 --- a/florence/receipt	Tue Mar 27 12:50:45 2018 +0200
    91.2 +++ b/florence/receipt	Fri Mar 30 19:31:50 2018 +0300
    91.3 @@ -12,7 +12,7 @@
    91.4  
    91.5  DEPENDS="gtk+ GConf librsvg at-spi2-core at-spi2-atk gstreamer0"
    91.6  BUILD_DEPENDS="gtk+-dev GConf-dev librsvg-dev at-spi2-core-dev at-spi2-atk-dev \
    91.7 -gstreamer0-dev libnotify-dev gnome-doc-utils-dev gnome-doc-utils intltool"
    91.8 +gstreamer0-dev libnotify-dev gnome-doc-utils intltool"
    91.9  
   91.10  # Rules to configure and make the package.
   91.11  compile_rules()
    92.1 --- a/fltk/receipt	Tue Mar 27 12:50:45 2018 +0200
    92.2 +++ b/fltk/receipt	Fri Mar 30 19:31:50 2018 +0300
    92.3 @@ -29,7 +29,6 @@
    92.4  
    92.5  	sed -i -e '/cat./d' documentation/Makefile
    92.6  
    92.7 -	fix ld
    92.8  	./configure \
    92.9  		--enable-shared \
   92.10  		--enable-xft \
    93.1 --- a/fontconfig/receipt	Tue Mar 27 12:50:45 2018 +0200
    93.2 +++ b/fontconfig/receipt	Fri Mar 30 19:31:50 2018 +0300
    93.3 @@ -18,8 +18,6 @@
    93.4  	rm -f src/fcobjshash.h
    93.5  
    93.6  	./configure \
    93.7 -		--sysconfdir=/etc \
    93.8 -		--localstatedir=/var \
    93.9  		--with-arch=$ARCH \
   93.10  		--disable-static \
   93.11  		--enable-iconv \
   93.12 @@ -54,15 +52,13 @@
   93.13  	# chown -R root.root $fs
   93.14  }
   93.15  
   93.16 -# Rules to gen a SliTaz package suitable for Tazpkg.
   93.17 -genpkg_rules()
   93.18 -{
   93.19 +genpkg_rules() {
   93.20  	case $PACKAGE in
   93.21  		fontconfig)
   93.22  			copy @std
   93.23  			DEPENDS="bzlib freetype liblzma liblzma libpng16 libxml2 zlib"
   93.24  			;;
   93.25 -		fontconfig-dev)
   93.26 +		*-dev)
   93.27  			copy @dev
   93.28  			DEPENDS="fontconfig freetype-dev libpng16-dev libxml2-dev"
   93.29  			;;
    94.1 --- a/foomatic-db-engine/receipt	Tue Mar 27 12:50:45 2018 +0200
    94.2 +++ b/foomatic-db-engine/receipt	Fri Mar 30 19:31:50 2018 +0300
    94.3 @@ -1,50 +1,39 @@
    94.4 -# SliTaz package receipt.
    94.5 +# SliTaz package receipt v2.
    94.6  
    94.7  PACKAGE="foomatic-db-engine"
    94.8 -VERSION="4.0-20101114" 
    94.9 +VERSION="4.0-20101114"
   94.10  CATEGORY="system-tools"
   94.11 -SHORT_DESC="database engine generates PPD files from the data in Foomatic's XML database"
   94.12 +SHORT_DESC="Database engine generates PPD files from the data in Foomatic's \
   94.13 +XML database"
   94.14  MAINTAINER="jozee@slitaz.org"
   94.15  LICENSE="GPL2"
   94.16 +WEB_SITE="http://www.linuxprinting.org/foomatic.html"
   94.17 +
   94.18  TARBALL="$PACKAGE-$VERSION.tar.gz"
   94.19 -WEB_SITE="http://www.linuxprinting.org/foomatic.html"
   94.20  WGET_URL="http://www.openprinting.org/download/foomatic/$TARBALL"
   94.21 -TAGS="printer driver printing"
   94.22  
   94.23 -DEPENDS="ghostscript perl libxml2 foomatic-filters bash"
   94.24  BUILD_DEPENDS="cups-dev file libxml2-dev perl"
   94.25  
   94.26 -# Rules to configure and make the package.
   94.27 -compile_rules()
   94.28 -{
   94.29 +compile_rules() {
   94.30  	PERL_VER=$(grep ^VERSION= $WOK/perl/receipt | cut -d "=" -f2 | sed -e 's/"//g')
   94.31 -	cd $src
   94.32 -	./configure \
   94.33 -		--prefix=/usr \
   94.34 -		--sysconfdir=/etc \
   94.35 -		$CONFIGURE_ARGS &&
   94.36 +
   94.37 +	./configure $CONFIGURE_ARGS &&
   94.38  	make &&
   94.39 -	eval `perl -V:archname`
   94.40 -	make DESTDIR=$DESTDIR \
   94.41 -		INSTALLARCHLIB=/usr/lib/perl5/$PERL_VER/${archname} \
   94.42 -        INSTALLSITELIB=/usr/lib/perl5/site_perl/$PERL_VER/ \
   94.43 -        INSTALLSITEARCH=/usr/lib/perl5/site_perl/$PERL_VER/${archname} install
   94.44 -	
   94.45 +	eval $(perl -V:archname)
   94.46 +	make \
   94.47 +		DESTDIR=$DESTDIR \
   94.48 +		INSTALLARCHLIB=/usr/lib/perl5/$PERL_VER/$archname \
   94.49 +		INSTALLSITELIB=/usr/lib/perl5/site_perl/$PERL_VER/ \
   94.50 +		INSTALLSITEARCH=/usr/lib/perl5/site_perl/$PERL_VER/$archname \
   94.51 +		install
   94.52  }
   94.53  
   94.54 -# Rules to gen a SliTaz package suitable for Tazpkg.
   94.55 -genpkg_rules()
   94.56 -{
   94.57 -	mkdir -p $fs/usr/share $fs/etc
   94.58 -	cp -a $install/etc/foomatic $fs/etc
   94.59 -	cp -a $install/usr/bin $fs/usr	
   94.60 -	cp -a $install/usr/sbin $fs/usr	
   94.61 -	cp -a $install/usr/lib $fs/usr
   94.62 -	cp -a $install/usr/share/foomatic $fs/usr/share
   94.63 -	
   94.64 +genpkg_rules() {
   94.65 +	copy @std
   94.66 +	DEPENDS="ghostscript perl libxml2 foomatic-filters bash"
   94.67 +	TAGS="printer driver printing"
   94.68  }
   94.69  
   94.70 -pre_install()
   94.71 -{
   94.72 +pre_install() {
   94.73  	rm -rf "$1/usr/lib/perl5/site_perl/current"
   94.74  }
    95.1 --- a/foomatic-db-nonfree/receipt	Tue Mar 27 12:50:45 2018 +0200
    95.2 +++ b/foomatic-db-nonfree/receipt	Fri Mar 30 19:31:50 2018 +0300
    95.3 @@ -1,74 +1,75 @@
    95.4 -# SliTaz package receipt.
    95.5 +# SliTaz package receipt v2.
    95.6  
    95.7  PACKAGE="foomatic-db-nonfree"
    95.8 -VERSION="20101114" 
    95.9 +VERSION="20101114"
   95.10  CATEGORY="system-tools"
   95.11 -SHORT_DESC="database engine generates PPD files from the data in Foomatic's XML database"
   95.12 +SHORT_DESC="Database engine generates PPD files from the data in Foomatic's \
   95.13 +XML database"
   95.14  MAINTAINER="jozee@slitaz.org"
   95.15  LICENSE="other"
   95.16 +WEB_SITE="http://www.linuxprinting.org/foomatic.html"
   95.17 +
   95.18  TARBALL="$PACKAGE-$VERSION.tar.gz"
   95.19 -WEB_SITE="http://www.linuxprinting.org/foomatic.html"
   95.20  WGET_URL="http://www.openprinting.org/download/foomatic/$TARBALL"
   95.21 -TAGS="printer driver printing"
   95.22  
   95.23 -DEPENDS="perl libxml2 foomatic-db"
   95.24  BUILD_DEPENDS="ghostscript-dev cups-dev perl libxml2-dev"
   95.25  
   95.26 -# Rules to configure and make the package.
   95.27 -compile_rules()
   95.28 -{
   95.29 -	cd $src
   95.30 -	./configure \
   95.31 -		--prefix=/usr \
   95.32 -		--sysconfdir=/etc \
   95.33 -		$CONFIGURE_ARGS &&
   95.34 +compile_rules() {
   95.35 +	./configure $CONFIGURE_ARGS &&
   95.36  	make &&
   95.37 -	make DESTDIR=$DESTDIR  install
   95.38 -	
   95.39 +	make DESTDIR=$DESTDIR install || return 1
   95.40 +
   95.41 +	# gzip all ppd files
   95.42 +	find $install/usr/share/foomatic/db/source -name "*.ppd" | xargs gzip -n9
   95.43 +
   95.44 +	# include non-free license
   95.45 +	cp -a $src/COPYING $install/usr/share/licenses/$PACKAGE/
   95.46 +
   95.47 +	chown -R root:root $install
   95.48  }
   95.49  
   95.50 -# Rules to gen a SliTaz package suitable for Tazpkg.
   95.51 -genpkg_rules()
   95.52 -{
   95.53 -	mkdir -p $fs/usr/share/licenses/$PACKAGE/
   95.54 -	cp -a $install/usr/share/foomatic $fs/usr/share
   95.55 -	
   95.56 -	# gzip all ppd files
   95.57 -	find $fs/usr/share/foomatic/db/source -name "*.ppd" | xargs gzip -n9
   95.58 -	
   95.59 -	# include non-free license
   95.60 -	cp -a $src/COPYING $fs/usr/share/licenses/$PACKAGE/
   95.61 -	
   95.62 +genpkg_rules() {
   95.63 +	copy @std
   95.64 +	DEPENDS="perl libxml2 foomatic-db"
   95.65 +	TAGS="printer driver printing"
   95.66  }
   95.67  
   95.68 -pre_install()
   95.69 -{
   95.70 -	echo ""
   95.71 -	echo -e "\033[1m PROPRIETARY LICENSE:\033[0m $2"
   95.72 -	echo "================================================================================"
   95.73 -	echo "You are installing a package with proprietary license."
   95.74 -	echo "You must accept the license."
   95.75 -    echo "================================================================================"
   95.76 -    echo ""
   95.77 -	
   95.78 +pre_install() {
   95.79 +	cat <<EOT
   95.80 +
   95.81 +	.--------------------------------------------------------.
   95.82 +	| PROPRIETARY LICENSE:                                   |
   95.83 +	|--------------------------------------------------------|
   95.84 +	| You are installing a package with proprietary license. |
   95.85 +	| You must accept the license.                           |
   95.86 +	'--------------------------------------------------------'
   95.87 +
   95.88 +EOT
   95.89  }
   95.90  
   95.91 -post_install()
   95.92 -{
   95.93 -	echo ""
   95.94 -	echo -e "\033[1m FOOMATIC NON-FREE PRINTING LICENSE INFORMATION:\033[0m $2"
   95.95 -	echo "================================================================================"
   95.96 -	echo "For installing this package, you have to accept the $PACKAGE license."
   95.97 -    echo "The license is stored in /usr/share/licenses/$PACKAGE "    
   95.98 -    echo -n "Would you like to read the license (y/N) : "; read anser
   95.99 -    if [ "$anser" = "y" ]; then
  95.100 +post_install() {
  95.101 +	cat <<EOT
  95.102 +
  95.103 +	.-----------------------------------------------------.
  95.104 +	| FOOMATIC NON-FREE PRINTING LICENSE INFORMATION:     |
  95.105 +	|-----------------------------------------------------|
  95.106 +	| For installing this package, you have to accept the |
  95.107 +	| foomatic-db-nonfree package license.                |
  95.108 +	| The license is stored in                            |
  95.109 +	| /usr/share/licenses/foomatic-db-nonfree/            |
  95.110 +	'-----------------------------------------------------'
  95.111 +EOT
  95.112 +
  95.113 +	echo -n "Would you like to read the license (y/N) : "; read anser
  95.114 +	if [ "$anser" == "y" ]; then
  95.115  		more < "$1/usr/share/licenses/$PACKAGE/COPYING"
  95.116 -		echo "" 		
  95.117 +		echo ""
  95.118  	fi
  95.119 -	echo "================================================================================"
  95.120 -	 echo -n "Do you accept the license (y/N) : "; read anser
  95.121 -    if [ "$anser" = "N" ]; then
  95.122 -		echo "You did not accept the license, Removing the pkg."	
  95.123 -		chroot "$1/" tazpkg remove "$PACKAGE"		
  95.124 +
  95.125 +	separator '='
  95.126 +	echo -n "Do you accept the license (y/N) : "; read anser
  95.127 +	if [ "$anser" == "N" ]; then
  95.128 +		echo "You did not accept the license, Removing the pkg."
  95.129 +		chroot "$1/" tazpkg remove "$PACKAGE"
  95.130  	fi
  95.131  }
    96.1 --- a/foomatic-db/receipt	Tue Mar 27 12:50:45 2018 +0200
    96.2 +++ b/foomatic-db/receipt	Fri Mar 30 19:31:50 2018 +0300
    96.3 @@ -1,39 +1,28 @@
    96.4 -# SliTaz package receipt.
    96.5 +# SliTaz package receipt v2.
    96.6  
    96.7  PACKAGE="foomatic-db"
    96.8 -VERSION="4.0-20101114" 
    96.9 +VERSION="4.0-20101114"
   96.10  CATEGORY="system-tools"
   96.11  SHORT_DESC="Database used by foomatic-db-engine to generate PPD files"
   96.12  MAINTAINER="jozee@slitaz.org"
   96.13  LICENSE="GPL2"
   96.14 +WEB_SITE="http://www.linuxprinting.org/foomatic.html"
   96.15 +
   96.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   96.17 -WEB_SITE="http://www.linuxprinting.org/foomatic.html"
   96.18  WGET_URL="http://www.openprinting.org/download/foomatic/$TARBALL"
   96.19 -TAGS="printer driver printing"
   96.20  
   96.21 -DEPENDS="ghostscript perl libxml2"
   96.22  BUILD_DEPENDS="ghostscript-dev cups-dev perl libxml2-dev"
   96.23  
   96.24 -# Rules to configure and make the package.
   96.25 -compile_rules()
   96.26 -{
   96.27 -	cd $src
   96.28 -	./configure \
   96.29 -		--prefix=/usr \
   96.30 -		--sysconfdir=/etc \
   96.31 -		$CONFIGURE_ARGS &&
   96.32 +compile_rules() {
   96.33 +	./configure $CONFIGURE_ARGS &&
   96.34  	make &&
   96.35 -	make DESTDIR=$DESTDIR install
   96.36 -	
   96.37 +	make DESTDIR=$DESTDIR install || return 1
   96.38 +
   96.39 +	chown -R root:root $install
   96.40  }
   96.41  
   96.42 -# Rules to gen a SliTaz package suitable for Tazpkg.
   96.43 -genpkg_rules()
   96.44 -{
   96.45 -	mkdir -p $fs/usr	
   96.46 -	cp -a $install/usr/share $fs/usr	
   96.47 -	
   96.48 -	# remove unzipped ppd files
   96.49 -	find $fs/usr/share/foomatic/db/source/PPD -name "*.ppd" -exec rm -f '{}' 2>/dev/null \;
   96.50 +genpkg_rules() {
   96.51 +	copy @std
   96.52 +	DEPENDS="ghostscript perl libxml2"
   96.53 +	TAGS="printer driver printing"
   96.54  }
   96.55 -
    97.1 --- a/foomatic-filters/receipt	Tue Mar 27 12:50:45 2018 +0200
    97.2 +++ b/foomatic-filters/receipt	Fri Mar 30 19:31:50 2018 +0300
    97.3 @@ -1,40 +1,26 @@
    97.4 -# SliTaz package receipt.
    97.5 +# SliTaz package receipt v2.
    97.6  
    97.7  PACKAGE="foomatic-filters"
    97.8 -VERSION="4.0.5" 
    97.9 +VERSION="4.0.5"
   97.10  CATEGORY="system-tools"
   97.11  SHORT_DESC="Top quality printer drivers for Canon, Epson"
   97.12  MAINTAINER="jozee@slitaz.org"
   97.13  LICENSE="GPL2"
   97.14 +WEB_SITE="http://www.linuxprinting.org/foomatic.html"
   97.15 +
   97.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   97.17 -WEB_SITE="http://www.linuxprinting.org/foomatic.html"
   97.18  WGET_URL="http://www.openprinting.org/download/foomatic/$TARBALL"
   97.19 -TAGS="printer driver printing"
   97.20  
   97.21 -DEPENDS="ghostscript gcc-lib-base"
   97.22  BUILD_DEPENDS="ghostscript-dev cups-dev cups a2ps autoconf"
   97.23  
   97.24 -# Rules to configure and make the package.
   97.25 -compile_rules()
   97.26 -{
   97.27 -	cd $src
   97.28 -	./configure \
   97.29 -		--prefix=/usr \
   97.30 -		--sysconfdir=/etc \
   97.31 -		$CONFIGURE_ARGS &&
   97.32 +compile_rules() {
   97.33 +	./configure $CONFIGURE_ARGS &&
   97.34  	make &&
   97.35  	make DESTDIR=$DESTDIR install
   97.36 -	
   97.37  }
   97.38  
   97.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
   97.40 -genpkg_rules()
   97.41 -{
   97.42 -	mkdir -p $fs/etc $fs/usr/lib
   97.43 -	
   97.44 -	cp -a $install/usr/bin $fs/usr
   97.45 -	cp -a $install/usr/lib/cups $fs/usr/lib
   97.46 -	cp -a $install/etc   $fs
   97.47 -	
   97.48 +genpkg_rules() {
   97.49 +	copy @std
   97.50 +	DEPENDS="ghostscript gcc-lib-base"
   97.51 +	TAGS="printer driver printing"
   97.52  }
   97.53 -
    98.1 --- a/freeradius/receipt	Tue Mar 27 12:50:45 2018 +0200
    98.2 +++ b/freeradius/receipt	Fri Mar 30 19:31:50 2018 +0300
    98.3 @@ -3,24 +3,21 @@
    98.4  PACKAGE="freeradius"
    98.5  VERSION="2.1.12"
    98.6  CATEGORY="security"
    98.7 -SHORT_DESC="radius server"
    98.8 +SHORT_DESC="Radius server"
    98.9  MAINTAINER="sdaigl@lacitec.on.ca"
   98.10  LICENSE="GPL2 LGPL2"
   98.11 -SOURCE="freeradius-server"
   98.12 -TARBALL="$SOURCE-$VERSION.tar.gz"
   98.13  WEB_SITE="http://www.freeradius.org/"
   98.14 +
   98.15 +TARBALL="freeradius-server-$VERSION.tar.gz"
   98.16  WGET_URL="ftp://ftp.freeradius.org/pub/freeradius/$TARBALL"
   98.17  
   98.18 -BUILD_DEPENDS="libtool openldap-dev openssl-dev pam-dev krb5-dev gdbm-dev \
   98.19 -libtool"
   98.20 +BUILD_DEPENDS="libtool openldap-dev openssl-dev pam-dev krb5-dev gdbm-dev libtool"
   98.21  SPLIT="freeradius freeradius-dialupadmin freeradius-pam"
   98.22  
   98.23 -# Rules to configure and make the package.
   98.24 -compile_rules()
   98.25 -{
   98.26 +compile_rules() {
   98.27  	export CFLAGS="$CFLAGS -fno-strict-aliasing"
   98.28 -	./configure --sysconfdir=/etc \
   98.29 -		--localstatedir=/var \
   98.30 +
   98.31 +	./configure \
   98.32  		--with-system-libtool \
   98.33  		--with-system-libltdl \
   98.34  		$CONFIGURE_ARGS &&
   98.35 @@ -28,52 +25,49 @@
   98.36  	make R=$DESTDIR install
   98.37  }
   98.38  
   98.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
   98.40 -genpkg_rules()
   98.41 -{
   98.42 +genpkg_rules() {
   98.43  	case $PACKAGE in
   98.44 -	freeradius)
   98.45 -		CONFIG_FILES="/etc/raddb"
   98.46 -		DEPENDS="openssl cyrus-sasl libldap libltdl python readline \
   98.47 +		freeradius)
   98.48 +			CONFIG_FILES="/etc/raddb"
   98.49 +			DEPENDS="openssl cyrus-sasl libldap libltdl python readline \
   98.50  			libunixODBC libkrb5 libcomerr3 libmysqlclient gdbm"
   98.51 -		mkdir -p $fs/usr/lib $fs/usr/share $fs/etc/init.d $fs/var/run/radiusd
   98.52 +			mkdir -p $fs/usr/lib $fs/usr/share $fs/etc/init.d $fs/var/run/radiusd
   98.53  
   98.54 -		cp -a $install/usr/bin $fs/usr
   98.55 -		cp -a $install/usr/sbin $fs/usr
   98.56 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
   98.57 -		cp -a $install/usr/share/freeradius $fs/usr/share
   98.58 -		cp -a $install/etc $fs
   98.59 -		cp -a $install/var $fs
   98.60 -		rm -f $fs/usr/lib/rlm_pam* $fs/etc/raddb/modules/pam
   98.61 -		cp -a $stuff/freeradius $fs/etc/init.d/
   98.62 -		;;
   98.63 -	freeradius-dialupadmin)
   98.64 -		CAT="network|radius server web interface"
   98.65 -		CONFIG_FILES="/etc/dialupadmin"
   98.66 -		DEPENDS="php"
   98.67 -		mkdir -p $fs/usr/share $fs/etc/dialupadmin
   98.68 -		cp -a $src/dialup_admin $fs/usr/share
   98.69 -		cp -a $src/dialup_admin/conf/* $fs/etc/dialupadmin
   98.70 -		rm -rf $fs/usr/share/dialup_admin/conf
   98.71 -		ln -s /etc/dialupadmin $fs/usr/share/dialup_admin
   98.72 -		;;
   98.73 -	freeradius-pam)
   98.74 -		CAT="security|pam module for radius server"
   98.75 -		PROVIDE="freeradius:pam"
   98.76 -		DEPENDS="freeradius pam"
   98.77 -		mkdir -p $fs/usr/lib $fs/etc/raddb/modules
   98.78 -		cp -a $install/usr/lib/rlm_pam*.so* $fs/usr/lib
   98.79 -		cp -a $install/etc/raddb/modules/pam $fs/etc/raddb/modules
   98.80 -		;;
   98.81 +			cp -a $install/usr/bin $fs/usr
   98.82 +			cp -a $install/usr/sbin $fs/usr
   98.83 +			cp -a $install/usr/lib/*.so* $fs/usr/lib
   98.84 +			cp -a $install/usr/share/freeradius $fs/usr/share
   98.85 +			cp -a $install/etc $fs
   98.86 +			cp -a $install/var $fs
   98.87 +			rm -f $fs/usr/lib/rlm_pam* $fs/etc/raddb/modules/pam
   98.88 +			cp -a $stuff/freeradius $fs/etc/init.d/
   98.89 +			;;
   98.90 +		freeradius-dialupadmin)
   98.91 +			CAT="network|web interface"
   98.92 +			CONFIG_FILES="/etc/dialupadmin"
   98.93 +			DEPENDS="php"
   98.94 +			mkdir -p $fs/usr/share $fs/etc/dialupadmin
   98.95 +			cp -a $src/dialup_admin $fs/usr/share
   98.96 +			cp -a $src/dialup_admin/conf/* $fs/etc/dialupadmin
   98.97 +			rm -rf $fs/usr/share/dialup_admin/conf
   98.98 +			ln -s /etc/dialupadmin $fs/usr/share/dialup_admin
   98.99 +			;;
  98.100 +		freeradius-pam)
  98.101 +			CAT="security|pam module"
  98.102 +			PROVIDE="freeradius:pam"
  98.103 +			DEPENDS="freeradius pam"
  98.104 +			mkdir -p $fs/usr/lib $fs/etc/raddb/modules
  98.105 +			cp -a $install/usr/lib/rlm_pam*.so* $fs/usr/lib
  98.106 +			cp -a $install/etc/raddb/modules/pam $fs/etc/raddb/modules
  98.107 +			;;
  98.108  	esac
  98.109  }
  98.110  
  98.111 -post_install_freeradius_dialupadmin()
  98.112 -{
  98.113 +post_install_freeradius_dialupadmin() {
  98.114  	# Configure lighttpd server
  98.115  	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
  98.116  		if ! grep -q /usr/share/dialup_admin/ "$1/etc/lighttpd/lighttpd.conf"; then
  98.117 -	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/dialupadmin/" => "/usr/share/dialup_admin/htdocs/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
  98.118 +			sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/dialupadmin/" => "/usr/share/dialup_admin/htdocs/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
  98.119  			if [ -z "$1" ]; then
  98.120  				# Start Web server.
  98.121  				/etc/init.d/lighttpd stop
    99.1 --- a/freetds/receipt	Tue Mar 27 12:50:45 2018 +0200
    99.2 +++ b/freetds/receipt	Fri Mar 30 19:31:50 2018 +0300
    99.3 @@ -15,12 +15,7 @@
    99.4  SPLIT="freetds-dev"
    99.5  
    99.6  compile_rules() {
    99.7 -	./configure \
    99.8 -		--prefix=/usr \
    99.9 -		--infodir=/usr/share/info \
   99.10 -		--sysconfdir=/etc \
   99.11 -		--mandir=/usr/share/man \
   99.12 -		$CONFIGURE_ARGS 2>&1 | grep -v /config.rpath &&
   99.13 +	./configure $CONFIGURE_ARGS &&
   99.14  	make &&
   99.15  	make DESTDIR=$DESTDIR install
   99.16  }
   100.1 --- a/freetype-infinality/receipt	Tue Mar 27 12:50:45 2018 +0200
   100.2 +++ b/freetype-infinality/receipt	Fri Mar 30 19:31:50 2018 +0300
   100.3 @@ -23,39 +23,30 @@
   100.4  	patch -p1 < $src/patch/freetype-entire-infinality-patchset-20130104-01.patch
   100.5  
   100.6  	./configure \
   100.7 -		--sysconfdir=/etc \
   100.8  		--disable-static \
   100.9  		$CONFIGURE_ARGS &&
  100.10  	make &&
  100.11 -	make install 2>&1 | grep -v rmdir
  100.12 +	make install || return 1
  100.13 +
  100.14 +	# profile settings
  100.15 +	install -Dm644 $src/patch/infinality-settings.sh \
  100.16 +		$install/etc/profile.d/infinality-settings.sh
  100.17  }
  100.18  
  100.19  genpkg_rules() {
  100.20  	case $PACKAGE in
  100.21  		freetype-infinality)
  100.22 -			mkdir -p \
  100.23 -				$fs/etc/profile.d \
  100.24 -				$fs/usr/lib/freetype-infinality
  100.25 -			# profile settings
  100.26 -			install -m644 $src/patch/infinality-settings.sh $fs/etc/profile.d
  100.27 -			# binary & libs
  100.28 -			cp -a $install/usr/bin $fs/usr
  100.29 -			cp -a $install/usr/lib/*.so* $fs/usr/lib/freetype-infinality
  100.30 +			copy @std
  100.31  			DEPENDS="slitaz-base-files zlib"
  100.32  			PROVIDE="freetype"
  100.33  			;;
  100.34  		*-dev)
  100.35 -			mkdir -p $fs/usr/lib
  100.36 -			cp -a $install/usr/include $fs/usr
  100.37 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  100.38 -			cp -a $install/usr/lib/*.*a $fs/usr/lib
  100.39 -			cp -a $install/usr/share $fs/usr
  100.40 +			copy @dev
  100.41  			DEPENDS="freetype-infinality libzip-dev bzip2-dev"
  100.42  			;;
  100.43  	esac
  100.44  }
  100.45  
  100.46 -
  100.47  post_install_freetype_infinality() {
  100.48  	# SliTaz not support /etc/profile.d/ by default, but use /etc/profile file
  100.49  	cat >> "$1/etc/profile" <<EOT
  100.50 @@ -67,7 +58,14 @@
  100.51  	# add patched libs to loader config
  100.52  	echo '/usr/lib/freetype-infinality' >> "$1/etc/ld.so.conf"
  100.53  	chroot "$1/" ldconfig
  100.54 -	echo 'Now you can log out/in to take effect on all your apps'
  100.55 +
  100.56 +	[ -n "$quiet" ] || cat <<EOT
  100.57 +
  100.58 +	.---------------------------------------.
  100.59 +	| Now you can log out/in to take effect |
  100.60 +	| on all your apps.                     |
  100.61 +	'---------------------------------------'
  100.62 +EOT
  100.63  }
  100.64  
  100.65  post_remove_freetype_infinality() {
   101.1 --- a/freetype/receipt	Tue Mar 27 12:50:45 2018 +0200
   101.2 +++ b/freetype/receipt	Fri Mar 30 19:31:50 2018 +0300
   101.3 @@ -25,7 +25,6 @@
   101.4  
   101.5  	./autogen.sh &&
   101.6  	./configure \
   101.7 -		--sysconfdir=/etc \
   101.8  		--disable-static \
   101.9  		$CONFIGURE_ARGS &&
  101.10  	make &&
   102.1 --- a/freetype1/receipt	Tue Mar 27 12:50:45 2018 +0200
   102.2 +++ b/freetype1/receipt	Fri Mar 30 19:31:50 2018 +0300
   102.3 @@ -21,7 +21,8 @@
   102.4  		--mandir=$DESTDIR/usr/share/man \
   102.5  		--includedir=$DESTDIR/usr/include \
   102.6  		--libdir=$DESTDIR/usr/lib \
   102.7 -		--with-x --enable-gif \
   102.8 +		--with-x \
   102.9 +		--enable-gif \
  102.10  		$CONFIGURE_ARGS &&
  102.11  	make ttlib ttpo || return 1
  102.12  
   103.1 --- a/ftp-proxy/receipt	Tue Mar 27 12:50:45 2018 +0200
   103.2 +++ b/ftp-proxy/receipt	Fri Mar 30 19:31:50 2018 +0300
   103.3 @@ -1,30 +1,24 @@
   103.4 -# SliTaz package receipt.
   103.5 +# SliTaz package receipt v2.
   103.6  
   103.7  PACKAGE="ftp-proxy"
   103.8  SOURCE="proxy-suite"
   103.9  VERSION="1.9.2.4"
  103.10  CATEGORY="network"
  103.11 -SHORT_DESC="Application level proxy for the FTP protocol."
  103.12 +SHORT_DESC="Application level proxy for the FTP protocol"
  103.13  MAINTAINER="pascal.bellard@slitaz.org"
  103.14  LICENSE="GPL2"
  103.15  WEB_SITE="ftp://ftp.suse.com/pub/projects/proxy-suite/src"
  103.16 +
  103.17  TARBALL="$SOURCE-$VERSION.tar.bz2"
  103.18  WGET_URL="$WEB_SITE/$TARBALL"
  103.19 -CONFIG_FILES="/etc/proxy-suite/ftp-proxy.conf"
  103.20  
  103.21 -DEPENDS=""
  103.22 -BUILD_DEPENDS=""
  103.23 -
  103.24 -# Rules to configure and make the package.
  103.25 -compile_rules()
  103.26 -{
  103.27 -	cd $src
  103.28 -	./configure --prefix=/usr --sysconfdir=/etc $CONFIGURE_ARGS &&
  103.29 -	make && make INST_ROOT=$DESTDIR install
  103.30 +compile_rules() {
  103.31 +	./configure $CONFIGURE_ARGS &&
  103.32 +	make &&
  103.33 +	make INST_ROOT=$DESTDIR install
  103.34  }
  103.35  
  103.36 -# Rules to gen a SliTaz package suitable for Tazpkg.
  103.37 -genpkg_rules()
  103.38 -{
  103.39 -	cp -a $install/* $fs
  103.40 +genpkg_rules() {
  103.41 +	copy @std
  103.42 +	CONFIG_FILES="/etc/proxy-suite/ftp-proxy.conf"
  103.43  }
   104.1 --- a/fuse3/receipt	Tue Mar 27 12:50:45 2018 +0200
   104.2 +++ b/fuse3/receipt	Fri Mar 30 19:31:50 2018 +0300
   104.3 @@ -18,7 +18,6 @@
   104.4  compile_rules() {
   104.5  	export MOUNT_FUSE_PATH=/usr/bin
   104.6  	./configure \
   104.7 -		--sysconfdir=/etc \
   104.8  		--disable-static \
   104.9  		$CONFIGURE_ARGS &&
  104.10  	make &&
   105.1 --- a/fwknop/receipt	Tue Mar 27 12:50:45 2018 +0200
   105.2 +++ b/fwknop/receipt	Fri Mar 30 19:31:50 2018 +0300
   105.3 @@ -16,10 +16,7 @@
   105.4  
   105.5  compile_rules() {
   105.6  	autoreconf -fiv &&
   105.7 -	./configure \
   105.8 -		--sysconfdir=/etc \
   105.9 -		--localstatedir=/var \
  105.10 -		$CONFIGURE_ARGS &&
  105.11 +	./configure $CONFIGURE_ARGS &&
  105.12  	make &&
  105.13  	make install || return 1
  105.14  
   106.1 --- a/gadmin-antivirus/receipt	Tue Mar 27 12:50:45 2018 +0200
   106.2 +++ b/gadmin-antivirus/receipt	Fri Mar 30 19:31:50 2018 +0300
   106.3 @@ -1,38 +1,25 @@
   106.4 -# SliTaz package receipt.
   106.5 +# SliTaz package receipt v2.
   106.6  
   106.7  PACKAGE="gadmin-antivirus"
   106.8  VERSION="0.0.3"
   106.9  CATEGORY="x-window"
  106.10 -SHORT_DESC="GTK+ configuration tool for ClamAV."
  106.11 +SHORT_DESC="GTK+ configuration tool for ClamAV"
  106.12  MAINTAINER="pascal.bellard@slitaz.org"
  106.13  LICENSE="GPL3"
  106.14 +WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  106.15 +
  106.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  106.17 -WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  106.18  WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
  106.19  
  106.20 -DEPENDS="gtk+ clamav"
  106.21  BUILD_DEPENDS="gtk+-dev"
  106.22  
  106.23 -
  106.24 -# Rules to configure and make the package.
  106.25 -compile_rules()
  106.26 -{
  106.27 -	cd $src
  106.28 -	./configure --prefix=/usr \
  106.29 -		--sysconfdir=/etc \
  106.30 -		--localstatedir=/var \
  106.31 -		--mandir=/usr/share/man \
  106.32 -		$CONFIGURE_ARGS &&
  106.33 +compile_rules() {
  106.34 +	./configure $CONFIGURE_ARGS &&
  106.35  	make &&
  106.36  	make DESTDIR=$DESTDIR install
  106.37  }
  106.38  
  106.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  106.40 -genpkg_rules()
  106.41 -{
  106.42 -	mkdir -p $fs/usr/share/applications
  106.43 -	cp -a $install/etc $fs
  106.44 -	cp -a $install/usr/sbin $fs/usr
  106.45 -	cp -a $install/usr/share/pixmaps $fs/usr/share
  106.46 -	cp -a $stuff/$PACKAGE.desktop $fs/usr/share/applications
  106.47 +genpkg_rules() {
  106.48 +	copy @std
  106.49 +	DEPENDS="gtk+ clamav"
  106.50  }
   107.1 --- a/gadmin-bind/receipt	Tue Mar 27 12:50:45 2018 +0200
   107.2 +++ b/gadmin-bind/receipt	Fri Mar 30 19:31:50 2018 +0300
   107.3 @@ -1,36 +1,25 @@
   107.4 -# SliTaz package receipt.
   107.5 +# SliTaz package receipt v2.
   107.6  
   107.7  PACKAGE="gadmin-bind"
   107.8  VERSION="0.2.5"
   107.9  CATEGORY="x-window"
  107.10 -SHORT_DESC="GTK+ configuration tool for bind9."
  107.11 +SHORT_DESC="GTK+ configuration tool for bind9"
  107.12  MAINTAINER="pascal.bellard@slitaz.org"
  107.13  LICENSE="GPL3"
  107.14 +WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  107.15 +
  107.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  107.17 -WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  107.18  WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
  107.19  
  107.20 -DEPENDS="gtk+ bind"
  107.21  BUILD_DEPENDS="gtk+-dev"
  107.22  
  107.23 -
  107.24 -# Rules to configure and make the package.
  107.25 -compile_rules()
  107.26 -{
  107.27 -	cd $src
  107.28 -	./configure --prefix=/usr \
  107.29 -		--sysconfdir=/etc \
  107.30 -		--mandir=/usr/share/man \
  107.31 -		$CONFIGURE_ARGS &&
  107.32 +compile_rules() {
  107.33 +	./configure $CONFIGURE_ARGS &&
  107.34  	make &&
  107.35  	make DESTDIR=$DESTDIR install
  107.36  }
  107.37  
  107.38 -# Rules to gen a SliTaz package suitable for Tazpkg.
  107.39 -genpkg_rules()
  107.40 -{
  107.41 -	mkdir -p $fs/usr/share/applications
  107.42 -	cp -a $install/usr/sbin $fs/usr
  107.43 -	cp -a $install/usr/share/pixmaps $fs/usr/share
  107.44 -	cp -a $stuff/$PACKAGE.desktop $fs/usr/share/applications
  107.45 +genpkg_rules() {
  107.46 +	copy @std
  107.47 +	DEPENDS="gtk+ bind"
  107.48  }
   108.1 --- a/gadmin-dhcpd/receipt	Tue Mar 27 12:50:45 2018 +0200
   108.2 +++ b/gadmin-dhcpd/receipt	Fri Mar 30 19:31:50 2018 +0300
   108.3 @@ -1,37 +1,25 @@
   108.4 -# SliTaz package receipt.
   108.5 +# SliTaz package receipt v2.
   108.6  
   108.7  PACKAGE="gadmin-dhcpd"
   108.8  VERSION="0.5.2"
   108.9  CATEGORY="x-window"
  108.10 -SHORT_DESC="GTK+ configuration tool for DHCPD."
  108.11 +SHORT_DESC="GTK+ configuration tool for DHCPD"
  108.12  MAINTAINER="pascal.bellard@slitaz.org"
  108.13  LICENSE="GPL3"
  108.14 +WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  108.15 +
  108.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  108.17 -WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  108.18  WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
  108.19  
  108.20 -DEPENDS="gtk+ dhcp"
  108.21  BUILD_DEPENDS="gtk+-dev"
  108.22  
  108.23 -
  108.24 -# Rules to configure and make the package.
  108.25 -compile_rules()
  108.26 -{
  108.27 -	cd $src
  108.28 -	./configure --prefix=/usr \
  108.29 -		--sysconfdir=/etc \
  108.30 -		--localstatedir=/var \
  108.31 -		--mandir=/usr/share/man \
  108.32 -		$CONFIGURE_ARGS &&
  108.33 +compile_rules() {
  108.34 +	./configure $CONFIGURE_ARGS &&
  108.35  	make &&
  108.36  	make DESTDIR=$DESTDIR install
  108.37  }
  108.38  
  108.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  108.40 -genpkg_rules()
  108.41 -{
  108.42 -	mkdir -p $fs/usr/share/applications
  108.43 -	cp -a $install/usr/sbin $fs/usr
  108.44 -	cp -a $install/usr/share/pixmaps $fs/usr/share
  108.45 -	cp -a $stuff/$PACKAGE.desktop $fs/usr/share/applications
  108.46 +genpkg_rules() {
  108.47 +	copy @std
  108.48 +	DEPENDS="gtk+ dhcp"
  108.49  }
   109.1 --- a/gadmin-httpd/receipt	Tue Mar 27 12:50:45 2018 +0200
   109.2 +++ b/gadmin-httpd/receipt	Fri Mar 30 19:31:50 2018 +0300
   109.3 @@ -1,38 +1,25 @@
   109.4 -# SliTaz package receipt.
   109.5 +# SliTaz package receipt v2.
   109.6  
   109.7  PACKAGE="gadmin-httpd"
   109.8  VERSION="0.1.5"
   109.9  CATEGORY="x-window"
  109.10 -SHORT_DESC="GTK+ configuration tool for Apache."
  109.11 +SHORT_DESC="GTK+ configuration tool for Apache"
  109.12  MAINTAINER="pascal.bellard@slitaz.org"
  109.13  LICENSE="GPL3"
  109.14 +WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  109.15 +
  109.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  109.17 -WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  109.18  WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
  109.19  
  109.20 -DEPENDS="gtk+ apache"
  109.21  BUILD_DEPENDS="gtk+-dev"
  109.22  
  109.23 -
  109.24 -# Rules to configure and make the package.
  109.25 -compile_rules()
  109.26 -{
  109.27 -	cd $src
  109.28 -	./configure --prefix=/usr \
  109.29 -		--sysconfdir=/etc \
  109.30 -		--localstatedir=/var \
  109.31 -		--mandir=/usr/share/man \
  109.32 -		$CONFIGURE_ARGS &&
  109.33 +compile_rules() {
  109.34 +	./configure $CONFIGURE_ARGS &&
  109.35  	make &&
  109.36  	make DESTDIR=$DESTDIR install
  109.37  }
  109.38  
  109.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  109.40 -genpkg_rules()
  109.41 -{
  109.42 -	mkdir -p $fs/usr/share/applications
  109.43 -	cp -a $install/etc $fs
  109.44 -	cp -a $install/usr/sbin $fs/usr
  109.45 -	cp -a $install/usr/share/pixmaps $fs/usr/share
  109.46 -	cp -a $stuff/$PACKAGE.desktop $fs/usr/share/applications
  109.47 +genpkg_rules() {
  109.48 +	copy @std
  109.49 +	DEPENDS="gtk+ apache"
  109.50  }
   110.1 --- a/gadmin-openvpn-client/receipt	Tue Mar 27 12:50:45 2018 +0200
   110.2 +++ b/gadmin-openvpn-client/receipt	Fri Mar 30 19:31:50 2018 +0300
   110.3 @@ -1,36 +1,25 @@
   110.4 -# SliTaz package receipt.
   110.5 +# SliTaz package receipt v2.
   110.6  
   110.7  PACKAGE="gadmin-openvpn-client"
   110.8  VERSION="0.1.8"
   110.9  CATEGORY="x-window"
  110.10 -SHORT_DESC="GTK+ configuration tool for OpenVPN (client)."
  110.11 +SHORT_DESC="GTK+ configuration tool for OpenVPN (client)"
  110.12  MAINTAINER="pascal.bellard@slitaz.org"
  110.13  LICENSE="GPL3"
  110.14 +WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  110.15 +
  110.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  110.17 -WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  110.18  WGET_URL="http://dalalven.dtdns.net/linux/gadmin-openvpn/client/$TARBALL"
  110.19  
  110.20 -DEPENDS="gtk+ openvpn"
  110.21  BUILD_DEPENDS="gtk+-dev"
  110.22  
  110.23 -
  110.24 -# Rules to configure and make the package.
  110.25 -compile_rules()
  110.26 -{
  110.27 -	cd $src
  110.28 -	./configure --prefix=/usr \
  110.29 -		--sysconfdir=/etc \
  110.30 -		--mandir=/usr/share/man \
  110.31 -		$CONFIGURE_ARGS &&
  110.32 +compile_rules() {
  110.33 +	./configure $CONFIGURE_ARGS &&
  110.34  	make &&
  110.35  	make DESTDIR=$DESTDIR install
  110.36  }
  110.37  
  110.38 -# Rules to gen a SliTaz package suitable for Tazpkg.
  110.39 -genpkg_rules()
  110.40 -{
  110.41 -	mkdir -p $fs/usr/share/applications
  110.42 -	cp -a $install/usr/sbin $fs/usr
  110.43 -	cp -a $install/usr/share/pixmaps $fs/usr/share
  110.44 -	cp -a $stuff/$PACKAGE.desktop $fs/usr/share/applications
  110.45 +genpkg_rules() {
  110.46 +	copy @std
  110.47 +	DEPENDS="gtk+ openvpn"
  110.48  }
   111.1 --- a/gadmin-openvpn-server/receipt	Tue Mar 27 12:50:45 2018 +0200
   111.2 +++ b/gadmin-openvpn-server/receipt	Fri Mar 30 19:31:50 2018 +0300
   111.3 @@ -1,37 +1,25 @@
   111.4 -# SliTaz package receipt.
   111.5 +# SliTaz package receipt v2.
   111.6  
   111.7  PACKAGE="gadmin-openvpn-server"
   111.8  VERSION="0.1.6"
   111.9  CATEGORY="x-window"
  111.10 -SHORT_DESC="GTK+ configuration tool for OpenVPN (server)."
  111.11 +SHORT_DESC="GTK+ configuration tool for OpenVPN (server)"
  111.12  MAINTAINER="pascal.bellard@slitaz.org"
  111.13  LICENSE="GPL3"
  111.14 +WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  111.15 +
  111.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  111.17 -WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  111.18  WGET_URL="http://dalalven.dtdns.net/linux/gadmin-openvpn/server/$TARBALL"
  111.19  
  111.20 -DEPENDS="gtk+ openvpn"
  111.21  BUILD_DEPENDS="gtk+-dev"
  111.22  
  111.23 -
  111.24 -# Rules to configure and make the package.
  111.25 -compile_rules()
  111.26 -{
  111.27 -	cd $src
  111.28 -	./configure --prefix=/usr \
  111.29 -		--sysconfdir=/etc \
  111.30 -		--mandir=/usr/share/man \
  111.31 -		$CONFIGURE_ARGS &&
  111.32 +compile_rules() {
  111.33 +	./configure $CONFIGURE_ARGS &&
  111.34  	make &&
  111.35  	make DESTDIR=$DESTDIR install
  111.36  }
  111.37  
  111.38 -# Rules to gen a SliTaz package suitable for Tazpkg.
  111.39 -genpkg_rules()
  111.40 -{
  111.41 -	mkdir -p $fs/usr/share/applications
  111.42 -	cp -a $install/etc $fs
  111.43 -	cp -a $install/usr/sbin $fs/usr
  111.44 -	cp -a $install/usr/share/pixmaps $fs/usr/share
  111.45 -	cp -a $stuff/$PACKAGE.desktop $fs/usr/share/applications
  111.46 +genpkg_rules() {
  111.47 +	copy @std
  111.48 +	DEPENDS="gtk+ openvpn"
  111.49  }
   112.1 --- a/gadmin-proftpd/receipt	Tue Mar 27 12:50:45 2018 +0200
   112.2 +++ b/gadmin-proftpd/receipt	Fri Mar 30 19:31:50 2018 +0300
   112.3 @@ -1,37 +1,25 @@
   112.4 -# SliTaz package receipt.
   112.5 +# SliTaz package receipt v2.
   112.6  
   112.7  PACKAGE="gadmin-proftpd"
   112.8  VERSION="0.4.6"
   112.9  CATEGORY="x-window"
  112.10 -SHORT_DESC="GTK+ configuration tool for ProFTPd."
  112.11 +SHORT_DESC="GTK+ configuration tool for ProFTPd"
  112.12  MAINTAINER="pascal.bellard@slitaz.org"
  112.13  LICENSE="GPL3"
  112.14 +WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  112.15 +
  112.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  112.17 -WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  112.18  WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
  112.19  
  112.20 -DEPENDS="gtk+ proftpd"
  112.21  BUILD_DEPENDS="gtk+-dev"
  112.22  
  112.23 -
  112.24 -# Rules to configure and make the package.
  112.25 -compile_rules()
  112.26 -{
  112.27 -	cd $src
  112.28 -	./configure --prefix=/usr \
  112.29 -		--sysconfdir=/etc \
  112.30 -		--mandir=/usr/share/man \
  112.31 -		$CONFIGURE_ARGS &&
  112.32 +compile_rules() {
  112.33 +	./configure $CONFIGURE_ARGS &&
  112.34  	make &&
  112.35  	make DESTDIR=$DESTDIR install
  112.36  }
  112.37  
  112.38 -# Rules to gen a SliTaz package suitable for Tazpkg.
  112.39 -genpkg_rules()
  112.40 -{
  112.41 -	mkdir -p $fs/usr/share/applications
  112.42 -	cp -a $install/etc $fs
  112.43 -	cp -a $install/usr/sbin $fs/usr
  112.44 -	cp -a $install/usr/share/pixmaps $fs/usr/share
  112.45 -	cp -a $stuff/$PACKAGE.desktop $fs/usr/share/applications
  112.46 +genpkg_rules() {
  112.47 +	copy @std
  112.48 +	DEPENDS="gtk+ proftpd"
  112.49  }
   113.1 --- a/gadmin-rsync/receipt	Tue Mar 27 12:50:45 2018 +0200
   113.2 +++ b/gadmin-rsync/receipt	Fri Mar 30 19:31:50 2018 +0300
   113.3 @@ -1,37 +1,25 @@
   113.4 -# SliTaz package receipt.
   113.5 +# SliTaz package receipt v2.
   113.6  
   113.7  PACKAGE="gadmin-rsync"
   113.8  VERSION="0.1.8"
   113.9  CATEGORY="x-window"
  113.10 -SHORT_DESC="GTK+ configuration tool for rsync."
  113.11 +SHORT_DESC="GTK+ configuration tool for rsync"
  113.12  MAINTAINER="pascal.bellard@slitaz.org"
  113.13  LICENSE="GPL3"
  113.14 +WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  113.15 +
  113.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  113.17 -WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  113.18  WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
  113.19  
  113.20 -DEPENDS="gtk+ rsync"
  113.21  BUILD_DEPENDS="gtk+-dev"
  113.22  
  113.23 -
  113.24 -# Rules to configure and make the package.
  113.25 -compile_rules()
  113.26 -{
  113.27 -	cd $src
  113.28 -	./configure --prefix=/usr \
  113.29 -		--sysconfdir=/etc \
  113.30 -		--mandir=/usr/share/man \
  113.31 -		$CONFIGURE_ARGS &&
  113.32 +compile_rules() {
  113.33 +	./configure $CONFIGURE_ARGS &&
  113.34  	make &&
  113.35  	make DESTDIR=$DESTDIR install
  113.36  }
  113.37  
  113.38 -# Rules to gen a SliTaz package suitable for Tazpkg.
  113.39 -genpkg_rules()
  113.40 -{
  113.41 -	mkdir -p $fs/usr/share/applications
  113.42 -	cp -a $install/etc $fs
  113.43 -	cp -a $install/usr/sbin $fs/usr
  113.44 -	cp -a $install/usr/share/pixmaps $fs/usr/share
  113.45 -	cp -a $stuff/$PACKAGE.desktop $fs/usr/share/applications
  113.46 +genpkg_rules() {
  113.47 +	copy @std
  113.48 +	DEPENDS="gtk+ rsync"
  113.49  }
   114.1 --- a/gadmin-samba/receipt	Tue Mar 27 12:50:45 2018 +0200
   114.2 +++ b/gadmin-samba/receipt	Fri Mar 30 19:31:50 2018 +0300
   114.3 @@ -1,39 +1,25 @@
   114.4 -# SliTaz package receipt.
   114.5 +# SliTaz package receipt v2.
   114.6  
   114.7  PACKAGE="gadmin-samba"
   114.8  VERSION="0.3.4"
   114.9  CATEGORY="x-window"
  114.10 -SHORT_DESC="GTK+ configuration tool for SAMBA."
  114.11 +SHORT_DESC="GTK+ configuration tool for SAMBA"
  114.12  MAINTAINER="pascal.bellard@slitaz.org"
  114.13  LICENSE="GPL3"
  114.14 +WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  114.15 +
  114.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  114.17 -WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  114.18  WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
  114.19  
  114.20 -DEPENDS="gtk+ samba"
  114.21  BUILD_DEPENDS="gtk+-dev"
  114.22  
  114.23 -
  114.24 -# Rules to configure and make the package.
  114.25 -compile_rules()
  114.26 -{
  114.27 -	cd $src
  114.28 -	./configure --prefix=/usr \
  114.29 -		--sysconfdir=/etc \
  114.30 -		--localstatedir=/var \
  114.31 -		--mandir=/usr/share/man \
  114.32 -		$CONFIGURE_ARGS &&
  114.33 +compile_rules() {
  114.34 +	./configure $CONFIGURE_ARGS &&
  114.35  	make &&
  114.36  	make DESTDIR=$DESTDIR install
  114.37  }
  114.38  
  114.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  114.40 -genpkg_rules()
  114.41 -{
  114.42 -	mkdir -p $fs/usr/share/applications
  114.43 -	cp -a $install/etc $fs
  114.44 -	cp -a $install/var $fs
  114.45 -	cp -a $install/usr/sbin $fs/usr
  114.46 -	cp -a $install/usr/share/pixmaps $fs/usr/share
  114.47 -	cp -a $stuff/$PACKAGE.desktop $fs/usr/share/applications
  114.48 +genpkg_rules() {
  114.49 +	copy @std
  114.50 +	DEPENDS="gtk+ samba"
  114.51  }
   115.1 --- a/gadmin-sendmail/receipt	Tue Mar 27 12:50:45 2018 +0200
   115.2 +++ b/gadmin-sendmail/receipt	Fri Mar 30 19:31:50 2018 +0300
   115.3 @@ -1,38 +1,25 @@
   115.4 -# SliTaz package receipt.
   115.5 +# SliTaz package receipt v2.
   115.6  
   115.7  PACKAGE="gadmin-sendmail"
   115.8  VERSION="0.0.4"
   115.9  CATEGORY="x-window"
  115.10 -SHORT_DESC="GTK+ configuration tool for sendmail."
  115.11 +SHORT_DESC="GTK+ configuration tool for sendmail"
  115.12  MAINTAINER="pascal.bellard@slitaz.org"
  115.13  LICENSE="GPL3"
  115.14 +WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  115.15 +
  115.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  115.17 -WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  115.18  WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
  115.19  
  115.20 -DEPENDS="gtk+ sendmail"
  115.21  BUILD_DEPENDS="gtk+-dev"
  115.22  
  115.23 -
  115.24 -# Rules to configure and make the package.
  115.25 -compile_rules()
  115.26 -{
  115.27 -	cd $src
  115.28 -	./configure --prefix=/usr \
  115.29 -		--sysconfdir=/etc \
  115.30 -		--localstatedir=/var \
  115.31 -		--mandir=/usr/share/man \
  115.32 -		$CONFIGURE_ARGS &&
  115.33 +compile_rules() {
  115.34 +	./configure $CONFIGURE_ARGS &&
  115.35  	make &&
  115.36  	make DESTDIR=$DESTDIR install
  115.37  }
  115.38  
  115.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  115.40 -genpkg_rules()
  115.41 -{
  115.42 -	mkdir -p $fs/usr/share/applications
  115.43 -	cp -a $install/etc $fs
  115.44 -	cp -a $install/usr/sbin $fs/usr
  115.45 -	cp -a $install/usr/share/pixmaps $fs/usr/share
  115.46 -	cp -a $stuff/$PACKAGE.desktop $fs/usr/share/applications
  115.47 +genpkg_rules() {
  115.48 +	copy @std
  115.49 +	DEPENDS="gtk+ sendmail"
  115.50  }
   116.1 --- a/gadmin-squid/receipt	Tue Mar 27 12:50:45 2018 +0200
   116.2 +++ b/gadmin-squid/receipt	Fri Mar 30 19:31:50 2018 +0300
   116.3 @@ -1,38 +1,25 @@
   116.4 -# SliTaz package receipt.
   116.5 +# SliTaz package receipt v2.
   116.6  
   116.7  PACKAGE="gadmin-squid"
   116.8  VERSION="0.1.4"
   116.9  CATEGORY="x-window"
  116.10 -SHORT_DESC="GTK+ configuration tool for SQUID."
  116.11 +SHORT_DESC="GTK+ configuration tool for SQUID"
  116.12  MAINTAINER="pascal.bellard@slitaz.org"
  116.13  LICENSE="GPL3"
  116.14 +WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  116.15 +
  116.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  116.17 -WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  116.18  WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
  116.19  
  116.20 -DEPENDS="gtk+ squid"
  116.21  BUILD_DEPENDS="gtk+-dev"
  116.22  
  116.23 -
  116.24 -# Rules to configure and make the package.
  116.25 -compile_rules()
  116.26 -{
  116.27 -	cd $src
  116.28 -	./configure --prefix=/usr \
  116.29 -		--sysconfdir=/etc \
  116.30 -		--localstatedir=/var \
  116.31 -		--mandir=/usr/share/man \
  116.32 -		$CONFIGURE_ARGS &&
  116.33 +compile_rules() {
  116.34 +	./configure $CONFIGURE_ARGS &&
  116.35  	make &&
  116.36  	make DESTDIR=$DESTDIR install
  116.37  }
  116.38  
  116.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  116.40 -genpkg_rules()
  116.41 -{
  116.42 -	mkdir -p $fs/usr/share/applications
  116.43 -	cp -a $install/etc $fs
  116.44 -	cp -a $install/usr/sbin $fs/usr
  116.45 -	cp -a $install/usr/share/pixmaps $fs/usr/share
  116.46 -	cp -a $stuff/$PACKAGE.desktop $fs/usr/share/applications
  116.47 +genpkg_rules() {
  116.48 +	copy @std
  116.49 +	DEPENDS="gtk+ squid"
  116.50  }
   117.1 --- a/gadmin-sshd/receipt	Tue Mar 27 12:50:45 2018 +0200
   117.2 +++ b/gadmin-sshd/receipt	Fri Mar 30 19:31:50 2018 +0300
   117.3 @@ -1,39 +1,26 @@
   117.4 -# SliTaz package receipt.
   117.5 +# SliTaz package receipt v2.
   117.6  
   117.7  PACKAGE="gadmin-sshd"
   117.8  VERSION="0.0.2"
   117.9  CATEGORY="x-window"
  117.10 -SHORT_DESC="GTK+ configuration tool for SSH."
  117.11 +SHORT_DESC="GTK+ configuration tool for SSH"
  117.12  MAINTAINER="pascal.bellard@slitaz.org"
  117.13  LICENSE="GPL3"
  117.14 +WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  117.15 +
  117.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  117.17 -WEB_SITE="http://dalalven.dtdns.net/linux/gadmintools-webpage/"
  117.18  WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
  117.19 -TAGS="ssh"
  117.20  
  117.21 -DEPENDS="gtk+ openssh"
  117.22  BUILD_DEPENDS="gtk+-dev"
  117.23  
  117.24 -
  117.25 -# Rules to configure and make the package.
  117.26 -compile_rules()
  117.27 -{
  117.28 -	cd $src
  117.29 -	./configure --prefix=/usr \
  117.30 -		--sysconfdir=/etc \
  117.31 -		--localstatedir=/var \
  117.32 -		--mandir=/usr/share/man \
  117.33 -		$CONFIGURE_ARGS &&
  117.34 +compile_rules() {
  117.35 +	./configure $CONFIGURE_ARGS &&
  117.36  	make &&
  117.37  	make DESTDIR=$DESTDIR install
  117.38  }
  117.39  
  117.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
  117.41 -genpkg_rules()
  117.42 -{
  117.43 -	mkdir -p $fs/usr/share/applications
  117.44 -	cp -a $install/etc $fs
  117.45 -	cp -a $install/usr/sbin $fs/usr
  117.46 -	cp -a $install/usr/share/pixmaps $fs/usr/share
  117.47 -	cp -a $stuff/$PACKAGE.desktop $fs/usr/share/applications
  117.48 +genpkg_rules() {
  117.49 +	copy @std
  117.50 +	DEPENDS="gtk+ openssh"
  117.51 +	TAGS="ssh"
  117.52  }
   118.1 --- a/gamin/receipt	Tue Mar 27 12:50:45 2018 +0200
   118.2 +++ b/gamin/receipt	Fri Mar 30 19:31:50 2018 +0300
   118.3 @@ -29,8 +29,6 @@
   118.4  	export ac_cv_have_abstract_sockets=yes
   118.5  
   118.6  	./configure \
   118.7 -		--prefix=/usr \
   118.8 -		--sysconfdir=/etc \
   118.9  		--libexecdir=/usr/lib/gamin \
  118.10  		$CONFIGURE_ARGS &&
  118.11  	make &&
   119.1 --- a/garcon/receipt	Tue Mar 27 12:50:45 2018 +0200
   119.2 +++ b/garcon/receipt	Fri Mar 30 19:31:50 2018 +0300
   119.3 @@ -16,10 +16,7 @@
   119.4  SPLIT="garcon-dev"
   119.5  
   119.6  compile_rules() {
   119.7 -	fix ld
   119.8  	./configure \
   119.9 -		--sysconfdir=/etc \
  119.10 -		--localstatedir=/var \
  119.11  		--disable-debug \
  119.12  		--disable-gtk-doc \
  119.13  		$CONFIGURE_ARGS &&
   120.1 --- a/gcr/receipt	Tue Mar 27 12:50:45 2018 +0200
   120.2 +++ b/gcr/receipt	Fri Mar 30 19:31:50 2018 +0300
   120.3 @@ -19,10 +19,10 @@
   120.4  compile_rules() {
   120.5  	sed -i -r 's:"(/desktop):"/org/gnome\1:' schema/*.xml
   120.6  
   120.7 -	./configure \
   120.8 -		--sysconfdir=/etc \
   120.9 -		$CONFIGURE_ARGS &&
  120.10 -	make && make install
  120.11 +	./configure $CONFIGURE_ARGS &&
  120.12 +	fix libtool &&
  120.13 +	make &&
  120.14 +	make install
  120.15  }
  120.16  
  120.17  genpkg_rules() {
   121.1 --- a/gdal/receipt	Tue Mar 27 12:50:45 2018 +0200
   121.2 +++ b/gdal/receipt	Fri Mar 30 19:31:50 2018 +0300
   121.3 @@ -18,8 +18,6 @@
   121.4  compile_rules() {
   121.5  	fix math
   121.6  	./configure \
   121.7 -		--sysconfdir=/etc \
   121.8 -		--localstatedir=/var \
   121.9  		--datadir=/usr/share/gdal \
  121.10  		--with-threads \
  121.11  		--with-perl \
  121.12 @@ -27,7 +25,8 @@
  121.13  		--with-geos \
  121.14  		--with-sqlite3=no \
  121.15  		--with-ogr &&
  121.16 -	make && make install BINDINGS="perl python"
  121.17 +	make &&
  121.18 +	make install BINDINGS="perl python"
  121.19  }
  121.20  
  121.21  genpkg_rules() {
   122.1 --- a/gecko-mediaplayer/receipt	Tue Mar 27 12:50:45 2018 +0200
   122.2 +++ b/gecko-mediaplayer/receipt	Fri Mar 30 19:31:50 2018 +0300
   122.3 @@ -1,51 +1,47 @@
   122.4 -# SliTaz package receipt.
   122.5 +# SliTaz package receipt v2.
   122.6  
   122.7  PACKAGE="gecko-mediaplayer"
   122.8  VERSION="1.0.3"
   122.9  CATEGORY="multimedia"
  122.10 -SHORT_DESC="Browser plugin that uses gnome-mplayer to play media in a web browser"
  122.11 +SHORT_DESC="Browser plugin that uses gnome-mplayer to play media in a web \
  122.12 +browser"
  122.13  MAINTAINER="jozee@slitaz.org"
  122.14  LICENSE="GPL2"
  122.15 +WEB_SITE="http://code.google.com/p/gecko-mediaplayer/"
  122.16 +
  122.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
  122.18 -WEB_SITE="http://code.google.com/p/gecko-mediaplayer/"
  122.19  WGET_URL="http://gecko-mediaplayer.googlecode.com/files/$TARBALL"
  122.20 -TAGS="player audio video browser"
  122.21  
  122.22 -DEPENDS="gnome-mplayer dbus-glib gcc-lib-base"
  122.23  BUILD_DEPENDS="firefox-dev dbus-dev dbus-glib-dev nspr-dev"
  122.24  
  122.25 -# Rules to configure and make the package.
  122.26 -compile_rules()
  122.27 -{
  122.28 +compile_rules() {
  122.29  	sed -i 's/utf8characters/UTF8Characters/g' src/*.cpp
  122.30  	sed -i 's|NPP_Initialize|//&|' src/np_entry.cpp
  122.31  	sed -i 's|char[\*\) ]*NP*_GetMIMEDescription(|const &|' src/npupp.h \
  122.32  		src/np_entry.cpp src/npp_gate.cpp
  122.33 -	./configure --prefix=/usr \
  122.34 -		--sysconfdir=/etc \
  122.35 +
  122.36 +	./configure \
  122.37  		--disable-schemas-install \
  122.38  		--without-gconf \
  122.39  		CPPFLAGS="$CPPFLAGS -I/usr/include/nspr" \
  122.40  		$CONFIGURE_ARGS &&
  122.41 -	make  &&
  122.42 +	make &&
  122.43  	make DESTDIR=$DESTDIR install
  122.44  }
  122.45  
  122.46 -# Rules to gen a SliTaz package suitable for Tazpkg.
  122.47 -genpkg_rules()
  122.48 -{
  122.49 +genpkg_rules() {
  122.50  	mkdir -p $fs/usr/lib
  122.51  	cp -a $install/usr/lib/mozilla $fs/usr/lib
  122.52 +	DEPENDS="gnome-mplayer dbus-glib gcc-lib-base"
  122.53 +	TAGS="player audio video browser"
  122.54  }
  122.55  
  122.56 -post_install()
  122.57 -{
  122.58 -	for i in $(cd "$1"; ls usr/lib/mozilla/plugins/$PACKAGE*.so 2> /dev/null); do
  122.59 +post_install() {
  122.60 +	for i in $(cd "$1"; ls usr/lib/mozilla/plugins/$PACKAGE*.so 2>/dev/null); do
  122.61  		ln -s "/$i" "$1"/usr/lib/firefox*/plugins
  122.62  	done
  122.63  }
  122.64  
  122.65 -post_remove()
  122.66 -{
  122.67 +post_remove() {
  122.68  	rm -f /usr/lib/firefox*/plugins/$PACKAGE*.so
  122.69  }
   123.1 --- a/geoip/receipt	Tue Mar 27 12:50:45 2018 +0200
   123.2 +++ b/geoip/receipt	Fri Mar 30 19:31:50 2018 +0300
   123.3 @@ -17,29 +17,20 @@
   123.4  compile_rules() {
   123.5  	autoreconf -i
   123.6  	./configure \
   123.7 -		--prefix=/usr \
   123.8 -		--infodir=/usr/share/info \
   123.9 -		--mandir=/usr/share/man \
  123.10  		--sysconfdir=/etc/geoip \
  123.11 -		$CONFIGURE_ARGS 2>&1 | \
  123.12 -		sed 's|missing: No such|missing: no such|'
  123.13 -	make && make DESTDIR=$DESTDIR install
  123.14 +		$CONFIGURE_ARGS &&
  123.15 +	make &&
  123.16 +	make DESTDIR=$DESTDIR install
  123.17  }
  123.18  
  123.19  genpkg_rules() {
  123.20  	case $PACKAGE in
  123.21  		geoip)
  123.22 -			mkdir -p $fs/usr/lib $fs/usr/share
  123.23 -			cp -a $install/usr/bin $fs/usr
  123.24 -			cp -a $install/etc $fs
  123.25 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
  123.26 -			cp -a $install/usr/share/GeoIP $fs/usr/share
  123.27 +			copy @std
  123.28  			DEPENDS="zlib"
  123.29  			;;
  123.30  		*-dev)
  123.31 -			mkdir -p $fs/usr/lib
  123.32 -			cp -a $install/usr/lib/*.*a $fs/usr/lib
  123.33 -			cp -a $install/usr/include $fs/usr
  123.34 +			copy @dev
  123.35  			;;
  123.36  	esac
  123.37  }
   124.1 --- a/gettext/receipt	Tue Mar 27 12:50:45 2018 +0200
   124.2 +++ b/gettext/receipt	Fri Mar 30 19:31:50 2018 +0300
   124.3 @@ -22,7 +22,6 @@
   124.4  		arm) ARCH_ARGS="--disable-acl";;
   124.5  	esac
   124.6  
   124.7 -	fix ld
   124.8  	./configure $CONFIGURE_ARGS $ARCH_ARGS && make && make install || return 1
   124.9  
  124.10  	chmod 0755 $install/usr/lib/preloadable_libintl.so
   125.1 --- a/ghex/receipt	Tue Mar 27 12:50:45 2018 +0200
   125.2 +++ b/ghex/receipt	Fri Mar 30 19:31:50 2018 +0300
   125.3 @@ -11,7 +11,7 @@
   125.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   125.5  WGET_URL="http://ftp.acc.umu.se/pub/GNOME/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
   125.6  
   125.7 -BUILD_DEPENDS="gtk+-dev gnome-doc-utils-dev libgnomeui-dev libbonoboui-dev \
   125.8 +BUILD_DEPENDS="gtk+-dev gnome-doc-utils libgnomeui-dev libbonoboui-dev \
   125.9  libgnome-dev libbonobo-dev libbonoboui-dev libgnome-keyring-dev \
  125.10  libgnomeprintui-dev intltool"
  125.11  
   126.1 --- a/gigolo/receipt	Tue Mar 27 12:50:45 2018 +0200
   126.2 +++ b/gigolo/receipt	Fri Mar 30 19:31:50 2018 +0300
   126.3 @@ -14,10 +14,7 @@
   126.4  BUILD_DEPENDS="xfce4-dev-tools gtk+-dev xorg-libX11-dev"
   126.5  
   126.6  compile_rules() {
   126.7 -	fix ld
   126.8  	./autogen.sh \
   126.9 -		--sysconfdir=/etc \
  126.10 -		--localstatedir=/var \
  126.11  		$CONFIGURE_ARGS &&
  126.12  	make &&
  126.13  	make install
   127.1 --- a/gimp/receipt	Tue Mar 27 12:50:45 2018 +0200
   127.2 +++ b/gimp/receipt	Fri Mar 30 19:31:50 2018 +0300
   127.3 @@ -6,8 +6,9 @@
   127.4  SHORT_DESC="Gnu Image Manipulation Program or GIMP!"
   127.5  MAINTAINER="pankso@slitaz.org"
   127.6  LICENSE="GPL3"
   127.7 +WEB_SITE="http://www.gimp.org/"
   127.8 +
   127.9  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  127.10 -WEB_SITE="http://www.gimp.org/"
  127.11  WGET_URL="http://download.gimp.org/pub/gimp/v${VERSION%.*}/$TARBALL"
  127.12  
  127.13  BUILD_DEPENDS="gettext perl-xml-parser babl-dev gegl-dev glib-dev \
  127.14 @@ -15,106 +16,97 @@
  127.15  gdk-pixbuf-dev gtk+-dev libexif-dev aalib-dev libmng-dev jasper-dev"
  127.16  SPLIT="gimp gimp-brushes gimp-console gimp-dev gimp-plug-ins"
  127.17  
  127.18 -# Rules to configure and make the package.
  127.19 -compile_rules()
  127.20 -{
  127.21 +compile_rules() {
  127.22  	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lm"
  127.23 +
  127.24  	./configure \
  127.25 -		--prefix=/usr \
  127.26 -		--sysconfdir=/etc \
  127.27 -		--infodir=/usr/share/info \
  127.28 -		--mandir=/usr/share/man \
  127.29  		--with-html-dir=/usr/share/doc \
  127.30  		--without-print \
  127.31  		--disable-python \
  127.32  		--without-poppler \
  127.33 -  		--without-libcurl \
  127.34 -  		--without-alsa \
  127.35 -  		--without-librsvg \
  127.36 -  		--without-dbus \
  127.37 -  		--without-webkit \
  127.38 +		--without-libcurl \
  127.39 +		--without-alsa \
  127.40 +		--without-librsvg \
  127.41 +		--without-dbus \
  127.42 +		--without-webkit \
  127.43  		$CONFIGURE_ARGS &&
  127.44 -	make $MAKEFLAGS && make install
  127.45 +	make $MAKEFLAGS &&
  127.46 +	make install
  127.47  }
  127.48  
  127.49 -# Rules to gen a SliTaz package suitable for Tazpkg.
  127.50 -genpkg_rules()
  127.51 -{
  127.52 +genpkg_rules() {
  127.53  	case $PACKAGE in
  127.54 -	gimp)
  127.55 -		SUGGESTED="gimp-plug-ins gimp-brushes gimp-console \
  127.56 +		gimp)
  127.57 +			SUGGESTED="gimp-plug-ins gimp-brushes gimp-console \
  127.58  			gimp-plugin-ufraw"
  127.59 -		DEPENDS="libart_lgpl babl gegl glib tiff xorg-libXdamage \
  127.60 +			DEPENDS="libart_lgpl babl gegl glib tiff xorg-libXdamage \
  127.61  			xorg-libXmu xorg-libXt gdk-pixbuf gtk+ libexif"
  127.62 -		mkdir -p $fs/usr/lib $fs/usr/share/pixmaps
  127.63 +			mkdir -p $fs/usr/lib $fs/usr/share/pixmaps
  127.64  
  127.65 -		cp -a $install/etc $fs
  127.66 -		cp -a $install/usr/bin $fs/usr
  127.67 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
  127.68 -		cp -a $install/usr/lib/gimp $fs/usr/lib
  127.69 +			cp -a $install/etc $fs
  127.70 +			cp -a $install/usr/bin $fs/usr
  127.71 +			cp -a $install/usr/lib/*.so* $fs/usr/lib
  127.72 +			cp -a $install/usr/lib/gimp $fs/usr/lib
  127.73  
  127.74 -		cp $install/usr/share/icons/hicolor/24x24/apps/gimp.png \
  127.75 -			$fs/usr/share/pixmaps/gimp.png
  127.76 +			cp $install/usr/share/icons/hicolor/24x24/apps/gimp.png \
  127.77 +				$fs/usr/share/pixmaps/gimp.png
  127.78  
  127.79 -		# The gimp-console goes in a separate package
  127.80 -		rm $fs/usr/bin/gimp-console*
  127.81 +			# The gimp-console goes in a separate package
  127.82 +			rm $fs/usr/bin/gimp-console*
  127.83  
  127.84 -		# Most plug-ins goes in a separate package
  127.85 -		rm -rf $fs/usr/lib/gimp/2.0/plug-ins/*
  127.86 -		for i in file-jpeg file-png pixelize screenshot
  127.87 -		do
  127.88 -			cp $install/usr/lib/gimp/2.0/plug-ins/$i \
  127.89 -				$fs/usr/lib/gimp/2.0/plug-ins
  127.90 -		done
  127.91 +			# Most plug-ins goes in a separate package
  127.92 +			rm -rf $fs/usr/lib/gimp/2.0/plug-ins/*
  127.93 +			for i in file-jpeg file-png pixelize screenshot; do
  127.94 +				cp $install/usr/lib/gimp/2.0/plug-ins/$i \
  127.95 +					$fs/usr/lib/gimp/2.0/plug-ins
  127.96 +			done
  127.97  
  127.98 -		# Include only Basic brushes --> gimp-brushes
  127.99 -		cp -a $install/usr/share/gimp $fs/usr/share
 127.100 -		for i in gimp-* Legacy Media Sketch Splatters Texture
 127.101 -		do
 127.102 -			rm -rf $fs/usr/share/gimp/2.0/brushes/$i
 127.103 -		done
 127.104 +			# Include only Basic brushes --> gimp-brushes
 127.105 +			cp -a $install/usr/share/gimp $fs/usr/share
 127.106 +			for i in gimp-* Legacy Media Sketch Splatters Texture; do
 127.107 +				rm -rf $fs/usr/share/gimp/2.0/brushes/$i
 127.108 +			done
 127.109  
 127.110 -		# Remove devel files
 127.111 -		rm $fs/usr/lib/gimp/2.0/modules/*.*a
 127.112 +			# Remove devel files
 127.113 +			rm $fs/usr/lib/gimp/2.0/modules/*.*a
 127.114  
 127.115 -		# Put a nice splash with a spider
 127.116 -		cp -a $stuff/gimp-splash.png $fs/usr/share/gimp/2.0/images
 127.117 -		;;
 127.118 -	gimp-brushes)
 127.119 -		CAT="graphics|Gimp brushes set."
 127.120 -		DEPENDS="gimp"
 127.121 -		mkdir -p $fs/usr/share/gimp/2.0
 127.122 -		cp -a $install/usr/share/gimp/2.0/brushes $fs/usr/share/gimp/2.0
 127.123 -		rm -rf $fs/usr/share/gimp/2.0/brushes/Basic
 127.124 -		;;
 127.125 -	gimp-console)
 127.126 -		CAT="graphics|The GIMP console."
 127.127 -		DEPENDS="babl pango cairo gimp glib xorg-libX11 xorg-libXau"
 127.128 -		mkdir -p $fs/usr/bin
 127.129 -		cp -a $install/usr/bin/gimp-console* $fs/usr/bin
 127.130 -		;;
 127.131 -	gimp-dev)
 127.132 -		mkdir -p $fs/usr
 127.133 -		cp -a $install/usr/include $fs/usr
 127.134 -		cp -a $install/usr/lib $fs/usr
 127.135 -		# Remove libraries files
 127.136 -		rm -rf $fs/usr/lib/*.so*
 127.137 -		rm -rf $fs/usr/lib/gimp/2.0/modules/*.so*
 127.138 -		rm -rf $fs/usr/lib/gimp/2.0/environ
 127.139 -		rm -rf $fs/usr/lib/gimp/2.0/interpreters
 127.140 -		rm -rf $fs/usr/lib/gimp/2.0/plug-ins
 127.141 -		;;
 127.142 -	gimp-plug-ins)
 127.143 -		CAT="graphics|The GIMP image editor plug-ins suite for advanced users."
 127.144 -		DEPENDS="gimp lcms xorg-libXpm libmng aalib libexif tiff"
 127.145 -		mkdir -p $fs/usr/lib/gimp/2.0
 127.146 -		cp -a $install/usr/lib/gimp/2.0/plug-ins $fs/usr/lib/gimp/2.0
 127.147 +			# Put a nice splash with a spider
 127.148 +			cp -a $stuff/gimp-splash.png $fs/usr/share/gimp/2.0/images
 127.149 +			;;
 127.150 +		gimp-brushes)
 127.151 +			CAT="graphics|brushes set"
 127.152 +			DEPENDS="gimp"
 127.153 +			mkdir -p $fs/usr/share/gimp/2.0
 127.154 +			cp -a $install/usr/share/gimp/2.0/brushes $fs/usr/share/gimp/2.0
 127.155 +			rm -rf $fs/usr/share/gimp/2.0/brushes/Basic
 127.156 +			;;
 127.157 +		gimp-console)
 127.158 +			CAT="graphics|console"
 127.159 +			DEPENDS="babl pango cairo gimp glib xorg-libX11 xorg-libXau"
 127.160 +			mkdir -p $fs/usr/bin
 127.161 +			cp -a $install/usr/bin/gimp-console* $fs/usr/bin
 127.162 +			;;
 127.163 +		gimp-dev)
 127.164 +			mkdir -p $fs/usr
 127.165 +			cp -a $install/usr/include $fs/usr
 127.166 +			cp -a $install/usr/lib $fs/usr
 127.167 +			# Remove libraries files
 127.168 +			rm -rf $fs/usr/lib/*.so*
 127.169 +			rm -rf $fs/usr/lib/gimp/2.0/modules/*.so*
 127.170 +			rm -rf $fs/usr/lib/gimp/2.0/environ
 127.171 +			rm -rf $fs/usr/lib/gimp/2.0/interpreters
 127.172 +			rm -rf $fs/usr/lib/gimp/2.0/plug-ins
 127.173 +			;;
 127.174 +		gimp-plug-ins)
 127.175 +			CAT="graphics|plug-ins suite for advanced users"
 127.176 +			DEPENDS="gimp lcms xorg-libXpm libmng aalib libexif tiff"
 127.177 +			mkdir -p $fs/usr/lib/gimp/2.0
 127.178 +			cp -a $install/usr/lib/gimp/2.0/plug-ins $fs/usr/lib/gimp/2.0
 127.179  
 127.180 -		# Remove plug-ins provided by the main package.
 127.181 -		for i in file-jpeg file-png pixelize screenshot
 127.182 -		do
 127.183 -			rm $fs/usr/lib/gimp/2.0/plug-ins/$i
 127.184 -		done
 127.185 -		;;
 127.186 +			# Remove plug-ins provided by the main package.
 127.187 +			for i in file-jpeg file-png pixelize screenshot; do
 127.188 +				rm $fs/usr/lib/gimp/2.0/plug-ins/$i
 127.189 +			done
 127.190 +			;;
 127.191  	esac
 127.192  }
   128.1 --- a/glib/receipt	Tue Mar 27 12:50:45 2018 +0200
   128.2 +++ b/glib/receipt	Fri Mar 30 19:31:50 2018 +0300
   128.3 @@ -18,11 +18,9 @@
   128.4  SPLIT="glib-dev"
   128.5  
   128.6  compile_rules() {
   128.7 -	fix ld
   128.8  	case "$ARCH" in
   128.9  		i?86|x86_64)
  128.10  			./configure \
  128.11 -				--sysconfdir=/etc \
  128.12  				--with-pcre=system \
  128.13  				--enable-static \
  128.14  				$CONFIGURE_ARGS ;;
   129.1 --- a/glibmm/receipt	Tue Mar 27 12:50:45 2018 +0200
   129.2 +++ b/glibmm/receipt	Fri Mar 30 19:31:50 2018 +0300
   129.3 @@ -18,10 +18,10 @@
   129.4  compile_rules() {
   129.5  	sed -i "/^libdocdir =/ s|\$(book_name)|glibmm-$VERSION|" docs/Makefile.in
   129.6  
   129.7 -	fix ld &&
   129.8  	./configure $CONFIGURE_ARGS &&
   129.9  	fix libtool &&
  129.10 -	make && make install
  129.11 +	make &&
  129.12 +	make install
  129.13  }
  129.14  
  129.15  genpkg_rules() {
   130.1 --- a/glusterfs/receipt	Tue Mar 27 12:50:45 2018 +0200
   130.2 +++ b/glusterfs/receipt	Fri Mar 30 19:31:50 2018 +0300
   130.3 @@ -1,44 +1,30 @@
   130.4 -# SliTaz package receipt.
   130.5 +# SliTaz package receipt v2.
   130.6  
   130.7  PACKAGE="glusterfs"
   130.8  VERSION="3.12.5"
   130.9  CATEGORY="misc"
  130.10 -SHORT_DESC="Distributed file system."
  130.11 +SHORT_DESC="Distributed file system"
  130.12  MAINTAINER="pascal.bellard@slitaz.org"
  130.13  LICENSE="GPL2 LGPL3"
  130.14  WEB_SITE="http://www.gluster.org/"
  130.15 +
  130.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  130.17  WGET_URL="https://download.gluster.org/pub/gluster/glusterfs/${VERSION%.*}/$VERSION/$TARBALL"
  130.18  
  130.19 -DEPENDS="python readline mpc-library elfutils openssl"
  130.20  BUILD_DEPENDS="flex python-dev readline-dev mpc-library elfutils openssl-dev \
  130.21  acl-dev sqlite-dev liburcu-dev libxml2-dev"
  130.22  
  130.23 -# Rules to configure and make the package.
  130.24 -compile_rules()
  130.25 -{
  130.26 +compile_rules() {
  130.27  	sed -i "/^cat/,/^EOM/d;s/exit/echo '$HOST_SYSTEM'\n&/" config.sub
  130.28 -	./configure --prefix=/usr --infodir=/usr/share/info \
  130.29 +
  130.30 +	./configure \
  130.31  		--libexecdir=/usr/share \
  130.32 -		--mandir=/usr/share/man \
  130.33 -		--sysconfdir=/etc \
  130.34 -		--localstatedir=/var \
  130.35  		$CONFIGURE_ARGS &&
  130.36  	make &&
  130.37  	make  install
  130.38  }
  130.39  
  130.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
  130.41 -genpkg_rules()
  130.42 -{
  130.43 -	mkdir -p $fs/usr/share
  130.44 -	cp -a $install/etc $fs
  130.45 -	cp -a $install/var $fs
  130.46 -	cp -a $install/sbin $fs
  130.47 -	cp -a $install/usr/sbin $fs/usr
  130.48 -	cp -a $install/usr/lib $fs/usr
  130.49 -	cp -a $install/usr/share/glusterfs $fs/usr/share
  130.50 -
  130.51 -	# Clean-up
  130.52 -	find $fs/usr/lib -name "*.*a" -exec rm -f {} \;
  130.53 +genpkg_rules() {
  130.54 +	copy @std
  130.55 +	DEPENDS="python readline mpc-library elfutils openssl"
  130.56  }
   131.1 --- a/gmime/receipt	Tue Mar 27 12:50:45 2018 +0200
   131.2 +++ b/gmime/receipt	Fri Mar 30 19:31:50 2018 +0300
   131.3 @@ -18,13 +18,13 @@
   131.4  COOKOPTS="skip-log-errors"
   131.5  
   131.6  compile_rules() {
   131.7 -	fix ld
   131.8  	./configure \
   131.9  		--disable-static \
  131.10  		--enable-smime \
  131.11  		$CONFIGURE_ARGS &&
  131.12  	fix libtool &&
  131.13 -	make && make install
  131.14 +	make &&
  131.15 +	make install
  131.16  }
  131.17  
  131.18  genpkg_rules() {
   132.1 --- a/gnome-commander/receipt	Tue Mar 27 12:50:45 2018 +0200
   132.2 +++ b/gnome-commander/receipt	Fri Mar 30 19:31:50 2018 +0300
   132.3 @@ -11,7 +11,7 @@
   132.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   132.5  WGET_URL="https://download.gnome.org/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
   132.6  
   132.7 -BUILD_DEPENDS="gtk+-dev glib-dev gnome-doc-utils-dev libgnome-dev \
   132.8 +BUILD_DEPENDS="gtk+-dev glib-dev gnome-doc-utils libgnome-dev \
   132.9  libgnomeui-dev gdk-pixbuf-dev cairo-dev pango-dev atk-dev libbonoboui-dev \
  132.10  libgnomecanvas-dev libart_lgpl-dev xorg-libXinerama-dev xorg-libXrandr-dev \
  132.11  xorg-dev libgnome-keyring-dev libgcrypt-dev rarian-dev rarian exiv2-dev \
   133.1 --- a/gnome-desktop/receipt	Tue Mar 27 12:50:45 2018 +0200
   133.2 +++ b/gnome-desktop/receipt	Fri Mar 30 19:31:50 2018 +0300
   133.3 @@ -11,13 +11,12 @@
   133.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   133.5  WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
   133.6  
   133.7 -BUILD_DEPENDS="python-dev libxml2-python GConf-dev gnome-doc-utils-dev \
   133.8 +BUILD_DEPENDS="python-dev libxml2-python GConf-dev gnome-doc-utils \
   133.9  intltool gtk+-dev xorg-libXrandr-dev"
  133.10  SPLIT="gnome-desktop-dev"
  133.11  
  133.12  compile_rules() {
  133.13  	./configure \
  133.14 -		--prefix=/usr \
  133.15  		--sysconfdir=/etc/gnome \
  133.16  		--localstatedir=/var/lib \
  133.17  		--enable-gtk-doc-html=no \
  133.18 @@ -26,7 +25,8 @@
  133.19  		--disable-static \
  133.20  		--with-gnome-distributor="SliTaz GNU/Linux" \
  133.21  		$CONFIGURE_ARGS &&
  133.22 -	make && make DESTDIR=$DESTDIR install
  133.23 +	make &&
  133.24 +	make DESTDIR=$DESTDIR install
  133.25  }
  133.26  
  133.27  genpkg_rules() {
  133.28 @@ -40,10 +40,7 @@
  133.29  			DEPENDS="GConf gtk+ startup-notification"
  133.30  			;;
  133.31  		*-dev)
  133.32 -			mkdir -p $fs/usr/lib
  133.33 -			cp -a $install/usr/include $fs/usr
  133.34 -			cp -a $install/usr/lib/*a $fs/usr/lib
  133.35 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  133.36 +			copy @dev
  133.37  			;;
  133.38  	esac
  133.39  }
   134.1 --- a/gnome-doc-utils/receipt	Tue Mar 27 12:50:45 2018 +0200
   134.2 +++ b/gnome-doc-utils/receipt	Fri Mar 30 19:31:50 2018 +0300
   134.3 @@ -2,7 +2,7 @@
   134.4  
   134.5  PACKAGE="gnome-doc-utils"
   134.6  VERSION="0.20.10"
   134.7 -CATEGORY="misc"
   134.8 +CATEGORY="development"
   134.9  SHORT_DESC="Documentation utilities for GNOME"
  134.10  MAINTAINER="erjo@slitaz.org"
  134.11  LICENSE="GPL2 LGPL2.1"
  134.12 @@ -12,40 +12,16 @@
  134.13  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
  134.14  
  134.15  BUILD_DEPENDS="libxml2-dev libxslt-dev rarian-dev libxml2-python intltool"
  134.16 -SPLIT="gnome-doc-utils-dev"
  134.17  
  134.18  compile_rules() {
  134.19  	./configure \
  134.20 -		--prefix=/usr \
  134.21 -		--infodir=/usr/share/info \
  134.22 -		--sysconfdir=/etc \
  134.23 -		--localstatedir=/var \
  134.24  		--disable-scrollkeeper \
  134.25 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
  134.26 +		$CONFIGURE_ARGS &&
  134.27  	make -j1 &&
  134.28  	make -j1 DESTDIR=$DESTDIR install
  134.29  }
  134.30  
  134.31  genpkg_rules() {
  134.32 -	case $PACKAGE in
  134.33 -		gnome-doc-utils)
  134.34 -			mkdir -p $fs/usr/bin $fs/usr/share/locale
  134.35 -			cp -a $install/usr/bin/gnome-doc-tool $fs/usr/bin
  134.36 -			cp -a $install/usr/bin/xml2po $fs/usr/bin
  134.37 -			cp -a $install/usr/share/xml $fs/usr/share
  134.38 -			cp -a $install/usr/lib $fs/usr
  134.39 -			DEPENDS="libxml2 libxslt python libxml2-python rarian docbook-xml"
  134.40 -			;;
  134.41 -		*-dev)
  134.42 -			mkdir -p $fs/usr/bin \
  134.43 -				$fs/usr/lib \
  134.44 -				$fs/usr/share
  134.45 -			cp -a $install/usr/share/pkgconfig $fs/usr/lib
  134.46 -			cp -a $install/usr/bin/gnome-doc-prepare $fs/usr/bin
  134.47 -			cp -a $install/usr/share/aclocal $fs/usr/share
  134.48 -			cp -a $install/usr/share/man $fs/usr/share
  134.49 -			cp -a $install/usr/share/gnome* $fs/usr/share
  134.50 -			cp -a $install/usr/lib $fs/usr
  134.51 -			;;
  134.52 -	esac
  134.53 +	copy @std @dev
  134.54 +	DEPENDS="libxml2 libxslt python libxml2-python rarian docbook-xml"
  134.55  }
   135.1 --- a/gnome-games/receipt	Tue Mar 27 12:50:45 2018 +0200
   135.2 +++ b/gnome-games/receipt	Fri Mar 30 19:31:50 2018 +0300
   135.3 @@ -13,7 +13,7 @@
   135.4  
   135.5  BUILD_DEPENDS="glib-dev gtk+-dev GConf-dev librsvg-dev clutter-dev \
   135.6  clutter-gtk-dev pygtk-dev libcanberra-dev intltool guile-dev \
   135.7 -gnome-doc-utils-dev xorg-libSM-dev xorg-libICE-dev gobject-introspection-dev"
   135.8 +gnome-doc-utils xorg-libSM-dev xorg-libICE-dev gobject-introspection-dev"
   135.9  
  135.10  gg='gnome-games'
  135.11  SPLIT="\
  135.12 @@ -23,16 +23,15 @@
  135.13  $gg-swell-foop $gg-common  $gg-help      $gg           $gg-dev"
  135.14  
  135.15  compile_rules() {
  135.16 -	fix ld
  135.17  	./configure \
  135.18 -		--sysconfdir=/etc \
  135.19  		--bindir=/usr/games \
  135.20 -		--localstatedir=/var \
  135.21  		--disable-scrollkeeper \
  135.22  		--enable-introspection \
  135.23  		--enable-sound \
  135.24  		$CONFIGURE_ARGS &&
  135.25 -	make && make install || return 1
  135.26 +	fix libtool &&
  135.27 +	make &&
  135.28 +	make install || return 1
  135.29  
  135.30  	chmod a+w $install/var/games/*.scores
  135.31  }
   136.1 --- a/gnome-keyring/receipt	Tue Mar 27 12:50:45 2018 +0200
   136.2 +++ b/gnome-keyring/receipt	Fri Mar 30 19:31:50 2018 +0300
   136.3 @@ -18,11 +18,13 @@
   136.4  	sed -i	-e 's|<glib.h>|&\n#include <libtasn1.h>|' \
   136.5  		-e  's|const struct static_struct_asn|const ASN1_ARRAY_TYPE|' \
   136.6  		egg/egg-asn1x.h
   136.7 +
   136.8  	./configure \
   136.9  		--libexecdir=/usr/lib/$PACKAGE \
  136.10  		--sysconfdir=/etc/gnome \
  136.11  		--disable-pam &&
  136.12 -	make && make install
  136.13 +	make &&
  136.14 +	make install
  136.15  }
  136.16  
  136.17  genpkg_rules() {
  136.18 @@ -36,4 +38,3 @@
  136.19  			;;
  136.20  	esac
  136.21  }
  136.22 -
   137.1 --- a/gnome-keyring3/receipt	Tue Mar 27 12:50:45 2018 +0200
   137.2 +++ b/gnome-keyring3/receipt	Fri Mar 30 19:31:50 2018 +0300
   137.3 @@ -19,9 +19,9 @@
   137.4  	sed -i -r 's:"(/desktop):"/org/gnome\1:' schema/*.xml
   137.5  
   137.6  	./configure \
   137.7 -		--sysconfdir=/etc \
   137.8  		--disable-pam \
   137.9  		$CONFIGURE_ARGS &&
  137.10 +	fix libtool &&
  137.11  	make &&
  137.12  	make install
  137.13  }
   138.1 --- a/gnome-menus/receipt	Tue Mar 27 12:50:45 2018 +0200
   138.2 +++ b/gnome-menus/receipt	Fri Mar 30 19:31:50 2018 +0300
   138.3 @@ -9,18 +9,13 @@
   138.4  WEB_SITE="http://www.gnome.org/"
   138.5  
   138.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
   138.7 -#WGET_URL="http://ftp.gnome.org/pub/GNOME/desktop/${VERSION%.*}/$VERSION/sources/$TARBALL"
   138.8  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   138.9  
  138.10  BUILD_DEPENDS="intltool python-dev python glib-dev"
  138.11  SPLIT="gnome-menus-dev"
  138.12  
  138.13  compile_rules() {
  138.14 -	./configure \
  138.15 -		--prefix=/usr \
  138.16 -		--sysconfdir=/etc \
  138.17 -		--mandir=/usr/share/man \
  138.18 -		$CONFIGURE_ARGS &&
  138.19 +	./configure $CONFIGURE_ARGS &&
  138.20  	make &&
  138.21  	make DESTDIR=$DESTDIR install
  138.22  }
  138.23 @@ -28,22 +23,12 @@
  138.24  genpkg_rules() {
  138.25  	case $PACKAGE in
  138.26  		gnome-menus)
  138.27 -			PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
  138.28 -			mkdir -p $fs/usr/lib
  138.29 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
  138.30 -			cp -a $install/usr/lib/$PYTHON_LIB $fs/usr/lib
  138.31 -			rm $fs/usr/lib/$PYTHON_LIB/site-packages/*.*a
  138.32 +			copy @std
  138.33  			DEPENDS="glib"
  138.34  			SUGGESTED="python gamin"
  138.35  			;;
  138.36  		*-dev)
  138.37 -			PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
  138.38 -			mkdir -p $fs/usr/lib/$PYTHON_LIB/site-packages
  138.39 -			cp -a $install/usr/lib/*.*a $fs/usr/lib
  138.40 -			cp -a $install/usr/lib/$PYTHON_LIB/site-packages/*.*a \
  138.41 -				$fs/usr/lib/$PYTHON_LIB/site-packages
  138.42 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  138.43 -			cp -a $install/usr/include $fs/usr
  138.44 +			copy @dev
  138.45  			DEPENDS="gnome-menus python-dev"
  138.46  			;;
  138.47  	esac
   139.1 --- a/gnome-mime-data/receipt	Tue Mar 27 12:50:45 2018 +0200
   139.2 +++ b/gnome-mime-data/receipt	Fri Mar 30 19:31:50 2018 +0300
   139.3 @@ -1,4 +1,4 @@
   139.4 -# SliTaz package receipt.
   139.5 +# SliTaz package receipt v2.
   139.6  
   139.7  PACKAGE="gnome-mime-data"
   139.8  VERSION="2.18.0"
   139.9 @@ -6,33 +6,22 @@
  139.10  SHORT_DESC="The GNOME Mime Data file types"
  139.11  MAINTAINER="erjo@slitaz.org"
  139.12  LICENSE="GPL2"
  139.13 +WEB_SITE="http://www.gnome.org"
  139.14 +
  139.15  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  139.16 -WEB_SITE="http://www.gnome.org"
  139.17 -WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
  139.18 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
  139.19  
  139.20 -DEPENDS="perl-xml-parser"
  139.21  BUILD_DEPENDS="perl-xml-parser gettext"
  139.22  
  139.23 -# Rules to configure and make the package.
  139.24 -compile_rules()
  139.25 -{
  139.26 -	cd $src
  139.27 +compile_rules() {
  139.28  	./configure \
  139.29 -		--prefix=/usr \
  139.30  		--sysconfdir=/etc/gnome \
  139.31  		$CONFIGURE_ARGS &&
  139.32 -	make && make DESTDIR=$DESTDIR install
  139.33 +	make &&
  139.34 +	make DESTDIR=$DESTDIR install
  139.35  }
  139.36  
  139.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
  139.38 -genpkg_rules()
  139.39 -{
  139.40 -	mkdir -p $fs/usr/share $fs/usr/lib
  139.41 -	
  139.42 -	cp -a $install/etc $fs/
  139.43 -	cp -a $install/usr/share/application-registry $fs/usr/share
  139.44 -	cp -a $install/usr/share/mime-info $fs/usr/share
  139.45 -	cp -a $install/usr/share/pkgconfig $fs/usr/lib
  139.46 -	
  139.47 +genpkg_rules() {
  139.48 +	copy @std
  139.49 +	DEPENDS="perl-xml-parser"
  139.50  }
  139.51 -
   140.1 --- a/gnome-mplayer/receipt	Tue Mar 27 12:50:45 2018 +0200
   140.2 +++ b/gnome-mplayer/receipt	Fri Mar 30 19:31:50 2018 +0300
   140.3 @@ -1,42 +1,35 @@
   140.4 -# SliTaz package receipt.
   140.5 +# SliTaz package receipt v2.
   140.6  
   140.7  PACKAGE="gnome-mplayer"
   140.8  VERSION="1.0.3"
   140.9  CATEGORY="multimedia"
  140.10 -SHORT_DESC="simple MPlayer GUI"
  140.11 +SHORT_DESC="Simple MPlayer GUI"
  140.12  MAINTAINER="jozee@slitaz.org"
  140.13  LICENSE="GPL2"
  140.14 +WEB_SITE="http://gnome-mplayer.googlecode.com/"
  140.15 +
  140.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  140.17 -WEB_SITE="http://gnome-mplayer.googlecode.com/" 
  140.18  WGET_URL="$WEB_SITE/files/$TARBALL"
  140.19 -TAGS="player audio video movie mp3 ogg dvd"
  140.20  
  140.21 -DEPENDS="mplayer gtk+ dbus-glib libnotify alsa-lib libgpod"
  140.22  BUILD_DEPENDS="$DEPENDS dbus-dev dbus-glib-dev libnotify-dev libgpod-dev \
  140.23  xorg-libX11-dev xorg-libxcb-dev gtk+-dev xorg-libXScrnSaver-dev"
  140.24  
  140.25 -# Rules to configure and make the package.
  140.26 -compile_rules()
  140.27 -{
  140.28 -	cd $src	
  140.29 -	./configure --prefix=/usr \
  140.30 -		--sysconfdir=/etc \
  140.31 +compile_rules() {
  140.32 +	./configure \
  140.33  		--disable-schemas-install \
  140.34  		--without-gconf \
  140.35  		--disable-nautilus \
  140.36  		--disable-panscan \
  140.37  		--without-libmusicbrainz3 &&
  140.38  	make  &&
  140.39 -	make install
  140.40 -	
  140.41 +	make install || return 1
  140.42 +
  140.43 +	sed 's|Exec=gnome-mplayer|Exec=gnome-mplayer %F|' \
  140.44 +		-i $install/usr/share/applications/$PACKAGE.desktop
  140.45  }
  140.46  
  140.47 -# Rules to gen a SliTaz package suitable for Tazpkg.
  140.48 -genpkg_rules()
  140.49 -{
  140.50 -	mkdir -p $fs/usr/share/icons/hicolor $fs/usr/share/applications
  140.51 -	cp -a $install/usr/bin $fs/usr
  140.52 -	cp -a $install/usr/share/glib-2.0 $fs/usr/share
  140.53 -	cp -a $install/usr/share/icons/hicolor/16x16 $fs/usr/share/icons/hicolor
  140.54 -	sed -i 's|Exec=gnome-mplayer|Exec=gnome-mplayer %F|' $install/usr/share/applications/$PACKAGE.desktop
  140.55 +genpkg_rules() {
  140.56 +	copy @std
  140.57 +	DEPENDS="mplayer gtk+ dbus-glib libnotify alsa-lib libgpod"
  140.58 +	TAGS="player audio video movie mp3 ogg dvd"
  140.59  }
   141.1 --- a/gnome-python/receipt	Tue Mar 27 12:50:45 2018 +0200
   141.2 +++ b/gnome-python/receipt	Fri Mar 30 19:31:50 2018 +0300
   141.3 @@ -19,8 +19,10 @@
   141.4  	./configure \
   141.5  		--libexecdir=/usr/lib/$PACKAGE \
   141.6  		--sysconfdir=/etc/gnome \
   141.7 -		--disable-pam $CONFIGURE_ARGS &&
   141.8 -	make && make install
   141.9 +		--disable-pam \
  141.10 +		$CONFIGURE_ARGS &&
  141.11 +	make &&
  141.12 +	make install
  141.13  }
  141.14  
  141.15  genpkg_rules() {
   142.1 --- a/gnome-vfs/receipt	Tue Mar 27 12:50:45 2018 +0200
   142.2 +++ b/gnome-vfs/receipt	Fri Mar 30 19:31:50 2018 +0300
   142.3 @@ -25,9 +25,6 @@
   142.4  	automake --add-missing
   142.5  	CFLAGS="$CFLAGS -fno-strict-aliasing" \
   142.6  	./configure \
   142.7 -		--prefix=/usr \
   142.8 -		--sysconfdir=/etc \
   142.9 -		--localstatedir=/var \
  142.10  		--disable-static \
  142.11  		--libexecdir=/usr/lib/gnome-vfs-2.0 \
  142.12  		--disable-hal \
   143.1 --- a/gnubg/receipt	Tue Mar 27 12:50:45 2018 +0200
   143.2 +++ b/gnubg/receipt	Fri Mar 30 19:31:50 2018 +0300
   143.3 @@ -1,36 +1,29 @@
   143.4 -# SliTaz package receipt.
   143.5 +# SliTaz package receipt v2.
   143.6  
   143.7  PACKAGE="gnubg"
   143.8  VERSION="1.05.000"
   143.9  CATEGORY="games"
  143.10 -SHORT_DESC="GNU Backgammon game."
  143.11 +SHORT_DESC="GNU Backgammon game"
  143.12  MAINTAINER="pascal.bellard@slitaz.org"
  143.13  LICENSE="GPL"
  143.14 +WEB_SITE="http://www.gnubg.org/"
  143.15 +
  143.16  TARBALL="$PACKAGE-release-$VERSION-sources.tar.gz"
  143.17 -WEB_SITE="http://www.gnubg.org/"
  143.18  WGET_URL="http://files.gnubg.org/media/sources/$TARBALL"
  143.19  
  143.20 -DEPENDS="gtk+ libcanberra ncurses python gmp libvorbis libltdl"
  143.21  BUILD_DEPENDS="autoconf automake bison flex libtool \
  143.22  glib-dev libpng16-dev freetype-dev gtk+-dev cairo-dev libcanberra-dev \
  143.23  gtkglext-dev readline-dev python sqlite3-dev gmp-dev"
  143.24  
  143.25 -# Rules to configure and make the package.
  143.26 -compile_rules()
  143.27 -{
  143.28 -	./configure --prefix=/usr \
  143.29 -		--sysconfdir=/etc \
  143.30 -		--mandir=/usr/share/man \
  143.31 +compile_rules() {
  143.32 +	./configure \
  143.33  		--disable-cputest \
  143.34  		$CONFIGURE_ARGS &&
  143.35  	make &&
  143.36  	make DESTDIR=$DESTDIR install
  143.37  }
  143.38  
  143.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  143.40 -genpkg_rules()
  143.41 -{
  143.42 -	mkdir -p $fs/usr/share/applications
  143.43 -	cp -a $install/* $fs
  143.44 -	cp -a $stuff/gnubg.desktop $fs/usr/share/applications
  143.45 +genpkg_rules() {
  143.46 +	copy @std
  143.47 +	DEPENDS="gtk+ libcanberra ncurses python gmp libvorbis libltdl"
  143.48  }
   144.1 --- a/gnucash/receipt	Tue Mar 27 12:50:45 2018 +0200
   144.2 +++ b/gnucash/receipt	Fri Mar 30 19:31:50 2018 +0300
   144.3 @@ -1,4 +1,4 @@
   144.4 -# SliTaz package receipt.
   144.5 +# SliTaz package receipt v2.
   144.6  
   144.7  PACKAGE="gnucash"
   144.8  VERSION="2.6.3"
   144.9 @@ -7,25 +7,21 @@
  144.10  MAINTAINER="domcox@slitaz.org"
  144.11  LICENSE="GPL2"
  144.12  WEB_SITE="http://www.gnucash.org"
  144.13 +
  144.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
  144.15  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  144.16 -LOCALES="cs da de el es fr hu it pl pt pt_BR ru sv zh_CN zh_TW"
  144.17  
  144.18 -DEPENDS="glib gtk+ goffice guile libgnomecanvas libofx libwebkit libxml2 \
  144.19 -libxslt perl slib zlib util-linux-uuid"
  144.20  BUILD_DEPENDS="glib-dev gtk+-dev goffice-dev guile-dev libgnomecanvas-dev \
  144.21  libofx-dev libwebkit-dev libxml2-dev libxslt-dev perl slib zlib-dev intltool \
  144.22  util-linux-uuid-dev libtool"
  144.23  
  144.24 -# Rules to configure and make the package.
  144.25 -compile_rules()
  144.26 -{
  144.27 +LOCALES="cs da de el es fr hu it pl pt pt_BR ru sv zh_CN zh_TW"
  144.28 +
  144.29 +compile_rules() {
  144.30  	# busybox compliance
  144.31  	sed -i 's/cat -s/cat/g' $src/doc/Makefile.in
  144.32 -	# build
  144.33 +
  144.34  	./configure \
  144.35 -		--prefix=/usr \
  144.36 -		--sysconfdir=/etc \
  144.37  		--libexecdir=/usr/lib \
  144.38  		--disable-dbi \
  144.39  		--enable-ofx \
  144.40 @@ -36,31 +32,8 @@
  144.41  	make -j1 install $DESTDIR=$install
  144.42  }
  144.43  
  144.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
  144.45 -genpkg_rules()
  144.46 -{
  144.47 -	mkdir -p $fs/usr/share/locale
  144.48 -	# /etc
  144.49 -	cp -a $install/etc $fs
  144.50 -	# /usr/bin
  144.51 -	cp -a $install/usr/bin $fs/usr
  144.52 -	# /usr/lib
  144.53 -	cp -a $install/usr/lib $fs/usr
  144.54 -	rm -f $fs/usr/lib/*.*a
  144.55 -	rm -f $fs/usr/lib/gnucash/*.*a
  144.56 -	# /usr/share
  144.57 -	local sharedirs="appdata applications glib-2.0 gnucash"
  144.58 -	for dir in $sharedirs; do
  144.59 -		cp -a $install/usr/share/$dir $fs/usr/share
  144.60 -	done
  144.61 -	# desktop file and icon
  144.62 -	mkdir -p $fs/usr/share/pixmaps
  144.63 -	cp -a $install/usr/share/icons/hicolor/32x32/apps/gnucash-icon.png \
  144.64 -		$fs/usr/share/pixmaps/gnucash.png
  144.65 -	sed -i 's/Icon=.*/Icon=gnucash/' \
  144.66 -		$install/usr/share/applications/gnucash.desktop
  144.67 -	# locales
  144.68 -	for locale in $LOCALES; do
  144.69 -		cp -a $install/usr/share/locale/$locale $fs/usr/share/locale
  144.70 -	done
  144.71 +genpkg_rules() {
  144.72 +	copy @std *.mo
  144.73 +	DEPENDS="glib gtk+ goffice guile libgnomecanvas libofx libwebkit libxml2 \
  144.74 +	libxslt perl slib zlib util-linux-uuid"
  144.75  }
   145.1 --- a/gobject-introspection/receipt	Tue Mar 27 12:50:45 2018 +0200
   145.2 +++ b/gobject-introspection/receipt	Fri Mar 30 19:31:50 2018 +0300
   145.3 @@ -25,7 +25,6 @@
   145.4  			;;
   145.5  	esac
   145.6  
   145.7 -	fix ld
   145.8  	./configure \
   145.9  		--disable-static \
  145.10  		$CONFIGURE_ARGS &&
   146.1 --- a/gparted/receipt	Tue Mar 27 12:50:45 2018 +0200
   146.2 +++ b/gparted/receipt	Fri Mar 30 19:31:50 2018 +0300
   146.3 @@ -26,13 +26,13 @@
   146.4  	# Remove keywords from desktop file and apply SliTaz graphical SU method
   146.5  	sed -i '/^_Keywords=/d; s|@gksuprog@|tazbox su|' gparted.desktop.in.in
   146.6  
   146.7 -	fix ld
   146.8  	./configure \
   146.9  		--disable-scrollkeeper \
  146.10  		--disable-doc \
  146.11  		$CONFIGURE_ARGS &&
  146.12  	fix libtool &&
  146.13 -	make && make install
  146.14 +	make &&
  146.15 +	make install
  146.16  }
  146.17  
  146.18  genpkg_rules() {
   147.1 --- a/gputils/receipt	Tue Mar 27 12:50:45 2018 +0200
   147.2 +++ b/gputils/receipt	Fri Mar 30 19:31:50 2018 +0300
   147.3 @@ -1,28 +1,22 @@
   147.4 -# SliTaz package receipt.
   147.5 +# SliTaz package receipt v2.
   147.6  
   147.7  PACKAGE="gputils"
   147.8  VERSION="0.14.3"
   147.9  CATEGORY="development"
  147.10 -SHORT_DESC="Tools for the Microchip (TM) PIC microcontrollers."
  147.11 +SHORT_DESC="Tools for the Microchip (TM) PIC microcontrollers"
  147.12  MAINTAINER="pascal.bellard@slitaz.org"
  147.13  LICENSE="GPL2"
  147.14  WEB_SITE="http://gputils.sourceforge.net/"
  147.15 +
  147.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  147.17  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  147.18  
  147.19 -DEPENDS=""
  147.20 -BUILD_DEPENDS=""
  147.21 -
  147.22 -# Rules to configure and make the package.
  147.23 -compile_rules()
  147.24 -{
  147.25 -	cd $src
  147.26 -	./configure --prefix=/usr --sysconfdir=/etc $CONFIGURE_ARGS &&
  147.27 -	make && make DESTDIR=$DESTDIR install
  147.28 +compile_rules() {
  147.29 +	./configure $CONFIGURE_ARGS &&
  147.30 +	make &&
  147.31 +	make DESTDIR=$DESTDIR install
  147.32  }
  147.33  
  147.34 -# Rules to gen a SliTaz package suitable for Tazpkg.
  147.35 -genpkg_rules()
  147.36 -{
  147.37 -	cp -a $install/* $fs
  147.38 +genpkg_rules() {
  147.39 +	copy @std
  147.40  }
   148.1 --- a/grantlee/receipt	Tue Mar 27 12:50:45 2018 +0200
   148.2 +++ b/grantlee/receipt	Fri Mar 30 19:31:50 2018 +0300
   148.3 @@ -19,7 +19,6 @@
   148.4  	mkdir build
   148.5  	cd    build
   148.6  
   148.7 -	fix ld
   148.8  	cmake \
   148.9  		-DCMAKE_INSTALL_PREFIX=/usr \
  148.10  		-DCMAKE_BUILD_TYPE=Release \
   149.1 --- a/gst0-plugins-bad/receipt	Tue Mar 27 12:50:45 2018 +0200
   149.2 +++ b/gst0-plugins-bad/receipt	Fri Mar 30 19:31:50 2018 +0300
   149.3 @@ -19,12 +19,8 @@
   149.4  zvbi-dev"
   149.5  SPLIT="gst0-plugins-bad-dev"
   149.6  
   149.7 -# Rules to configure and make the package.
   149.8 -compile_rules()
   149.9 -{
  149.10 +compile_rules() {
  149.11  	./configure \
  149.12 -		--sysconfdir=/etc \
  149.13 -		--localstatedir=/var \
  149.14  		--disable-static \
  149.15  		--disable-debug \
  149.16  		--enable-experimental \
  149.17 @@ -35,9 +31,7 @@
  149.18  	make install
  149.19  }
  149.20  
  149.21 -# Rules to gen a SliTaz package suitable for Tazpkg.
  149.22 -genpkg_rules()
  149.23 -{
  149.24 +genpkg_rules() {
  149.25  	case $PACKAGE in
  149.26  		*-bad)
  149.27  			copy @std
   150.1 --- a/gst0-plugins-base/receipt	Tue Mar 27 12:50:45 2018 +0200
   150.2 +++ b/gst0-plugins-base/receipt	Fri Mar 30 19:31:50 2018 +0300
   150.3 @@ -26,8 +26,6 @@
   150.4  		arm*) export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include" ;;
   150.5  	esac
   150.6  	./configure \
   150.7 -		--sysconfdir=/etc \
   150.8 -		--localstatedir=/var \
   150.9  		--enable-experimental \
  150.10  		--disable-static \
  150.11  		--disable-debug \
  150.12 @@ -35,7 +33,8 @@
  150.13  		--with-package-name="$SHORT_DESC" \
  150.14  		--with-package-origin="http://www.slitaz.org/" \
  150.15  		$CONFIGURE_ARGS &&
  150.16 -	make $MAKEFLAGS && make install
  150.17 +	make $MAKEFLAGS &&
  150.18 +	make install
  150.19  }
  150.20  
  150.21  genpkg_rules() {
   151.1 --- a/gst0-plugins-good/receipt	Tue Mar 27 12:50:45 2018 +0200
   151.2 +++ b/gst0-plugins-good/receipt	Fri Mar 30 19:31:50 2018 +0300
   151.3 @@ -7,6 +7,7 @@
   151.4  MAINTAINER="jozee@slitaz.org"
   151.5  LICENSE="LGPL2.1"
   151.6  WEB_SITE="http://gstreamer.freedesktop.org/"
   151.7 +LFS="http://www.linuxfromscratch.org/blfs/view/7.6/multimedia/gst-plugins-good.html"
   151.8  
   151.9  TARBALL="gst-plugins-good-$VERSION.tar.xz"
  151.10  WGET_URL="$GNOME_MIRROR/gst-plugins-good/0.10/$TARBALL"
  151.11 @@ -18,17 +19,12 @@
  151.12  libshout-dev libsoup-dev speex-dev taglib-dev wavpack-dev libjpeg-turbo-dev"
  151.13  SPLIT="gst0-plugins-good-extra gst0-plugins-good gst0-plugins-good-dev"
  151.14  
  151.15 -# Rules to configure and make the package.
  151.16 -compile_rules()
  151.17 -{
  151.18 -	# http://www.linuxfromscratch.org/blfs/view/7.6/multimedia/gst-plugins-good.html
  151.19 +compile_rules() {
  151.20  	sed -i "/input:/d" sys/v4l2/gstv4l2bufferpool.c &&
  151.21  	sed -i "/case V4L2_CID_HCENTER/d; /case V4L2_CID_VCENTER/d" \
  151.22  		sys/v4l2/v4l2_calls.c &&
  151.23  
  151.24  	./configure \
  151.25 -		--sysconfdir=/etc \
  151.26 -		--localstatedir=/var \
  151.27  		--with-package-name="$SHORT_DESC" \
  151.28  		--with-package-origin="http://www.slitaz.org/" \
  151.29  		--enable-experimental \
  151.30 @@ -45,9 +41,7 @@
  151.31  	make -C docs/plugins install-data
  151.32  }
  151.33  
  151.34 -# Rules to gen a SliTaz package suitable for Tazpkg.
  151.35 -genpkg_rules()
  151.36 -{
  151.37 +genpkg_rules() {
  151.38  	case $PACKAGE in
  151.39  		*-extra)
  151.40  			copy *deinterlace.so *dv.so *jack.so *rtp.so *rtpmanager.so \
   152.1 --- a/gst0-plugins-ugly/receipt	Tue Mar 27 12:50:45 2018 +0200
   152.2 +++ b/gst0-plugins-ugly/receipt	Fri Mar 30 19:31:50 2018 +0300
   152.3 @@ -2,58 +2,43 @@
   152.4  
   152.5  PACKAGE="gst0-plugins-ugly"
   152.6  VERSION="0.10.19"
   152.7 -SERIES="0.10"
   152.8  CATEGORY="multimedia"
   152.9  SHORT_DESC="GStreamer Ugly Plugins"
  152.10  MAINTAINER="jozee@slitaz.org"
  152.11  LICENSE="LGPL2.1"
  152.12 -SUGGESTED="x264"
  152.13 +WEB_SITE="http://gstreamer.freedesktop.org/"
  152.14 +
  152.15  TARBALL="gst-plugins-ugly-$VERSION.tar.xz"
  152.16 -WEB_SITE="http://gstreamer.freedesktop.org/"
  152.17  WGET_URL="$WEB_SITE/src/gst-plugins-ugly/$TARBALL"
  152.18 -LOCALES="da de es fr id it pt_BR ru zh_CN"
  152.19  
  152.20  BUILD_DEPENDS="gstreamer0-dev gst0-plugins-base-dev lame-dev libdvdread-dev
  152.21  libcdio-dev libmad-dev libmpeg2-dev x264-dev"
  152.22 -SPLIT="gst0-plugins-ugly gst0-plugins-ugly-dev"
  152.23 +SPLIT="gst0-plugins-ugly-dev"
  152.24  
  152.25 -# Rules to configure and make the package.
  152.26 -compile_rules()
  152.27 -{
  152.28 +compile_rules() {
  152.29  	./configure \
  152.30 -		--prefix=/usr \
  152.31 -		--sysconfdir=/etc \
  152.32 -		--localstatedir=/var \
  152.33  		--disable-static \
  152.34  		--disable-debug \
  152.35 -		--with-package-name="GStreamer Ugly Plugins ($SERIES)" \
  152.36 +		--with-package-name="GStreamer Ugly Plugins (0.10)" \
  152.37  		--with-package-origin="http://www.slitaz.org/" \
  152.38  		$CONFIGURE_ARGS &&
  152.39 -	make $MAKEFLAGS 2>&1 | grep -v /usr/local/include &&
  152.40 +	make $MAKEFLAGS &&		# grep -v /usr/local/include
  152.41  	make install
  152.42  }
  152.43  
  152.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
  152.45 -genpkg_rules()
  152.46 -{
  152.47 +genpkg_rules() {
  152.48  	case $PACKAGE in
  152.49 -	gst0-plugins-ugly)
  152.50 -		DEPENDS="gst0-plugins-base lame libdvdread libcdio libmad \
  152.51 +		gst0-plugins-ugly)
  152.52 +			copy @std *.mo
  152.53 +			DEPENDS="gst0-plugins-base lame libdvdread libcdio libmad \
  152.54  			libmpeg2 opencore-amr"
  152.55 -		mkdir -p $fs/usr/lib/gstreamer-$SERIES $fs/usr/share/locale
  152.56 -		mv $install/usr/lib/gstreamer-$SERIES/*.so* $fs/usr/lib/gstreamer-$SERIES
  152.57 -		mv $install/usr/share/gstreamer-$SERIES $fs/usr/share
  152.58 -		for locale in $LOCALES; do
  152.59 -			mv $install/usr/share/locale/$locale $fs/usr/share/locale
  152.60 -		done
  152.61 -		;;
  152.62 -	gst0-plugins-ugly-dev)
  152.63 -		CAT="development|gst0-plugins-ugly devel files"
  152.64 -		DEPENDS="gstreamer0-dev gst0-plugins-base-dev lame-dev \
  152.65 +			SUGGESTED="x264"
  152.66 +			;;
  152.67 +		*-dev)
  152.68 +			copy @dev
  152.69 +			DEPENDS="gstreamer0-dev gst0-plugins-base-dev lame-dev \
  152.70  			libdvdread-dev libcdio-dev libmad-dev libmpeg2-dev \
  152.71  			x264-dev"
  152.72 -		mkdir -p $fs/usr/lib/gstreamer-$SERIES
  152.73 -		cp -a $install/usr/lib/gstreamer-$SERIES/*.*a $fs/usr/lib/gstreamer-$SERIES
  152.74 -		;;
  152.75 +			;;
  152.76  	esac
  152.77  }
   153.1 --- a/gst0-python/receipt	Tue Mar 27 12:50:45 2018 +0200
   153.2 +++ b/gst0-python/receipt	Fri Mar 30 19:31:50 2018 +0300
   153.3 @@ -16,11 +16,7 @@
   153.4  SPLIT="gst0-python-dev"
   153.5  
   153.6  compile_rules() {
   153.7 -	./configure \
   153.8 -		--prefix=/usr \
   153.9 -		--sysconfdir=/etc \
  153.10 -		--localstatedir=/var \
  153.11 -		$CONFIGURE_ARGS &&
  153.12 +	./configure $CONFIGURE_ARGS &&
  153.13  	make &&
  153.14  	make DESTDIR=$DESTDIR install
  153.15  }
   154.1 --- a/gst1-plugins-good/receipt	Tue Mar 27 12:50:45 2018 +0200
   154.2 +++ b/gst1-plugins-good/receipt	Fri Mar 30 19:31:50 2018 +0300
   154.3 @@ -6,42 +6,44 @@
   154.4  SHORT_DESC="GStreamer good Plugins"
   154.5  MAINTAINER="psychomaniak@xakep.ru"
   154.6  LICENSE="GPL2"
   154.7 +WEB_SITE="http://gstreamer.freedesktop.org/"
   154.8 +
   154.9  SOURCE="gst-plugins-good"
  154.10  TARBALL="$SOURCE-$VERSION.tar.xz"
  154.11 -WEB_SITE="http://gstreamer.freedesktop.org/"
  154.12  WGET_URL="${WEB_SITE}src/$SOURCE/$TARBALL"
  154.13  
  154.14  BUILD_DEPENDS="gstreamer1-dev gst1-plugins-base-dev mpg123-dev jpeg-dev"
  154.15  SPLIT="gst1-plugins-good-dev"
  154.16  
  154.17 -# Rules to configure and make the package.
  154.18 -compile_rules()
  154.19 -{
  154.20 +compile_rules() {
  154.21  	sed '/set ERROR_C/d' -i configure
  154.22  	sed '/set ERROR_OBJC/d' -i configure
  154.23 +
  154.24  	./configure \
  154.25 -		--prefix=/usr --sysconfdir=/etc \
  154.26 -		--localstatedir=/var --enable-experimental \
  154.27 -		--disable-static --disable-debug \
  154.28 -		--disable-libvisual --enable-introspection=no \
  154.29 -		--with-package-name="GStreamer Base Plugins ($SERIES)" \
  154.30 +		--enable-experimental \
  154.31 +		--disable-static \
  154.32 +		--disable-debug \
  154.33 +		--disable-libvisual \
  154.34 +		--enable-introspection=no \
  154.35 +		--with-package-name="GStreamer Base Plugins (1.10)" \
  154.36  		--with-package-origin="http://www.slitaz.org/" \
  154.37 -		$CONFIGURE_ARGS | grep -v 'No package' &&
  154.38 -	make $MAKEFLAGS && make install 2>/dev/null
  154.39 +		$CONFIGURE_ARGS &&
  154.40 +	make $MAKEFLAGS &&
  154.41 +	make install
  154.42  }
  154.43  
  154.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
  154.45 -genpkg_rules()
  154.46 -{
  154.47 -case $PACKAGE in
  154.48 -		gst1-plugins-good) copy @std
  154.49 +genpkg_rules() {
  154.50 +	case $PACKAGE in
  154.51 +		gst1-plugins-good)
  154.52 +			copy @std
  154.53  			DEPENDS="gstreamer1 gst1-plugins-base pango alsa-lib \
  154.54  			mpg123 jpeg"
  154.55 -		;;
  154.56 -		*-dev) copy @dev
  154.57 +			;;
  154.58 +		*-dev)
  154.59 +			copy @dev
  154.60  			DEPENDS="gstreamer1-dev gst1-plugins-base-dev  \
  154.61  			gstreamer1 gst1-plugins-base  gst1-plugins-good \
  154.62  			mpg123-dev jpeg-dev "
  154.63 -		;;
  154.64 -esac
  154.65 +			;;
  154.66 +	esac
  154.67  }
   155.1 --- a/gstreamer0/receipt	Tue Mar 27 12:50:45 2018 +0200
   155.2 +++ b/gstreamer0/receipt	Fri Mar 30 19:31:50 2018 +0300
   155.3 @@ -16,18 +16,13 @@
   155.4  flex m4 valgrind gettext"
   155.5  SPLIT="gstreamer0-dev"
   155.6  
   155.7 -# Rules to configure and make the package.
   155.8 -compile_rules()
   155.9 -{
  155.10 -	# Handle cross compilation
  155.11 +compile_rules() {
  155.12  	case "$ARCH" in
  155.13 -		i?86) origin="http://www.slitaz.org";;
  155.14  		arm*) origin="http://arm.slitaz.org";;
  155.15 +		*)    origin="http://www.slitaz.org";;
  155.16  	esac
  155.17  
  155.18  	./configure \
  155.19 -		--sysconfdir=/etc \
  155.20 -		--localstatedir=/var \
  155.21  		--libexecdir=/usr/lib \
  155.22  		--enable-silent-rules \
  155.23  		--disable-static \
  155.24 @@ -36,12 +31,11 @@
  155.25  		--with-package-name="GStreamer-0.10" \
  155.26  		--with-package-origin="$origin" \
  155.27  		$CONFIGURE_ARGS &&
  155.28 -	make $MAKEFLAGS && make install
  155.29 +	make $MAKEFLAGS &&
  155.30 +	make install
  155.31  }
  155.32  
  155.33 -# Rules to gen a SliTaz package suitable for Tazpkg.
  155.34 -genpkg_rules()
  155.35 -{
  155.36 +genpkg_rules() {
  155.37  	case $PACKAGE in
  155.38  		gstreamer0)
  155.39  			copy @std
   156.1 --- a/gsynaptics/receipt	Tue Mar 27 12:50:45 2018 +0200
   156.2 +++ b/gsynaptics/receipt	Fri Mar 30 19:31:50 2018 +0300
   156.3 @@ -11,7 +11,7 @@
   156.4  WGET_URL="http://sourceforge.jp/frs/redir.php?m=keihanna&f=%2F$PACKAGE%2F38463%2F$TARBALL"
   156.5  
   156.6  DEPENDS="GConf gtk+ libglade orbit2"
   156.7 -BUILD_DEPENDS="gtk+-dev libglade-dev GConf-dev gnome-doc-utils-dev intltool"
   156.8 +BUILD_DEPENDS="gtk+-dev libglade-dev GConf-dev gnome-doc-utils intltool"
   156.9  
  156.10  # Rules to configure and make the package.
  156.11  compile_rules()
   157.1 --- a/gtk+3/receipt	Tue Mar 27 12:50:45 2018 +0200
   157.2 +++ b/gtk+3/receipt	Fri Mar 30 19:31:50 2018 +0300
   157.3 @@ -8,7 +8,6 @@
   157.4  LICENSE="LGPL2"
   157.5  WEB_SITE="https://www.gtk.org/"
   157.6  LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/gtk3.html"
   157.7 -CROSS_BUGS="bug: /bin/bash: no: command not found"
   157.8  
   157.9  TARBALL="gtk+-$VERSION.tar.xz"
  157.10  WGET_URL="$GNOME_MIRROR/gtk+/${VERSION%.*}/$TARBALL"
  157.11 @@ -21,9 +20,9 @@
  157.12  libxslt gobject-introspection-dev xorg-libSM-dev"
  157.13  SPLIT="gtk+3-demo gtk+3-widget-factory gtk+3-icon-browser gtk+3 gtk+3-dev"
  157.14  COOKOPTS="skip-log-errors" # Failed to open file ?./gdk.gresource.xml?: No such file or directory
  157.15 +CROSS_BUGS="bug: /bin/bash: no: command not found"
  157.16  
  157.17  compile_rules() {
  157.18 -	fix ld
  157.19  	# Handle cross compilation.
  157.20  	case "$ARCH" in
  157.21  		arm*)
  157.22 @@ -35,8 +34,6 @@
  157.23  	esac
  157.24  
  157.25  	./configure \
  157.26 -		--sysconfdir=/etc \
  157.27 -		--localstatedir=/var \
  157.28  		--disable-debug \
  157.29  		--enable-xkb \
  157.30  		--enable-xinerama \
  157.31 @@ -55,7 +52,7 @@
  157.32  	make $MAKEFLAGS &&
  157.33  	make DESTDIR=$DESTDIR install || return 1
  157.34  
  157.35 -	cp -f $stuff/settings.ini $install/etc/gtk-3.0 &&
  157.36 +	cp -f $stuff/settings.ini $install/etc/gtk-3.0
  157.37  	find $install -name '*.desktop' | xargs sed -i '/NoDisplay/d'
  157.38  }
  157.39  
   158.1 --- a/gtk-xfce-engine/receipt	Tue Mar 27 12:50:45 2018 +0200
   158.2 +++ b/gtk-xfce-engine/receipt	Fri Mar 30 19:31:50 2018 +0300
   158.3 @@ -15,10 +15,7 @@
   158.4  SPLIT="gtk-xfce-engine-dev"
   158.5  
   158.6  compile_rules() {
   158.7 -	fix ld
   158.8  	./configure \
   158.9 -		--sysconfdir=/etc \
  158.10 -		--localstatedir=/var \
  158.11  		--disable-debug \
  158.12  		$CONFIGURE_ARGS &&
  158.13  	fix libtool &&
   159.1 --- a/gtkhash/receipt	Tue Mar 27 12:50:45 2018 +0200
   159.2 +++ b/gtkhash/receipt	Fri Mar 30 19:31:50 2018 +0300
   159.3 @@ -24,13 +24,12 @@
   159.4  
   159.5  	./autogen.sh &&
   159.6  	./configure \
   159.7 -		--sysconfdir=/etc \
   159.8 -		--localstatedir=/var \
   159.9  		--enable-blake2 \
  159.10  		--enable-linux-crypto \
  159.11  		--enable-mhash \
  159.12  		--enable-caja \
  159.13  		$CONFIGURE_ARGS &&
  159.14 +	fix libtool &&
  159.15  	make &&
  159.16  	make install
  159.17  }
   160.1 --- a/gtksourceview/receipt	Tue Mar 27 12:50:45 2018 +0200
   160.2 +++ b/gtksourceview/receipt	Fri Mar 30 19:31:50 2018 +0300
   160.3 @@ -15,10 +15,10 @@
   160.4  SPLIT="gtksourceview-dev"
   160.5  
   160.6  compile_rules() {
   160.7 -	fix ld
   160.8  	./configure $CONFIGURE_ARGS &&
   160.9  	fix libtool &&
  160.10 -	make && make install
  160.11 +	make &&
  160.12 +	make install
  160.13  }
  160.14  
  160.15  genpkg_rules() {
   161.1 --- a/gtksourceview3/receipt	Tue Mar 27 12:50:45 2018 +0200
   161.2 +++ b/gtksourceview3/receipt	Fri Mar 30 19:31:50 2018 +0300
   161.3 @@ -17,10 +17,10 @@
   161.4  SPLIT="gtksourceview3-dev"
   161.5  
   161.6  compile_rules() {
   161.7 -	fix ld
   161.8  	./configure $CONFIGURE_ARGS &&
   161.9  	fix libtool &&
  161.10 -	make && make install
  161.11 +	make &&
  161.12 +	make install
  161.13  }
  161.14  
  161.15  genpkg_rules() {
   162.1 --- a/gucharmap/receipt	Tue Mar 27 12:50:45 2018 +0200
   162.2 +++ b/gucharmap/receipt	Fri Mar 30 19:31:50 2018 +0300
   162.3 @@ -3,55 +3,43 @@
   162.4  PACKAGE="gucharmap"
   162.5  VERSION="3.0.1"
   162.6  CATEGORY="utilities"
   162.7 -SHORT_DESC="GNOME Character Map (GTK+2)"
   162.8 +SHORT_DESC="GNOME Character Map, GTK+2"
   162.9  MAINTAINER="al.bobylev@gmail.com"
  162.10  LICENSE="GPL3"
  162.11 +WEB_SITE="https://wiki.gnome.org/action/show/Apps/Gucharmap"
  162.12 +
  162.13  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  162.14 -WEB_SITE="https://wiki.gnome.org/action/show/Apps/Gucharmap"
  162.15  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
  162.16  
  162.17  BUILD_DEPENDS="itstool libxml2-tools glib-dev gtk+-dev intltool"
  162.18 -SPLIT="gucharmap gucharmap-dev gucharmap-i18n"
  162.19 +SPLIT="gucharmap-dev gucharmap-i18n"
  162.20  
  162.21 -# Rules to configure and make the package.
  162.22 -compile_rules()
  162.23 -{
  162.24 +compile_rules() {
  162.25  	./configure \
  162.26 -		--sysconfdir=/etc \
  162.27  		--disable-maintainer-mode \
  162.28  		--disable-gconf \
  162.29  		--disable-schemas-install \
  162.30  		--disable-scrollkeeper \
  162.31  		--with-gtk=2.0 \
  162.32  		$CONFIGURE_ARGS &&
  162.33 -	make && make install
  162.34 +	make &&
  162.35 +	make install
  162.36  }
  162.37  
  162.38 -# Rules to gen a SliTaz package suitable for Tazpkg.
  162.39 -genpkg_rules()
  162.40 -{
  162.41 +genpkg_rules() {
  162.42  	case $PACKAGE in
  162.43 -	gucharmap)
  162.44 -		DEPENDS="gtk+ xorg-libXdamage"
  162.45 -		mkdir -p $fs/usr/bin $fs/usr/lib $fs/usr/share
  162.46 -		cp -a $install/etc $fs
  162.47 -		cp -a $install/usr/bin/$PACKAGE $fs/usr/bin
  162.48 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
  162.49 -		cp -a $install/usr/share/applications $fs/usr/share
  162.50 -		;;
  162.51 -	gucharmap-dev)
  162.52 -		CAT="development|GNOME Character Map (GTK+2), development files"
  162.53 -		DEPENDS="gucharmap"
  162.54 -		mkdir -p $fs/usr/lib $fs/usr/share
  162.55 -		cp -a $install/usr/include $fs/usr
  162.56 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  162.57 -		cp -a $install/usr/lib/*.la $fs/usr/lib
  162.58 -		;;
  162.59 -	gucharmap-i18n)
  162.60 -		CAT="localization|Language files for GNOME Character Map (GTK+2)"
  162.61 -		DEPENDS="gucharmap"
  162.62 -		mkdir -p $fs/usr/share/locale
  162.63 -		cp -a $install/usr/share/locale/* $fs/usr/share/locale
  162.64 -		;;
  162.65 +		gucharmap)
  162.66 +			copy @std
  162.67 +			DEPENDS="gtk+ xorg-libXdamage"
  162.68 +			;;
  162.69 +		gucharmap-dev)
  162.70 +			copy @dev
  162.71 +			DEPENDS="gucharmap"
  162.72 +			;;
  162.73 +		gucharmap-i18n)
  162.74 +			copy locale/
  162.75 +			CAT="localization|language files"
  162.76 +			DEPENDS="gucharmap"
  162.77 +			;;
  162.78  	esac
  162.79  }
   163.1 --- a/gutenprint/receipt	Tue Mar 27 12:50:45 2018 +0200
   163.2 +++ b/gutenprint/receipt	Fri Mar 30 19:31:50 2018 +0300
   163.3 @@ -14,14 +14,8 @@
   163.4  foomatic-db-engine libtasn1-dev gmp-dev tar"
   163.5  SPLIT="gutenprint-dev"
   163.6  
   163.7 -# Rules to configure and make the package.
   163.8 -compile_rules()
   163.9 -{
  163.10 +compile_rules() {
  163.11  	./configure \
  163.12 -		--prefix=/usr \
  163.13 -		--sysconfdir=/etc \
  163.14 -		--localstatedir=/var \
  163.15 -		--mandir=/usr/share/man \
  163.16  		--disable-samples \
  163.17  		--with-cups \
  163.18  		--disable-test \
  163.19 @@ -30,31 +24,15 @@
  163.20  	make install 2>&1 | grep -v "rmdir: '/home/slitaz/wok/gutenprint/"
  163.21  }
  163.22  
  163.23 -# Rules to gen a SliTaz package suitable for Tazpkg.
  163.24 -genpkg_rules()
  163.25 -{
  163.26 +genpkg_rules() {
  163.27  	case $PACKAGE in
  163.28 -	gutenprint)
  163.29 -		DEPENDS="gnutls readline gtk+ cups libtasn1 gmp"
  163.30 -		mkdir -p $fs/etc $fs/usr/lib $fs/usr/share
  163.31 -	
  163.32 -		cp -a $install/usr/bin $fs/usr
  163.33 -		cp -a $install/usr/sbin $fs/usr
  163.34 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
  163.35 -		cp -a $install/usr/lib/cups $fs/usr/lib
  163.36 -		cp -a $install/usr/lib/gutenprint $fs/usr/lib
  163.37 -		cp -a $install/usr/share/cups $fs/usr/share
  163.38 -		cp -a $install/usr/share/$PACKAGE $fs/usr/share	
  163.39 -		cp -a $install/etc   $fs
  163.40 -	
  163.41 -		# Remove docs
  163.42 -		rm -rf $fs/usr/share/$PACKAGE/doc
  163.43 -		;;
  163.44 -	gutenprint-dev)
  163.45 -		mkdir -p $fs/usr/lib
  163.46 -		cp -a $install/usr/include $fs/usr
  163.47 -		cp -a $install/usr/lib/*.*a $fs/usr/lib
  163.48 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  163.49 -		;;
  163.50 +		gutenprint)
  163.51 +			copy @std
  163.52 +			rm -rf $fs/usr/share/$PACKAGE/doc # Remove docs
  163.53 +			DEPENDS="gnutls readline gtk+ cups libtasn1 gmp"
  163.54 +			;;
  163.55 +		gutenprint-dev)
  163.56 +			copy @dev
  163.57 +			;;
  163.58  	esac
  163.59  }
   164.1 --- a/gvfs/receipt	Tue Mar 27 12:50:45 2018 +0200
   164.2 +++ b/gvfs/receipt	Fri Mar 30 19:31:50 2018 +0300
   164.3 @@ -21,9 +21,7 @@
   164.4  COOKOPTS="skip-log-errors"
   164.5  
   164.6  compile_rules() {
   164.7 -
   164.8  	./configure \
   164.9 -		--sysconfdir=/etc \
  164.10  		--enable-gtk-doc \
  164.11  		--disable-libsystemd-login \
  164.12  		--with-systemduserunitdir=no \
   165.1 --- a/gxine/receipt	Tue Mar 27 12:50:45 2018 +0200
   165.2 +++ b/gxine/receipt	Fri Mar 30 19:31:50 2018 +0300
   165.3 @@ -22,12 +22,9 @@
   165.4  
   165.5  	# Fix for lirc
   165.6  	#patch -p0 < $stuff/gxine-0.5.907-lirc.patch || return 1
   165.7 -	
   165.8 +
   165.9  	#--with-logo-format=image
  165.10  	./configure \
  165.11 -		--prefix=/usr \
  165.12 -		--mandir=/usr/share/man \
  165.13 -		--sysconfdir=/etc \
  165.14  		--with-dbus \
  165.15  		--with-spidermonkey=/usr/include/js \
  165.16  		--without-browser-plugin \
  165.17 @@ -38,8 +35,8 @@
  165.18  		--disable-own-playlist-parsers \
  165.19  		VENDOR_PKG_VERSION="$VERSION; SliTaz GNU/Linux" \
  165.20  		$CONFIGURE_ARGS &&
  165.21 -	make && make DESTDIR=$DESTDIR install
  165.22 -	sed -i '/^x/d' $install/usr/share/applications/gxine.desktop
  165.23 +	make &&
  165.24 +	make DESTDIR=$DESTDIR install
  165.25  }
  165.26  
  165.27  genpkg_rules() {
   166.1 --- a/hal-info/receipt	Tue Mar 27 12:50:45 2018 +0200
   166.2 +++ b/hal-info/receipt	Fri Mar 30 19:31:50 2018 +0300
   166.3 @@ -1,37 +1,28 @@
   166.4 -# SliTaz package receipt.
   166.5 +# SliTaz package receipt v2.
   166.6  
   166.7  PACKAGE="hal-info"
   166.8  VERSION="20091130"
   166.9  CATEGORY="x-window"
  166.10 -SHORT_DESC="hal sub-package that provides the hardware data and quirks. "
  166.11 +SHORT_DESC="hal sub-package that provides the hardware data and quirks"
  166.12  MAINTAINER="domcox@slitaz.org"
  166.13  LICENSE="GPL2 LGPL2.1"
  166.14 +WEB_SITE="http://www.freedesktop.org/wiki/Software/hal"
  166.15 +
  166.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  166.17 -WEB_SITE="http://www.freedesktop.org/wiki/Software/hal"
  166.18  WGET_URL="http://hal.freedesktop.org/releases/$TARBALL"
  166.19  
  166.20 -DEPENDS="hal hal-extra"
  166.21  BUILD_DEPENDS="hal-dev"
  166.22  
  166.23 -# Rules to configure and make the package.
  166.24 -compile_rules()
  166.25 -{
  166.26 -	cd $src
  166.27 +compile_rules() {
  166.28  	./configure \
  166.29 -		--prefix=/usr \
  166.30  		--libexecdir=/usr/lib/hal \
  166.31 -		--sysconfdir=/etc \
  166.32 -		--localstatedir=/var \
  166.33 -		--infodir=/usr/share/info \
  166.34 -		--mandir=/usr/share/man \
  166.35  		--disable-recall \
  166.36  		$CONFIGURE_ARGS &&
  166.37 -	make && 
  166.38 +	make &&
  166.39  	make DESTDIR=$DESTDIR install
  166.40  }
  166.41  
  166.42 -# Rules to gen a SliTaz package suitable for Tazpkg.
  166.43 -genpkg_rules()
  166.44 -{
  166.45 -	cp -a $install/usr $fs/
  166.46 +genpkg_rules() {
  166.47 +	copy @std
  166.48 +	DEPENDS="hal hal-extra"
  166.49  }
   167.1 --- a/hal/receipt	Tue Mar 27 12:50:45 2018 +0200
   167.2 +++ b/hal/receipt	Fri Mar 30 19:31:50 2018 +0300
   167.3 @@ -3,13 +3,13 @@
   167.4  PACKAGE="hal"
   167.5  VERSION="0.5.14"
   167.6  CATEGORY="x-window"
   167.7 -SHORT_DESC="Hardware Abstraction Layer."
   167.8 +SHORT_DESC="Hardware Abstraction Layer"
   167.9  MAINTAINER="pankso@slitaz.org"
  167.10  LICENSE="GPL2"
  167.11 +WEB_SITE="http://www.freedesktop.org/wiki/Software/hal"
  167.12 +
  167.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
  167.14 -WEB_SITE="http://www.freedesktop.org/wiki/Software/hal"
  167.15  WGET_URL="http://hal.freedesktop.org/releases/$TARBALL"
  167.16 -CROSS="error: cannot check for file existence when cross compiling"
  167.17  
  167.18  BUILD_DEPENDS="dbus-dev dbus-glib dbus-glib-dev udev-dev pciutils \
  167.19  util-linux-blkid-dev expat-dev util-linux-uuid-dev glib-dev libv4l-dev"
  167.20 @@ -25,11 +25,9 @@
  167.21  hald-probe-ieee1394-unit
  167.22  hald-probe-pc-floppy
  167.23  hald-probe-printer"
  167.24 +CROSS="error: cannot check for file existence when cross compiling"
  167.25  
  167.26 -# Rules to configure and make the package.
  167.27 -compile_rules()
  167.28 -{
  167.29 -	cd $src
  167.30 +compile_rules() {
  167.31  	sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
  167.32  		hald/linux/probing/probe-video4linux.c
  167.33  	sed -i 's|glib/gmain|glib|' hald/linux/addons/addon-*.c
  167.34 @@ -39,11 +37,9 @@
  167.35  	grep -qs 'define u8' hald/linux/probing/linux_dvd_rw_utils.c ||
  167.36  	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
  167.37  		hald/linux/probing/linux_dvd_rw_utils.c
  167.38 +
  167.39  	./configure \
  167.40 -		--prefix=/usr \
  167.41  		--libexecdir=/usr/lib/hal \
  167.42 -		--sysconfdir=/etc \
  167.43 -		--localstatedir=/var \
  167.44  		--disable-usb-ids \
  167.45  		--disable-policy-kit \
  167.46  		--build=$HOST_SYSTEM \
  167.47 @@ -53,9 +49,7 @@
  167.48  	make install
  167.49  }
  167.50  
  167.51 -# Rules to gen a SliTaz package suitable for Tazpkg.
  167.52 -genpkg_rules()
  167.53 -{
  167.54 +genpkg_rules() {
  167.55  	case $PACKAGE in
  167.56  	hal)
  167.57  		DEPENDS="dbus dbus-glib slitaz-base-files udev \
  167.58 @@ -128,8 +122,7 @@
  167.59  	esac
  167.60  }
  167.61  
  167.62 -pre_install_hal()
  167.63 -{
  167.64 +pre_install_hal() {
  167.65  	# Go for echoing on configuration files if any haldaemon user
  167.66  	# was found.
  167.67  	if ! grep -q 'haldaemon' "$1/etc/passwd"; then
  167.68 @@ -151,8 +144,7 @@
  167.69  	fi
  167.70  }
  167.71  
  167.72 -pre_remove_hal()
  167.73 -{
  167.74 +pre_remove_hal() {
  167.75  	/etc/init.d/hald stop
  167.76  	deluser haldaemon
  167.77  }
   168.1 --- a/hplip/receipt	Tue Mar 27 12:50:45 2018 +0200
   168.2 +++ b/hplip/receipt	Fri Mar 30 19:31:50 2018 +0300
   168.3 @@ -1,35 +1,29 @@
   168.4 -# SliTaz package receipt.
   168.5 +# SliTaz package receipt v2.
   168.6  
   168.7  PACKAGE="hplip"
   168.8 -VERSION="3.12.11" 
   168.9 +VERSION="3.12.11"
  168.10  CATEGORY="system-tools"
  168.11 -SHORT_DESC="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
  168.12 +SHORT_DESC="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and \
  168.13 +some LaserJet"
  168.14  MAINTAINER="jozee@slitaz.org"
  168.15  LICENSE="GPL2"
  168.16 +WEB_SITE="http://hplipopensource.com"
  168.17 +
  168.18  TARBALL="$PACKAGE-$VERSION.tar.gz"
  168.19 -WEB_SITE="http://hplipopensource.com"
  168.20  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  168.21 -TAGS="printer driver printing"
  168.22 -BUGS="Unable to delete hplip.desktop from $fs.  Using hack in post_install."
  168.23  
  168.24 -DEPENDS="ghostscript python cups dbus-python libusb jpeg tiff sane-backends \
  168.25 -libgphoto2 libexif gcc-lib-base libltdl libv4l net-snmp PyQt-x11-gpl"
  168.26  BUILD_DEPENDS="ghostscript-dev dbus-python-dev sane-backends-dev \
  168.27  sane-backends libexif-dev libgphoto2-dev Qt4-dev libgphoto2 libusb-dev \
  168.28  jpeg-dev cups-dev dbus-dev tiff-dev python python-dev dbus-python net-snmp-dev \
  168.29  libtool"
  168.30  
  168.31 -# Rules to configure and make the package. --prefix=/usr 
  168.32 -compile_rules()
  168.33 -{
  168.34 -	cd $src
  168.35 +BUGS="Unable to delete hplip.desktop from $fs.  Using hack in post_install."
  168.36  
  168.37 +compile_rules() {
  168.38  	# fix build with cups 1.6 - FC hplip-ipp-accessors.patch
  168.39  	patch -Np1 -i $stuff/cups-1.6-buildfix.diff
  168.40  
  168.41  	./configure  \
  168.42 -		--prefix=/usr \
  168.43 -		--sysconfdir=/etc \
  168.44  		--disable-doc-build \
  168.45  		--enable-qt4 \
  168.46  		$CONFIGURE_ARGS &&
  168.47 @@ -37,36 +31,22 @@
  168.48  	make DESTDIR=$DESTDIR install
  168.49  }
  168.50  
  168.51 -# Rules to gen a SliTaz package suitable for Tazpkg.
  168.52 -genpkg_rules()
  168.53 -{
  168.54 -	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share
  168.55 -	
  168.56 -	cp -a $install/etc   $fs
  168.57 -	cp -a $install/usr/bin $fs/usr
  168.58 -	cp -a $install/usr/lib/cups $fs/usr/lib
  168.59 -	cp -a $install/usr/lib/python* $fs/usr/lib
  168.60 -	cp -a $install/usr/lib/sane $fs/usr/lib
  168.61 -	cp -a $install/usr/lib/*so* $fs/usr/lib
  168.62 -	cp -a $install/usr/share/cups \
  168.63 -		   $install/usr/share/hplip \
  168.64 -		   $install/usr/share/ppd \
  168.65 -		   $fs/usr/share
  168.66 -
  168.67 +genpkg_rules() {
  168.68 +	copy @std
  168.69  	# compress non-zipped ppd files
  168.70  	find $fs/usr/share/ppd/HP -name "*.ppd" -exec gzip -n9 {} \;
  168.71 -
  168.72  	# make sure hp-toolbox exist
  168.73 -	ln -sf ../share/hplip/toolbox.py $fs/usr/bin/hp-toolbox	
  168.74 -
  168.75 +	ln -sf ../share/hplip/toolbox.py $fs/usr/bin/hp-toolbox
  168.76  	# remove autostart of hp-daemon
  168.77  	rm -rf $fs/etc/sane.d
  168.78 - 
  168.79  	# remove xdg
  168.80  	rm -rf $fs/etc/xdg
  168.81 +	DEPENDS="ghostscript python cups dbus-python libusb jpeg tiff \
  168.82 +	sane-backends libgphoto2 libexif gcc-lib-base libltdl libv4l net-snmp \
  168.83 +	PyQt-x11-gpl"
  168.84 +	TAGS="printer driver printing"
  168.85  }
  168.86  
  168.87 -post_install()
  168.88 -{
  168.89 -	tazpkg reconfigure udev --root="$1"
  168.90 +post_install() {
  168.91 +	tazpkg reconfigure eudev --root="$1"
  168.92  }
   169.1 --- a/icecast/receipt	Tue Mar 27 12:50:45 2018 +0200
   169.2 +++ b/icecast/receipt	Fri Mar 30 19:31:50 2018 +0300
   169.3 @@ -1,36 +1,28 @@
   169.4 -# SliTaz package receipt.
   169.5 +# SliTaz package receipt v2.
   169.6  
   169.7  PACKAGE="icecast"
   169.8  VERSION="2.3.3"
   169.9  CATEGORY="multimedia"
  169.10 -SHORT_DESC="An opensource alternative to shoutcast that supports mp3, ogg (vorbis/theora) and aac streaming"
  169.11 +SHORT_DESC="An opensource alternative to shoutcast that supports mp3, ogg \
  169.12 +(vorbis/theora) and aac streaming"
  169.13  MAINTAINER="devl547@gmail.com"
  169.14  LICENSE="GPL2"
  169.15 +WEB_SITE="http://www.icecast.org/"
  169.16 +
  169.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
  169.18 -WEB_SITE="http://www.icecast.org/"
  169.19  WGET_URL="http://downloads.xiph.org/releases/$PACKAGE/$TARBALL"
  169.20  
  169.21 -DEPENDS="libxslt libxml2 libogg libvorbis libtheora"
  169.22 -BUILD_DEPENDS="libxslt-dev libxml2-dev libogg-dev libvorbis-dev libtheora-dev libogg libvorbis libtheora"
  169.23 +BUILD_DEPENDS="libxslt-dev libxml2-dev libogg-dev libvorbis-dev libtheora-dev"
  169.24  
  169.25 -# Rules to configure and make the package.
  169.26 -compile_rules()
  169.27 -{
  169.28 -	cd $src
  169.29 +compile_rules() {
  169.30  	./configure \
  169.31 -		--prefix=/usr \
  169.32 -		--sysconfdir=/etc \
  169.33  		--disable-yp \
  169.34  		$CONFIGURE_ARGS &&
  169.35  	make -j2 &&
  169.36  	make DESTDIR=$DESTDIR install
  169.37  }
  169.38  
  169.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  169.40 -genpkg_rules()
  169.41 -{
  169.42 -	mkdir -p $fs/usr/share
  169.43 -	cp -a $install/usr/bin $fs/usr/
  169.44 -	cp -a $install/etc $fs/
  169.45 -	cp -a $install/usr/share/icecast $fs/usr/share
  169.46 +genpkg_rules() {
  169.47 +	copy @std
  169.48 +	DEPENDS="libxslt libxml2 libogg libvorbis libtheora"
  169.49  }
   170.1 --- a/icewm/receipt	Tue Mar 27 12:50:45 2018 +0200
   170.2 +++ b/icewm/receipt	Fri Mar 30 19:31:50 2018 +0300
   170.3 @@ -16,21 +16,17 @@
   170.4  xorg-libXft-dev alsa-lib-dev libsndfile-dev xorg-libXinerama-dev fribidi-dev \
   170.5  gdk-pixbuf-dev flac-dev"
   170.6  
   170.7 -# Rules to configure and make the package.
   170.8 -compile_rules()
   170.9 -{
  170.10 +compile_rules() {
  170.11  	./configure \
  170.12 -		--sysconfdir=/etc \
  170.13 -		--docdir=/usr/share/doc/icewm-$VERSION \
  170.14 -		--enable-guievents --with-icesound=ALSA \
  170.15 +		--enable-guievents \
  170.16 +		--with-icesound=ALSA \
  170.17  		$CONFIGURE_ARGS &&
  170.18 -	make && make install &&
  170.19 +	make &&
  170.20 +	make install &&
  170.21  	rm $install/usr/share/xsessions/icewm.desktop
  170.22  }
  170.23  
  170.24 -# Rules to gen a SliTaz package suitable for Tazpkg.
  170.25 -genpkg_rules()
  170.26 -{
  170.27 +genpkg_rules() {
  170.28  	copy @std
  170.29  	TAGS="window-manager"
  170.30  	DEPENDS="alsa-lib flac fribidi gdk-pixbuf libsndfile libvorbis xorg-libSM \
   171.1 --- a/icinga/receipt	Tue Mar 27 12:50:45 2018 +0200
   171.2 +++ b/icinga/receipt	Fri Mar 30 19:31:50 2018 +0300
   171.3 @@ -1,4 +1,4 @@
   171.4 -# SliTaz package receipt.
   171.5 +# SliTaz package receipt v2.
   171.6  
   171.7  PACKAGE="icinga"
   171.8  VERSION="1.2.1"
   171.9 @@ -6,19 +6,15 @@
  171.10  SHORT_DESC="Open Source host, service and network monitoring program"
  171.11  MAINTAINER="erjo@slitaz.org"
  171.12  LICENSE="GPL2"
  171.13 +WEB_SITE="http://www.icinga.org"
  171.14 +
  171.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
  171.16 -WEB_SITE="http://www.icinga.org"
  171.17  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  171.18  
  171.19 -DEPENDS=""
  171.20  BUILD_DEPENDS="perl"
  171.21  
  171.22 -# Rules to configure and make the package.
  171.23 -compile_rules()
  171.24 -{
  171.25 +compile_rules() {
  171.26  	./configure \
  171.27 -		--prefix=/usr \
  171.28 -		--datadir=/usr/share/icinga \
  171.29  		--with-htmurl=/icinga \
  171.30  		--with-lockfile=/var/run/icinga.pid \
  171.31  		--with-icinga-user=nobody \
  171.32 @@ -35,17 +31,17 @@
  171.33  		--with-mail=/usr/bin/mailx \
  171.34  		$CONFIGURE_ARGS &&
  171.35  	make all && \
  171.36 -	make DESTDIR=$DESTDIR install \
  171.37 -	    install-commandmode \
  171.38 +	make DESTDIR=$DESTDIR \
  171.39 +		install \
  171.40 +		install-commandmode \
  171.41  		install-config \
  171.42  		install-webconf \
  171.43  		install-idoutils \
  171.44  		install-api
  171.45 +
  171.46 +	# TODO: check files permissions
  171.47  }
  171.48  
  171.49 -# Rules to gen a SliTaz package suitable for Tazpkg.
  171.50 -genpkg_rules()
  171.51 -{
  171.52 -	mkdir -p $fs/usr/share/icinga
  171.53 -	cp -a $install/usr/bin $fs/usr
  171.54 +genpkg_rules() {
  171.55 +	copy @std
  171.56  }
   172.1 --- a/igmpproxy/receipt	Tue Mar 27 12:50:45 2018 +0200
   172.2 +++ b/igmpproxy/receipt	Fri Mar 30 19:31:50 2018 +0300
   172.3 @@ -1,30 +1,22 @@
   172.4 -# SliTaz package receipt.
   172.5 +# SliTaz package receipt v2.
   172.6  
   172.7  PACKAGE="igmpproxy"
   172.8  VERSION="0.1"
   172.9  CATEGORY="network"
  172.10 -SHORT_DESC="Simple forwarding of Multicast traffic between networks."
  172.11 +SHORT_DESC="Simple forwarding of Multicast traffic between networks"
  172.12  MAINTAINER="pascal.bellard@slitaz.org"
  172.13  LICENSE="GPL2"
  172.14 +WEB_SITE="http://igmpproxy.sourceforge.net/"
  172.15 +
  172.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  172.17 -WEB_SITE="http://igmpproxy.sourceforge.net/"
  172.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  172.19  
  172.20 -# Rules to configure and make the package.
  172.21 -compile_rules()
  172.22 -{
  172.23 -	cd $src
  172.24 -	./configure --prefix=/usr --infodir=/usr/share/info \
  172.25 -	--sysconfdir=/etc --mandir=/usr/share/man \
  172.26 -	$CONFIGURE_ARGS &&
  172.27 +compile_rules() {
  172.28 +	./configure $CONFIGURE_ARGS &&
  172.29  	make &&
  172.30  	make DESTDIR=$DESTDIR install
  172.31  }
  172.32  
  172.33 -# Rules to gen a SliTaz package suitable for Tazpkg.
  172.34 -genpkg_rules()
  172.35 -{
  172.36 -	mkdir -p $fs/usr/
  172.37 -	cp -a $install/etc $fs
  172.38 -	cp -a $install/usr/sbin $fs/usr
  172.39 +genpkg_rules() {
  172.40 +	copy @std
  172.41  }
   173.1 --- a/imagemagick/receipt	Tue Mar 27 12:50:45 2018 +0200
   173.2 +++ b/imagemagick/receipt	Fri Mar 30 19:31:50 2018 +0300
   173.3 @@ -21,7 +21,6 @@
   173.4  
   173.5  compile_rules() {
   173.6  	./configure \
   173.7 -		--sysconfdir=/etc \
   173.8  		--with-perl \
   173.9  		--with-magick-plus-plus \
  173.10  		--with-modules \
  173.11 @@ -29,8 +28,9 @@
  173.12  		--with-rsvg \
  173.13  		--disable-static \
  173.14  		$CONFIGURE_ARGS &&
  173.15 +	fix libtool &&
  173.16  	make $MAKEFLAGS &&
  173.17 -	make DESTDIR=$DESTDIR install
  173.18 +	make DESTDIR=$DESTDIR install || return 1
  173.19  
  173.20  	chmod -R u+w $install/usr/lib/perl5/
  173.21  }
   174.1 --- a/imagemagick6/receipt	Tue Mar 27 12:50:45 2018 +0200
   174.2 +++ b/imagemagick6/receipt	Fri Mar 30 19:31:50 2018 +0300
   174.3 @@ -20,22 +20,18 @@
   174.4  openexr-dev libgsf-dev" # graphviz-dev
   174.5  SPLIT="imagemagick6-dev"
   174.6  
   174.7 -# Rules to configure and make the package.
   174.8 -compile_rules()
   174.9 -{
  174.10 +compile_rules() {
  174.11  	./configure \
  174.12 -		--sysconfdir=/etc \
  174.13  		--enable-hdri \
  174.14  		--with-modules \
  174.15  		--disable-static \
  174.16  		$CONFIGURE_ARGS &&
  174.17 +	fix libtool &&
  174.18  	make $MAKEFLAGS &&
  174.19  	make DESTDIR=$DESTDIR install-libs-only
  174.20  }
  174.21  
  174.22 -# Rules to gen a SliTaz package suitable for Tazpkg.
  174.23 -genpkg_rules()
  174.24 -{
  174.25 +genpkg_rules() {
  174.26  	case $PACKAGE in
  174.27  		imagemagick6)
  174.28  			copy @std
   175.1 --- a/imlib2/receipt	Tue Mar 27 12:50:45 2018 +0200
   175.2 +++ b/imlib2/receipt	Fri Mar 30 19:31:50 2018 +0300
   175.3 @@ -19,7 +19,6 @@
   175.4  # be modified manually
   175.5  
   175.6  compile_rules() {
   175.7 -	fix ld
   175.8  	./configure \
   175.9  		--disable-static \
  175.10  		$CONFIGURE_ARGS &&
   176.1 --- a/ipkungfu/receipt	Tue Mar 27 12:50:45 2018 +0200
   176.2 +++ b/ipkungfu/receipt	Fri Mar 30 19:31:50 2018 +0300
   176.3 @@ -1,34 +1,25 @@
   176.4 -# SliTaz package receipt.
   176.5 +# SliTaz package receipt v2.
   176.6  
   176.7  PACKAGE="ipkungfu"
   176.8  VERSION="0.6.1"
   176.9  CATEGORY="network"
  176.10 -SHORT_DESC="Iptables-based Linux firewall."
  176.11 +SHORT_DESC="Iptables-based Linux firewall"
  176.12  MAINTAINER="pascal.bellard@slitaz.org"
  176.13  LICENSE="GPL2"
  176.14 +WEB_SITE="http://www.linuxkungfu.org/"
  176.15 +
  176.16  TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
  176.17 -WEB_SITE="http://www.linuxkungfu.org/"
  176.18  WGET_URL="http://http.debian.net/debian/pool/main/i/$PACKAGE/$TARBALL"
  176.19  
  176.20 -DEPENDS="iptables bash"
  176.21  BUILD_DEPENDS="iptables"
  176.22  
  176.23 -# Rules to configure and make the package.
  176.24 -compile_rules()
  176.25 -{
  176.26 -	./configure --prefix=/usr \
  176.27 -		--sysconfdir=/etc \
  176.28 -		--mandir=/usr/share/man \
  176.29 -		$CONFIGURE_ARGS &&
  176.30 +compile_rules() {
  176.31 +	./configure $CONFIGURE_ARGS &&
  176.32  	make &&
  176.33 -	make -j 1 DESTDIR=$DESTDIR install
  176.34 +	make -j1 DESTDIR=$DESTDIR install
  176.35  }
  176.36  
  176.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
  176.38 -genpkg_rules()
  176.39 -{
  176.40 -	mkdir -p $fs/usr/share
  176.41 -	cp -a $install/usr/sbin $fs/usr
  176.42 -	cp -a $install/usr/share/ipkungfu $fs/usr/share
  176.43 -	cp -a $install/etc $fs
  176.44 +genpkg_rules() {
  176.45 +	copy @std
  176.46 +	DEPENDS="iptables bash"
  176.47  }
   177.1 --- a/irssi/receipt	Tue Mar 27 12:50:45 2018 +0200
   177.2 +++ b/irssi/receipt	Fri Mar 30 19:31:50 2018 +0300
   177.3 @@ -1,4 +1,4 @@
   177.4 -# SliTaz package receipt
   177.5 +# SliTaz package receipt v2.
   177.6  
   177.7  PACKAGE="irssi"
   177.8  VERSION="0.8.17"
   177.9 @@ -6,31 +6,23 @@
  177.10  SHORT_DESC="Lightweight console IRC client"
  177.11  MAINTAINER="mallory@sweetpeople.org"
  177.12  LICENSE="GPL2"
  177.13 +WEB_SITE="http://irssi.org/"
  177.14 +
  177.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
  177.16 -WEB_SITE="http://irssi.org/"
  177.17  WGET_URL="http://irssi.org/files/$TARBALL"
  177.18 -TAGS="irc"
  177.19  
  177.20 -DEPENDS="glib openssl perl ncurses"
  177.21  BUILD_DEPENDS="glib-dev ncurses-dev slitaz-toolchain openssl-dev perl-dev"
  177.22  
  177.23 -# Rules to configure and make the package.
  177.24 -compile_rules()
  177.25 -{	
  177.26 +compile_rules() {
  177.27  	./configure \
  177.28 -		--prefix=/usr \
  177.29  		--sysconfdir=/etc/irssi \
  177.30  		$CONFIGURE_ARGS &&
  177.31  	make &&
  177.32  	make DESTDIR=$DESTDIR install
  177.33  }
  177.34  
  177.35 -# Rules to gen a SliTaz package suitable for Tazpkg.
  177.36 -genpkg_rules()
  177.37 -{
  177.38 -	mkdir -p $fs/usr/share/
  177.39 -	cp -a $install/etc $fs
  177.40 -	cp -a $install/usr/bin $fs/usr
  177.41 -	cp -a $install/usr/lib $fs/usr
  177.42 -	cp -a $install/usr/share/irssi $fs/usr/share
  177.43 +genpkg_rules() {
  177.44 +	copy @std
  177.45 +	DEPENDS="glib openssl perl ncurses"
  177.46 +	TAGS="irc"
  177.47  }
   178.1 --- a/ivman/receipt	Tue Mar 27 12:50:45 2018 +0200
   178.2 +++ b/ivman/receipt	Fri Mar 30 19:31:50 2018 +0300
   178.3 @@ -1,36 +1,29 @@
   178.4 -# SliTaz package receipt.
   178.5 +# SliTaz package receipt v2.
   178.6  
   178.7  PACKAGE="ivman"
   178.8  VERSION="0.6.14"
   178.9  CATEGORY="system-tools"
  178.10 -SHORT_DESC="Generic handler for HAL events."
  178.11 +SHORT_DESC="Generic handler for HAL events"
  178.12  MAINTAINER="pascal.bellard@slitaz.org"
  178.13  LICENSE="GPL2 QPL"
  178.14 +WEB_SITE="http://$PACKAGE.sourceforge.net/"
  178.15 +
  178.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  178.17 -WEB_SITE="http://$PACKAGE.sourceforge.net/"
  178.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  178.19 -CONFIG_FILES="/etc/ivman"
  178.20  
  178.21 -DEPENDS="hal dbus glib libxml2 zlib"
  178.22  BUILD_DEPENDS="$DEPENDS hal-dev dbus-dev glib-dev libxml2-dev dbus-glib-dev"
  178.23  
  178.24 -# Rules to configure and make the package.
  178.25 -compile_rules()
  178.26 -{
  178.27 -	cd $src
  178.28 -	./configure --prefix=/usr --infodir=/usr/share/info \
  178.29 -	--mandir=/usr/share/man --sysconfdir=/etc $CONFIGURE_ARGS &&
  178.30 +compile_rules() {
  178.31 +	./configure $CONFIGURE_ARGS &&
  178.32  	make &&
  178.33 -	make DESTDIR=$DESTDIR install
  178.34 +	make DESTDIR=$DESTDIR install || return 1
  178.35 +
  178.36 +	cp $stuff/*.xml $install/etc/ivman/
  178.37 +	sed -i 's|bash|sh|' $install/usr/bin/ivman-launch
  178.38  }
  178.39  
  178.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
  178.41 -genpkg_rules()
  178.42 -{
  178.43 -	mkdir -p $fs/usr
  178.44 -	cp -a $install/etc $fs
  178.45 -	cp -a $install/usr/bin $fs/usr
  178.46 -	cp -a stuff/*.xml $fs/etc/ivman
  178.47 -	sed -i s/'bash'/'sh'/ $fs/usr/bin/ivman-launch
  178.48 +genpkg_rules() {
  178.49 +	copy @std
  178.50 +	DEPENDS="hal dbus glib libxml2 zlib"
  178.51 +	CONFIG_FILES="/etc/ivman"
  178.52  }
  178.53 -
   179.1 --- a/jabberd2/receipt	Tue Mar 27 12:50:45 2018 +0200
   179.2 +++ b/jabberd2/receipt	Fri Mar 30 19:31:50 2018 +0300
   179.3 @@ -19,11 +19,8 @@
   179.4  	sed -i 's|#else /.*|&\nint set_debug_log_from_config(config_t c){}|' util/log.c
   179.5  	CFLAGS="${CFLAGS/-Os/-O2}"
   179.6  	./configure \
   179.7 -		--prefix=/usr \
   179.8 -		--infodir=/usr/share/info \
   179.9 +		--sysconfdir=/etc/jabberd \
  179.10  		--enable-sqlite \
  179.11 -		--sysconfdir=/etc/jabberd \
  179.12 -		--mandir=/usr/share/man \
  179.13  		$CONFIGURE_ARGS &&
  179.14  	make &&
  179.15  	make DESTDIR=$DESTDIR install
   180.1 --- a/joe/receipt	Tue Mar 27 12:50:45 2018 +0200
   180.2 +++ b/joe/receipt	Fri Mar 30 19:31:50 2018 +0300
   180.3 @@ -1,4 +1,4 @@
   180.4 -#Slitaz package receipt
   180.5 +#Slitaz package receipt v2.
   180.6  
   180.7  PACKAGE="joe"
   180.8  VERSION="3.7"
   180.9 @@ -6,27 +6,21 @@
  180.10  SHORT_DESC="Joe's Own Editor is a fully featured terminal based screen editor"
  180.11  MAINTAINER="threarth@yahoo.it"
  180.12  LICENSE="GPL"
  180.13 +WEB_SITE="http://joe-editor.sourceforge.net/"
  180.14 +
  180.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
  180.16 -WEB_SITE="http://joe-editor.sourceforge.net/"
  180.17 -WGET_URL="http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/$PACKAGE-$VERSION/$PACKAGE-$VERSION.tar.gz"
  180.18 -TAGS="text-editor"
  180.19 +WGET_URL="$SF_MIRROR/joe-editor/$TARBALL"
  180.20  
  180.21 -DEPENDS="ncurses"
  180.22  BUILD_DEPENDS="ncurses-dev"
  180.23  
  180.24 -# Rules to configure and make the package.
  180.25 -compile_rules()
  180.26 -{
  180.27 -	./configure --sysconfdir=/etc \
  180.28 -		$CONFIGURE_ARGS &&
  180.29 -	make && make install
  180.30 +compile_rules() {
  180.31 +	./configure $CONFIGURE_ARGS &&
  180.32 +	make &&
  180.33 +	make install
  180.34  }
  180.35  
  180.36 -# Rules to gen a SliTaz package suitable for Tazpkg.
  180.37 -genpkg_rules()
  180.38 -{
  180.39 -	mkdir -p $fs/usr/share
  180.40 -	cp -a $install/etc $fs
  180.41 -	cp -a $install/usr/bin $fs/usr
  180.42 -	cp -a $install/usr/share/joe $fs/usr/share 
  180.43 +genpkg_rules() {
  180.44 +	copy @std
  180.45 +	DEPENDS="ncurses"
  180.46 +	TAGS="text-editor"
  180.47  }
   181.1 --- a/json-glib/receipt	Tue Mar 27 12:50:45 2018 +0200
   181.2 +++ b/json-glib/receipt	Fri Mar 30 19:31:50 2018 +0300
   181.3 @@ -16,10 +16,10 @@
   181.4  SPLIT="json-glib-dev"
   181.5  
   181.6  compile_rules() {
   181.7 -	fix ld
   181.8  	./configure $CONFIGURE_ARGS &&
   181.9  	fix libtool &&
  181.10 -	make && make install
  181.11 +	make &&
  181.12 +	make install
  181.13  }
  181.14  
  181.15  genpkg_rules() {
   182.1 --- a/jwm/receipt	Tue Mar 27 12:50:45 2018 +0200
   182.2 +++ b/jwm/receipt	Fri Mar 30 19:31:50 2018 +0300
   182.3 @@ -1,82 +1,74 @@
   182.4 -# SliTaz package receipt.
   182.5 +# SliTaz package receipt v2.
   182.6  
   182.7  PACKAGE="jwm"
   182.8  VERSION="2.2.0"
   182.9  CATEGORY="x-window"
  182.10 -SHORT_DESC="JWM is a light Window Manager for the X window system."
  182.11 +SHORT_DESC="JWM is a light Window Manager for the X window system"
  182.12  MAINTAINER="pankso@slitaz.org"
  182.13  LICENSE="GPL2"
  182.14 +WEB_SITE="http://www.joewing.net/programs/jwm/"
  182.15 +
  182.16  TARBALL="$PACKAGE-$VERSION.tar.xz"
  182.17 -WEB_SITE="http://www.joewing.net/programs/jwm/"
  182.18  WGET_URL="http://www.joewing.net/programs/jwm/releases/$TARBALL"
  182.19 -TAGS="window-manager"
  182.20  
  182.21 -DEPENDS="xorg-libX11 xorg-libXft xorg-libXrender xorg-libXpm xorg-libXext \
  182.22 -xorg-libXmu xorg-libXinerama xorg-libXau xorg-libXdmcp xorg-libXt libjpeg \
  182.23 -libpng16 slitaz-configs-base xorg-xload xorg-xclock imlib2 hsetroot"
  182.24  BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev jpeg-dev libpng16-dev \
  182.25  xorg-libXext-dev gettext"
  182.26  
  182.27 -# Handle cross compilation
  182.28 -case "$ARCH" in
  182.29 -	arm)
  182.30 -		DEPENDS="$DEPENDS joe lynx ytree"
  182.31 -		ARCH_ARGS="--disable-nls" ;;
  182.32 -	i?86)
  182.33 -		DEPENDS="$DEPENDS compton nano" ;;
  182.34 -esac
  182.35 -
  182.36 -# Rules to configure and make the package.
  182.37 -compile_rules()
  182.38 -{
  182.39 +compile_rules() {
  182.40 +	case "$ARCH" in
  182.41 +		arm*) ARCH_ARGS="--disable-nls";;
  182.42 +		*)    ARCH_ARGS="";;
  182.43 +	esac
  182.44  	#[ -f done.resize-backgound.u ] || patch -p1 < $stuff/resize-backgound.u
  182.45  	#touch done.resize-backgound.u
  182.46 +
  182.47  	./configure \
  182.48 -    	--prefix=/usr \
  182.49 -    	--mandir=/usr/share/man \
  182.50  		--sysconfdir=/etc/xdg/jwm \
  182.51  		--disable-fribidi \
  182.52  		--disable-rpath \
  182.53  		--disable-rsvg \
  182.54  		--disable-confirm \
  182.55 -		$CONFIGURE_ARGS $ARCH_ARGS 2>/dev/null &&
  182.56 -	make && make install
  182.57 +		$ARCH_ARGS \
  182.58 +		$CONFIGURE_ARGS &&
  182.59 +	make &&
  182.60 +	make install || return 1
  182.61 +
  182.62 +	# Simple and default config file
  182.63 +	install -Dm644 $stuff/simple.jwmrc          $install/etc/xdg/jwm/simple.jwmrc
  182.64 +	install -Dm644 $stuff/slitaz.jwmrc          $install/etc/xdg/jwm/system.jwmrc
  182.65 +	install -Dm644 $stuff/xsessions/jwm.desktop $install/usr/share/xsessions/jwm.desktop
  182.66  }
  182.67  
  182.68 -testsuite()
  182.69 -{
  182.70 +testsuite() {
  182.71  	readelf -h $install/usr/bin/jwm
  182.72  }
  182.73  
  182.74 -# Rules to gen a SliTaz package suitable for Tazpkg.
  182.75 -genpkg_rules()
  182.76 -{
  182.77 -	mkdir -p $fs/etc/xdg/jwm $fs/usr/share
  182.78 -	cp -a $install/usr/bin $fs/usr/bin
  182.79 -	# Simple and default config file.
  182.80 -	cp $stuff/simple.jwmrc $fs/etc/xdg/jwm/simple.jwmrc
  182.81 -	cp $stuff/slitaz.jwmrc $fs/etc/xdg/jwm/system.jwmrc
  182.82 -	cp -r $stuff/xsessions $fs/usr/share
  182.83 +genpkg_rules() {
  182.84 +	copy @std
  182.85 +	DEPENDS="xorg-libX11 xorg-libXft xorg-libXrender xorg-libXpm xorg-libXext \
  182.86 +	xorg-libXmu xorg-libXinerama xorg-libXau xorg-libXdmcp xorg-libXt libjpeg \
  182.87 +	libpng16 slitaz-configs-base xorg-xload xorg-xclock imlib2 hsetroot"
  182.88 +	case "$ARCH" in
  182.89 +		arm*) DEPENDS="$DEPENDS joe lynx ytree";;
  182.90 +		*)    DEPENDS="$DEPENDS compton nano" ;;
  182.91 +	esac
  182.92 +	TAGS="window-manager"
  182.93  }
  182.94  
  182.95 -post_install()
  182.96 -{
  182.97 +post_install() {
  182.98  	if [ -d "$1/etc/jwm" ]; then
  182.99 -		echo "Removing old system wide configs: /etc/jwm"
 182.100 +		# Removing old system wide configs: /etc/jwm
 182.101  		rm -rf "$1/etc/jwm"
 182.102  	fi
 182.103  	res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//)
 182.104  	# Adding WM to SLIM available sessions.
 182.105  	if ! echo "$res" | grep -q $PACKAGE; then
 182.106 -		echo -n "Adding $PACKAGE to /etc/slim.conf..."
 182.107  		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" "$1/etc/slim.conf"
 182.108 -		status
 182.109  	fi
 182.110  	true
 182.111  }
 182.112  
 182.113 -post_remove()
 182.114 -{
 182.115 +post_remove() {
 182.116  	# Remove WM from SLIM available sessions.
 182.117  	if grep -q $PACKAGE "$1/etc/slim.conf"; then
 182.118  		sed -i s/,$PACKAGE// "$1/etc/slim.conf"
   183.1 --- a/kazehakase/receipt	Tue Mar 27 12:50:45 2018 +0200
   183.2 +++ b/kazehakase/receipt	Fri Mar 30 19:31:50 2018 +0300
   183.3 @@ -7,19 +7,16 @@
   183.4  MAINTAINER="al.bobylev@gmail.com"
   183.5  LICENSE="GPL2"
   183.6  WEB_SITE="http://kazehakase.sourceforge.jp/"
   183.7 +
   183.8  TARBALL="$PACKAGE-$VERSION.tar.gz"
   183.9  WGET_URL="http://iij.dl.osdn.jp/kazehakase/43802/$TARBALL"
  183.10  PATCH_URL="http://http.debian.net/debian/pool/main/k/kazehakase/kazehakase_0.5.8-4.diff.gz"
  183.11 -TAGS="web-browser"
  183.12  
  183.13 -DEPENDS="libwebkit"
  183.14  BUILD_DEPENDS="libtool automake autoconf intltool \
  183.15 -gtk+-dev dbus-glib-dev libwebkit-dev gnutls-dev xorg-libSM-dev zlib-dev \
  183.16 +gtk+-dev dbus-glib-dev webkitgtk-dev gnutls-dev xorg-libSM-dev zlib-dev \
  183.17  util-linux-uuid-dev libxslt-dev"
  183.18  
  183.19 -# Rules to configure and make the package.
  183.20 -compile_rules()
  183.21 -{
  183.22 +compile_rules() {
  183.23  	PATCH_GZ="$(basename "$PATCH_URL")"
  183.24  	[ -e "$SRC/$PATCH_GZ" ] || wget -O "$SRC/$PATCH_GZ" "$PATCH_URL"
  183.25  	cp "$SRC/$PATCH_GZ" $src
  183.26 @@ -46,15 +43,13 @@
  183.27  
  183.28  	./autogen.sh
  183.29  
  183.30 -	./configure \
  183.31 -		--prefix=/usr \
  183.32 -		--sysconfdir=/etc \
  183.33 -		$CONFIGURE_ARGS && make && make install
  183.34 +	./configure $CONFIGURE_ARGS &&
  183.35 +	make &&
  183.36 +	make install
  183.37  }
  183.38  
  183.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  183.40 -genpkg_rules()
  183.41 -{
  183.42 -	cp -a $install/* $fs
  183.43 -	find $fs -name '*.la' -delete
  183.44 +genpkg_rules() {
  183.45 +	copy @std
  183.46 +	DEPENDS="webkitgtk"
  183.47 +	TAGS="web-browser"
  183.48  }
   184.1 --- a/keepalived/receipt	Tue Mar 27 12:50:45 2018 +0200
   184.2 +++ b/keepalived/receipt	Fri Mar 30 19:31:50 2018 +0300
   184.3 @@ -1,33 +1,25 @@
   184.4 -# SliTaz package receipt.
   184.5 +# SliTaz package receipt v2.
   184.6  
   184.7  PACKAGE="keepalived"
   184.8  VERSION="1.2.15"
   184.9  CATEGORY="system-tools"
  184.10 -SHORT_DESC="Routing software for loadbalancing and high-availability."
  184.11 +SHORT_DESC="Routing software for loadbalancing and high-availability"
  184.12  MAINTAINER="pascal.bellard@slitaz.org"
  184.13  LICENSE="GPL2"
  184.14 +WEB_SITE="http://www.keepalived.org/"
  184.15 +
  184.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  184.17 -WEB_SITE="http://www.keepalived.org/"
  184.18  WGET_URL="${WEB_SITE}software/$TARBALL"
  184.19  
  184.20 -DEPENDS="openssl libnl"
  184.21  BUILD_DEPENDS="openssl-dev glib libnl-dev"
  184.22  
  184.23 -# Rules to configure and make the package.
  184.24 -compile_rules()
  184.25 -{
  184.26 -	./configure --prefix=/usr \
  184.27 -		--sysconfdir=/etc \
  184.28 -		$CONFIGURE_ARGS &&
  184.29 +compile_rules() {
  184.30 +	./configure $CONFIGURE_ARGS &&
  184.31  	make &&
  184.32  	make DESTDIR=$DESTDIR install
  184.33  }
  184.34  
  184.35 -# Rules to gen a SliTaz package suitable for Tazpkg.
  184.36 -genpkg_rules()
  184.37 -{
  184.38 -	mkdir -p $fs/usr
  184.39 -	cp -a $install/etc $fs/
  184.40 -	cp -a $install/usr/bin $fs/usr
  184.41 -	cp -a $install/usr/sbin $fs/usr
  184.42 +genpkg_rules() {
  184.43 +	copy @std
  184.44 +	DEPENDS="openssl libnl"
  184.45  }
   185.1 --- a/kino/receipt	Tue Mar 27 12:50:45 2018 +0200
   185.2 +++ b/kino/receipt	Fri Mar 30 19:31:50 2018 +0300
   185.3 @@ -1,34 +1,27 @@
   185.4 -# SliTaz package receipt.
   185.5 +# SliTaz package receipt v2.
   185.6  
   185.7  PACKAGE="kino"
   185.8  VERSION="1.3.4"
   185.9  CATEGORY="multimedia"
  185.10 -SHORT_DESC="Non linear Video editor."
  185.11 +SHORT_DESC="Non linear Video editor"
  185.12  MAINTAINER="pankso@slitaz.org"
  185.13  LICENSE="GPL2"
  185.14 -SUGGESTED="lame vorbis-tools mjpegtools dvdauthor"
  185.15 +WEB_SITE="http://www.kinodv.org/"
  185.16 +
  185.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
  185.18 -WEB_SITE="http://www.kinodv.org/"
  185.19  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  185.20 -TAGS="video editor"
  185.21  
  185.22 -DEPENDS="gtk+ libglade libdv libraw1394 libavc1394 libsamplerate alsa-lib \
  185.23 -libiec61883 xorg-libXv linux-firewire xorg-libXdamage ffmpeg"
  185.24  BUILD_DEPENDS="intltool libdv perl xorg-dev xorg-dev-proto gtk+-dev libglade-dev \
  185.25  libdv-dev libraw1394-dev libavc1394-dev libsamplerate-dev xorg-libXv-dev \
  185.26  libiec61883-dev libxml2-dev bash libpng16-dev freetype-dev fontconfig-dev \
  185.27  libiec61883 ffmpeg-dev xorg-libXv libsamplerate util-linux-uuid-dev \
  185.28  alsa-lib xorg-libXext libv4l-dev"
  185.29  
  185.30 -# Rules to configure and make the package.
  185.31 -compile_rules()
  185.32 -{
  185.33 +compile_rules() {
  185.34  	sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
  185.35  		ffmpeg/libavdevice/v4l.c src/v4l.h
  185.36 +
  185.37  	./configure \
  185.38 -		--prefix=/usr \
  185.39 -		--mandir=/usr/share/man \
  185.40 -		--sysconfdir=/etc \
  185.41  		--disable-local-ffmpeg \
  185.42  		--enable-shared \
  185.43  		--with-libdv-only \
  185.44 @@ -37,17 +30,12 @@
  185.45  	make DESTDIR=$DESTDIR install
  185.46  }
  185.47  
  185.48 -# Rules to gen a SliTaz package suitable for Tazpkg.
  185.49 -genpkg_rules()
  185.50 -{
  185.51 -	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications
  185.52 -	cp -a $stuff/applications/*desktop $fs/usr/share/applications
  185.53 -	cp -a $install/etc $fs
  185.54 -	cp -a $install/usr/bin $fs/usr
  185.55 -	cp -a $install/usr/lib $fs/usr
  185.56 -	rm $fs/usr/lib/kino-gtk2/*.*a
  185.57 -	cp -a $install/usr/share/kino $fs/usr/share
  185.58 -
  185.59 +genpkg_rules() {
  185.60 +	copy @std
  185.61  	# Remove Help files
  185.62  	rm -rf $fs/usr/share/kino/help
  185.63 +	DEPENDS="gtk+ libglade libdv libraw1394 libavc1394 libsamplerate alsa-lib \
  185.64 +	libiec61883 xorg-libXv linux-firewire xorg-libXdamage ffmpeg"
  185.65 +	SUGGESTED="lame vorbis-tools mjpegtools dvdauthor"
  185.66 +	TAGS="video editor"
  185.67  }
   186.1 --- a/kismet/receipt	Tue Mar 27 12:50:45 2018 +0200
   186.2 +++ b/kismet/receipt	Fri Mar 30 19:31:50 2018 +0300
   186.3 @@ -1,4 +1,4 @@
   186.4 -# SliTaz package receipt.
   186.5 +# SliTaz package receipt v2.
   186.6  
   186.7  PACKAGE="kismet"
   186.8  VERSION="2011-03-R2"
   186.9 @@ -6,54 +6,44 @@
  186.10  SHORT_DESC="Wireless network monitoring tool"
  186.11  MAINTAINER="domcox@slitaz.org"
  186.12  LICENSE="GPL2"
  186.13 +WEB_SITE="http://www.kismetwireless.net"
  186.14 +
  186.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
  186.16 -WEB_SITE="http://www.kismetwireless.net"
  186.17  WGET_URL="http://www.kismetwireless.net/code/$TARBALL"
  186.18 -TAGS="wireless network monitor"
  186.19  
  186.20 -DEPENDS="dbus libnl libpcap ncurses pcre libcap attr"
  186.21  BUILD_DEPENDS="libpcap-dev ncurses-dev libnl-dev"
  186.22  
  186.23 -# Rules to configure and make the package.
  186.24 -compile_rules()
  186.25 -{
  186.26 +compile_rules() {
  186.27  	touch -d 197001010000 .depend
  186.28 +
  186.29  	./configure \
  186.30 -		--prefix=/usr \
  186.31  		--sysconfdir=/etc/kismet \
  186.32 -	$CONFIGURE_ARGS && \
  186.33 -	make && \
  186.34 -	make DESTDIR=$DESTDIR install
  186.35 +		$CONFIGURE_ARGS &&
  186.36 +	make &&
  186.37 +	make DESTDIR=$DESTDIR install || return 1
  186.38 +
  186.39 +	install -Dm755 $src/kismet_capture $install/usr/bin/kismet_capture
  186.40  }
  186.41  
  186.42 -# Rules to gen a SliTaz package suitable for Tazpkg.
  186.43 -genpkg_rules()
  186.44 -{
  186.45 -	mkdir -p $fs/usr
  186.46 -	cp -a $install/usr/bin $fs/usr
  186.47 -	cp -a $src/kismet_capture $fs/usr/bin
  186.48 -	mkdir -p $fs/etc
  186.49 -	cp -a $install/etc/kismet $fs/etc
  186.50 +genpkg_rules() {
  186.51 +	copy @std
  186.52  	# do not overwrite existing configuration
  186.53 -	mv $fs/etc/kismet/kismet.conf $fs/etc/kismet/kismet.conf.new
  186.54 +	mv $fs/etc/kismet/kismet.conf       $fs/etc/kismet/kismet.conf.new
  186.55  	mv $fs/etc/kismet/kismet_drone.conf $fs/etc/kismet/kismet_drone.conf.new
  186.56 +	DEPENDS="dbus libnl libpcap ncurses pcre libcap attr"
  186.57 +	TAGS="wireless network monitor"
  186.58  }
  186.59  
  186.60 -post_install()
  186.61 -{
  186.62 -    # addgroup kismet if needed                                                                                                                
  186.63 -    if ! grep -q kismet "$1/etc/group"; then
  186.64 -        echo -n "Adding group kismet..."
  186.65 -        chroot "$1/" addgroup -g 315 kismet
  186.66 -        status
  186.67 +post_install() {
  186.68 +	# addgroup kismet if needed
  186.69 +	if ! grep -q kismet "$1/etc/group"; then
  186.70 +		chroot "$1/" addgroup -g 315 kismet
  186.71  	fi
  186.72  	# Add tux to kismet group
  186.73  	chroot "$1/" addgroup tux kismet
  186.74  	# set Kismet as suid-root
  186.75 -	echo -n "Set Kismet as suid-root.."
  186.76 -	chroot "$1/" chown root:kismet /usr/bin/kismet_capture && \
  186.77 +	chroot "$1/" chown root:kismet /usr/bin/kismet_capture &&
  186.78  	chroot "$1/" chmod 4550 /usr/bin/kismet_capture
  186.79 -	status
  186.80  	# configuration files update
  186.81  	create=1
  186.82  	overwrite=2
  186.83 @@ -63,15 +53,14 @@
  186.84  	if [ -e kismet_ui.conf ]; then
  186.85  		mv kismet_ui.conf kismet_ui.oldpkg
  186.86  	fi
  186.87 -	for file in "kismet" "kismet_drone"
  186.88 -	do
  186.89 +	for file in "kismet" "kismet_drone"; do
  186.90  		# check current files version
  186.91  		if [ ! -e $file.conf ]; then
  186.92  			action=$create
  186.93 -			else
  186.94 - 			current=`grep version= $file.conf`
  186.95 -			new=`grep version= $file.conf.new`
  186.96 -			if [ "$current" = "$new" ]; then
  186.97 +		else
  186.98 +			current=$(grep version= $file.conf)
  186.99 +			new=$(grep version= $file.conf.new)
 186.100 +			if [ "$current" == "$new" ]; then
 186.101  				action=$keep
 186.102  			else
 186.103  				action=$overwrite
 186.104 @@ -79,19 +68,19 @@
 186.105  		fi
 186.106  		# update if needed
 186.107  		case $action in
 186.108 -		$create)
 186.109 -			mv $file.conf.new $file.conf
 186.110 -		;;
 186.111 -		$keep)
 186.112 -			rm $file.conf.new
 186.113 -			warning="keep"
 186.114 -		;;
 186.115 -		$overwrite)
 186.116 -			mv $file.conf $file.conf.oldpkg
 186.117 -			mv $file.conf.new $file.conf
 186.118 -			warning=$overwrite
 186.119 -			echo "Warning: /etc/kismet/$file.conf new version from upstream"
 186.120 -		;;
 186.121 +			$create)
 186.122 +				mv $file.conf.new $file.conf
 186.123 +				;;
 186.124 +			$keep)
 186.125 +				rm $file.conf.new
 186.126 +				warning="keep"
 186.127 +				;;
 186.128 +			$overwrite)
 186.129 +				mv $file.conf $file.conf.oldpkg
 186.130 +				mv $file.conf.new $file.conf
 186.131 +				warning=$overwrite
 186.132 +				echo "Warning: /etc/kismet/$file.conf new version from upstream"
 186.133 +				;;
 186.134  		esac
 186.135  	done
 186.136  	if [ "$warning" != "keep" ]; then
 186.137 @@ -102,8 +91,7 @@
 186.138  	true
 186.139  }
 186.140  
 186.141 -post_remove()
 186.142 -{
 186.143 -    delgroup kismet
 186.144 -	rm -rf /etc/kismet
 186.145 +post_remove() {
 186.146 +	chroot "$1/" delgroup kismet
 186.147 +	rm -rf $1/etc/kismet
 186.148  }
   187.1 --- a/knock/receipt	Tue Mar 27 12:50:45 2018 +0200
   187.2 +++ b/knock/receipt	Fri Mar 30 19:31:50 2018 +0300
   187.3 @@ -1,39 +1,32 @@
   187.4 -# SliTaz package receipt.
   187.5 +# SliTaz package receipt v2.
   187.6  
   187.7  PACKAGE="knock"
   187.8  VERSION="0.7"
   187.9  CATEGORY="security"
  187.10 -SHORT_DESC="Port knock sequence listener."
  187.11 +SHORT_DESC="Port knock sequence listener"
  187.12  MAINTAINER="pascal.bellard@slitaz.org"
  187.13  LICENSE="GPL2"
  187.14 +WEB_SITE="http://www.zeroflux.org/$PACKAGE"
  187.15 +
  187.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  187.17 -WEB_SITE="http://www.zeroflux.org/$PACKAGE"
  187.18  WGET_URL="http://www.zeroflux.org/proj/$PACKAGE/files/$TARBALL"
  187.19 -CONFIG_FILES="/etc/knockd.conf"
  187.20  
  187.21 -DEPENDS="iptables libpcap"
  187.22  BUILD_DEPENDS="libpcap-dev"
  187.23  
  187.24 -# Rules to configure and make the package.
  187.25 -compile_rules()
  187.26 -{
  187.27 +compile_rules() {
  187.28  	[ -f done.knock.u ] || patch -p1 < $stuff/knock.u
  187.29  	touch done.knock.u
  187.30 -	./configure --prefix=/usr \
  187.31 -		--infodir=/usr/share/info \
  187.32 -		--sysconfdir=/etc \
  187.33 -		--mandir=/usr/share/man \
  187.34 -		$CONFIGURE_ARGS &&
  187.35 +
  187.36 +	./configure $CONFIGURE_ARGS &&
  187.37  	make &&
  187.38 -	make DESTDIR=$DESTDIR install
  187.39 +	make DESTDIR=$DESTDIR install || return 1
  187.40 +
  187.41 +	install -Dm755 $stuff/etc/init.d/knock       $install/etc/init.d/knock
  187.42 +	install -Dm755 $stuff/usr/sbin/knockd-helper $install/usr/sbin/knockd-helper
  187.43  }
  187.44  
  187.45 -# Rules to gen a SliTaz package suitable for Tazpkg.
  187.46 -genpkg_rules()
  187.47 -{
  187.48 -	cp -a $stuff/etc $fs
  187.49 -	cp -a $stuff/usr $fs
  187.50 -	cp -a $install/usr/sbin $fs/usr
  187.51 -	cp -a $install/usr/bin $fs/usr
  187.52 -	cp -a $install/etc $fs
  187.53 +genpkg_rules() {
  187.54 +	copy @std
  187.55 +	DEPENDS="iptables libpcap"
  187.56 +	CONFIG_FILES="/etc/knockd.conf"
  187.57  }
   188.1 --- a/krb5/receipt	Tue Mar 27 12:50:45 2018 +0200
   188.2 +++ b/krb5/receipt	Fri Mar 30 19:31:50 2018 +0300
   188.3 @@ -19,20 +19,16 @@
   188.4  	CFLAGS="${CFLAGS/-Os/-O2}"
   188.5  	CXXFLAGS="$CFLAGS"
   188.6  
   188.7 -	cd src
   188.8  	sed -e "s@python2.5/Python.h@& python2.7/Python.h@g" \
   188.9  		-e "s@-lpython2.5]@&,\n  AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])@g" \
  188.10 -		-i configure.in &&
  188.11 -
  188.12 +		-i configure.in
  188.13  	sed -e 's@\^u}@^u cols 300}@' \
  188.14 -		-i tests/dejagnu/config/default.exp &&
  188.15 -
  188.16 +		-i tests/dejagnu/config/default.exp
  188.17  	sed -e '/eq 0/{N;s/12 //}' \
  188.18 -		-i plugins/kdb/db2/libdb2/test/run.test &&
  188.19 +		-i plugins/kdb/db2/libdb2/test/run.test
  188.20  
  188.21  	autoconf &&
  188.22  	./configure \
  188.23 -		--sysconfdir=/etc \
  188.24  		--localstatedir=/var/lib \
  188.25  		--with-system-et=no \
  188.26  		--with-system-ss=no \
   189.1 --- a/less/receipt	Tue Mar 27 12:50:45 2018 +0200
   189.2 +++ b/less/receipt	Fri Mar 30 19:31:50 2018 +0300
   189.3 @@ -17,10 +17,10 @@
   189.4  
   189.5  compile_rules() {
   189.6  	./configure \
   189.7 -		--sysconfdir=/etc \
   189.8  		--with-regex=pcre \
   189.9  		$CONFIGURE_ARGS &&
  189.10 -	make && make DESTDIR=$install install
  189.11 +	make &&
  189.12 +	make DESTDIR=$install install
  189.13  }
  189.14  
  189.15  genpkg_rules() {
   190.1 --- a/libappindicator-gtk2/receipt	Tue Mar 27 12:50:45 2018 +0200
   190.2 +++ b/libappindicator-gtk2/receipt	Fri Mar 30 19:31:50 2018 +0300
   190.3 @@ -26,10 +26,9 @@
   190.4  	sed -i 's|example ||g' Makefile.in
   190.5  	export CFLAGS="$CFLAGS -Wno-deprecated-declarations"
   190.6  	./configure \
   190.7 -		--sysconfdir=/etc \
   190.8 -		--localstatedir=/var \
   190.9  		$SET_ARGS \
  190.10  		$CONFIGURE_ARGS &&
  190.11 +	fix libtool &&
  190.12  	make &&
  190.13  	make install
  190.14  }
   191.1 --- a/libarchive/receipt	Tue Mar 27 12:50:45 2018 +0200
   191.2 +++ b/libarchive/receipt	Fri Mar 30 19:31:50 2018 +0300
   191.3 @@ -17,7 +17,6 @@
   191.4  SPLIT="libarchive-dev"
   191.5  
   191.6  compile_rules() {
   191.7 -	fix ld
   191.8  	./configure \
   191.9  		--disable-static \
  191.10  		$CONFIGURE_ARGS &&
   192.1 --- a/libb2/receipt	Tue Mar 27 12:50:45 2018 +0200
   192.2 +++ b/libb2/receipt	Fri Mar 30 19:31:50 2018 +0300
   192.3 @@ -16,12 +16,8 @@
   192.4  SPLIT="libb2-dev"
   192.5  
   192.6  compile_rules() {
   192.7 -
   192.8  	./autogen.sh &&
   192.9 -	./configure \
  192.10 -		--sysconfdir=/etc \
  192.11 -		--localstatedir=/var \
  192.12 -		$CONFIGURE_ARGS &&
  192.13 +	./configure $CONFIGURE_ARGS &&
  192.14  	make &&
  192.15  	make install
  192.16  }
   193.1 --- a/libbonobo/receipt	Tue Mar 27 12:50:45 2018 +0200
   193.2 +++ b/libbonobo/receipt	Fri Mar 30 19:31:50 2018 +0300
   193.3 @@ -17,40 +17,23 @@
   193.4  
   193.5  compile_rules() {
   193.6  	sed -i 's/-DG_DISABLE_DEPRECATED//' activation-server/Makefile*
   193.7 +
   193.8  	./configure \
   193.9 -		--prefix=/usr \
  193.10  		--sysconfdir=/etc/gnome \
  193.11  		--libexecdir=/usr/lib/bonobo \
  193.12  		$CONFIGURE_ARGS &&
  193.13 -	make && make install
  193.14 +	make &&
  193.15 +	make install
  193.16  }
  193.17  
  193.18  genpkg_rules() {
  193.19  	case $PACKAGE in
  193.20  		libbonobo)
  193.21 -			mkdir -p $fs/usr/lib
  193.22 -			cp -a $install/etc $fs/
  193.23 -			cp -a $install/usr/bin $fs/usr
  193.24 -			cp -a $install/usr/sbin $fs/usr
  193.25 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
  193.26 -			cp -a $install/usr/lib/orbit-2.0 $fs/usr/lib
  193.27 -			cp -a $install/usr/lib/bonobo $fs/usr/lib
  193.28 -
  193.29 -			# Clean unwated files
  193.30 -			cd $fs/usr/lib ; find . -name "*.*a" -exec rm -f {} \;
  193.31 +			copy @std
  193.32  			DEPENDS="glib orbit2 libxml2 libglade"
  193.33  			;;
  193.34  		*-dev)
  193.35 -			mkdir -p $fs/usr/lib $fs/usr/share
  193.36 -
  193.37 -			cp -a $install/usr/include $fs/usr
  193.38 -			cp -a $install/usr/lib/*.a* $fs/usr/lib
  193.39 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  193.40 -			cp -a $install/usr/lib/bonobo-2.0 $fs/usr/lib
  193.41 -			cp -a $install/usr/share/idl $fs/usr/share
  193.42 -
  193.43 -			# remove archive lib
  193.44 -			find $fs/usr/lib -name *.so* -exec rm -f {} \;
  193.45 +			copy @dev
  193.46  			;;
  193.47  	esac
  193.48  }
   194.1 --- a/libbonoboui/receipt	Tue Mar 27 12:50:45 2018 +0200
   194.2 +++ b/libbonoboui/receipt	Fri Mar 30 19:31:50 2018 +0300
   194.3 @@ -22,7 +22,8 @@
   194.4  		--sysconfdir=/etc/gnome \
   194.5  		--libexecdir=/usr/lib/bonobo \
   194.6  		$CONFIGURE_ARGS &&
   194.7 -	make && make install
   194.8 +	make &&
   194.9 +	make install
  194.10  }
  194.11  
  194.12  genpkg_rules() {
   195.1 --- a/libbytesize/receipt	Tue Mar 27 12:50:45 2018 +0200
   195.2 +++ b/libbytesize/receipt	Fri Mar 30 19:31:50 2018 +0300
   195.3 @@ -16,12 +16,12 @@
   195.4  SPLIT="libbytesize-python libbytesize libbytesize-dev"
   195.5  
   195.6  compile_rules() {
   195.7 -	fix ld
   195.8  	./autogen.sh &&
   195.9  
  195.10  	./configure $CONFIGURE_ARGS &&
  195.11  	fix libtool &&
  195.12 -	make && make install
  195.13 +	make &&
  195.14 +	make install
  195.15  }
  195.16  
  195.17  genpkg_rules() {
   196.1 --- a/libdbusmenu-gtk2/receipt	Tue Mar 27 12:50:45 2018 +0200
   196.2 +++ b/libdbusmenu-gtk2/receipt	Fri Mar 30 19:31:50 2018 +0300
   196.3 @@ -18,8 +18,6 @@
   196.4  
   196.5  compile_rules() {
   196.6  	./configure \
   196.7 -		--sysconfdir=/etc \
   196.8 -		--localstatedir=/var \
   196.9  		--with-gtk=2 \
  196.10  		$CONFIGURE_ARGS &&
  196.11  	make &&
   197.1 --- a/libdbusmenu-gtk3/receipt	Tue Mar 27 12:50:45 2018 +0200
   197.2 +++ b/libdbusmenu-gtk3/receipt	Fri Mar 30 19:31:50 2018 +0300
   197.3 @@ -17,8 +17,6 @@
   197.4  
   197.5  compile_rules() {
   197.6  	./configure \
   197.7 -		--sysconfdir=/etc \
   197.8 -		--localstatedir=/var \
   197.9  		--with-gtk=3 \
  197.10  		$CONFIGURE_ARGS &&
  197.11  	make &&
   198.1 --- a/libdesktop-agnostic/receipt	Tue Mar 27 12:50:45 2018 +0200
   198.2 +++ b/libdesktop-agnostic/receipt	Fri Mar 30 19:31:50 2018 +0300
   198.3 @@ -16,9 +16,8 @@
   198.4  gobject-introspection-dev pygobject-dev pygtk-dev"
   198.5  SPLIT="libdesktop-agnostic-dev"
   198.6  
   198.7 -# Rules to configure and make the package.
   198.8 -compile_rules()
   198.9 -{
  198.10 +compile_rules() {
  198.11 +	# site script isn't used
  198.12  	./waf configure \
  198.13  		--prefix=/usr \
  198.14  		--sysconfdir=/etc \
  198.15 @@ -31,9 +30,7 @@
  198.16  		--destdir=$DESTDIR
  198.17  }
  198.18  
  198.19 -# Rules to gen a SliTaz package suitable for Tazpkg.
  198.20 -genpkg_rules()
  198.21 -{
  198.22 +genpkg_rules() {
  198.23  	case $PACKAGE in
  198.24  		libdesktop-agnostic)
  198.25  			copy @std
   199.1 --- a/libfakekey/receipt	Tue Mar 27 12:50:45 2018 +0200
   199.2 +++ b/libfakekey/receipt	Fri Mar 30 19:31:50 2018 +0300
   199.3 @@ -16,8 +16,6 @@
   199.4  
   199.5  compile_rules() {
   199.6  	./configure \
   199.7 -		--sysconfdir=/etc \
   199.8 -		--localstatedir=/var \
   199.9  		--disable-static \
  199.10  		$CONFIGURE_ARGS &&
  199.11  	make AM_LDFLAGS=-lX11 &&
   200.1 --- a/libfm-extra/receipt	Tue Mar 27 12:50:45 2018 +0200
   200.2 +++ b/libfm-extra/receipt	Fri Mar 30 19:31:50 2018 +0300
   200.3 @@ -18,12 +18,12 @@
   200.4  
   200.5  compile_rules() {
   200.6  	./configure \
   200.7 -		--sysconfdir=/etc \
   200.8  		--with-extra-only \
   200.9  		--with-gtk=no \
  200.10  		--disable-static \
  200.11  		$CONFIGURE_ARGS &&
  200.12 -	make && make install
  200.13 +	make &&
  200.14 +	make install
  200.15  }
  200.16  
  200.17  genpkg_rules() {
   201.1 --- a/libfm/receipt	Tue Mar 27 12:50:45 2018 +0200
   201.2 +++ b/libfm/receipt	Fri Mar 30 19:31:50 2018 +0300
   201.3 @@ -21,10 +21,11 @@
   201.4  
   201.5  compile_rules() {
   201.6  	./configure \
   201.7 -		--sysconfdir=/etc \
   201.8  		--disable-static \
   201.9  		$CONFIGURE_ARGS &&
  201.10 -	make && make install || return 1
  201.11 +	fix libtool &&
  201.12 +	make &&
  201.13 +	make install || return 1
  201.14  
  201.15  	# remove useless file
  201.16  	rm -r $install/usr/share/mime/
   202.1 --- a/libgdiplus/receipt	Tue Mar 27 12:50:45 2018 +0200
   202.2 +++ b/libgdiplus/receipt	Fri Mar 30 19:31:50 2018 +0300
   202.3 @@ -3,11 +3,13 @@
   202.4  PACKAGE="libgdiplus"
   202.5  VERSION="5.4"
   202.6  CATEGORY="development"
   202.7 -SHORT_DESC="Mono library providing a GDI+ compatible API on non-Windows operating systems"
   202.8 +SHORT_DESC="Mono library providing a GDI+ compatible API on non-Windows \
   202.9 +operating systems"
  202.10  MAINTAINER="rcx@zoominternet.net"
  202.11  LICENSE="MIT"
  202.12 +WEB_SITE="http://www.mono-project.com/Libgdiplus"
  202.13 +
  202.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
  202.15 -WEB_SITE="http://www.mono-project.com/Libgdiplus"
  202.16  WGET_URL="https://github.com/mono/libgdiplus/archive/$VERSION.tar.gz"
  202.17  
  202.18  BUILD_DEPENDS="m4 bison glib-dev xorg-dev libxml2-dev \
  202.19 @@ -19,37 +21,27 @@
  202.20  # Build documentation at http://mono-project.com/Compiling_Mono
  202.21  # and http://mono-project.com/Release_Notes_Mono_2.4#Installing_Mono_2.4
  202.22  
  202.23 -# Rules to configure and make the package.
  202.24 -compile_rules()
  202.25 -{
  202.26 +compile_rules() {
  202.27  	./autogen.sh
  202.28  	./configure \
  202.29 -		--prefix=/usr \
  202.30 -		--infodir=/usr/share/info \
  202.31 -		--mandir=/usr/share/man \
  202.32 -		--sysconfdir=/etc \
  202.33  		--with-cairo=system \
  202.34 -		$CONFIGURE_ARGS  &&
  202.35 -	make  &&
  202.36 +		$CONFIGURE_ARGS &&
  202.37 +	fix libtool &&
  202.38 +	make &&
  202.39  	make DESTDIR=$DESTDIR install
  202.40  }
  202.41  
  202.42 -# Rules to gen a SliTaz package suitable for Tazpkg.
  202.43 -genpkg_rules()
  202.44 -{
  202.45 +genpkg_rules() {
  202.46  	case $PACKAGE in
  202.47 -	libgdiplus)
  202.48 -		DEPENDS="glib glibc-base xorg-libICE xorg-libSM xorg-libX11 \
  202.49 +		libgdiplus)
  202.50 +			copy @std
  202.51 +			DEPENDS="glib glibc-base xorg-libICE xorg-libSM xorg-libX11 \
  202.52  			xorg-libXau xorg-libXdmcp xorg-libXrender cairo expat \
  202.53  			freetype fontconfig giflib jpeg libpng16 tiff xorg-pixman \
  202.54  			libexif zlib util-linux-uuid"
  202.55 -		mkdir -p $fs/usr/lib
  202.56 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
  202.57 -		;;
  202.58 -	libgdiplus-dev)
  202.59 -		mkdir -p $fs/usr/lib
  202.60 -		cp -a $install/usr/lib/*.*a $fs/usr/lib
  202.61 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  202.62 -		;;
  202.63 +			;;
  202.64 +		*-dev)
  202.65 +			copy @dev
  202.66 +			;;
  202.67  	esac
  202.68  }
   203.1 --- a/libglade/receipt	Tue Mar 27 12:50:45 2018 +0200
   203.2 +++ b/libglade/receipt	Fri Mar 30 19:31:50 2018 +0300
   203.3 @@ -18,7 +18,6 @@
   203.4  	sed -i '/DG_DISABLE_DEPRECATED/d' glade/Makefile.in || exit 1
   203.5  	mkdir po; touch po/POTFILES.in
   203.6  
   203.7 -	fix ld
   203.8  	./configure \
   203.9  		--disable-static \
  203.10  		$CONFIGURE_ARGS &&
   204.1 --- a/libgnome-keyring/receipt	Tue Mar 27 12:50:45 2018 +0200
   204.2 +++ b/libgnome-keyring/receipt	Fri Mar 30 19:31:50 2018 +0300
   204.3 @@ -19,7 +19,8 @@
   204.4  		--libexecdir=/usr/lib/$PACKAGE \
   204.5  		--sysconfdir=/etc/gnome \
   204.6  		$CONFIGURE_ARGS &&
   204.7 -	make && make install
   204.8 +	make &&
   204.9 +	make install
  204.10  }
  204.11  
  204.12  genpkg_rules() {
   205.1 --- a/libgnome-keyring3/receipt	Tue Mar 27 12:50:45 2018 +0200
   205.2 +++ b/libgnome-keyring3/receipt	Fri Mar 30 19:31:50 2018 +0300
   205.3 @@ -16,9 +16,7 @@
   205.4  SPLIT="libgnome-keyring3-dev"
   205.5  
   205.6  compile_rules() {
   205.7 -	./configure \
   205.8 -		--sysconfdir=/etc \
   205.9 -		$CONFIGURE_ARGS &&
  205.10 +	./configure $CONFIGURE_ARGS &&
  205.11  	make &&
  205.12  	make install
  205.13  }
   206.1 --- a/libgnome/receipt	Tue Mar 27 12:50:45 2018 +0200
   206.2 +++ b/libgnome/receipt	Fri Mar 30 19:31:50 2018 +0300
   206.3 @@ -23,7 +23,9 @@
   206.4  		--sysconfdir=/etc/gnome \
   206.5  		--localstatedir=/var/lib \
   206.6  		$CONFIGURE_ARGS &&
   206.7 -	make && make install || return 1
   206.8 +	fix libtool &&
   206.9 +	make &&
  206.10 +	make install || return 1
  206.11  
  206.12  	mkdir -p $install/usr/share/images
  206.13  	ln -s ../pixmaps/backgrounds/gnome/background-default.jpg \
   207.1 --- a/libgnomecanvasmm/receipt	Tue Mar 27 12:50:45 2018 +0200
   207.2 +++ b/libgnomecanvasmm/receipt	Fri Mar 30 19:31:50 2018 +0300
   207.3 @@ -23,11 +23,10 @@
   207.4  		examples/canvas_affine/canvas_affine.cc \
   207.5  		examples/canvas_events/canvas_events.cc
   207.6  
   207.7 -	./configure \
   207.8 -		--sysconfdir=/etc \
   207.9 -		--localstatedir=/var \
  207.10 -		$CONFIGURE_ARGS && 
  207.11 -	make && make install
  207.12 +	./configure $CONFIGURE_ARGS &&
  207.13 +	fix libtool &&
  207.14 +	make &&
  207.15 +	make install
  207.16  }
  207.17  
  207.18  genpkg_rules() {
   208.1 --- a/libgtkhtml/receipt	Tue Mar 27 12:50:45 2018 +0200
   208.2 +++ b/libgtkhtml/receipt	Fri Mar 30 19:31:50 2018 +0300
   208.3 @@ -15,13 +15,10 @@
   208.4  SPLIT="libgtkhtml-dev"
   208.5  
   208.6  compile_rules() {
   208.7 -	./configure \
   208.8 -		--prefix=/usr \
   208.9 -		--sysconfdir=/etc \
  208.10 -		--infodir=/usr/share/info \
  208.11 -		--mandir=/usr/share/man \
  208.12 -		$CONFIGURE_ARGS &&
  208.13 -	make && make DESTDIR=$DESTDIR install
  208.14 +	./configure $CONFIGURE_ARGS &&
  208.15 +	fix libtool &&
  208.16 +	make &&
  208.17 +	make DESTDIR=$DESTDIR install
  208.18  }
  208.19  
  208.20  genpkg_rules() {
   209.1 --- a/libgudev/receipt	Tue Mar 27 12:50:45 2018 +0200
   209.2 +++ b/libgudev/receipt	Fri Mar 30 19:31:50 2018 +0300
   209.3 @@ -16,12 +16,12 @@
   209.4  SPLIT="libgudev-dev"
   209.5  
   209.6  compile_rules() {
   209.7 -	fix ld
   209.8  	./configure \
   209.9  		--disable-umockdev \
  209.10  		$CONFIGURE_ARGS &&
  209.11  	fix libtool &&
  209.12 -	make && make install
  209.13 +	make &&
  209.14 +	make install
  209.15  }
  209.16  
  209.17  genpkg_rules() {
   210.1 --- a/libgusb/receipt	Tue Mar 27 12:50:45 2018 +0200
   210.2 +++ b/libgusb/receipt	Fri Mar 30 19:31:50 2018 +0300
   210.3 @@ -16,7 +16,6 @@
   210.4  SPLIT="libgusb-dev"
   210.5  
   210.6  compile_rules() {
   210.7 -	fix ld
   210.8  	./configure \
   210.9  		--disable-static \
  210.10  		$CONFIGURE_ARGS &&
   211.1 --- a/libindicator-gtk2/receipt	Tue Mar 27 12:50:45 2018 +0200
   211.2 +++ b/libindicator-gtk2/receipt	Fri Mar 30 19:31:50 2018 +0300
   211.3 @@ -22,13 +22,12 @@
   211.4  	autoreconf -fi &&
   211.5  
   211.6  	./configure \
   211.7 -		--sysconfdir=/etc \
   211.8 -		--localstatedir=/var \
   211.9  		--libexecdir=/usr/lib/libindicator \
  211.10  		--with-gtk=2 \
  211.11  		--disable-static \
  211.12  		--disable-tests \
  211.13  		$CONFIGURE_ARGS &&
  211.14 +	fix libtool &&
  211.15  	make &&
  211.16  	make install
  211.17  }
   212.1 --- a/libindicator-gtk3/receipt	Tue Mar 27 12:50:45 2018 +0200
   212.2 +++ b/libindicator-gtk3/receipt	Fri Mar 30 19:31:50 2018 +0300
   212.3 @@ -22,8 +22,6 @@
   212.4  	autoreconf -fi &&
   212.5  
   212.6  	./configure \
   212.7 -		--sysconfdir=/etc \
   212.8 -		--localstatedir=/var \
   212.9  		--libexecdir=/usr/lib/libindicator \
  212.10  		--with-gtk=3 \
  212.11  		--disable-static \
   213.1 --- a/libinput/receipt	Tue Mar 27 12:50:45 2018 +0200
   213.2 +++ b/libinput/receipt	Fri Mar 30 19:31:50 2018 +0300
   213.3 @@ -16,7 +16,6 @@
   213.4  SPLIT="libinput-debug-gui libinput libinput-dev"
   213.5  
   213.6  compile_rules() {
   213.7 -	fix ld
   213.8  	./configure \
   213.9  		--disable-static \
  213.10  		--disable-libwacom \
   214.1 --- a/libirman/receipt	Tue Mar 27 12:50:45 2018 +0200
   214.2 +++ b/libirman/receipt	Fri Mar 30 19:31:50 2018 +0300
   214.3 @@ -14,26 +14,19 @@
   214.4  SPLIT="libirman-dev"
   214.5  
   214.6  compile_rules() {
   214.7 -	./configure \
   214.8 -		--prefix=/usr \
   214.9 -		--sysconfdir=/etc \
  214.10 -		$CONFIGURE_ARGS &&
  214.11 -	make && make install
  214.12 +	./configure $CONFIGURE_ARGS &&
  214.13 +	make &&
  214.14 +	make install
  214.15  }
  214.16  
  214.17  genpkg_rules() {
  214.18  	case $PACKAGE in
  214.19  		libirman)
  214.20 -			mkdir -p $fs/usr/lib
  214.21 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
  214.22 -			cp -a $install/usr/bin $fs/usr
  214.23 -			cp -a $install/etc $fs
  214.24 +			copy @std
  214.25  			CONFIG_FILES="/etc/irman.conf"
  214.26  			;;
  214.27  		*-dev)
  214.28 -			mkdir -p $fs/usr/lib
  214.29 -			cp -a $install/usr/lib/*.*a $fs/usr/lib
  214.30 -			cp -a $install/usr/include $fs/usr
  214.31 +			copy @dev
  214.32  			;;
  214.33  	esac
  214.34  }
   215.1 --- a/libmatekbd/receipt	Tue Mar 27 12:50:45 2018 +0200
   215.2 +++ b/libmatekbd/receipt	Fri Mar 30 19:31:50 2018 +0300
   215.3 @@ -15,10 +15,8 @@
   215.4  SPLIT="libmatekbd-dev"
   215.5  
   215.6  compile_rules() {
   215.7 -	./autogen.sh \
   215.8 -		--sysconfdir=/etc \
   215.9 -		--localstatedir=/var \
  215.10 -		$CONFIGURE_ARGS &&
  215.11 +	./autogen.sh $CONFIGURE_ARGS &&
  215.12 +	fix libtool &&
  215.13  	make &&
  215.14  	make install
  215.15  }
   216.1 --- a/libmatemixer/receipt	Tue Mar 27 12:50:45 2018 +0200
   216.2 +++ b/libmatemixer/receipt	Fri Mar 30 19:31:50 2018 +0300
   216.3 @@ -16,9 +16,8 @@
   216.4  
   216.5  compile_rules() {
   216.6  	./autogen.sh \
   216.7 -		--sysconfdir=/etc \
   216.8 -		--localstatedir=/var \
   216.9  		$CONFIGURE_ARGS &&
  216.10 +	fix libtool &&
  216.11  	make &&
  216.12  	make install
  216.13  }
   217.1 --- a/libmateweather/receipt	Tue Mar 27 12:50:45 2018 +0200
   217.2 +++ b/libmateweather/receipt	Fri Mar 30 19:31:50 2018 +0300
   217.3 @@ -16,10 +16,9 @@
   217.4  
   217.5  compile_rules() {
   217.6  	./autogen.sh \
   217.7 -		--sysconfdir=/etc \
   217.8 -		--localstatedir=/var \
   217.9  		--enable-locations-compression \
  217.10  		$CONFIGURE_ARGS &&
  217.11 +	fix libtool &&
  217.12  	make &&
  217.13  	make install
  217.14  }
   218.1 --- a/libmediainfo/receipt	Tue Mar 27 12:50:45 2018 +0200
   218.2 +++ b/libmediainfo/receipt	Fri Mar 30 19:31:50 2018 +0300
   218.3 @@ -18,31 +18,29 @@
   218.4  	cd Project/GNU/Library
   218.5  	./autogen.sh
   218.6  	./configure \
   218.7 -		--prefix=/usr \
   218.8 -		--sysconfdir=/etc \
   218.9  		--enable-shared \
  218.10  		--enable-minimize-size \
  218.11  		--with-libcurl \
  218.12  		--with-libmms \
  218.13  		$CONFIGURE_ARGS &&
  218.14 -	make && make install || return 1
  218.15 +	make &&
  218.16 +	make install || return 1
  218.17  
  218.18 -	mkdir -p $install/usr/bin
  218.19 -	cp -a libmediainfo-config $install/usr/bin
  218.20 -	sed -i -e "s|$src/Project/GNU/Library|/usr/lib|" -e 's|.libs||' \
  218.21 -		$install/usr/bin/libmediainfo-config
  218.22 +	install -Dm755 libmediainfo-config $install/usr/bin/libmediainfo-config
  218.23 +	sed \
  218.24 +		-e "s|$src/Project/GNU/Library|/usr/lib|" \
  218.25 +		-e 's|.libs||' \
  218.26 +		-i $install/usr/bin/libmediainfo-config
  218.27  }
  218.28  
  218.29  genpkg_rules() {
  218.30  	case $PACKAGE in
  218.31  		libmediainfo)
  218.32 -			mkdir -p $fs/usr/lib
  218.33 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
  218.34 +			copy @std
  218.35  			DEPENDS="libcurl libmms"
  218.36  			;;
  218.37  		*-dev)
  218.38 -			cp -a $install/* $fs
  218.39 -			rm $fs/usr/lib/*.so*
  218.40 +			copy @dev
  218.41  			;;
  218.42  	esac
  218.43  }
   219.1 --- a/libnl/receipt	Tue Mar 27 12:50:45 2018 +0200
   219.2 +++ b/libnl/receipt	Fri Mar 30 19:31:50 2018 +0300
   219.3 @@ -16,10 +16,10 @@
   219.4  
   219.5  compile_rules() {
   219.6  	./configure \
   219.7 -		--sysconfdir=/etc \
   219.8  		--disable-static \
   219.9  		$CONFIGURE_ARGS &&
  219.10 -	make && make install
  219.11 +	make &&
  219.12 +	make install
  219.13  }
  219.14  
  219.15  genpkg_rules() {
   220.1 --- a/liboil/receipt	Tue Mar 27 12:50:45 2018 +0200
   220.2 +++ b/liboil/receipt	Fri Mar 30 19:31:50 2018 +0300
   220.3 @@ -15,10 +15,7 @@
   220.4  COOKOPTS="skip-log-errors"
   220.5  
   220.6  compile_rules() {
   220.7 -	./configure \
   220.8 -		--prefix=/usr \
   220.9 -		--sysconfdir=/etc \
  220.10 -		$CONFIGURE_ARGS &&
  220.11 +	./configure $CONFIGURE_ARGS &&
  220.12  	make &&
  220.13  	make install || return 1
  220.14  
   221.1 --- a/libpaper/receipt	Tue Mar 27 12:50:45 2018 +0200
   221.2 +++ b/libpaper/receipt	Fri Mar 30 19:31:50 2018 +0300
   221.3 @@ -14,25 +14,21 @@
   221.4  BUILD_DEPENDS="automake libtool"
   221.5  SPLIT="libpaper-dev"
   221.6  
   221.7 -# Rules to configure and make the package.
   221.8 -compile_rules()
   221.9 -{
  221.10 +compile_rules() {
  221.11  	autoreconf -fi &&
  221.12  
  221.13  	./configure \
  221.14 -		--sysconfdir=/etc \
  221.15  		--disable-static \
  221.16  		$CONFIGURE_ARGS &&
  221.17 -	make && make install &&
  221.18 +	make &&
  221.19 +	make install || return 1
  221.20  
  221.21 -	install -m755 $stuff/run-parts $install/usr/bin &&
  221.22 -	mkdir -p $install/etc &&
  221.23 +	install -m755 $stuff/run-parts $install/usr/bin
  221.24 +	mkdir -p $install/etc
  221.25  	echo 'a4' > $install/etc/papersize
  221.26  }
  221.27  
  221.28 -# Rules to gen a SliTaz package suitable for Tazpkg.
  221.29 -genpkg_rules()
  221.30 -{
  221.31 +genpkg_rules() {
  221.32  	case $PACKAGE in
  221.33  		libpaper)
  221.34  			copy @std
   222.1 --- a/librsvg/receipt	Tue Mar 27 12:50:45 2018 +0200
   222.2 +++ b/librsvg/receipt	Fri Mar 30 19:31:50 2018 +0300
   222.3 @@ -17,12 +17,12 @@
   222.4  SPLIT="rsvg-convert rsvg-view librsvg-dev"
   222.5  
   222.6  compile_rules() {
   222.7 -	fix ld
   222.8  	./configure \
   222.9  		--enable-vala \
  222.10  		$CONFIGURE_ARGS &&
  222.11  	fix libtool &&
  222.12 -	make && make install
  222.13 +	make &&
  222.14 +	make install
  222.15  }
  222.16  
  222.17  genpkg_rules() {
   223.1 --- a/libsde-utils/receipt	Tue Mar 27 12:50:45 2018 +0200
   223.2 +++ b/libsde-utils/receipt	Fri Mar 30 19:31:50 2018 +0300
   223.3 @@ -1,4 +1,4 @@
   223.4 -# SliTaz package receipt.
   223.5 +# SliTaz package receipt v2.
   223.6  
   223.7  PACKAGE="libsde-utils"
   223.8  VERSION="451ac07"
   223.9 @@ -7,34 +7,28 @@
  223.10  MAINTAINER="al.bobylev@gmail.com"
  223.11  LICENSE="GPL"
  223.12  WEB_SITE="http://make-linux.org/"
  223.13 +
  223.14  TARBALL="$PACKAGE-$VERSION.tar.xz"
  223.15  #BRANCH="451ac0770e789d91e87d7911aa41049a172aab26"
  223.16  #WGET_URL="git|git://make-linux.org/sde/libsde-utils.git"
  223.17  WGET_URL="http://git.make-linux.org/sde/$PACKAGE.git/snapshot/$TARBALL"
  223.18  
  223.19 -DEPENDS="glib glibc-base"
  223.20  BUILD_DEPENDS="git cmake glib-dev libtool automake"
  223.21  # glib-2.0>=2.36
  223.22  
  223.23 -# Rules to configure and make the package.
  223.24 -compile_rules()
  223.25 -{
  223.26 +compile_rules() {
  223.27  	rm -rf $src/.git
  223.28  	# cmake -DCMAKE_INSTALL_PREFIX=/usr . &&
  223.29  	./autogen.sh
  223.30  	./configure \
  223.31 -		--prefix=/usr \
  223.32 -		--sysconfdir=/etc \
  223.33  		--enable-silent-rules \
  223.34 -		--with-gnu-ld || return 1
  223.35 +		--with-gnu-ld \
  223.36 +		&&
  223.37  	make &&
  223.38  	make install
  223.39  }
  223.40  
  223.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
  223.42 -genpkg_rules()
  223.43 -{
  223.44 -	mkdir -p $fs/usr/lib
  223.45 -	# cp -a $install/usr/lib/*.so* $fs/usr/lib
  223.46 -	cp -a $install/* $fs
  223.47 +genpkg_rules() {
  223.48 +	copy @std @dev
  223.49 +	DEPENDS="glib glibc-base"
  223.50  }
   224.1 --- a/libsdl2-ttf/receipt	Tue Mar 27 12:50:45 2018 +0200
   224.2 +++ b/libsdl2-ttf/receipt	Fri Mar 30 19:31:50 2018 +0300
   224.3 @@ -16,10 +16,10 @@
   224.4  SPLIT="libsdl2-ttf-dev"
   224.5  
   224.6  compile_rules() {
   224.7 -	fix ld
   224.8  	./configure $CONFIGURE_ARGS &&
   224.9  	fix libtool &&
  224.10 -	make && make install
  224.11 +	make &&
  224.12 +	make install
  224.13  }
  224.14  
  224.15  genpkg_rules() {
   225.1 --- a/libshout/receipt	Tue Mar 27 12:50:45 2018 +0200
   225.2 +++ b/libshout/receipt	Fri Mar 30 19:31:50 2018 +0300
   225.3 @@ -11,26 +11,18 @@
   225.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   225.5  WGET_URL="http://downloads.xiph.org/releases/$PACKAGE/$TARBALL"
   225.6  
   225.7 -BUILD_DEPENDS="libvorbis-dev libtheora-dev speex-dev libogg-dev"
   225.8  BUILD_DEPENDS="libogg-dev libvorbis-dev libtheora-dev speex-dev openssl-dev"
   225.9  SPLIT="libshout-dev"
  225.10  
  225.11 -# Rules to configure and make the package.
  225.12 -compile_rules()
  225.13 -{
  225.14 +compile_rules() {
  225.15  	sed -e 's/SSLeay_add_all_algorithms/OpenSSL_add_all_algorithms/g' -i src/tls.c
  225.16  
  225.17 -	./configure \
  225.18 -		--sysconfdir=/etc \
  225.19 -		--localstatedir=/var \
  225.20 -		$CONFIGURE_ARGS &&
  225.21 -	make && make install
  225.22 -#	make LDFLAGS+=-lspeex && make install
  225.23 +	./configure $CONFIGURE_ARGS &&
  225.24 +	make &&
  225.25 +	make install
  225.26  }
  225.27  
  225.28 -# Rules to gen a SliTaz package suitable for Tazpkg.
  225.29 -genpkg_rules()
  225.30 -{
  225.31 +genpkg_rules() {
  225.32  	case $PACKAGE in
  225.33  		libshout)
  225.34  			copy @std
   226.1 --- a/libtdb/receipt	Tue Mar 27 12:50:45 2018 +0200
   226.2 +++ b/libtdb/receipt	Fri Mar 30 19:31:50 2018 +0300
   226.3 @@ -14,9 +14,8 @@
   226.4  BUILD_DEPENDS="python-dev libxslt-dev docbook-xsl"
   226.5  SPLIT="libtdb-python libtdb libtdb-dev"
   226.6  
   226.7 -# Rules to configure and make the package.
   226.8 -compile_rules()
   226.9 -{
  226.10 +compile_rules() {
  226.11 +	# site script isn't used
  226.12  	./configure \
  226.13  		--prefix=/usr \
  226.14  		--localstatedir=/var \
  226.15 @@ -27,9 +26,7 @@
  226.16  	cook_pick_docs docs/README web/index.html
  226.17  }
  226.18  
  226.19 -# Rules to gen a SliTaz package suitable for Tazpkg.
  226.20 -genpkg_rules()
  226.21 -{
  226.22 +genpkg_rules() {
  226.23  	case $PACKAGE in
  226.24  		libtdb-python)
  226.25  			copy python*/
   227.1 --- a/libtirpc/receipt	Tue Mar 27 12:50:45 2018 +0200
   227.2 +++ b/libtirpc/receipt	Fri Mar 30 19:31:50 2018 +0300
   227.3 @@ -22,11 +22,11 @@
   227.4  	sed -i '/key_secret_is/s|secret|secretkey|' src/libtirpc.map
   227.5  
   227.6  	./configure \
   227.7 -		--sysconfdir=/etc \
   227.8  		--disable-static \
   227.9  		--disable-gssapi \
  227.10  		$CONFIGURE_ARGS &&
  227.11 -	make && make install || return 1
  227.12 +	make &&
  227.13 +	make install || return 1
  227.14  
  227.15  	mkdir -p $install/lib
  227.16  	mv -v $install/usr/lib/libtirpc.so.* $install/lib
   228.1 --- a/libva-intel-driver/receipt	Tue Mar 27 12:50:45 2018 +0200
   228.2 +++ b/libva-intel-driver/receipt	Fri Mar 30 19:31:50 2018 +0300
   228.3 @@ -18,10 +18,7 @@
   228.4  compile_rules() {
   228.5  	autoreconf -fi &&
   228.6  
   228.7 -	./configure \
   228.8 -		--sysconfdir=/etc \
   228.9 -		--localstatedir=/var \
  228.10 -		$CONFIGURE_ARGS &&
  228.11 +	./configure $CONFIGURE_ARGS &&
  228.12  	make &&
  228.13  	make install
  228.14  }
   229.1 --- a/libva/receipt	Tue Mar 27 12:50:45 2018 +0200
   229.2 +++ b/libva/receipt	Fri Mar 30 19:31:50 2018 +0300
   229.3 @@ -16,11 +16,7 @@
   229.4  SPLIT="libva-dev"
   229.5  
   229.6  compile_rules() {
   229.7 -	fix ld
   229.8 -	./configure \
   229.9 -		--sysconfdir=/etc \
  229.10 -		--localstatedir=/var \
  229.11 -		$CONFIGURE_ARGS &&
  229.12 +	./configure $CONFIGURE_ARGS &&
  229.13  	fix libtool &&
  229.14  	make &&
  229.15  	make install
   230.1 --- a/libvdpau/receipt	Tue Mar 27 12:50:45 2018 +0200
   230.2 +++ b/libvdpau/receipt	Fri Mar 30 19:31:50 2018 +0300
   230.3 @@ -15,10 +15,7 @@
   230.4  SPLIT="libvdpau-dev"
   230.5  
   230.6  compile_rules() {
   230.7 -	./configure \
   230.8 -		--sysconfdir=/etc \
   230.9 -		--localstatedir=/var \
  230.10 -		$CONFIGURE_ARGS &&
  230.11 +	./configure $CONFIGURE_ARGS &&
  230.12  	make &&
  230.13  	make install
  230.14  }
   231.1 --- a/libxfce4ui/receipt	Tue Mar 27 12:50:45 2018 +0200
   231.2 +++ b/libxfce4ui/receipt	Fri Mar 30 19:31:50 2018 +0300
   231.3 @@ -17,10 +17,7 @@
   231.4  SPLIT="libxfce4ui-dev libxfce4ui-glade3 libxfce4ui"
   231.5  
   231.6  compile_rules() {
   231.7 -	fix ld
   231.8  	./configure \
   231.9 -		--sysconfdir=/etc \
  231.10 -		--localstatedir=/var \
  231.11  		--disable-debug \
  231.12  		--disable-gtk-doc \
  231.13  		$CONFIGURE_ARGS &&
   232.1 --- a/libxfce4util/receipt	Tue Mar 27 12:50:45 2018 +0200
   232.2 +++ b/libxfce4util/receipt	Fri Mar 30 19:31:50 2018 +0300
   232.3 @@ -15,10 +15,7 @@
   232.4  SPLIT="libxfce4util-dev"
   232.5  
   232.6  compile_rules() {
   232.7 -	fix ld
   232.8  	./configure \
   232.9 -		--sysconfdir=/etc \
  232.10 -		--localstatedir=/var \
  232.11  		--disable-debug \
  232.12  		--disable-gtk-doc \
  232.13  		$CONFIGURE_ARGS &&
   233.1 --- a/libxkbcommon-wayland/receipt	Tue Mar 27 12:50:45 2018 +0200
   233.2 +++ b/libxkbcommon-wayland/receipt	Fri Mar 30 19:31:50 2018 +0300
   233.3 @@ -18,14 +18,12 @@
   233.4  
   233.5  compile_rules() {
   233.6  	./configure \
   233.7 -		--sysconfdir=/etc \
   233.8 -		--localstatedir=/var \
   233.9  		--with-xkb-config-root=/usr/share/X11/xkb \
  233.10 -		--docdir=/usr/share/doc/libxkbcommon-$VERSION \
  233.11  		--enable-wayland \
  233.12  		--disable-x11 \
  233.13  		$CONFIGURE_ARGS &&
  233.14 -	make && make install
  233.15 +	make &&
  233.16 +	make install
  233.17  }
  233.18  
  233.19  genpkg_rules() {
   234.1 --- a/libxkbcommon/receipt	Tue Mar 27 12:50:45 2018 +0200
   234.2 +++ b/libxkbcommon/receipt	Fri Mar 30 19:31:50 2018 +0300
   234.3 @@ -16,22 +16,17 @@
   234.4  SPLIT="libxkbcommon-x11 libxkbcommon libxkbcommon-dev"
   234.5  SIBLINGS="libxkbcommon-wayland"
   234.6  
   234.7 -# Rules to configure and make the package.
   234.8 -compile_rules()
   234.9 -{
  234.10 +compile_rules() {
  234.11  	./configure \
  234.12 -		--sysconfdir=/etc \
  234.13 -		--localstatedir=/var \
  234.14  		--with-xkb-config-root=/usr/share/X11/xkb \
  234.15  		--docdir=/usr/share/doc/libxkbcommon-$VERSION \
  234.16  		--disable-wayland \
  234.17  		$CONFIGURE_ARGS &&
  234.18 -	make && make install
  234.19 +	make &&
  234.20 +	make install
  234.21  }
  234.22  
  234.23 -# Rules to gen a SliTaz package suitable for Tazpkg.
  234.24 -genpkg_rules()
  234.25 -{
  234.26 +genpkg_rules() {
  234.27  	case $PACKAGE in
  234.28  		libxkbcommon-x11)
  234.29  			copy libxkbcommon-x11.so*
   235.1 --- a/libzen/receipt	Tue Mar 27 12:50:45 2018 +0200
   235.2 +++ b/libzen/receipt	Fri Mar 30 19:31:50 2018 +0300
   235.3 @@ -1,35 +1,31 @@
   235.4 -# SliTaz package receipt.
   235.5 +# SliTaz package receipt v2.
   235.6  
   235.7  PACKAGE="libzen"
   235.8  VERSION="0.4.32"
   235.9 -CATEGORY="libdevel"
  235.10 +CATEGORY="development"
  235.11  SHORT_DESC="ZenLib - small C++ derivative class to have a simpler life"
  235.12  MAINTAINER="al.bobylev@gmail.com"
  235.13  LICENSE="zlib/libpng"
  235.14  WEB_SITE="http://mediaarea.net/"
  235.15 +
  235.16  TARBALL="${PACKAGE}_$VERSION.tar.bz2"
  235.17  WGET_URL="${WEB_SITE}download/source/$PACKAGE/$VERSION/$TARBALL"
  235.18  
  235.19 -DEPENDS=""
  235.20  BUILD_DEPENDS="libtool"
  235.21  
  235.22 -# Rules to configure and make the package.
  235.23 -compile_rules()
  235.24 -{
  235.25 +compile_rules() {
  235.26  	cd Project/GNU/Library
  235.27  	./autogen.sh
  235.28 -	./configure \
  235.29 -		--prefix=/usr \
  235.30 -		--sysconfdir=/etc \
  235.31 -		$CONFIGURE_ARGS &&
  235.32 -	make && make install
  235.33 +	./configure $CONFIGURE_ARGS &&
  235.34 +	make &&
  235.35 +	make install || return 1
  235.36  
  235.37 -	sed -i -e "s|$src/Project/GNU/Library|/usr/lib|" -e 's|/.libs||' \
  235.38 -	$install/usr/bin/libzen-config
  235.39 +	sed \
  235.40 +		-e "s|$src/Project/GNU/Library|/usr/lib|" \
  235.41 +		-e 's|/.libs||' \
  235.42 +		-i $install/usr/bin/libzen-config
  235.43  }
  235.44  
  235.45 -# Rules to gen a SliTaz package suitable for Tazpkg.
  235.46 -genpkg_rules()
  235.47 -{
  235.48 -	cp -a $install/* $fs
  235.49 +genpkg_rules() {
  235.50 +	copy @dev
  235.51  }
   236.1 --- a/lightdm-gtk2-greeter/receipt	Tue Mar 27 12:50:45 2018 +0200
   236.2 +++ b/lightdm-gtk2-greeter/receipt	Fri Mar 30 19:31:50 2018 +0300
   236.3 @@ -22,7 +22,6 @@
   236.4  	esac
   236.5  
   236.6  	./configure \
   236.7 -		--sysconfdir=/etc \
   236.8  		--disable-static \
   236.9  		--enable-introspection \
  236.10  		$SET_ARGS \
   237.1 --- a/lightdm-qt/receipt	Tue Mar 27 12:50:45 2018 +0200
   237.2 +++ b/lightdm-qt/receipt	Fri Mar 30 19:31:50 2018 +0300
   237.3 @@ -20,7 +20,6 @@
   237.4  compile_rules() {
   237.5  	./configure \
   237.6  		--libexecdir=/usr/lib \
   237.7 -		--sysconfdir=/etc \
   237.8  		--disable-static \
   237.9  		--enable-introspection \
  237.10  		--enable-liblightdm-gobject \
  237.11 @@ -34,35 +33,13 @@
  237.12  genpkg_rules() {
  237.13  	case $PACKAGE in
  237.14  		lightdm-qt)
  237.15 -			mkdir -p \
  237.16 -				$fs/usr/lib \
  237.17 -				$fs/usr/share/locale
  237.18 -			cp -a $install/etc $fs
  237.19 -			cp -a $install/usr/bin $fs/usr
  237.20 -			cp -a $install/usr/lib/lightdm $fs/usr/lib
  237.21 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
  237.22 -			cp -a $install/usr/sbin $fs/usr
  237.23 -
  237.24 -			# localization
  237.25 -			. $WOK/slitaz-i18n/stuff/locale-pack.conf
  237.26 -			for lang in $LOCALE_PACK; do
  237.27 -				langf=$install/usr/share/locale/$lang
  237.28 -				[ -d $langf ] && cp -a $langf $fs/usr/share/locale
  237.29 -			done
  237.30 +			copy @std *.mo
  237.31  			CONFIG_FILES="/etc/init/lightdm.conf /etc/lightdm/keys.conf \
  237.32  			/etc/lightdm/lightdm.conf /etc/lightdm/users.conf"
  237.33  			DEPENDS="libQtDBus libQtGui libgcrypt glib libxklavier pam"
  237.34  			;;
  237.35  		*-dev)
  237.36 -			mkdir -p \
  237.37 -				$fs/usr/lib \
  237.38 -				$fs/usr/share
  237.39 -			cp -a $install/usr/include $fs/usr
  237.40 -			cp -a $install/usr/lib/girepository* $fs/usr/lib
  237.41 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  237.42 -			cp -a $install/usr/lib/*.la $fs/usr/lib
  237.43 -			cp -a $install/usr/share/gir* $fs/usr/share
  237.44 -			cp -a $install/usr/share/vala $fs/usr/share
  237.45 +			copy @dev
  237.46  			DEPENDS="Qt4-dev lightdm-dev lightdm-qt xorg-libXi-dev \
  237.47  			xorg-libxkbfile-dev"
  237.48  			;;
   238.1 --- a/lightdm/receipt	Tue Mar 27 12:50:45 2018 +0200
   238.2 +++ b/lightdm/receipt	Fri Mar 30 19:31:50 2018 +0300
   238.3 @@ -20,7 +20,6 @@
   238.4  compile_rules() {
   238.5  	./configure \
   238.6  		--libexecdir=/usr/lib \
   238.7 -		--sysconfdir=/etc \
   238.8  		--disable-static \
   238.9  		--enable-introspection \
  238.10  		--enable-liblightdm-gobject \
   239.1 --- a/links-dfb/receipt	Tue Mar 27 12:50:45 2018 +0200
   239.2 +++ b/links-dfb/receipt	Fri Mar 30 19:31:50 2018 +0300
   239.3 @@ -1,41 +1,35 @@
   239.4 -# SliTaz package receipt.
   239.5 +# SliTaz package receipt v2.
   239.6  
   239.7  PACKAGE="links-dfb"
   239.8  VERSION="2.14"
   239.9  CATEGORY="network"
  239.10 -SHORT_DESC="Light and fast web browser using Ncurses, X or DirectFB."
  239.11 +SHORT_DESC="Light and fast web browser using Ncurses, X or DirectFB"
  239.12  MAINTAINER="pankso@slitaz.org"
  239.13  LICENSE="GPL2"
  239.14 -SOURCE="links"
  239.15 -TARBALL="$SOURCE-$VERSION.tar.gz"
  239.16  WEB_SITE="http://links.twibright.com/"
  239.17 +
  239.18 +TARBALL="links-$VERSION.tar.gz"
  239.19  WGET_URL="http://links.twibright.com/download/$TARBALL"
  239.20 -PROVIDE="links"
  239.21  
  239.22 -DEPENDS="ncurses openssl jpeg libpng16 tiff zlib libgomp directfb"
  239.23  BUILD_DEPENDS="openssl-dev ncurses-dev jpeg-dev libpng16-dev tiff-dev \
  239.24  zlib-dev directfb-dev"
  239.25  
  239.26 -# Rules to configure and make the package.
  239.27 -compile_rules()
  239.28 -{
  239.29 +compile_rules() {
  239.30  	sed -i 's/\*last_val/last_val/' dip.c
  239.31 +
  239.32  	./configure \
  239.33 -		--prefix=/usr \
  239.34 -		--sysconfdir=/etc \
  239.35 -		--mandir=/usr/share/man \
  239.36  		--with-directfb \
  239.37  		--without-bzip2 \
  239.38  		--enable-graphics \
  239.39  		$CONFIGURE_ARGS &&
  239.40  	make &&
  239.41 -	make DESTDIR=$DESTDIR install
  239.42 +	make DESTDIR=$DESTDIR install || return 1
  239.43 +
  239.44 +	install -Dm644 $src/graphics/links.xpm $install/usr/share/pixmaps/links.xpm
  239.45  }
  239.46  
  239.47 -# Rules to gen a SliTaz package suitable for Tazpkg.
  239.48 -genpkg_rules()
  239.49 -{
  239.50 -	mkdir -p $fs/usr/share/pixmaps
  239.51 -	cp -a $install/usr/bin $fs/usr
  239.52 -	cp $src/graphics/links.xpm $fs/usr/share/pixmaps
  239.53 +genpkg_rules() {
  239.54 +	copy @std
  239.55 +	DEPENDS="ncurses openssl jpeg libpng16 tiff zlib libgomp directfb"
  239.56 +	PROVIDE="links"
  239.57  }
   240.1 --- a/links/receipt	Tue Mar 27 12:50:45 2018 +0200
   240.2 +++ b/links/receipt	Fri Mar 30 19:31:50 2018 +0300
   240.3 @@ -1,54 +1,46 @@
   240.4 -# SliTaz package receipt.
   240.5 +# SliTaz package receipt v2.
   240.6  
   240.7  PACKAGE="links"
   240.8  VERSION="2.14"
   240.9  CATEGORY="network"
  240.10 -SHORT_DESC="Light and fast web browser using Ncurses or Xlib."
  240.11 +SHORT_DESC="Light and fast web browser using Ncurses or Xlib"
  240.12  MAINTAINER="pankso@slitaz.org"
  240.13  LICENSE="GPL2"
  240.14 +WEB_SITE="http://links.twibright.com/"
  240.15 +
  240.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  240.17 -WEB_SITE="http://links.twibright.com/"
  240.18  WGET_URL="http://links.twibright.com/download/$TARBALL"
  240.19 -TAGS="web-browser"
  240.20  
  240.21 -SUGGESTED="gpm"
  240.22 -DEPENDS="ncurses openssl jpeg libpng16 tiff xorg-libX11 xorg-libXau \
  240.23 -xorg-libXdmcp xorg-libxcb zlib liblzma bzlib libgomp"
  240.24  BUILD_DEPENDS="openssl-dev xorg-libX11-dev jpeg-dev libpng16-dev tiff-dev \
  240.25  zlib-dev xorg-libXdmcp-dev xorg-libxcb-dev xorg-libXau-dev xz-dev bzip2-dev \
  240.26  gpm-dev"
  240.27  
  240.28 -# Handle cross compilation
  240.29  case "$ARCH" in
  240.30  	arm*)
  240.31 -		VERSION="2.7" 
  240.32 -		TARBALL="$PACKAGE-$VERSION.tar.gz" 
  240.33 -		WGET_URL="http://links.twibright.com/download/$TARBALL" ;;
  240.34 +		VERSION="2.7"
  240.35 +		TARBALL="$PACKAGE-$VERSION.tar.gz"
  240.36 +		WGET_URL="http://links.twibright.com/download/$TARBALL";;
  240.37 +esac
  240.38 +case "$SLITAZ_ARCH" in
  240.39 +	arm*) VERSION="2.7";;
  240.40  esac
  240.41  
  240.42 -# Handle SliTaz arch
  240.43 -case "$SLITAZ_ARCH" in
  240.44 -	arm*) VERSION="2.7" ;;
  240.45 -esac
  240.46 -
  240.47 -# Rules to configure and make the package.
  240.48 -compile_rules()
  240.49 -{
  240.50 +compile_rules() {
  240.51  	./configure \
  240.52 -		--prefix=/usr \
  240.53 -		--sysconfdir=/etc \
  240.54  		--enable-graphics \
  240.55  		--without-directfb \
  240.56  		$CONFIGURE_ARGS &&
  240.57  	make &&
  240.58 -	make DESTDIR=$DESTDIR install
  240.59 +	make DESTDIR=$DESTDIR install || return 1
  240.60 +
  240.61 +	install -Dm644 $src/graphics/links.xpm $install/usr/share/pixmaps/links.xpm
  240.62 +	install -Dm644 $stuff/links.html       $install/usr/share/webhome/links.html
  240.63  }
  240.64  
  240.65 -# Rules to gen a SliTaz package suitable for Tazpkg.
  240.66 -genpkg_rules()
  240.67 -{
  240.68 -	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/webhome
  240.69 -	cp -a $install/usr/bin $fs/usr
  240.70 -	cp $src/graphics/links.xpm $fs/usr/share/pixmaps
  240.71 -	cp $stuff/links.html $fs/usr/share/webhome
  240.72 +genpkg_rules() {
  240.73 +	copy @std
  240.74 +	DEPENDS="ncurses openssl jpeg libpng16 tiff xorg-libX11 xorg-libXau \
  240.75 +	xorg-libXdmcp xorg-libxcb zlib liblzma bzlib libgomp"
  240.76 +	SUGGESTED="gpm"
  240.77 +	TAGS="web-browser"
  240.78  }
   241.1 --- a/lirc/receipt	Tue Mar 27 12:50:45 2018 +0200
   241.2 +++ b/lirc/receipt	Fri Mar 30 19:31:50 2018 +0300
   241.3 @@ -3,7 +3,8 @@
   241.4  PACKAGE="lirc"
   241.5  VERSION="0.9.4d"
   241.6  CATEGORY="utilities"
   241.7 -SHORT_DESC="Enables decoding and sending signals of many commonly used remote controls."
   241.8 +SHORT_DESC="Enables decoding and sending signals of many commonly used remote \
   241.9 +controls"
  241.10  MAINTAINER="rcx@zoominternet.net"
  241.11  LICENSE="GPL2"
  241.12  TARBALL="$PACKAGE-$VERSION.tar.gz"
  241.13 @@ -13,18 +14,13 @@
  241.14  BUILD_DEPENDS="linux linux-module-headers python libusb-dev libirman-dev \
  241.15  portaudio-dev alsa-lib-dev libusb-compat-dev util-linux-uuid-dev \
  241.16  libftdi-dev jack-dev libxslt python3 udev-dev"
  241.17 -SPLIT="lirc lirc-dev"
  241.18 +SPLIT="lirc-dev"
  241.19  
  241.20 -# Rules to configure and make the package.
  241.21 -compile_rules()
  241.22 -{
  241.23 -	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
  241.24 +compile_rules() {
  241.25 +	KERNEL_VERSION=$(grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g')
  241.26  	sed -i "s/uname -r/echo $KERNEL_VERSION-slitaz/g" configure
  241.27  
  241.28  	./configure \
  241.29 -		--prefix=/usr \
  241.30 -		--sysconfdir=/etc \
  241.31 -		--localstatedir=/var \
  241.32  		--with-x \
  241.33  		--with-driver=all \
  241.34  		--with-kerneldir=/usr/src/linux \
  241.35 @@ -34,27 +30,15 @@
  241.36  	make DESTDIR=$DESTDIR install 2>&1 | sed '/depmod:/d'
  241.37  }
  241.38  
  241.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  241.40 -genpkg_rules()
  241.41 -{
  241.42 +genpkg_rules() {
  241.43  	case $PACKAGE in
  241.44 -	lirc)
  241.45 -		DEPENDS="glibc-base libusb libusb-compat libftdi xorg-libXau \
  241.46 +		lirc)
  241.47 +			copy @std
  241.48 +			DEPENDS="glibc-base libusb libusb-compat libftdi xorg-libXau \
  241.49  			libirman portaudio alsa-lib util-linux-uuid"
  241.50 -		mkdir -p $fs/usr/lib $fs/usr/share
  241.51 -		cp -a $install/usr/share/lirc $fs/usr/share
  241.52 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
  241.53 -		cp -a $install/usr/bin $fs/usr
  241.54 -		cp -a $install/usr/sbin $fs/usr
  241.55 -
  241.56 -		cp -a $install/etc $fs
  241.57 -		cp -a $install/var $fs
  241.58 -		;;
  241.59 -	lirc-dev)
  241.60 -		mkdir -p $fs/usr/lib
  241.61 -		cp -a $install/usr/lib/*.*a $fs/usr/lib
  241.62 -		cp -a $install/usr/include $fs/usr
  241.63 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  241.64 -		;;
  241.65 +			;;
  241.66 +		*-dev)
  241.67 +			copy @dev
  241.68 +			;;
  241.69  	esac
  241.70  }
   242.1 --- a/littleutils/receipt	Tue Mar 27 12:50:45 2018 +0200
   242.2 +++ b/littleutils/receipt	Fri Mar 30 19:31:50 2018 +0300
   242.3 @@ -1,4 +1,4 @@
   242.4 -# SliTaz package receipt.
   242.5 +# SliTaz package receipt v2.
   242.6  
   242.7  PACKAGE="littleutils"
   242.8  VERSION="1.0.32"
   242.9 @@ -6,27 +6,20 @@
  242.10  SHORT_DESC="Image optimizers, archive recompressors, file property tools ..."
  242.11  MAINTAINER="pascal.bellard@slitaz.org"
  242.12  LICENSE="GPL3"
  242.13 +WEB_SITE="http://sourceforge.net/projects/littleutils/"
  242.14 +
  242.15  TARBALL="$PACKAGE-$VERSION.tar.xz"
  242.16 -WEB_SITE="http://sourceforge.net/projects/littleutils/"
  242.17  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  242.18  
  242.19 -DEPENDS="bash perl"
  242.20 +compile_rules() {
  242.21 +	sed -i '/stdalign/d' littleutils/*.c
  242.22  
  242.23 -# Rules to configure and make the package.
  242.24 -compile_rules()
  242.25 -{
  242.26 -	sed -i '/stdalign/d' littleutils/*.c
  242.27 -	./configure --prefix=/usr \
  242.28 -		--sysconfdir=/etc \
  242.29 -		$CONFIGURE_ARGS &&
  242.30 +	./configure $CONFIGURE_ARGS &&
  242.31  	make &&
  242.32  	make DESTDIR=$DESTDIR install
  242.33  }
  242.34  
  242.35 -# Rules to gen a SliTaz package suitable for Tazpkg.
  242.36 -genpkg_rules()
  242.37 -{
  242.38 -	mkdir -p $fs/usr
  242.39 -	cp -a $install/usr/bin $fs/usr
  242.40 -	cp -a $install/usr/lib $fs/usr
  242.41 +genpkg_rules() {
  242.42 +	copy @std
  242.43 +	DEPENDS="bash perl"
  242.44  }
   243.1 --- a/log4c/receipt	Tue Mar 27 12:50:45 2018 +0200
   243.2 +++ b/log4c/receipt	Fri Mar 30 19:31:50 2018 +0300
   243.3 @@ -14,25 +14,16 @@
   243.4  SPLIT="log4c-dev"
   243.5  
   243.6  compile_rules() {
   243.7 -	./configure \
   243.8 -		--sysconfdir=/etc \
   243.9 -		$CONFIGURE_ARGS &&
  243.10 -	make && make install
  243.11 +	./configure $CONFIGURE_ARGS &&
  243.12 +	make &&
  243.13 +	make install || return 1
  243.14 +
  243.15 +	mv $install/etc/log4crc.sample $install/etc/log4crc
  243.16  }
  243.17  
  243.18  genpkg_rules() {
  243.19  	case $PACKAGE in
  243.20 -		log4c)
  243.21 -			mkdir -p $fs/usr/lib $fs/etc
  243.22 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
  243.23 -			cp -a $install/etc/log4crc.sample $fs/etc/log4crc
  243.24 -			;;
  243.25 -		*-dev)
  243.26 -			mkdir -p $fs/usr/lib 
  243.27 -			cp -a $install/usr/bin $fs/usr
  243.28 -			cp -a $install/usr/lib/*.*a $fs/usr/lib
  243.29 -			cp -a $install/usr/include $fs/usr
  243.30 -			cp -a $install/usr/share $fs/usr
  243.31 -			;;
  243.32 +		log4c) copy @std;;
  243.33 +		*-dev) copy @dev;;
  243.34  	esac
  243.35  }
   244.1 --- a/lxappearance-obconf/receipt	Tue Mar 27 12:50:45 2018 +0200
   244.2 +++ b/lxappearance-obconf/receipt	Fri Mar 30 19:31:50 2018 +0300
   244.3 @@ -16,10 +16,10 @@
   244.4  
   244.5  compile_rules() {
   244.6  	./configure \
   244.7 -		--sysconfdir=/etc \
   244.8  		--disable-static \
   244.9  		$CONFIGURE_ARGS &&
  244.10 -	make && make install
  244.11 +	make &&
  244.12 +	make install
  244.13  }
  244.14  
  244.15  genpkg_rules() {
   245.1 --- a/lxappearance/receipt	Tue Mar 27 12:50:45 2018 +0200
   245.2 +++ b/lxappearance/receipt	Fri Mar 30 19:31:50 2018 +0300
   245.3 @@ -7,6 +7,7 @@
   245.4  MAINTAINER="pankso@slitaz.org"
   245.5  LICENSE="GPL2"
   245.6  WEB_SITE="https://wiki.lxde.org/en/LXAppearance"
   245.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxappearance.html"
   245.8  
   245.9  TARBALL="$PACKAGE-$VERSION.tar.xz"
  245.10  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
  245.11 @@ -14,24 +15,18 @@
  245.12  BUILD_DEPENDS="intltool xorg-libX11-dev gtk+-dev dbus-dev dbus-glib-dev"
  245.13  SPLIT="lxappearance-dev"
  245.14  
  245.15 -# Rules to configure and make the package.
  245.16 -compile_rules()
  245.17 -{
  245.18 -	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxappearance.html
  245.19 -
  245.20 +compile_rules() {
  245.21  	# remove keywords from desktop file
  245.22  	sed -i '/^_Keywords/d' $src/data/lxappearance.desktop.in
  245.23  
  245.24  	./configure \
  245.25 -		--sysconfdir=/etc \
  245.26  		--enable-dbus \
  245.27  		$CONFIGURE_ARGS &&
  245.28 -	make && make install
  245.29 +	make &&
  245.30 +	make install
  245.31  }
  245.32  
  245.33 -# Rules to gen a SliTaz package suitable for Tazpkg.
  245.34 -genpkg_rules()
  245.35 -{
  245.36 +genpkg_rules() {
  245.37  	TAGS="LXDE"
  245.38  	case $PACKAGE in
  245.39  		lxappearance)
   246.1 --- a/lxc/receipt	Tue Mar 27 12:50:45 2018 +0200
   246.2 +++ b/lxc/receipt	Fri Mar 30 19:31:50 2018 +0300
   246.3 @@ -3,57 +3,45 @@
   246.4  PACKAGE="lxc"
   246.5  VERSION="2.1.1"
   246.6  CATEGORY="system-tools"
   246.7 -SHORT_DESC="Userspace control package for Linux Containers."
   246.8 +SHORT_DESC="Userspace control package for Linux Containers"
   246.9  MAINTAINER="pascal.bellard@slitaz.org"
  246.10  LICENSE="LGPL2.1"
  246.11 +WEB_SITE="http://linuxcontainers.org/"
  246.12 +
  246.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
  246.14 -WEB_SITE="http://linuxcontainers.org/"
  246.15  WGET_URL="${WEB_SITE}downloads/$TARBALL"
  246.16  
  246.17  BUILD_DEPENDS="libcap-dev util-linux-getopt"
  246.18  SPLIT="lxc-dev"
  246.19  
  246.20 -# Rules to configure and make the package.
  246.21 -compile_rules()
  246.22 -{
  246.23 -	./configure --prefix=/usr --mandir=/usr/share/man \
  246.24 -		--sysconfdir=/etc \
  246.25 +compile_rules() {
  246.26 +	./configure \
  246.27  		--libexec=/usr/lib/$PACKAGE \
  246.28 -		--localstatedir=/var \
  246.29 -	$CONFIGURE_ARGS &&
  246.30 +		$CONFIGURE_ARGS &&
  246.31  	make &&
  246.32 -	make DESTDIR=$DESTDIR install
  246.33 +	make DESTDIR=$DESTDIR install || return 1
  246.34 +
  246.35 +	sed \
  246.36 +		-e 's/^is_set(/zgrep() { zcat | grep "$@"; }\n\n&/' \
  246.37 +		-e 's/\(.*\$GREP .*\)\(\$CONFIG.*\)/\1< \2/' \
  246.38 +		-i $install/usr/bin/lxc-checkconfig
  246.39 +	chmod +x $install/usr/bin/lxc-*
  246.40  }
  246.41  
  246.42 -# Rules to gen a SliTaz package suitable for Tazpkg.   
  246.43 -genpkg_rules()                                      
  246.44 -{
  246.45 +genpkg_rules() {
  246.46  	case $PACKAGE in
  246.47 -	lxc)
  246.48 -		DEPENDS="libcap perl util-linux-getopt linux-netfilter \
  246.49 +		lxc)
  246.50 +			copy @std
  246.51 +			DEPENDS="libcap perl util-linux-getopt linux-netfilter \
  246.52  			linux-bridge iptables bridge-utils"
  246.53 -		mkdir -p $fs/usr/share $fs/var/lib/lxc
  246.54 -		cp -a $install/usr/share/lxc $fs/usr/share
  246.55 -		cp -a $install/usr/bin $fs/usr
  246.56 -		cp -a $install/usr/lib $fs/usr
  246.57 -		rm -rf $fs/usr/lib/pkgconfig
  246.58 -		cp -a $install/etc $fs
  246.59 -		cp -a $install/var $fs
  246.60 -		sed -i -e 's/^is_set(/zgrep() { zcat | grep "$@"; }\n\n&/' \
  246.61 -			-e 's/\(.*\$GREP .*\)\(\$CONFIG.*\)/\1< \2/' \
  246.62 -			$fs/usr/bin/lxc-checkconfig
  246.63 -		chmod +x $fs/usr/bin/lxc-*
  246.64 -		;;
  246.65 -	lxc-dev)
  246.66 -		mkdir -p $fs/usr/lib
  246.67 -		cp -a $install/usr/include $fs/usr
  246.68 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  246.69 -		;;
  246.70 +			;;
  246.71 +		lxc-dev)
  246.72 +			copy @dev
  246.73 +			;;
  246.74  	esac
  246.75  }
  246.76  
  246.77 -post_install_lxc()
  246.78 -{
  246.79 +post_install_lxc() {
  246.80  	[ -n "$1" ] && return
  246.81  	lxc-checkconfig  | tee /dev/stderr | grep -q required && cat <<EOT
  246.82  
   247.1 --- a/lxde-common/receipt	Tue Mar 27 12:50:45 2018 +0200
   247.2 +++ b/lxde-common/receipt	Fri Mar 30 19:31:50 2018 +0300
   247.3 @@ -7,25 +7,20 @@
   247.4  MAINTAINER="al.bobylev@gmail.com"
   247.5  LICENSE="LGPL3"
   247.6  WEB_SITE="http://www.lxde.org/"
   247.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxde-common.html"
   247.8  
   247.9  TARBALL="$PACKAGE-$VERSION.tar.xz"
  247.10  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
  247.11  
  247.12  BUILD_DEPENDS="intltool"
  247.13  
  247.14 -# Rules to configure and make the package.
  247.15 -compile_rules()
  247.16 -{
  247.17 -	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxde-common.html
  247.18 -	./configure \
  247.19 -		--sysconfdir=/etc \
  247.20 -		$CONFIGURE_ARGS &&
  247.21 -	make && make install
  247.22 +compile_rules() {
  247.23 +	./configure $CONFIGURE_ARGS &&
  247.24 +	make &&
  247.25 +	make install
  247.26  }
  247.27  
  247.28 -# Rules to gen a SliTaz package suitable for Tazpkg.
  247.29 -genpkg_rules()
  247.30 -{
  247.31 +genpkg_rules() {
  247.32 +	copy @std
  247.33  	TAGS="LXDE"
  247.34 -	copy @std
  247.35  }
   248.1 --- a/lxdm/receipt	Tue Mar 27 12:50:45 2018 +0200
   248.2 +++ b/lxdm/receipt	Fri Mar 30 19:31:50 2018 +0300
   248.3 @@ -11,22 +11,18 @@
   248.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   248.5  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   248.6  
   248.7 -BUILD_DEPENDS="xorg-dev gtk+-dev"
   248.8  BUILD_DEPENDS="intltool xorg-libX11-dev gtk+-dev   iso-codes" # + consolekit2-dev
   248.9  SPLIT="lxdm-dev"
  248.10  
  248.11 -# Rules to configure and make the package.
  248.12 -compile_rules()
  248.13 -{
  248.14 +compile_rules() {
  248.15  	./configure \
  248.16  		--sbindir=/usr/bin \
  248.17  		--libexecdir=/usr/lib/lxdm \
  248.18 -		--sysconfdir=/etc \
  248.19 -		--localstatedir=/var \
  248.20  		--enable-password \
  248.21  		--without-pam \
  248.22  		$CONFIGURE_ARGS &&
  248.23 -	make && make install || return 1
  248.24 +	make &&
  248.25 +	make install || return 1
  248.26  
  248.27  	# lxdm daemon
  248.28  	cp -a $stuff/init.d/ $install/etc/
  248.29 @@ -36,9 +32,7 @@
  248.30  	chown -R root:root $install
  248.31  }
  248.32  
  248.33 -# Rules to gen a SliTaz package suitable for Tazpkg.
  248.34 -genpkg_rules()
  248.35 -{
  248.36 +genpkg_rules() {
  248.37  	case $PACKAGE in
  248.38  		lxdm)
  248.39  			copy @std
   249.1 --- a/lxlauncher/receipt	Tue Mar 27 12:50:45 2018 +0200
   249.2 +++ b/lxlauncher/receipt	Fri Mar 30 19:31:50 2018 +0300
   249.3 @@ -1,4 +1,4 @@
   249.4 -# SliTaz package receipt.
   249.5 +# SliTaz package receipt v2.
   249.6  
   249.7  PACKAGE="lxlauncher"
   249.8  VERSION="0.2.4"
   249.9 @@ -6,51 +6,27 @@
  249.10  SHORT_DESC="LXDE launcher for netbooks"
  249.11  LICENSE="GPL3"
  249.12  MAINTAINER="pankso@slitaz.org"
  249.13 +WEB_SITE="https://wiki.lxde.org/en/LXLauncher"
  249.14 +
  249.15  TARBALL="$PACKAGE-$VERSION.tar.xz"
  249.16 -WEB_SITE="https://wiki.lxde.org/en/LXLauncher"
  249.17  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
  249.18 -TAGS="LXDE netbook"
  249.19  
  249.20 -DEPENDS="xorg-libX11 gtk+ gnome-menus startup-notification menu-cache xorg-libXdamage"
  249.21  BUILD_DEPENDS="xorg-libX11-dev gtk+-dev gnome-menus gnome-menus-dev \
  249.22  menu-cache-dev startup-notification-dev startup-notification xorg-libxcb-dev \
  249.23  intltool"
  249.24  
  249.25 -# Rules to configure and make the package.
  249.26 -compile_rules()
  249.27 -{
  249.28 -	#export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
  249.29 -	## Fix infinite loop.
  249.30 -	#touch po/stamp-it
  249.31 -	## Default icons to 32
  249.32 -	#sed -i s/'120'/'100'/ src/lxlauncher.c
  249.33 -	#sed -i s/'48'/'32'/ src/lxlauncher.c
  249.34 -	./configure \
  249.35 -		--prefix=/usr \
  249.36 -		--sysconfdir=/etc \
  249.37 -		$CONFIGURE_ARGS &&
  249.38 +compile_rules() {
  249.39 +	./configure $CONFIGURE_ARGS &&
  249.40  	make &&
  249.41 -	make DESTDIR=$DESTDIR install
  249.42 +	make DESTDIR=$DESTDIR install || return 1
  249.43 +
  249.44 +	# SliTaz homemade config file
  249.45 +	install -Dm644 $stuff/gtkrc $install/etc/xdg/lxlauncher/gtkrc
  249.46  }
  249.47  
  249.48 -# Rules to gen a SliTaz package suitable for Tazpkg.
  249.49 -genpkg_rules()
  249.50 -{
  249.51 -	mkdir -p $fs/usr/share
  249.52 -
  249.53 -	cp -a $install/usr/bin $fs/usr
  249.54 -
  249.55 -	# SliTaz home make config files
  249.56 -	cp -a $install/etc $fs
  249.57 -	cp -a $stuff/gtkrc $fs/etc/xdg/lxlauncher
  249.58 -
  249.59 -	cp -a $install/usr/share/desktop-directories $fs/usr/share
  249.60 -
  249.61 -	#cp -a $stuff/background $fs/usr/share/lxlauncher
  249.62 -	#background="internet learn play settings work"
  249.63 -	#for i in $background; do
  249.64 -	#	ln -sf slitaz.jpg $fs/usr/share/lxlauncher/background/accessibility_${i}_wallpaper.jpg
  249.65 -	#done
  249.66 -
  249.67 -	chown -R root.root $fs
  249.68 +genpkg_rules() {
  249.69 +	copy @std
  249.70 +	DEPENDS="xorg-libX11 gtk+ gnome-menus startup-notification menu-cache \
  249.71 +	xorg-libXdamage"
  249.72 +	TAGS="LXDE netbook"
  249.73  }
   250.1 --- a/lxmenu-data/receipt	Tue Mar 27 12:50:45 2018 +0200
   250.2 +++ b/lxmenu-data/receipt	Fri Mar 30 19:31:50 2018 +0300
   250.3 @@ -7,26 +7,20 @@
   250.4  MAINTAINER="rcx@zoominternet.net"
   250.5  LICENSE="GPL2"
   250.6  WEB_SITE="http://lxde.org/"
   250.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxmenu-data.html"
   250.8  
   250.9  TARBALL="$PACKAGE-$VERSION.tar.xz"
  250.10  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
  250.11  
  250.12 +BUILD_DEPENDS_arm=" "
  250.13  BUILD_DEPENDS="gettext intltool"
  250.14 -BUILD_DEPENDS_arm=" "
  250.15  
  250.16 -# Rules to configure and make the package.
  250.17 -compile_rules()
  250.18 -{
  250.19 -	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxmenu-data.html
  250.20 -	./configure \
  250.21 -		--sysconfdir=/etc \
  250.22 -		$CONFIGURE_ARGS &&
  250.23 +compile_rules() {
  250.24 +	./configure $CONFIGURE_ARGS &&
  250.25  	make && make install
  250.26  }
  250.27  
  250.28 -# Rules to gen a SliTaz package suitable for Tazpkg.
  250.29 -genpkg_rules()
  250.30 -{
  250.31 +genpkg_rules() {
  250.32  	copy @std
  250.33  	CONFIG_FILES="/etc/xdg/menus/lxde-applications.menu"
  250.34  	TAGS="LXDE"
   251.1 --- a/lxpanel/receipt	Tue Mar 27 12:50:45 2018 +0200
   251.2 +++ b/lxpanel/receipt	Fri Mar 30 19:31:50 2018 +0300
   251.3 @@ -19,9 +19,7 @@
   251.4  libkeybinder-dev"
   251.5  SPLIT="lxpanel-extra lxpanel lxpanel-dev"
   251.6  
   251.7 -# Rules to configure and make the package.
   251.8 -compile_rules()
   251.9 -{
  251.10 +compile_rules() {
  251.11  	case "$ARCH" in
  251.12  		arm*) ARCH_ARGS='--with-plugins="netstatus,volumealsa,cpu,batt,xkb,thermal,cpufreq,monitors"';;
  251.13  	esac
  251.14 @@ -29,11 +27,11 @@
  251.15  	./autogen.sh
  251.16  	CFLAGS="$CFLAGS -lgmodule-2.0"
  251.17  	./configure \
  251.18 -		--sysconfdir=/etc \
  251.19 -		--localstatedir=/var \
  251.20  		$ARCH_ARGS \
  251.21  		$CONFIGURE_ARGS &&
  251.22 -	make && make install || exit 1
  251.23 +	fix libtool &&
  251.24 +	make &&
  251.25 +	make install || exit 1
  251.26  
  251.27  	# SliTaz profile
  251.28  	cp -r $stuff/slitaz $install/etc/xdg/lxpanel/
  251.29 @@ -41,9 +39,7 @@
  251.30  	chown -R root:root $install
  251.31  }
  251.32  
  251.33 -# Rules to gen a SliTaz package suitable for Tazpkg.
  251.34 -genpkg_rules()
  251.35 -{
  251.36 +genpkg_rules() {
  251.37  	case $PACKAGE in
  251.38  		lxpanel-extra)
  251.39  			copy kbled.so ns-*.png *lock-*.png xkb-flags/ \
   252.1 --- a/lxpolkit/receipt	Tue Mar 27 12:50:45 2018 +0200
   252.2 +++ b/lxpolkit/receipt	Fri Mar 30 19:31:50 2018 +0300
   252.3 @@ -1,4 +1,4 @@
   252.4 -# SliTaz package receipt.
   252.5 +# SliTaz package receipt V2.
   252.6  
   252.7  PACKAGE="lxpolkit"
   252.8  VERSION="0.1.0"
   252.9 @@ -6,29 +6,23 @@
  252.10  SHORT_DESC="LXDE PolicyKit authentication agent"
  252.11  MAINTAINER="pankso@slitaz.org"
  252.12  LICENSE="GPL3"
  252.13 +WEB_SITE="http://lxde.org"
  252.14 +
  252.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
  252.16 -WGET_URL="$SF_MIRROR/lxde/LXPolkit/$TARBALL"
  252.17 -WEB_SITE="http://lxde.org"
  252.18 -TAGS="LXDE"
  252.19 +WGET_URL="$SF_MIRROR/lxde/$TARBALL"
  252.20  
  252.21 -DEPENDS="gtk+ polkit"
  252.22  BUILD_DEPENDS="gtk+-dev polkit-dev intltool"
  252.23  
  252.24 -# Rules to configure and make the package.
  252.25 -compile_rules()
  252.26 -{
  252.27 +compile_rules() {
  252.28  	./configure \
  252.29 -		--sysconfdir=/etc \
  252.30  		--libexecdir=/usr/lib/lxde \
  252.31  		$CONFIGURE_ARGS &&
  252.32 -	make && make install
  252.33 +	make &&
  252.34 +	make install
  252.35  }
  252.36  
  252.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
  252.38 -genpkg_rules()
  252.39 -{
  252.40 -    mkdir -p $fs/usr/share
  252.41 -    cp -a $install/etc $fs
  252.42 -    cp -a $install/usr/lib $fs/usr
  252.43 -    cp -a $install/usr/share/$PACKAGE $fs/usr/share
  252.44 +genpkg_rules() {
  252.45 +	copy @std
  252.46 +	DEPENDS="gtk+ polkit"
  252.47 +	TAGS="LXDE"
  252.48  }
   253.1 --- a/lxsession/receipt	Tue Mar 27 12:50:45 2018 +0200
   253.2 +++ b/lxsession/receipt	Fri Mar 30 19:31:50 2018 +0300
   253.3 @@ -7,6 +7,7 @@
   253.4  MAINTAINER="pankso@slitaz.org"
   253.5  LICENSE="GPL2"
   253.6  WEB_SITE="https://wiki.lxde.org/en/LXSession"
   253.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxsession.html"
   253.8  
   253.9  TARBALL="$PACKAGE-$VERSION.tar.xz"
  253.10  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
  253.11 @@ -14,20 +15,15 @@
  253.12  BUILD_DEPENDS="intltool xorg-libX11-dev polkit-dev vala libxslt docbook-xsl \
  253.13  automake gtk+-dev"
  253.14  
  253.15 -# Rules to configure and make the package.
  253.16 -compile_rules()
  253.17 -{
  253.18 -	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxsession.html
  253.19 -
  253.20 +compile_rules() {
  253.21  	# https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/lxsession
  253.22  	# Regenerate C sources from Vala code
  253.23  	rm *.stamp
  253.24  	autoreconf -fi
  253.25  
  253.26 -	./configure \
  253.27 -		--sysconfdir=/etc \
  253.28 -		$CONFIGURE_ARGS &&
  253.29 -	make && make install || return 1
  253.30 +	./configure $CONFIGURE_ARGS &&
  253.31 +	make &&
  253.32 +	make install || return 1
  253.33  
  253.34  	# customize desktop.conf for SliTaz
  253.35  	confdir="$install/etc/xdg/lxsession/LXDE"
  253.36 @@ -56,9 +52,7 @@
  253.37  	touch $confdir/autostart
  253.38  }
  253.39  
  253.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
  253.41 -genpkg_rules()
  253.42 -{
  253.43 +genpkg_rules() {
  253.44  	copy @std
  253.45  	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango polkit \
  253.46  	xorg-libX11   dbus-glib lsb-release"
   254.1 --- a/lynx/receipt	Tue Mar 27 12:50:45 2018 +0200
   254.2 +++ b/lynx/receipt	Fri Mar 30 19:31:50 2018 +0300
   254.3 @@ -1,45 +1,38 @@
   254.4 -# SliTaz package receipt.
   254.5 +# SliTaz package receipt v2.
   254.6  
   254.7  PACKAGE="lynx"
   254.8  VERSION="2.8.8"
   254.9  CATEGORY="network"
  254.10 -SHORT_DESC="Terminal-based text-only browser."
  254.11 +SHORT_DESC="Terminal-based text-only browser"
  254.12  MAINTAINER="samuel_trassare@yahoo.com"
  254.13  LICENSE="GPL2"
  254.14  WEB_SITE="http://lynx.isc.org"
  254.15 +
  254.16  TARBALL="$PACKAGE$VERSION.tar.gz"
  254.17  WGET_URL="http://lynx.isc.org/$PACKAGE$VERSION/$TARBALL"
  254.18  
  254.19  # Will require build dep libtirpc after glibc is upgraded to 2.14.
  254.20 -DEPENDS="openssl ncurses zlib"
  254.21  BUILD_DEPENDS="openssl-dev ncurses-dev zlib-dev gettext-tools"
  254.22  
  254.23 -# Rules to configure and make the package.
  254.24 -compile_rules()
  254.25 -{
  254.26 -	./configure $CONFIGURE_ARGS \
  254.27 -		--sysconfdir=/etc \
  254.28 -		--mandir=/usr/share/man \
  254.29 +compile_rules() {
  254.30 +	./configure \
  254.31  		--enable-ipv6 \
  254.32  		--enable-gnutls-compat \
  254.33  		--enable-nls \
  254.34  		--with-ssl \
  254.35  		--with-gnutls \
  254.36  		--with-zlib \
  254.37 -		--with-nss-compat &&
  254.38 -	make && 
  254.39 +		--with-nss-compat \
  254.40 +		$CONFIGURE_ARGS &&
  254.41 +	make &&
  254.42  	make install
  254.43  }
  254.44  
  254.45 -# Rules to gen a SliTaz package suitable for Tazpkg.
  254.46 -genpkg_rules()
  254.47 -{
  254.48 -	mkdir -p $fs/usr
  254.49 -	cp -a $install/usr/bin $fs/usr
  254.50 -	cp -a $install/etc $fs/
  254.51 +testsuite() {
  254.52 +	readelf -h $install/usr/bin/lynx
  254.53  }
  254.54  
  254.55 -testsuite()
  254.56 -{
  254.57 -	readelf -h $install/usr/bin/lynx
  254.58 +genpkg_rules() {
  254.59 +	copy @std
  254.60 +	DEPENDS="openssl ncurses zlib"
  254.61  }
   255.1 --- a/man-db/receipt	Tue Mar 27 12:50:45 2018 +0200
   255.2 +++ b/man-db/receipt	Fri Mar 30 19:31:50 2018 +0300
   255.3 @@ -18,13 +18,13 @@
   255.4  
   255.5  compile_rules() {
   255.6  	./configure \
   255.7 -		--sysconfdir=/etc \
   255.8  		--disable-setuid \
   255.9  		--with-browser=/usr/bin/lynx \
  255.10  		--with-vgrind=/usr/bin/vgrind \
  255.11  		--with-grap=/usr/bin/grap \
  255.12  		$CONFIGURE_ARGS &&
  255.13 -	make && make install
  255.14 +	make &&
  255.15 +	make install || return 1
  255.16  
  255.17  	sed -i "s:man root:root root:g" $install/usr/lib/tmpfiles.d/man-db.conf
  255.18  }
   256.1 --- a/marco/receipt	Tue Mar 27 12:50:45 2018 +0200
   256.2 +++ b/marco/receipt	Fri Mar 30 19:31:50 2018 +0300
   256.3 @@ -17,10 +17,7 @@
   256.4  SPLIT="marco-dev"
   256.5  
   256.6  compile_rules() {
   256.7 -	fix ld
   256.8  	./autogen.sh \
   256.9 -		--sysconfdir=/etc \
  256.10 -		--localstatedir=/var \
  256.11  		$CONFIGURE_ARGS &&
  256.12  	fix libtool &&
  256.13  	make &&
   257.1 --- a/matchbox-desktop/receipt	Tue Mar 27 12:50:45 2018 +0200
   257.2 +++ b/matchbox-desktop/receipt	Fri Mar 30 19:31:50 2018 +0300
   257.3 @@ -1,36 +1,27 @@
   257.4 -# SliTaz package receipt.
   257.5 +# SliTaz package receipt v2.
   257.6  
   257.7  PACKAGE="matchbox-desktop"
   257.8  VERSION="0.9.1"
   257.9  CATEGORY="x-window"
  257.10 -SHORT_DESC="Matchbox desktop."
  257.11 +SHORT_DESC="Matchbox desktop"
  257.12  MAINTAINER="pankso@slitaz.org"
  257.13  LICENSE="GPL2"
  257.14 +WEB_SITE="http://matchbox-project.org/"
  257.15 +
  257.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  257.17 -WEB_SITE="http://matchbox-project.org/"
  257.18  WGET_URL="${WEB_SITE}sources/$PACKAGE/${VERSION%.*}/$TARBALL"
  257.19  
  257.20 -DEPENDS="gtk+ startup-notification libmatchbox"
  257.21  BUILD_DEPENDS="gtk+-dev startup-notification-dev libmatchbox-dev"
  257.22  
  257.23 -# Rules to configure and make the package.
  257.24 -compile_rules()
  257.25 -{
  257.26 +compile_rules() {
  257.27  	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -ldl"
  257.28 -	./configure \
  257.29 -		--sysconfdir=/etc \
  257.30 -		$CONFIGURE_ARGS &&
  257.31 +
  257.32 +	./configure $CONFIGURE_ARGS &&
  257.33  	sed -i s'/$(install_sh) -d/mkdir -p/' data/Makefile &&
  257.34  	make && make install
  257.35  }
  257.36  
  257.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
  257.38 -genpkg_rules()
  257.39 -{
  257.40 -	mkdir -p $fs/usr/lib/matchbox/desktop
  257.41 -	cp -a $install/etc $fs
  257.42 -	cp -a $install/usr/bin $fs/usr
  257.43 -	cp -a $install/usr/lib/matchbox/desktop/*.so \
  257.44 -		$fs/usr/lib/matchbox/desktop
  257.45 -	cp -a $install/usr/share $fs/usr
  257.46 +genpkg_rules() {
  257.47 +	copy @std
  257.48 +	DEPENDS="gtk+ startup-notification libmatchbox"
  257.49  }
   258.1 --- a/matchbox-window-manager/receipt	Tue Mar 27 12:50:45 2018 +0200
   258.2 +++ b/matchbox-window-manager/receipt	Fri Mar 30 19:31:50 2018 +0300
   258.3 @@ -1,37 +1,31 @@
   258.4 -# SliTaz package receipt.
   258.5 +# SliTaz package receipt v2.
   258.6  
   258.7  PACKAGE="matchbox-window-manager"
   258.8  VERSION="1.2"
   258.9  CATEGORY="x-window"
  258.10 -SHORT_DESC="Matchbox Window Manager."
  258.11 +SHORT_DESC="Matchbox Window Manager"
  258.12  MAINTAINER="pankso@slitaz.org"
  258.13  LICENSE="GPL2"
  258.14 +WEB_SITE="http://matchbox-project.org/"
  258.15 +
  258.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  258.17 -WEB_SITE="http://matchbox-project.org/"
  258.18  WGET_URL="${WEB_SITE}sources/$PACKAGE/$VERSION/$TARBALL"
  258.19 -TAGS="window-manager"
  258.20  
  258.21 -DEPENDS="gtk+ startup-notification libmatchbox"
  258.22  BUILD_DEPENDS="gtk+-dev startup-notification-dev libmatchbox-dev expat-dev \
  258.23  xorg-libSM-dev"
  258.24  
  258.25 -# Rules to configure and make the package.
  258.26 -compile_rules()
  258.27 -{
  258.28 +compile_rules() {
  258.29  	./configure \
  258.30 -		--sysconfdir=/etc \
  258.31  		--enable-expat \
  258.32  		--enable-startup-notification \
  258.33  		--enable-session \
  258.34  		$CONFIGURE_ARGS &&
  258.35 -	make && make install
  258.36 +	make &&
  258.37 +	make install
  258.38  }
  258.39  
  258.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
  258.41 -genpkg_rules()
  258.42 -{
  258.43 -	mkdir -p $fs/usr
  258.44 -	cp -a $install/etc $fs
  258.45 -	cp -a $install/usr/bin $fs/usr
  258.46 -	cp -a $install/usr/share $fs/usr
  258.47 +genpkg_rules() {
  258.48 +	copy @std
  258.49 +	DEPENDS="gtk+ startup-notification libmatchbox"
  258.50 +	TAGS="window-manager"
  258.51  }
   259.1 --- a/mate-applets/receipt	Tue Mar 27 12:50:45 2018 +0200
   259.2 +++ b/mate-applets/receipt	Fri Mar 30 19:31:50 2018 +0300
   259.3 @@ -24,9 +24,8 @@
   259.4  
   259.5  compile_rules() {
   259.6  	./autogen.sh \
   259.7 -		--sysconfdir=/etc \
   259.8 -		--localstatedir=/var \
   259.9  		$CONFIGURE_ARGS &&
  259.10 +	fix libtool &&
  259.11  	make &&
  259.12  	make install
  259.13  }
   260.1 --- a/mate-backgrounds/receipt	Tue Mar 27 12:50:45 2018 +0200
   260.2 +++ b/mate-backgrounds/receipt	Fri Mar 30 19:31:50 2018 +0300
   260.3 @@ -17,8 +17,6 @@
   260.4  
   260.5  compile_rules() {
   260.6  	./autogen.sh \
   260.7 -		--sysconfdir=/etc \
   260.8 -		--localstatedir=/var \
   260.9  		$CONFIGURE_ARGS &&
  260.10  	make &&
  260.11  	make install
   261.1 --- a/mate-calc/receipt	Tue Mar 27 12:50:45 2018 +0200
   261.2 +++ b/mate-calc/receipt	Fri Mar 30 19:31:50 2018 +0300
   261.3 @@ -15,8 +15,6 @@
   261.4  
   261.5  compile_rules() {
   261.6  	./autogen.sh \
   261.7 -		--sysconfdir=/etc \
   261.8 -		--localstatedir=/var \
   261.9  		$CONFIGURE_ARGS &&
  261.10  	make &&
  261.11  	make install
   262.1 --- a/mate-common/receipt	Tue Mar 27 12:50:45 2018 +0200
   262.2 +++ b/mate-common/receipt	Fri Mar 30 19:31:50 2018 +0300
   262.3 @@ -15,8 +15,6 @@
   262.4  
   262.5  compile_rules() {
   262.6  	./autogen.sh \
   262.7 -		--sysconfdir=/etc \
   262.8 -		--localstatedir=/var \
   262.9  		$CONFIGURE_ARGS &&
  262.10  	make &&
  262.11  	make install
   263.1 --- a/mate-control-center/receipt	Tue Mar 27 12:50:45 2018 +0200
   263.2 +++ b/mate-control-center/receipt	Fri Mar 30 19:31:50 2018 +0300
   263.3 @@ -20,11 +20,9 @@
   263.4  
   263.5  compile_rules() {
   263.6  	./autogen.sh \
   263.7 -		--sysconfdir=/etc \
   263.8 -		--localstatedir=/var \
   263.9 -		\
  263.10  		--disable-update-mimedb \
  263.11  		$CONFIGURE_ARGS &&
  263.12 +	fix libtool &&
  263.13  	make &&
  263.14  	make install
  263.15  }
   264.1 --- a/mate-desktop/receipt	Tue Mar 27 12:50:45 2018 +0200
   264.2 +++ b/mate-desktop/receipt	Fri Mar 30 19:31:50 2018 +0300
   264.3 @@ -18,9 +18,8 @@
   264.4  
   264.5  compile_rules() {
   264.6  	./autogen.sh \
   264.7 -		--sysconfdir=/etc \
   264.8 -		--localstatedir=/var \
   264.9  		$CONFIGURE_ARGS &&
  264.10 +	fix libtool &&
  264.11  	make &&
  264.12  	make install
  264.13  }
   265.1 --- a/mate-icon-theme-faenza/receipt	Tue Mar 27 12:50:45 2018 +0200
   265.2 +++ b/mate-icon-theme-faenza/receipt	Fri Mar 30 19:31:50 2018 +0300
   265.3 @@ -16,13 +16,12 @@
   265.4  
   265.5  compile_rules() {
   265.6  	./autogen.sh \
   265.7 -		--sysconfdir=/etc \
   265.8 -		--localstatedir=/var \
   265.9  		$CONFIGURE_ARGS &&
  265.10  	make &&
  265.11  	make install || return 1
  265.12  
  265.13  	find $install -type d \( -name 32 -o -name 64 -o -name 96 \) -exec rm -r '{}' \; 2>/dev/null
  265.14 +	:
  265.15  }
  265.16  
  265.17  genpkg_rules() {
   266.1 --- a/mate-icon-theme/receipt	Tue Mar 27 12:50:45 2018 +0200
   266.2 +++ b/mate-icon-theme/receipt	Fri Mar 30 19:31:50 2018 +0300
   266.3 @@ -16,9 +16,6 @@
   266.4  
   266.5  compile_rules() {
   266.6  	./autogen.sh \
   266.7 -		--sysconfdir=/etc \
   266.8 -		--localstatedir=/var \
   266.9 -		\
  266.10  		--enable-icon-mapping \
  266.11  		$CONFIGURE_ARGS &&
  266.12  	make &&
   267.1 --- a/mate-indicator-applet/receipt	Tue Mar 27 12:50:45 2018 +0200
   267.2 +++ b/mate-indicator-applet/receipt	Fri Mar 30 19:31:50 2018 +0300
   267.3 @@ -16,9 +16,8 @@
   267.4  
   267.5  compile_rules() {
   267.6  	./autogen.sh \
   267.7 -		--sysconfdir=/etc \
   267.8 -		--localstatedir=/var \
   267.9  		$CONFIGURE_ARGS &&
  267.10 +	fix libtool &&
  267.11  	make &&
  267.12  	make install
  267.13  }
   268.1 --- a/mate-media/receipt	Tue Mar 27 12:50:45 2018 +0200
   268.2 +++ b/mate-media/receipt	Fri Mar 30 19:31:50 2018 +0300
   268.3 @@ -16,9 +16,8 @@
   268.4  
   268.5  compile_rules() {
   268.6  	./autogen.sh \
   268.7 -		--sysconfdir=/etc \
   268.8 -		--localstatedir=/var \
   268.9  		$CONFIGURE_ARGS &&
  268.10 +	fix libtool &&
  268.11  	make &&
  268.12  	make install
  268.13  }
   269.1 --- a/mate-menus/receipt	Tue Mar 27 12:50:45 2018 +0200
   269.2 +++ b/mate-menus/receipt	Fri Mar 30 19:31:50 2018 +0300
   269.3 @@ -16,9 +16,6 @@
   269.4  
   269.5  compile_rules() {
   269.6  	./autogen.sh \
   269.7 -		--sysconfdir=/etc \
   269.8 -		--localstatedir=/var \
   269.9 -		\
  269.10  		--enable-python \
  269.11  		$CONFIGURE_ARGS &&
  269.12  	make &&
   270.1 --- a/mate-netbook/receipt	Tue Mar 27 12:50:45 2018 +0200
   270.2 +++ b/mate-netbook/receipt	Fri Mar 30 19:31:50 2018 +0300
   270.3 @@ -16,9 +16,8 @@
   270.4  
   270.5  compile_rules() {
   270.6  	./autogen.sh \
   270.7 -		--sysconfdir=/etc \
   270.8 -		--localstatedir=/var \
   270.9  		$CONFIGURE_ARGS &&
  270.10 +	fix libtool &&
  270.11  	make &&
  270.12  	make install
  270.13  }
   271.1 --- a/mate-notification-daemon-gtk2/receipt	Tue Mar 27 12:50:45 2018 +0200
   271.2 +++ b/mate-notification-daemon-gtk2/receipt	Fri Mar 30 19:31:50 2018 +0300
   271.3 @@ -20,10 +20,9 @@
   271.4  
   271.5  	mkdir macros; autoreconf -fi
   271.6  	intltoolize;  autoreconf
   271.7 -	./configure \
   271.8 -		--sysconfdir=/etc \
   271.9 -	$CONFIGURE_ARGS &&
  271.10 -	make && make install
  271.11 +	./configure $CONFIGURE_ARGS &&
  271.12 +	make &&
  271.13 +	make install
  271.14  }
  271.15  
  271.16  genpkg_rules() {
   272.1 --- a/mate-notification-daemon/receipt	Tue Mar 27 12:50:45 2018 +0200
   272.2 +++ b/mate-notification-daemon/receipt	Fri Mar 30 19:31:50 2018 +0300
   272.3 @@ -17,8 +17,6 @@
   272.4  
   272.5  compile_rules() {
   272.6  	./autogen.sh \
   272.7 -		--sysconfdir=/etc \
   272.8 -		--localstatedir=/var \
   272.9  		$CONFIGURE_ARGS &&
  272.10  	make &&
  272.11  	make install
   273.1 --- a/mate-panel/receipt	Tue Mar 27 12:50:45 2018 +0200
   273.2 +++ b/mate-panel/receipt	Fri Mar 30 19:31:50 2018 +0300
   273.3 @@ -18,10 +18,9 @@
   273.4  
   273.5  compile_rules() {
   273.6  	./autogen.sh \
   273.7 -		--sysconfdir=/etc \
   273.8 -		--localstatedir=/var \
   273.9  		--with-in-process-applets=all \
  273.10  		$CONFIGURE_ARGS &&
  273.11 +	fix libtool &&
  273.12  	make &&
  273.13  	make install
  273.14  }
   274.1 --- a/mate-polkit/receipt	Tue Mar 27 12:50:45 2018 +0200
   274.2 +++ b/mate-polkit/receipt	Fri Mar 30 19:31:50 2018 +0300
   274.3 @@ -11,14 +11,14 @@
   274.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   274.5  WGET_URL="https://github.com/mate-desktop/mate-polkit/archive/v$VERSION.tar.gz"
   274.6  
   274.7 -BUILD_DEPENDS="mate-common gtk-doc gtk+3-dev polkit-dev"
   274.8 +BUILD_DEPENDS="mate-common gtk-doc gtk+3-dev polkit-dev \
   274.9 +gobject-introspection-dev"
  274.10  SPLIT="mate-polkit-dev"
  274.11  
  274.12  compile_rules() {
  274.13  	./autogen.sh \
  274.14 -		--sysconfdir=/etc \
  274.15 -		--localstatedir=/var \
  274.16  		$CONFIGURE_ARGS &&
  274.17 +	fix libtool &&
  274.18  	make &&
  274.19  	make install
  274.20  }
   275.1 --- a/mate-power-manager/receipt	Tue Mar 27 12:50:45 2018 +0200
   275.2 +++ b/mate-power-manager/receipt	Fri Mar 30 19:31:50 2018 +0300
   275.3 @@ -16,9 +16,8 @@
   275.4  
   275.5  compile_rules() {
   275.6  	./autogen.sh \
   275.7 -		--sysconfdir=/etc \
   275.8 -		--localstatedir=/var \
   275.9  		$CONFIGURE_ARGS &&
  275.10 +	fix libtool &&
  275.11  	make &&
  275.12  	make install
  275.13  }
   276.1 --- a/mate-screensaver/receipt	Tue Mar 27 12:50:45 2018 +0200
   276.2 +++ b/mate-screensaver/receipt	Fri Mar 30 19:31:50 2018 +0300
   276.3 @@ -17,10 +17,7 @@
   276.4  SPLIT="mate-screensaver-dev"
   276.5  
   276.6  compile_rules() {
   276.7 -	fix ld
   276.8  	./autogen.sh \
   276.9 -		--sysconfdir=/etc \
  276.10 -		--localstatedir=/var \
  276.11  		$CONFIGURE_ARGS &&
  276.12  	fix libtool &&
  276.13  	make &&
   277.1 --- a/mate-sensors-applet/receipt	Tue Mar 27 12:50:45 2018 +0200
   277.2 +++ b/mate-sensors-applet/receipt	Fri Mar 30 19:31:50 2018 +0300
   277.3 @@ -17,9 +17,8 @@
   277.4  
   277.5  compile_rules() {
   277.6  	./autogen.sh \
   277.7 -		--sysconfdir=/etc \
   277.8 -		--localstatedir=/var \
   277.9  		$CONFIGURE_ARGS &&
  277.10 +	fix libtool &&
  277.11  	make &&
  277.12  	make install
  277.13  }
   278.1 --- a/mate-session-manager/receipt	Tue Mar 27 12:50:45 2018 +0200
   278.2 +++ b/mate-session-manager/receipt	Fri Mar 30 19:31:50 2018 +0300
   278.3 @@ -16,8 +16,6 @@
   278.4  
   278.5  compile_rules() {
   278.6  	./autogen.sh \
   278.7 -		--sysconfdir=/etc \
   278.8 -		--localstatedir=/var \
   278.9  		$CONFIGURE_ARGS &&
  278.10  	make &&
  278.11  	make install
   279.1 --- a/mate-settings-daemon/receipt	Tue Mar 27 12:50:45 2018 +0200
   279.2 +++ b/mate-settings-daemon/receipt	Fri Mar 30 19:31:50 2018 +0300
   279.3 @@ -18,11 +18,9 @@
   279.4  
   279.5  compile_rules() {
   279.6  	./autogen.sh \
   279.7 -		--sysconfdir=/etc \
   279.8 -		--localstatedir=/var \
   279.9 -		\
  279.10  		--enable-pulse \
  279.11  		$CONFIGURE_ARGS &&
  279.12 +	fix libtool &&
  279.13  	make &&
  279.14  	make install
  279.15  }
   280.1 --- a/mate-system-monitor/receipt	Tue Mar 27 12:50:45 2018 +0200
   280.2 +++ b/mate-system-monitor/receipt	Fri Mar 30 19:31:50 2018 +0300
   280.3 @@ -16,9 +16,8 @@
   280.4  
   280.5  compile_rules() {
   280.6  	./autogen.sh \
   280.7 -		--sysconfdir=/etc \
   280.8 -		--localstatedir=/var \
   280.9  		$CONFIGURE_ARGS &&
  280.10 +	fix libtool &&
  280.11  	make &&
  280.12  	make install
  280.13  }
   281.1 --- a/mate-terminal/receipt	Tue Mar 27 12:50:45 2018 +0200
   281.2 +++ b/mate-terminal/receipt	Fri Mar 30 19:31:50 2018 +0300
   281.3 @@ -15,10 +15,7 @@
   281.4  xorg-libX11-dev itstool xorg-libSM-dev"
   281.5  
   281.6  compile_rules() {
   281.7 -	fix ld
   281.8  	./autogen.sh \
   281.9 -		--sysconfdir=/etc \
  281.10 -		--localstatedir=/var \
  281.11  		$CONFIGURE_ARGS &&
  281.12  	fix libtool &&
  281.13  	make &&
   282.1 --- a/mate-themes/receipt	Tue Mar 27 12:50:45 2018 +0200
   282.2 +++ b/mate-themes/receipt	Fri Mar 30 19:31:50 2018 +0300
   282.3 @@ -15,14 +15,12 @@
   282.4  
   282.5  compile_rules() {
   282.6  	./autogen.sh \
   282.7 -		--sysconfdir=/etc \
   282.8 -		--localstatedir=/var \
   282.9  		$CONFIGURE_ARGS &&
  282.10  	make &&
  282.11  	make install || return 1
  282.12  
  282.13  	# remove empty folder structure
  282.14 -	rm -r $fs/usr/share/locale/
  282.15 +	rm -r $install/usr/share/locale/
  282.16  }
  282.17  
  282.18  genpkg_rules() {
   283.1 --- a/mate-user-guide/receipt	Tue Mar 27 12:50:45 2018 +0200
   283.2 +++ b/mate-user-guide/receipt	Fri Mar 30 19:31:50 2018 +0300
   283.3 @@ -15,19 +15,12 @@
   283.4  
   283.5  compile_rules() {
   283.6  	./autogen.sh \
   283.7 -		--sysconfdir=/etc \
   283.8 -		--localstatedir=/var \
   283.9  		$CONFIGURE_ARGS &&
  283.10  	make &&
  283.11  	make install
  283.12  }
  283.13  
  283.14  genpkg_rules() {
  283.15 -	case $PACKAGE in
  283.16 -		mate-user-guide)
  283.17 -			copy @std help/C/
  283.18 -			DEPENDS=""
  283.19 -			;;
  283.20 -	esac
  283.21 +	copy @std help/C/
  283.22  	TAGS="MATE"
  283.23  }
   284.1 --- a/mate-user-share/receipt	Tue Mar 27 12:50:45 2018 +0200
   284.2 +++ b/mate-user-share/receipt	Fri Mar 30 19:31:50 2018 +0300
   284.3 @@ -17,9 +17,8 @@
   284.4  
   284.5  compile_rules() {
   284.6  	./autogen.sh \
   284.7 -		--sysconfdir=/etc \
   284.8 -		--localstatedir=/var \
   284.9  		$CONFIGURE_ARGS &&
  284.10 +	fix libtool &&
  284.11  	make &&
  284.12  	make install
  284.13  }
   285.1 --- a/mate-utils/receipt	Tue Mar 27 12:50:45 2018 +0200
   285.2 +++ b/mate-utils/receipt	Fri Mar 30 19:31:50 2018 +0300
   285.3 @@ -16,11 +16,7 @@
   285.4  SPLIT="mate-utils-dev"
   285.5  
   285.6  compile_rules() {
   285.7 -	fix ld
   285.8 -	./autogen.sh \
   285.9 -		--sysconfdir=/etc \
  285.10 -		--localstatedir=/var \
  285.11 -		$CONFIGURE_ARGS &&
  285.12 +	./autogen.sh $CONFIGURE_ARGS &&
  285.13  	fix libtool &&
  285.14  	make &&
  285.15  	make install
   286.1 --- a/mc/receipt	Tue Mar 27 12:50:45 2018 +0200
   286.2 +++ b/mc/receipt	Fri Mar 30 19:31:50 2018 +0300
   286.3 @@ -1,36 +1,31 @@
   286.4 -# SliTaz package receipt.
   286.5 +# SliTaz package receipt v2.
   286.6  
   286.7  PACKAGE="mc"
   286.8  VERSION="4.8.19"
   286.9  CATEGORY="system-tools"
  286.10 -SHORT_DESC="Midnight Commander - ncurses based file manager."
  286.11 +SHORT_DESC="Midnight Commander - ncurses based file manager"
  286.12  MAINTAINER="erjo@slitaz.org"
  286.13  LICENSE="GPL3"
  286.14  WEB_SITE="http://midnight-commander.org/"
  286.15 -TAGS="file-manager text-editor"
  286.16  
  286.17  TARBALL="$PACKAGE-$VERSION.tar.xz"
  286.18  WGET_URL="http://ftp.midnight-commander.org/$TARBALL"
  286.19  
  286.20 -SUGGESTED="gpm xz cdrkit-isoinfo lynx w3m wv poppler-apps file"
  286.21 -DEPENDS="ncurses glib e2fsprogs util-linux-blkid libssh2 openssl zlib pcre"
  286.22  BUILD_DEPENDS="gpm-dev glib-dev ncurses-dev util-linux-mount-dev \
  286.23  util-linux-blkid-dev util-linux-uuid-dev check-dev gettext libssh2-dev"
  286.24  
  286.25  COOKOPTS="!menus"
  286.26  
  286.27 -# Rules to configure and make the package.
  286.28 -compile_rules()
  286.29 -{
  286.30 +compile_rules() {
  286.31  	sed -i 's/lzma -cd/lzcat/' $src/src/editor/edit.c
  286.32  
  286.33  	./configure \
  286.34  		--enable-charset \
  286.35  		--with-gpm-mouse \
  286.36  		--with-screen=ncurses \
  286.37 -		--sysconfdir=/etc \
  286.38  		$CONFIGURE_ARGS &&
  286.39 -	make && make install
  286.40 +	make &&
  286.41 +	make install
  286.42  
  286.43  	mkdir -p $install/usr/share/terminfo/s
  286.44  	cp -a /usr/share/terminfo/s/screen-256color $install/usr/share/terminfo/s
  286.45 @@ -43,11 +38,12 @@
  286.46  	chown -R root:root $install
  286.47  }
  286.48  
  286.49 -# Rules to gen a SliTaz package suitable for Tazpkg.
  286.50 -genpkg_rules()
  286.51 -{
  286.52 +genpkg_rules() {
  286.53  	copy bin/ mc/ terminfo/ applications/
  286.54  
  286.55  	sed -i 's#|profile|#&receipt|#' $fs/usr/share/mc/syntax/Syntax
  286.56  	sed -i 's/lzma -dc/lzcat/g'     $fs/usr/libexec/mc/ext.d/archive.sh
  286.57 +	DEPENDS="ncurses glib e2fsprogs util-linux-blkid libssh2 openssl zlib pcre"
  286.58 +	SUGGESTED="gpm xz cdrkit-isoinfo lynx w3m wv poppler-apps file"
  286.59 +	TAGS="file-manager text-editor"
  286.60  }
   287.1 --- a/mesa/receipt	Tue Mar 27 12:50:45 2018 +0200
   287.2 +++ b/mesa/receipt	Fri Mar 30 19:31:50 2018 +0300
   287.3 @@ -29,11 +29,8 @@
   287.4  	GLL_DRV="i915,nouveau,r300,r600,radeonsi,svga,swrast,swr,virgl,etnaviv,imx"
   287.5  
   287.6  	sed -i "/pthread_stubs_possible=/s/yes/no/" configure.ac
   287.7 -	fix ld
   287.8  	./autogen.sh \
   287.9  		CFLAGS='-O2' CXXFLAGS='-O2' \
  287.10 -		--prefix=/usr \
  287.11 -		--sysconfdir=/etc \
  287.12  		--enable-texture-float \
  287.13  		--enable-gles1 \
  287.14  		--enable-gles2 \
  287.15 @@ -45,7 +42,8 @@
  287.16  		--with-gallium-drivers=$GLL_DRV &&
  287.17  	unset GLL_DRV &&
  287.18  	fix libtool &&
  287.19 -	make && make install || return 1
  287.20 +	make &&
  287.21 +	make install || return 1
  287.22  
  287.23  	cook_pick_docs docs/*
  287.24  	install -Dm644 $stuff/90-DRI.conf $install/etc/X11/xorg.conf.d/90-DRI.conf
   288.1 --- a/mesa12/receipt	Tue Mar 27 12:50:45 2018 +0200
   288.2 +++ b/mesa12/receipt	Fri Mar 30 19:31:50 2018 +0300
   288.3 @@ -7,9 +7,6 @@
   288.4  MAINTAINER="pascal.bellard@slitaz.org"
   288.5  LICENSE="MIT"
   288.6  WEB_SITE="https://www.mesa3d.org/"
   288.7 -SUGGESTED="nvidia"
   288.8 -PROVIDE="libgl"
   288.9 -CONFIG_FILES="/etc/drirc"
  288.10  
  288.11  TARBALL="mesa-$VERSION.tar.xz"
  288.12  WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/$VERSION/$TARBALL"
  288.13 @@ -56,9 +53,12 @@
  288.14  			libOSMesa.so* libgbm.so* libglapi.so* libxatracker.so*
  288.15  			DEPENDS="expat libdrm xorg-libXdamage xorg-libXxf86vm \
  288.16  			xorg-libXt udev xorg-libxshmfence"
  288.17 +			SUGGESTED="nvidia"
  288.18 +			PROVIDE="libgl"
  288.19 +			CONFIG_FILES="/etc/drirc"
  288.20  			;;
  288.21  		mesa12-dev)
  288.22 -			copy *.h *.la *.pc
  288.23 +			copy @dev
  288.24  			DEPENDS="mesa12 mesa12-dri mesa12-libegl libdrm-dev \
  288.25  			xorg-libXdamage-dev  xorg-libXxf86vm-dev \
  288.26  			xorg-libXt-dev xorg-glproto xorg-dri2proto"
  288.27 @@ -71,9 +71,9 @@
  288.28  			xorg-libpciaccess zlib"
  288.29  			;;
  288.30  		mesa12-libegl)
  288.31 +			copy libEGL*
  288.32  			CAT="libs|EGL library"
  288.33  			DEPENDS="mesa12"
  288.34 -			copy libEGL*
  288.35  			;;
  288.36  	esac
  288.37  }
   289.1 --- a/metacity/receipt	Tue Mar 27 12:50:45 2018 +0200
   289.2 +++ b/metacity/receipt	Fri Mar 30 19:31:50 2018 +0300
   289.3 @@ -17,7 +17,7 @@
   289.4  BUILD_DEPENDS="gsettings-desktop-schemas glib-dev gtk+-dev \
   289.5  xorg-libXcomposite-dev xorg-libXdamage-dev zenity-gtk2 xorg-libXinerama-dev \
   289.6  xorg-libXrandr-dev xorg-libXcursor-dev libcanberra-dev libltdl libvorbis-dev \
   289.7 -libogg-dev libtool gnome-doc-utils-dev GConf-dev util-linux-uuid-dev intltool"
   289.8 +libogg-dev libtool gnome-doc-utils GConf-dev util-linux-uuid-dev intltool"
   289.9  
  289.10  # Rules to configure and make the package.
  289.11  compile_rules()
   290.1 --- a/minicom/receipt	Tue Mar 27 12:50:45 2018 +0200
   290.2 +++ b/minicom/receipt	Fri Mar 30 19:31:50 2018 +0300
   290.3 @@ -1,39 +1,29 @@
   290.4 -# SliTaz package receipt.
   290.5 +# SliTaz package receipt v2.
   290.6  
   290.7  PACKAGE="minicom"
   290.8  VERSION="2.6"
   290.9  CATEGORY="development"
  290.10 -SHORT_DESC="menu driven communications program"
  290.11 +SHORT_DESC="Menu driven communications program"
  290.12  MAINTAINER="f.lombard@free.fr"
  290.13  LICENSE="GPL2"
  290.14 +WEB_SITE="http://alioth.debian.org/projects/minicom/"
  290.15 +
  290.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  290.17 -WEB_SITE="http://alioth.debian.org/projects/minicom/"
  290.18  WGET_URL="http://alioth.debian.org/frs/download.php/3195/$PACKAGE/$TARBALL"
  290.19 -CONFIG_FILES="/etc/minirc.dfl"
  290.20  
  290.21 -DEPENDS="ncurses"
  290.22  BUILD_DEPENDS="ncurses-dev"
  290.23  
  290.24 -# Rules to configure and make the package.
  290.25 -compile_rules()
  290.26 -{
  290.27 -	cd $src
  290.28 +compile_rules() {
  290.29  	sed -i 's/getline/get_line/' src/minicom.c
  290.30 -	./configure \
  290.31 -		--sysconfdir=/etc \
  290.32 -		--prefix=/usr \
  290.33 -		--infodir=/usr/share/info \
  290.34 -		--mandir=/usr/share/man \
  290.35 -		$CONFIGURE_ARGS &&
  290.36 +	./configure $CONFIGURE_ARGS &&
  290.37  	make &&
  290.38 -	make DESTDIR=$DESTDIR install
  290.39 +	make DESTDIR=$DESTDIR install || return 1
  290.40 +
  290.41 +	touch $install/etc/minirc.dfl
  290.42  }
  290.43  
  290.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
  290.45 -genpkg_rules()
  290.46 -{
  290.47 -	mkdir -p $fs/usr
  290.48 -	cp -a $install/usr/bin $fs/usr
  290.49 -	mkdir -p $fs/etc
  290.50 -	touch $fs$CONFIG_FILES
  290.51 +genpkg_rules() {
  290.52 +	copy @std
  290.53 +	DEPENDS="ncurses"
  290.54 +	CONFIG_FILES="/etc/minirc.dfl"
  290.55  }
   291.1 --- a/minidlna/receipt	Tue Mar 27 12:50:45 2018 +0200
   291.2 +++ b/minidlna/receipt	Fri Mar 30 19:31:50 2018 +0300
   291.3 @@ -1,34 +1,29 @@
   291.4 -# SliTaz package receipt.
   291.5 +# SliTaz package receipt v2.
   291.6  
   291.7  PACKAGE="minidlna"
   291.8  VERSION="1.1.4"
   291.9  CATEGORY="network"
  291.10 -SHORT_DESC="a simple media server fully compliant with DLNA/UPnP-AV clients"
  291.11 +SHORT_DESC="Simple media server fully compliant with DLNA/UPnP-AV clients"
  291.12  MAINTAINER="pascal.bellard@slitaz.org"
  291.13  LICENSE="GPL2"
  291.14 +WEB_SITE="http://minidlna.sourceforge.net/"
  291.15 +
  291.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  291.17 -WEB_SITE="http://minidlna.sourceforge.net/"
  291.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  291.19 -CONFIGFILES="/etc/minidlna.conf"
  291.20  
  291.21 -DEPENDS="ffmpeg jpeg libsqlite3 libexif libid3tag libogg libvorbis flac"
  291.22  BUILD_DEPENDS="ffmpeg-dev jpeg-dev sqlite3-dev libexif-dev libid3tag-dev \
  291.23  libogg-dev libvorbis-dev flac-dev gettext"
  291.24  
  291.25 -# Rules to configure and make the package.
  291.26 -compile_rules()
  291.27 -{
  291.28 -	./configure --prefix=/usr \
  291.29 -		--sysconfdir=/etc \
  291.30 -		$CONFIGURE_ARGS &&
  291.31 +compile_rules() {
  291.32 +	./configure $CONFIGURE_ARGS &&
  291.33  	make &&
  291.34 -	make DESTDIR=$DESTDIR install
  291.35 +	make DESTDIR=$DESTDIR install || return 1
  291.36 +
  291.37 +	install -Dm644 $src/minidlna.conf $install/etc/minidlna.conf
  291.38  }
  291.39  
  291.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
  291.41 -genpkg_rules()
  291.42 -{
  291.43 -	mkdir -p $fs/usr $fs/etc
  291.44 -	cp -a $install/usr/sbin $fs/usr
  291.45 -	cp -a $src/minidlna.conf $fs/etc
  291.46 +genpkg_rules() {
  291.47 +	copy @std
  291.48 +	DEPENDS="ffmpeg jpeg libsqlite3 libexif libid3tag libogg libvorbis flac"
  291.49 +	CONFIG_FILES="/etc/minidlna.conf"
  291.50  }
   292.1 --- a/module-init-tools/receipt	Tue Mar 27 12:50:45 2018 +0200
   292.2 +++ b/module-init-tools/receipt	Fri Mar 30 19:31:50 2018 +0300
   292.3 @@ -22,9 +22,9 @@
   292.4  		--enable-zlib \
   292.5  		--sbindir=/sbin \
   292.6  		--bindir=/bin \
   292.7 -		--sysconfdir=/etc \
   292.8  	$CONFIGURE_ARGS &&
   292.9 -	make && make install || return 1
  292.10 +	make &&
  292.11 +	make install || return 1
  292.12  
  292.13  	# Create the modprobe config directory
  292.14  	mkdir -p $install/etc/modprobe.d
   293.1 --- a/monkey/receipt	Tue Mar 27 12:50:45 2018 +0200
   293.2 +++ b/monkey/receipt	Fri Mar 30 19:31:50 2018 +0300
   293.3 @@ -15,6 +15,7 @@
   293.4  SPLIT="monkey-dev"
   293.5  
   293.6  compile_rules() {
   293.7 +	# site script isn't used
   293.8  	./configure \
   293.9  		--enable-shared \
  293.10  		--prefix=/usr \
  293.11 @@ -25,24 +26,15 @@
  293.12  		--mandir=/usr/share/man \
  293.13  		--plugdir=/usr/share/monkey/plugins &&
  293.14  	make &&
  293.15 -	make DESTDIR=$install install
  293.16 +	make DESTDIR=$install install || return 1
  293.17 +
  293.18 +	mkdir -p $install/usr/share/monkey/samples/
  293.19 +	mv $install/var/www $install/usr/share/monkey/samples/htdocs
  293.20  }
  293.21  
  293.22  genpkg_rules() {
  293.23  	case $PACKAGE in
  293.24 -		monkey)
  293.25 -			mkdir -p $fs/usr
  293.26 -			cp -a $install/usr/bin $fs/usr/
  293.27 -			cp -a $install/usr/share $fs/usr/
  293.28 -			cp -a $install/etc $fs/
  293.29 -			cp -a $install/var $fs/
  293.30 -			mkdir -p $fs/usr/share/monkey/samples
  293.31 -			mv $fs/var/www/ $fs/usr/share/monkey/samples/htdocs
  293.32 -			;;
  293.33 -		*-dev)
  293.34 -			mkdir -p $fs/usr
  293.35 -			cp -a $install/usr/include $fs/usr
  293.36 -			cp -a $install/usr/lib $fs/usr
  293.37 -			;;
  293.38 +		monkey) copy @std;;
  293.39 +		*-dev)  copy @dev;;
  293.40  	esac
  293.41  }
   294.1 --- a/mono/receipt	Tue Mar 27 12:50:45 2018 +0200
   294.2 +++ b/mono/receipt	Fri Mar 30 19:31:50 2018 +0300
   294.3 @@ -6,64 +6,57 @@
   294.4  SHORT_DESC="Cross-platform, open source .NET development framework"
   294.5  MAINTAINER="rcx@zoominternet.net"
   294.6  LICENSE="LGPL2"
   294.7 +WEB_SITE="http://www.mono-project.com/"
   294.8 +
   294.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
  294.10 -WEB_SITE="http://www.mono-project.com/"
  294.11  WGET_URL="http://download.mono-project.com/sources/$PACKAGE/$TARBALL"
  294.12  
  294.13  BUILD_DEPENDS="tar bzip2 m4 bison gawk \
  294.14  gettext glib-dev perl libgdiplus-dev"
  294.15 -SPLIT="mono mono-dev mono-doc"
  294.16 +SPLIT="mono-doc mono mono-dev"
  294.17  
  294.18  # Build documentation at http://mono-project.com/Compiling_Mono
  294.19  # and http://mono-project.com/Release_Notes_Mono_2.4#Installing_Mono_2.4
  294.20  
  294.21 -# Rules to configure and make the package.
  294.22 -compile_rules()
  294.23 -{
  294.24 +compile_rules() {
  294.25  	./configure \
  294.26 -		--sysconfdir=/etc \
  294.27  		--with-libgdiplus=installed \
  294.28 -		$CONFIGURE_ARGS 2>&1 | grep -v /libtool &&
  294.29 -	make -j 1 2>&1 | grep -v 'dll.makefrag: No such file' && make install
  294.30 +		$CONFIGURE_ARGS &&
  294.31 +	make -j1 &&
  294.32 +	make install
  294.33  
  294.34 -	for i in System.Web_standalone_test_net_2_0 \
  294.35 -		 System.Web_standalone_test_net_4_0 \
  294.36 -		 System.Web.Extensions_standalone_test_net_2_0 \
  294.37 -		 System.Web.Extensions_standalone_test_net_4_0 \
  294.38 -		 net_2_0_standalone-runner-support \
  294.39 -		 net_4_0_standalone-runner-support ; do
  294.40 +	for i in \
  294.41 +		System.Web_standalone_test_net_2_0 \
  294.42 +		System.Web_standalone_test_net_4_0 \
  294.43 +		System.Web.Extensions_standalone_test_net_2_0 \
  294.44 +		System.Web.Extensions_standalone_test_net_4_0 \
  294.45 +		net_2_0_standalone-runner-support \
  294.46 +		net_4_0_standalone-runner-support ; do
  294.47  		touch -d 197001010000 mcs/build/deps/$i.dll.makefrag
  294.48  	done
  294.49 +
  294.50  	cd $src/mcs/jay
  294.51 -	make -j 1 && make DESTDIR=$DESTDIR prefix=/usr INSTALL=../../install-sh install
  294.52 +	make -j1 &&
  294.53 +	make DESTDIR=$DESTDIR prefix=/usr INSTALL=../../install-sh install
  294.54  
  294.55  	#fix .pc file to be able to request mono on what it depends, fixes #go-oo build
  294.56  	sed -i -e "s:#Requires:Requires:" $DESTDIR/usr/lib/pkgconfig/mono.pc
  294.57 +
  294.58 +	chmod +x $install/usr/bin/*
  294.59  }
  294.60  
  294.61 -# Rules to gen a SliTaz package suitable for Tazpkg.
  294.62 -genpkg_rules()
  294.63 -{
  294.64 +genpkg_rules() {
  294.65  	case $PACKAGE in
  294.66 -	mono)
  294.67 -		DEPENDS="glib glibc-base zlib libgdiplus"
  294.68 -		mkdir -p $fs/usr/lib
  294.69 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
  294.70 -		cp -a $install/usr/lib/mono $fs/usr/lib
  294.71 -		cp -a $install/usr/bin $fs/usr
  294.72 -		cp -a $install/etc $fs
  294.73 -		chmod +x $fs/usr/bin/*
  294.74 -		;;
  294.75 -	mono-dev)
  294.76 -		mkdir -p $fs/usr/lib
  294.77 -		cp -a $install/usr/lib/*.a $fs/usr/lib
  294.78 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  294.79 -		cp -a $install/usr/include $fs/usr
  294.80 -		;;
  294.81 -	mono-doc)
  294.82 -		CAT="development|mono documentation files."
  294.83 -		mkdir -p $fs/usr/lib
  294.84 -		cp -a $install/usr/lib/monodoc $fs/usr/lib
  294.85 -		;;
  294.86 +		mono-doc)
  294.87 +			copy usr/lib/monodoc/
  294.88 +			CAT="development|documentation"
  294.89 +			;;
  294.90 +		mono)
  294.91 +			copy @std @rm
  294.92 +			DEPENDS="glib glibc-base zlib libgdiplus"
  294.93 +			;;
  294.94 +		mono-dev)
  294.95 +			copy @dev
  294.96 +			;;
  294.97  	esac
  294.98  }
   295.1 --- a/moosefs/receipt	Tue Mar 27 12:50:45 2018 +0200
   295.2 +++ b/moosefs/receipt	Fri Mar 30 19:31:50 2018 +0300
   295.3 @@ -16,12 +16,7 @@
   295.4  compile_rules() {
   295.5  	sed -i 's/bash/sh/' mfsmount/mfssnapshot
   295.6  
   295.7 -	./configure \
   295.8 -		--prefix=/usr \
   295.9 -		--mandir=/usr/share/man \
  295.10 -		--sysconfdir=/etc \
  295.11 -		--localstatedir=/var \
  295.12 -	$CONFIGURE_ARGS &&
  295.13 +	./configure $CONFIGURE_ARGS &&
  295.14  	make &&
  295.15  	make DESTDIR=$DESTDIR install
  295.16  }
   296.1 --- a/moserial/receipt	Tue Mar 27 12:50:45 2018 +0200
   296.2 +++ b/moserial/receipt	Fri Mar 30 19:31:50 2018 +0300
   296.3 @@ -12,8 +12,8 @@
   296.4  LOCALES="da de es fr pt_BR zh_CN"
   296.5  TAGS="serial console"
   296.6  
   296.7 -DEPENDS="GConf gnome-doc-utils gtk+"
   296.8 -BUILD_DEPENDS="GConf-dev gnome-doc-utils-dev intltool vala gtk+-dev"
   296.9 +DEPENDS="GConf gtk+"
  296.10 +BUILD_DEPENDS="GConf-dev gnome-doc-utils intltool vala gtk+-dev"
  296.11  
  296.12  # Rules to configure and make the package.
  296.13  compile_rules()
   297.1 --- a/mosh/receipt	Tue Mar 27 12:50:45 2018 +0200
   297.2 +++ b/mosh/receipt	Fri Mar 30 19:31:50 2018 +0300
   297.3 @@ -1,48 +1,47 @@
   297.4 -# SliTaz package receipt.
   297.5 +# SliTaz package receipt v2.
   297.6  
   297.7  PACKAGE="mosh"
   297.8  VERSION="1.3.2"
   297.9  CATEGORY="security"
  297.10 -SHORT_DESC="A Openbsd Secure Shell remplacement."
  297.11 +SHORT_DESC="A Openbsd Secure Shell remplacement"
  297.12  MAINTAINER="pascal.bellard@slitaz.org"
  297.13  LICENSE="GPL3"
  297.14 +WEB_SITE="http://mosh.mit.edu/"
  297.15 +
  297.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  297.17 -WEB_SITE="http://mosh.mit.edu/"
  297.18  WGET_URL="${WEB_SITE}$TARBALL"
  297.19 -TAGS="ssh"
  297.20  
  297.21 -DEPENDS="gcc-lib-base perl protobuf openssl zlib ncurses ssh"
  297.22  BUILD_DEPENDS="protobuf-dev openssl-dev zlib-dev \
  297.23  ncurses-dev automake autoconf libtool"
  297.24  
  297.25 -# Rules to configure and make the package.
  297.26 -compile_rules()
  297.27 -{
  297.28 +compile_rules() {
  297.29  	./autogen.sh
  297.30 -	./configure --prefix=/usr --sysconfdir=/etc \
  297.31 +	./configure \
  297.32  		--enable-compile-warnings=error &&
  297.33  	make &&
  297.34  	make DESTDIR=$DESTDIR install
  297.35  }
  297.36  
  297.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
  297.38 -genpkg_rules()
  297.39 -{
  297.40 -	mkdir -p $fs/usr
  297.41 -	cp -a $install/usr/bin $fs/usr
  297.42 +genpkg_rules() {
  297.43 +	copy @std
  297.44 +	DEPENDS="gcc-lib-base perl protobuf openssl zlib ncurses ssh"
  297.45 +	TAGS="ssh"
  297.46  }
  297.47  
  297.48 -post_install()
  297.49 -{
  297.50 +post_install() {
  297.51  	if ! grep ^DROPBEAR_OPTIONS "$1/etc/daemons.conf" | grep -q -- -a; then
  297.52  		cat <<EOT
  297.53 -The mosh server needs dropbear to allow connections to forwarded ports
  297.54 -from any host. Nothing to do if you are using OpenSSH or you plan
  297.55 -to use the mosh client only.
  297.56 +
  297.57 +	.----------------------------------------------------.
  297.58 +	| The mosh server needs dropbear to allow connections |
  297.59 +	| to forwarded ports from any host. Nothing to do if  |
  297.60 +	| you are using OpenSSH or you plan to use the mosh   |
  297.61 +	| client only.                                        |
  297.62 +	'-----------------------------------------------------'
  297.63  EOT
  297.64  		echo -n "Add -a for DROPBEAR_OPTIONS in /etc/daemons.conf now ?"
  297.65  		read -t 30 answer
  297.66 -		[ "$answer" == "y" ] && 
  297.67 +		[ "$answer" == "y" ] &&
  297.68  		sed -i 's/^DROPBEAR_OPTIONS="/&-a /' "$1/etc/daemons.conf" &&
  297.69  		[ -z "$1" ] && /etc/init.d/dropbear restart
  297.70  	fi
   298.1 --- a/motion/receipt	Tue Mar 27 12:50:45 2018 +0200
   298.2 +++ b/motion/receipt	Fri Mar 30 19:31:50 2018 +0300
   298.3 @@ -1,35 +1,31 @@
   298.4 -# SliTaz package receipt.
   298.5 +# SliTaz package receipt v2.
   298.6  
   298.7  PACKAGE="motion"
   298.8  VERSION="3.2.12"
   298.9  CATEGORY="multimedia"
  298.10 -SHORT_DESC="Motion is a program that monitors the video signal from cameras."
  298.11 +SHORT_DESC="Motion is a program that monitors the video signal from cameras"
  298.12  MAINTAINER="pankso@slitaz.org"
  298.13  LICENSE="GPL2"
  298.14 +WEB_SITE="http://www.lavrsen.dk/foswiki/bin/view/Motion"
  298.15 +
  298.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  298.17 -WEB_SITE="http://www.lavrsen.dk/foswiki/bin/view/Motion"
  298.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  298.19  
  298.20 -DEPENDS="libpthread-stubs jpeg libv4l"
  298.21  BUILD_DEPENDS="libpthread-stubs jpeg-dev libv4l-dev"
  298.22  #ffmpeg --> breaks build
  298.23  
  298.24 -# Rules to configure and make the package.
  298.25 -compile_rules()
  298.26 -{
  298.27 -	cd $src
  298.28 +compile_rules() {
  298.29  	sed -i 's@<linux/videodev.h>@<libv4l1.h>\n#include <linux/videodev2.h>@' *.c *.h
  298.30  	./configure \
  298.31  		--sysconfdir=/etc/motion &&
  298.32 -	make && make install
  298.33 +	make &&
  298.34 +	make install || return 1
  298.35 +
  298.36 +	install -Dm644 $stuff/motion.conf   $install/etc/motion/motion.conf
  298.37 +	install -Dm755 $stuff/init.d/motion $install/etc/init.d/motion
  298.38  }
  298.39  
  298.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
  298.41 -genpkg_rules()
  298.42 -{
  298.43 -	mkdir -p $fs/etc/motion $fs/usr
  298.44 -	cp -a $install/usr/bin $fs/usr
  298.45 -	cp -a $stuff/motion.conf $fs/etc/motion
  298.46 -	cp -a $stuff/init.d $fs/etc
  298.47 -	chmod 0644 $fs/etc/motion/*
  298.48 +genpkg_rules() {
  298.49 +	copy @std
  298.50 +	DEPENDS="libpthread-stubs jpeg libv4l"
  298.51  }
   299.1 --- a/mousepad/receipt	Tue Mar 27 12:50:45 2018 +0200
   299.2 +++ b/mousepad/receipt	Fri Mar 30 19:31:50 2018 +0300
   299.3 @@ -14,10 +14,7 @@
   299.4  BUILD_DEPENDS="intltool gtk+-dev gtksourceview-dev dbus-glib-dev"
   299.5  
   299.6  compile_rules() {
   299.7 -	fix ld
   299.8  	./configure \
   299.9 -		--sysconfdir=/etc \
  299.10 -		--localstatedir=/var \
  299.11  		--disable-debug \
  299.12  		$CONFIGURE_ARGS &&
  299.13  	fix libtool &&
   300.1 --- a/mozo/receipt	Tue Mar 27 12:50:45 2018 +0200
   300.2 +++ b/mozo/receipt	Fri Mar 30 19:31:50 2018 +0300
   300.3 @@ -15,8 +15,6 @@
   300.4  
   300.5  compile_rules() {
   300.6  	./autogen.sh \
   300.7 -		--sysconfdir=/etc \
   300.8 -		--localstatedir=/var \
   300.9  		$CONFIGURE_ARGS &&
  300.10  	make &&
  300.11  	make install
   301.1 --- a/mozplugger/receipt	Tue Mar 27 12:50:45 2018 +0200
   301.2 +++ b/mozplugger/receipt	Fri Mar 30 19:31:50 2018 +0300
   301.3 @@ -14,9 +14,7 @@
   301.4  BUILD_DEPENDS="xorg-libX11-dev"
   301.5  
   301.6  compile_rules() {
   301.7 -	./configure \
   301.8 -		--prefix=/usr \
   301.9 -		--sysconfdir=/etc &&
  301.10 +	./configure &&
  301.11  	make || return 1
  301.12  
  301.13  	mkdir -p \
   302.1 --- a/mplayerplug-in/receipt	Tue Mar 27 12:50:45 2018 +0200
   302.2 +++ b/mplayerplug-in/receipt	Fri Mar 30 19:31:50 2018 +0300
   302.3 @@ -43,7 +43,7 @@
   302.4  	make distclean
   302.5  	touch install.sh
   302.6  	get_firefox_version
   302.7 -	./configure --prefix=/usr --sysconfdir=/etc \
   302.8 +	./configure \
   302.9  		--enable-x \
  302.10  		--enable-wmp \
  302.11  		--enable-qt \
   303.1 --- a/mutt/receipt	Tue Mar 27 12:50:45 2018 +0200
   303.2 +++ b/mutt/receipt	Fri Mar 30 19:31:50 2018 +0300
   303.3 @@ -1,5 +1,4 @@
   303.4 -
   303.5 -# SliTaz package receipt
   303.6 +# SliTaz package receipt v2.
   303.7  
   303.8  PACKAGE="mutt"
   303.9  VERSION="1.6.1"
  303.10 @@ -7,50 +6,41 @@
  303.11  SHORT_DESC="Small and powerful text-based mail client"
  303.12  MAINTAINER="paul@slitaz.org"
  303.13  LICENSE="GPL2"
  303.14 +WEB_SITE="http://www.mutt.org"
  303.15 +
  303.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  303.17 -WEB_SITE="http://www.mutt.org"
  303.18  WGET_URL="ftp://ftp.mutt.org/pub/mutt/$TARBALL"
  303.19 -CONFIG_FILES="/etc/Muttrc /etc/mime.types"
  303.20  
  303.21 -DEPENDS="openssl ncurses zlib libidn libsasl"
  303.22  BUILD_DEPENDS="libidn-dev ncurses-dev openssl-dev perl cyrus-sasl-dev"
  303.23  
  303.24 -# Rules to configure and make the package.
  303.25 -compile_rules()
  303.26 -{	
  303.27 -    addgroup mail
  303.28 -    sed -i 's/STACK \*/STACK_OF(X509) */' mutt_ssl.c
  303.29 -    ./configure \
  303.30 -		--prefix=/usr \
  303.31 +compile_rules() {
  303.32 +	addgroup mail
  303.33 +	sed -i 's/STACK \*/STACK_OF(X509) */' mutt_ssl.c
  303.34 +
  303.35 +	./configure \
  303.36  		--enable-imap \
  303.37  		--with-ssl=/usr \
  303.38  		--with-mailpath=/var/mail \
  303.39 -		--sysconfdir=/etc \
  303.40  		--enable-pop \
  303.41  		--enable-smtp \
  303.42  		--with-sasl \
  303.43  		$CONFIGURE_ARGS &&
  303.44 -	make && make install &&
  303.45 +	make &&
  303.46 +	make install
  303.47 +
  303.48  	delgroup mail
  303.49  }
  303.50  
  303.51 -# Rules to gen a SliTaz package suitable for Tazpkg.
  303.52 -genpkg_rules()
  303.53 -{
  303.54 -	mkdir -p $fs/usr $fs/etc
  303.55 -	cp -a $install/usr/bin $fs/usr
  303.56 -	cp -a $install/etc/* $fs/etc	
  303.57 -	cp -a $install/usr/share $fs/usr
  303.58 -	rm -r $fs/usr/share/doc
  303.59 -	rm -r $fs/usr/share/man
  303.60 +genpkg_rules() {
  303.61 +	copy @std
  303.62 +	DEPENDS="openssl ncurses zlib libidn libsasl"
  303.63 +	CONFIG_FILES="/etc/Muttrc /etc/mime.types"
  303.64  }
  303.65  
  303.66 -post_install()
  303.67 -{
  303.68 +post_install() {
  303.69  	chroot "$1/" addgroup mail
  303.70  }
  303.71  
  303.72 -post_remove()
  303.73 -{
  303.74 +post_remove() {
  303.75  	chroot "$1/" delgroup mail
  303.76  }
   304.1 --- a/mygestures/receipt	Tue Mar 27 12:50:45 2018 +0200
   304.2 +++ b/mygestures/receipt	Fri Mar 30 19:31:50 2018 +0300
   304.3 @@ -1,32 +1,28 @@
   304.4 -# SliTaz package receipt.
   304.5 +# SliTaz package receipt v2.
   304.6  
   304.7  PACKAGE="mygestures"
   304.8  VERSION="0.7"
   304.9  CATEGORY="x-window"
  304.10 -SHORT_DESC="Recognizing gestures made with your mouse and perform actions."
  304.11 +SHORT_DESC="Recognizing gestures made with your mouse and perform actions"
  304.12  MAINTAINER="pankso@slitaz.org"
  304.13  LICENSE="GPL2"
  304.14 +WEB_SITE="http://sourceforge.net/projects/mygestures/"
  304.15 +
  304.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  304.17 -WEB_SITE="http://sourceforge.net/projects/mygestures/"
  304.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  304.19  
  304.20 -DEPENDS="xorg-libX11 xorg-libXtst jansson"
  304.21  BUILD_DEPENDS="xorg-libX11-dev xorg-libXtst jansson-dev xorg-libXmu-dev \
  304.22  xorg-libXrender-dev xorg-libXtst-dev libxml2-dev"
  304.23  
  304.24 -# Rules to configure and make the package.
  304.25 -compile_rules()
  304.26 -{
  304.27 +compile_rules() {
  304.28  	./configure \
  304.29  		--sysconfdir=/etc/$PACKAGE \
  304.30  		$CONFIGURE_ARGS &&
  304.31 -	make && make -j 1 install
  304.32 +	make &&
  304.33 +	make -j 1 install
  304.34  }
  304.35  
  304.36 -# Rules to gen a SliTaz package suitable for Tazpkg.
  304.37 -genpkg_rules()
  304.38 -{
  304.39 -	mkdir -p $fs/usr
  304.40 -	cp -a $install/etc $fs
  304.41 -	cp -a $install/usr/bin $fs/usr
  304.42 +genpkg_rules() {
  304.43 +	copy @std
  304.44 +	DEPENDS="xorg-libX11 xorg-libXtst jansson"
  304.45  }
   305.1 --- a/nagios-nrpe/receipt	Tue Mar 27 12:50:45 2018 +0200
   305.2 +++ b/nagios-nrpe/receipt	Fri Mar 30 19:31:50 2018 +0300
   305.3 @@ -15,9 +15,6 @@
   305.4  
   305.5  compile_rules() {
   305.6  	./configure \
   305.7 -		--prefix=/usr \
   305.8 -		--infodir=/usr/share/info \
   305.9 -		--localstatedir=/var \
  305.10  		--datadir=/usr/share/nagios \
  305.11  		--sysconfdir=/etc/nagios \
  305.12  		--sbindir=/usr/lib/nagios \
  305.13 @@ -27,7 +24,6 @@
  305.14  		--with-nagios-group=nagios \
  305.15  		--with-nrpe-user=nagios \
  305.16  		--with-nrpe-group=nagios \
  305.17 -		--mandir=/usr/share/man \
  305.18  		$CONFIGURE_ARGS &&
  305.19  	make all &&
  305.20  	make install || return 1
  305.21 @@ -52,7 +48,7 @@
  305.22  
  305.23  	# Set perms for files and directories
  305.24  	chroot "$1/" chown -R nagios.nagios /usr/lib/nagios/plugins
  305.25 -	chroot "$1/" chown    nagios.nagios /etc/nagios/* 
  305.26 +	chroot "$1/" chown    nagios.nagios /etc/nagios/*
  305.27  
  305.28  	# Add check_nrpe in nagios config file
  305.29  	echo "cfg_file=/etc/nagios/objects/nrpe.cfg" >> "$1/etc/nagios/nagios.cfg"
   306.1 --- a/nagios-nsca/receipt	Tue Mar 27 12:50:45 2018 +0200
   306.2 +++ b/nagios-nsca/receipt	Fri Mar 30 19:31:50 2018 +0300
   306.3 @@ -16,9 +16,6 @@
   306.4  
   306.5  compile_rules() {
   306.6  	./configure \
   306.7 -		--prefix=/usr \
   306.8 -		--infodir=/usr/share/info \
   306.9 -		--localstatedir=/var \
  306.10  		--datadir=/usr/share/nagios \
  306.11  		--sysconfdir=/etc/nagios \
  306.12  		--sbindir=/usr/sbin \
  306.13 @@ -27,7 +24,6 @@
  306.14  		--with-nsca-user=nagios \
  306.15  		--with-nsca-group=nagios \
  306.16  		--with-nsca-port=5667 \
  306.17 -		--mandir=/usr/share/man \
  306.18  		$CONFIGURE_ARGS &&
  306.19  	make all || return 1
  306.20  
   307.1 --- a/nagios/receipt	Tue Mar 27 12:50:45 2018 +0200
   307.2 +++ b/nagios/receipt	Fri Mar 30 19:31:50 2018 +0300
   307.3 @@ -18,19 +18,16 @@
   307.4  	sed -i '/sysconfdir=/ s|^|#|' /etc/slitaz/cook.site # default sysconfdir=/etc
   307.5  
   307.6  	./configure \
   307.7 -		--prefix=/usr \
   307.8 -		--infodir=/usr/share/info \
   307.9 -		--mandir=/usr/share/man \
  307.10 +		--sysconfdir=/etc/nagios \
  307.11 +		--libexecdir=/usr/lib/nagios/plugins \
  307.12 +		--sbindir=/usr/lib/nagios/cgi \
  307.13 +		--datadir=/usr/share/nagios \
  307.14 +		--localstatedir=/var/lib/nagios \
  307.15  		--with-nagios-user=nagios \
  307.16  		--with-nagios-group=nagios \
  307.17  		--with-lockfile=/var/run/nagios/nagios.pid \
  307.18  		--with-checkresult-dir=/var/spool/nagios/checkresults \
  307.19 -		--sysconfdir=/etc/nagios \
  307.20  		--with-httpd-conf=/etc/apache/conf.d \
  307.21 -		--libexecdir=/usr/lib/nagios/plugins \
  307.22 -		--sbindir=/usr/lib/nagios/cgi \
  307.23 -		--datadir=/usr/share/nagios \
  307.24 -		--localstatedir=/var/lib/nagios \
  307.25  		$CONFIGURE_ARGS &&
  307.26  	sed -i 's!HTMLDIR=.*!HTMLDIR=/usr/share/nagios!' html/Makefile &&
  307.27  
  307.28 @@ -83,10 +80,8 @@
  307.29  
  307.30  post_install_nagios() {
  307.31  	if ! grep -q nagios "$1/etc/passwd"; then
  307.32 -		echo -n "Adding user/group nagios..."
  307.33  		chroot "$1/" addgroup -S nagios
  307.34  		chroot "$1/" adduser -S -D -H -G nagios nagios
  307.35 -		status
  307.36  	fi
  307.37  
  307.38  	# Fix perms for files and directories
  307.39 @@ -107,7 +102,7 @@
  307.40  
  307.41  	.--------------------------------------------------------------.
  307.42  	| To starts nagios server you can run:                         |
  307.43 -	| /etc/init.d/$PACKAGE start                                   |
  307.44 +	| /etc/init.d/nagios start                                     |
  307.45  	|                                                              |
  307.46  	| Or add nagios to RUN_DAEMONS in /etc/rcS.conf                |
  307.47  	|--------------------------------------------------------------|
   308.1 --- a/nano/receipt	Tue Mar 27 12:50:45 2018 +0200
   308.2 +++ b/nano/receipt	Fri Mar 30 19:31:50 2018 +0300
   308.3 @@ -16,18 +16,15 @@
   308.4  
   308.5  compile_rules() {
   308.6  	./configure \
   308.7 -		--sysconfdir=/etc \
   308.8 -		--localstatedir=/var \
   308.9  		--disable-wrapping-as-root \
  308.10  		--enable-utf8 \
  308.11 -		$CONFIGURE_ARGS $ARCH_ARGS &&
  308.12 +		$CONFIGURE_ARGS &&
  308.13  	make && make install || exit 1
  308.14  
  308.15  	# Config file.
  308.16 -	mkdir -p $install/etc
  308.17 -	cp $src/doc/nanorc.sample $install/etc/nanorc
  308.18 +	install -Dm644 $src/doc/nanorc.sample $install/etc/nanorc
  308.19  
  308.20 -	install -v -m644 doc/texinfo/nano.html $install/usr/share/doc/nano-$VERSION
  308.21 +	cook_pick_docs doc/texinfo/nano.html
  308.22  }
  308.23  
  308.24  genpkg_rules() {
   309.1 --- a/nbd/receipt	Tue Mar 27 12:50:45 2018 +0200
   309.2 +++ b/nbd/receipt	Fri Mar 30 19:31:50 2018 +0300
   309.3 @@ -14,10 +14,7 @@
   309.4  BUILD_DEPENDS="glib-dev pcre-dev"
   309.5  
   309.6  compile_rules() {
   309.7 -	./configure \
   309.8 -		--sysconfdir=/etc \
   309.9 -		--prefix=/usr \
  309.10 -		$CONFIGURE_ARGS &&
  309.11 +	./configure $CONFIGURE_ARGS &&
  309.12  	make &&
  309.13  	make DESTDIR=$DESTDIR install || return 1
  309.14  
   310.1 --- a/ncftp/receipt	Tue Mar 27 12:50:45 2018 +0200
   310.2 +++ b/ncftp/receipt	Fri Mar 30 19:31:50 2018 +0300
   310.3 @@ -14,9 +14,7 @@
   310.4  BUILD_DEPENDS="ncurses-dev"
   310.5  
   310.6  compile_rules() {
   310.7 -	./configure \
   310.8 -		--prefix=/usr \
   310.9 -		--sysconfdir=/etc &&
  310.10 +	./configure &&
  310.11  	make &&
  310.12  	make DESTDIR=$DESTDIR install
  310.13  }
   311.1 --- a/ndisc6/receipt	Tue Mar 27 12:50:45 2018 +0200
   311.2 +++ b/ndisc6/receipt	Fri Mar 30 19:31:50 2018 +0300
   311.3 @@ -12,14 +12,9 @@
   311.4  WGET_URL="http://www.remlab.net/files/$PACKAGE/$TARBALL"
   311.5  
   311.6  compile_rules() {
   311.7 -	./configure \
   311.8 -		--prefix=/usr \
   311.9 -		--infodir=/usr/share/info \
  311.10 -		--localstatedir=/var \
  311.11 -		--sysconfdir=/etc \
  311.12 -		--mandir=/usr/share/man \
  311.13 -		$CONFIGURE_ARGS &&
  311.14 -	make && make DESTDIR=$DESTDIR install
  311.15 +	./configure $CONFIGURE_ARGS &&
  311.16 +	make &&
  311.17 +	make DESTDIR=$DESTDIR install
  311.18  }
  311.19  
  311.20  genpkg_rules() {
   312.1 --- a/ndoutils/receipt	Tue Mar 27 12:50:45 2018 +0200
   312.2 +++ b/ndoutils/receipt	Fri Mar 30 19:31:50 2018 +0300
   312.3 @@ -1,24 +1,19 @@
   312.4 -# SliTaz package receipt.
   312.5 +# SliTaz package receipt v2.
   312.6  
   312.7  PACKAGE="ndoutils"
   312.8  VERSION="1.5.2"
   312.9  CATEGORY="network"
  312.10 -SHORT_DESC="Provide mysql access to nagios."
  312.11 +SHORT_DESC="Provide mysql access to nagios"
  312.12  MAINTAINER="pascal.bellard@slitaz.org"
  312.13  LICENSE="GPL2"
  312.14 +WEB_SITE="http://www.nagios.org/"
  312.15 +
  312.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  312.17 -WEB_SITE="http://www.nagios.org/"
  312.18  WGET_URL="$SF_MIRROR/nagios/$TARBALL"
  312.19 -CONFIG_FILES="/etc/nagios"
  312.20  
  312.21 -DEPENDS="nagios mysql"
  312.22  BUILD_DEPENDS="mysql-dev"
  312.23  
  312.24 -# Rules to configure and make the package.
  312.25 -compile_rules()
  312.26 -{
  312.27 -	cd $src
  312.28 -	
  312.29 +compile_rules() {
  312.30  	while read patch_file; do
  312.31  		if [ ! -f done.$patch_file ]; then
  312.32  			patch -p1 < $stuff/$patch_file || exit 1
  312.33 @@ -28,21 +23,19 @@
  312.34  $PACKAGE-$VERSION-Makefiles.in.u
  312.35  EOT
  312.36  
  312.37 -	./configure --prefix=/usr \
  312.38 -	--with-ndo2db-user=nagios \
  312.39 -	--with-ndo2db-group=nagios \
  312.40 -	--localstatedir=/var/run/nagios \
  312.41 -	--sysconfdir=/etc/nagios \
  312.42 -	--libexecdir=/usr/lib/$PACKAGE \
  312.43 -	--mandir=/usr/share/man $CONFIGURE_ARGS &&
  312.44 -	make && \
  312.45 -	make DESTDIR=$DESTDIR install && \
  312.46 +	./configure \
  312.47 +		--with-ndo2db-user=nagios \
  312.48 +		--with-ndo2db-group=nagios \
  312.49 +		--localstatedir=/var/run/nagios \
  312.50 +		--sysconfdir=/etc/nagios \
  312.51 +		--libexecdir=/usr/lib/$PACKAGE \
  312.52 +		$CONFIGURE_ARGS &&
  312.53 +	make &&
  312.54 +	make DESTDIR=$DESTDIR install &&
  312.55  	make DESTDIR=$DESTDIR install-config
  312.56 -}	
  312.57 +}
  312.58  
  312.59 -# Rules to gen a SliTaz package suitable for Tazpkg.
  312.60 -genpkg_rules()
  312.61 -{
  312.62 +genpkg_rules() {
  312.63  	mkdir -p $fs/usr/share/nagios/ndoutils \
  312.64  		$fs/etc/nagios \
  312.65  		$fs/etc/mysql.d
  312.66 @@ -68,46 +61,44 @@
  312.67  	
  312.68  	chmod 755 $fs/usr/bin/*
  312.69  	chmod 755 $fs/etc/mysql.d/*
  312.70 +	DEPENDS="nagios mysql"
  312.71 +	CONFIG_FILES="/etc/nagios"
  312.72  }
  312.73  
  312.74 -post_install()
  312.75 -{
  312.76 +post_install() {
  312.77  	if ! grep -q nagios "$1/etc/passwd"; then
  312.78 -		echo -n "Adding user nagios..."
  312.79  		chroot "$1/" adduser -S -D -H nagios
  312.80 -		status
  312.81  	fi
  312.82 -		
  312.83 +
  312.84  	if ! grep -q ndomod.cfg "$1/etc/nagios/nagios.cfg"; then
  312.85  		sed -i '/LOG ROTATION METHOD/i\broker_module=/usr/lib/ndoutils/ndomod.o config_file=/etc/nagios/ndomod.cfg' "$1/etc/nagios/nagios.cfg"
  312.86  		chroot "$1/" chown nagios.nagios /etc/nagios/nagios.cfg
  312.87  	fi
  312.88 -	
  312.89 -	chroot "$1/" chown nagios.nagios /usr/lib/ndoutils/ndomod.o \
  312.90 -	 /etc/nagios/ndo2db.cfg /etc/nagios/ndomod.cfg \
  312.91 -	 /etc/nagios
  312.92 +
  312.93 +	chroot "$1/" chown nagios.nagios \
  312.94 +		/usr/lib/ndoutils/ndomod.o \
  312.95 +		/etc/nagios/ndo2db.cfg \
  312.96 +		/etc/nagios/ndomod.cfg \
  312.97 +		/etc/nagios
  312.98  
  312.99  	sed -i "s/nagios/ndo2db nagios/" "$1/etc/rcS.conf"
 312.100 -	
 312.101 -	if [ -z "$1" ]; then	
 312.102 +
 312.103 +	if [ -z "$1" ]; then
 312.104  		[ -f /var/run/mysqld/mysql.pid ] || /etc/init.d/mysql start
 312.105 -		/etc/mysql.d/$PACKAGE    
 312.106 +		/etc/mysql.d/$PACKAGE
 312.107  		#/usr/bin/ndo2db -c /etc/nagios/ndo2db.cfg
 312.108  		/etc/init.d/ndo2db start
 312.109  		/etc/init.d/nagios stop
 312.110  		/etc/init.d/nagios start
 312.111 -
 312.112 -	fi	
 312.113 +	fi
 312.114  }
 312.115  
 312.116 -pre_remove()
 312.117 -{
 312.118 +pre_remove() {
 312.119  	/etc/init.d/ndo2db stop
 312.120  }
 312.121  
 312.122 -post_remove()
 312.123 -{
 312.124 -		sed -i "s/ndo2db//" "$1/etc/rcS.conf"
 312.125 -		/etc/init.d/nagios restart
 312.126 -		sed -i 's|broker_module=/usr/lib/ndoutils/ndomod.o config_file=/etc/nagios/ndomod.cfg||' "$1/etc/nagios/nagios.cfg"
 312.127 +post_remove() {
 312.128 +	sed -i "s/ndo2db//" "$1/etc/rcS.conf"
 312.129 +	/etc/init.d/nagios restart
 312.130 +	sed -i 's|broker_module=/usr/lib/ndoutils/ndomod.o config_file=/etc/nagios/ndomod.cfg||' "$1/etc/nagios/nagios.cfg"
 312.131  }
   313.1 --- a/netatalk/receipt	Tue Mar 27 12:50:45 2018 +0200
   313.2 +++ b/netatalk/receipt	Fri Mar 30 19:31:50 2018 +0300
   313.3 @@ -1,7 +1,7 @@
   313.4  # SliTaz package receipt v2.
   313.5  
   313.6  PACKAGE="netatalk"
   313.7 -VERSION="2.2.3"
   313.8 +VERSION="3.1.11"
   313.9  CATEGORY="system-tools"
  313.10  SHORT_DESC="The AppleTalk Protocol Suite"
  313.11  MAINTAINER="pascal.bellard@slitaz.org"
  313.12 @@ -12,60 +12,43 @@
  313.13  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  313.14  
  313.15  BUILD_DEPENDS="db-dev openssl-dev file pam-dev"
  313.16 -SPLIT="netatalk netatalk-pam netatalk-dev"
  313.17 +SPLIT="netatalk netatalk-pam:pam netatalk-dev"
  313.18  
  313.19  compile_rules() {
  313.20 -	cp -a $src $src-pam
  313.21 +	case $SET in
  313.22 +		'')  SET_ARGS='--without-pam';;
  313.23 +		pam) SET_ARGS='--with-pam';;
  313.24 +	esac
  313.25 +
  313.26  	./configure \
  313.27 -		--without-pam \
  313.28 -		--prefix=/usr \
  313.29 -		--sysconfdir=/etc \
  313.30  		--libexecdir=/usr/lib/netatalk \
  313.31 -		--mandir=/usr/share/man \
  313.32 +		$SET_ARGS \
  313.33  		$CONFIGURE_ARGS &&
  313.34  	make &&
  313.35  	make DESTDIR=$DESTDIR install || return 1
  313.36  
  313.37 -	cd $src-pam
  313.38 -	./configure \
  313.39 -		--with-pam \
  313.40 -		--prefix=/usr \
  313.41 -		--sysconfdir=/etc \
  313.42 -		--libexecdir=/usr/lib/netatalk \
  313.43 -		--mandir=/usr/share/man \
  313.44 -		$CONFIGURE_ARGS &&
  313.45 -	make &&
  313.46 -	make DESTDIR=$DESTDIR-pam install
  313.47 +	cp -a $stuff/etc $install
  313.48  }
  313.49  
  313.50  genpkg_rules() {
  313.51  	case $PACKAGE in
  313.52 -		netatalk|netatalk-pam)
  313.53 +		netatalk)
  313.54 +			copy @std
  313.55 +			rm -rf $fs/etc/pam.d
  313.56  			DEPENDS="perl libdb openssl cups gnutls libgcrypt libgpg-error  \
  313.57  			libwrap zlib libcomerr3"
  313.58 -			if [ $PACKAGE == 'netatalk-pam' ]; then
  313.59 -				DEPENDS="$DEPENDS pam"
  313.60 -				PROVIDE="netatalk:pam"
  313.61 -				CAT="system-tools|using PAM"
  313.62 -				install=$install-pam
  313.63 -			fi
  313.64 -			mkdir -p $fs/usr/share $fs/usr/lib
  313.65 -			cp -a $install/usr/bin $fs/usr
  313.66 -			cp -a $install/usr/sbin $fs/usr
  313.67 -			#cp -a $install/usr/lib/netatalk $fs/usr/lib
  313.68 -			cp -a $install/etc $fs
  313.69 -			cp -a $stuff/etc $fs
  313.70 -			[ $PACKAGE == 'netatalk-pam' ] || rm -rf $fs/etc/pam.d
  313.71 -			rm -f $fs/etc/netatalk/uams/*a
  313.72 -			CONFIG_FILES="/etc/netatalk/AppleVolumes.* /etc/netatalk/*.conf"
  313.73 +			CONFIG_FILES="/etc/netatalk/"
  313.74 +			;;
  313.75 +		netatalk-pam)
  313.76 +			copy @std
  313.77 +			DEPENDS="perl libdb openssl cups gnutls libgcrypt libgpg-error  \
  313.78 +			libwrap zlib libcomerr3 pam"
  313.79 +			PROVIDE="netatalk:pam"
  313.80 +			CAT="system-tools|using PAM"
  313.81 +			CONFIG_FILES="/etc/netatalk/"
  313.82  			;;
  313.83  		netatalk-dev)
  313.84 -			mkdir -p $fs/usr/share $fs/etc/netatalk/uams/
  313.85 -			cp -a $install/usr/lib $fs/usr
  313.86 -			cp -a $install/usr/include $fs/usr
  313.87 -			#cp -a $install/usr/share/netatalk $fs/usr/share
  313.88 -			cp -a $install/etc/netatalk/uams/*.a $fs/etc/netatalk/uams/
  313.89 -			DEPENDS="netatalk"
  313.90 +			copy @dev
  313.91  			;;
  313.92  	esac
  313.93  }
   314.1 --- a/network-manager/receipt	Tue Mar 27 12:50:45 2018 +0200
   314.2 +++ b/network-manager/receipt	Fri Mar 30 19:31:50 2018 +0300
   314.3 @@ -12,7 +12,8 @@
   314.4  WGET_URL="$GNOME_MIRROR/NetworkManager/${VERSION%.*.*}/$TARBALL"
   314.5  
   314.6  BUILD_DEPENDS="dbus-dev dbus-glib-dev gtk+-dev wireless_tools-dev libgudev-dev \
   314.7 -libnl-dev nss-dev ppp-dev iptables-dev util-linux-uuid-dev dhcp-client intltool"
   314.8 +libnl-dev nss-dev ppp-dev iptables-dev util-linux-uuid-dev dhcp-client \
   314.9 +intltool eudev-dev"
  314.10  SPLIT="network-manager-dev"
  314.11  
  314.12  compile_rules() {
  314.13 @@ -20,41 +21,23 @@
  314.14  		src/ip6-manager/nm-ip6-manager.c
  314.15  	sed -i 's/.\(if (.nm_supplicant_config_add_setting_8021x\)/    \1/' \
  314.16  		src/supplicant-manager/nm-supplicant-config.c
  314.17 +
  314.18  	./configure \
  314.19 -		--prefix=/usr \
  314.20  		--libexecdir=/usr/lib/$PACKAGE \
  314.21 -		--sysconfdir=/etc \
  314.22 -		--localstatedir=/var \
  314.23 -		--with-distro=arch \
  314.24  		$CONFIGURE_ARGS &&
  314.25 -	make && make install
  314.26 +	make &&
  314.27 +	make install
  314.28  }
  314.29  
  314.30  genpkg_rules() {
  314.31  	case $PACKAGE in
  314.32  		network-manager)
  314.33 -			mkdir -p $fs/usr/lib/pppd/2.4.5 $fs/usr/share $fs $fs/lib
  314.34 -			cp -a $install/etc                      $fs
  314.35 -			cp -a $install/var                      $fs
  314.36 -			cp -a $install/usr/*bin                 $fs/usr
  314.37 -			cp -a $install/usr/lib/pppd/2.4.5/*so   $fs/usr/lib/pppd/2.4.5
  314.38 -			cp -a $install/usr/lib/libnm*.so*       $fs/usr/lib
  314.39 -			cp -a $install/usr/lib/network-manager  $fs/usr/lib
  314.40 -			cp -a $install/usr/lib/NetworkManager   $fs/usr/lib
  314.41 -			cp -a $install/usr/share/dbus-1         $fs/usr/share
  314.42 -			cp -a $install/usr/share/locale         $fs/usr/share
  314.43 -			cp -a $install/usr/share/polkit-1       $fs/usr/share
  314.44 -			cp -a $install/lib/udev                 $fs/lib
  314.45 +			copy @std
  314.46  			DEPENDS="dbus dbus-glib gtk+ wireless_tools libgudev libnl nss ppp \
  314.47  			iptables dhcp-client"
  314.48  			;;
  314.49  		*-dev)
  314.50 -			mkdir -p $fs/usr/lib/pppd/2.4.5 $fs/usr/include
  314.51 -			cp -a $install/usr/lib/*.la               $fs/usr/lib
  314.52 -			cp -a $install/usr/lib/pppd/2.4.5/*la     $fs/usr/lib/pppd/2.4.5
  314.53 -			cp -a $install/usr/lib/pkgconfig          $fs/usr/lib
  314.54 -			cp -a $install/usr/include/libnm*         $fs/usr/include
  314.55 -			cp -a $install/usr/include/NetworkManager $fs/usr/include
  314.56 +			copy @dev
  314.57  			;;
  314.58  	esac
  314.59  }
   315.1 --- a/notification-daemon-gtk2/receipt	Tue Mar 27 12:50:45 2018 +0200
   315.2 +++ b/notification-daemon-gtk2/receipt	Fri Mar 30 19:31:50 2018 +0300
   315.3 @@ -16,7 +16,6 @@
   315.4  SPLIT="notification-daemon-gtk2-dev"
   315.5  
   315.6  compile_rules() {
   315.7 -	fix ld
   315.8  	./configure $CONFIGURE_ARGS &&
   315.9  	fix libtool &&
  315.10  	make && make install
   316.1 --- a/nss_ldap/receipt	Tue Mar 27 12:50:45 2018 +0200
   316.2 +++ b/nss_ldap/receipt	Fri Mar 30 19:31:50 2018 +0300
   316.3 @@ -16,13 +16,9 @@
   316.4  compile_rules() {
   316.5  	./vers_string -v
   316.6  	./configure \
   316.7 -		--prefix=/usr \
   316.8 -		--infodir=/usr/share/info \
   316.9  		--enable-rfc2307bis \
  316.10  		--enable-schema-mapping \
  316.11  		--enable-paged-results \
  316.12 -		--sysconfdir=/etc \
  316.13 -		--mandir=/usr/share/man \
  316.14  		$CONFIGURE_ARGS &&
  316.15  	make $MAKEFLAGS &&
  316.16  	make DESTDIR=$DESTDIR install
   317.1 --- a/ntop/receipt	Tue Mar 27 12:50:45 2018 +0200
   317.2 +++ b/ntop/receipt	Fri Mar 30 19:31:50 2018 +0300
   317.3 @@ -18,11 +18,10 @@
   317.4  
   317.5  compile_rules() {
   317.6  	./autogen.sh \
   317.7 -		--prefix=/usr \
   317.8 -		--sysconfdir=/etc \
   317.9  		--localstatedir=/var/lib \
  317.10  		$CONFIGURE_ARGS &&
  317.11 -	make && make install || return 1
  317.12 +	make &&
  317.13 +	make install || return 1
  317.14  
  317.15  	#~ && make install-data-as
  317.16  
   318.1 --- a/openbox/receipt	Tue Mar 27 12:50:45 2018 +0200
   318.2 +++ b/openbox/receipt	Fri Mar 30 19:31:50 2018 +0300
   318.3 @@ -23,15 +23,14 @@
   318.4  		*)     SET_ARGS='';;
   318.5  	esac
   318.6  
   318.7 -	fix ld
   318.8  	# openbox required reconfiguration after patching...
   318.9  	autoreconf -fi &&
  318.10  
  318.11  	./configure \
  318.12 -		--sysconfdir=/etc \
  318.13  		--libexecdir=/usr/lib/openbox \
  318.14  		--disable-static \
  318.15 -		$ARCH_ARGS $SET_ARGS $CONFIGURE_ARGS &&
  318.16 +		$SET_ARGS \
  318.17 +		$CONFIGURE_ARGS &&
  318.18  	fix libtool &&
  318.19  	make &&
  318.20  	make -j1 DESTDIR=$DESTDIR install &&
   319.1 --- a/openldap/receipt	Tue Mar 27 12:50:45 2018 +0200
   319.2 +++ b/openldap/receipt	Fri Mar 30 19:31:50 2018 +0300
   319.3 @@ -22,8 +22,6 @@
   319.4  
   319.5  	autoconf &&
   319.6  	./configure \
   319.7 -		--sysconfdir=/etc \
   319.8 -		--localstatedir=/var \
   319.9  		--libexecdir=/usr/lib \
  319.10  		--disable-static \
  319.11  		--disable-debug \
  319.12 @@ -34,7 +32,9 @@
  319.13  		--disable-hdb \
  319.14  		$CONFIGURE_ARGS &&
  319.15  	sed -i 's|@VERSION_OPTION@||' $src/libraries/*/Makefile &&
  319.16 -	make depend && make && make install || return 1
  319.17 +	make depend &&
  319.18 +	make &&
  319.19 +	make install || return 1
  319.20  
  319.21  	install -Dm0755 $stuff/etc/init.d/openldap $install/etc/init.d/openldap
  319.22  
   320.1 --- a/openmpi/receipt	Tue Mar 27 12:50:45 2018 +0200
   320.2 +++ b/openmpi/receipt	Fri Mar 30 19:31:50 2018 +0300
   320.3 @@ -15,8 +15,6 @@
   320.4  SPLIT="openmpi-dev"
   320.5  
   320.6  compile_rules() {
   320.7 -	sed -i '/sysconfdir=/ s|^|#|' /etc/slitaz/cook.site # default sysconfdir=/etc
   320.8 -
   320.9  	./configure \
  320.10  		--sysconfdir=/etc/openmpi \
  320.11  		--enable-mpi-f90 \
  320.12 @@ -30,7 +28,8 @@
  320.13  		--with-libltdl=/usr \
  320.14  		FC=/usr/bin/gfortran \
  320.15  		LDFLAGS='-Wl,-z,noexecstack' &&
  320.16 -	make && make install
  320.17 +	make &&
  320.18 +	make install
  320.19  }
  320.20  
  320.21  genpkg_rules() {
   321.1 --- a/opensc/receipt	Tue Mar 27 12:50:45 2018 +0200
   321.2 +++ b/opensc/receipt	Fri Mar 30 19:31:50 2018 +0300
   321.3 @@ -1,37 +1,26 @@
   321.4 -# SliTaz package receipt.
   321.5 +# SliTaz package receipt v2.
   321.6  
   321.7  PACKAGE="opensc"
   321.8  VERSION="0.13.0"
   321.9  CATEGORY="security"
  321.10 -SHORT_DESC="Tools and libraries for smart cards."
  321.11 +SHORT_DESC="Tools and libraries for smart cards"
  321.12  MAINTAINER="pascal.bellard@slitaz.org"
  321.13  LICENSE="LGPL2.1"
  321.14 +WEB_SITE="https://github.com/OpenSC/OpenSC/wiki"
  321.15 +
  321.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  321.17 -WEB_SITE="https://github.com/OpenSC/OpenSC/wiki"
  321.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  321.19 -CONFIG_FILES="/etc/opensc.conf"
  321.20  
  321.21 -DEPENDS="openssl zlib"
  321.22  BUILD_DEPENDS="pcsc-lite-dev openssl-dev"
  321.23  
  321.24 -# Rules to configure and make the package.
  321.25 -compile_rules()
  321.26 -{
  321.27 -	./configure --prefix=/usr \
  321.28 -		--sysconfdir=/etc \
  321.29 -		--localstatedir=/var \
  321.30 -		--mandir=/usr/share/man \
  321.31 -		$CONFIGURE_ARGS &&
  321.32 +compile_rules() {
  321.33 +	./configure $CONFIGURE_ARGS &&
  321.34  	make &&
  321.35  	make DESTDIR=$DESTDIR install
  321.36  }
  321.37  
  321.38 -# Rules to gen a SliTaz package suitable for Tazpkg.
  321.39 -genpkg_rules()
  321.40 -{
  321.41 -	mkdir -p $fs/usr/share
  321.42 -	cp -a $install/etc $fs
  321.43 -	cp -a $install/usr/bin $fs/usr
  321.44 -	cp -a $install/usr/share/opensc $fs/usr/share
  321.45 -	cp -a $install/usr/lib $fs/usr
  321.46 +genpkg_rules() {
  321.47 +	copy @std
  321.48 +	DEPENDS="openssl zlib"
  321.49 +	CONFIG_FILES="/etc/opensc.conf"
  321.50  }
   322.1 --- a/openssh/receipt	Tue Mar 27 12:50:45 2018 +0200
   322.2 +++ b/openssh/receipt	Fri Mar 30 19:31:50 2018 +0300
   322.3 @@ -16,8 +16,6 @@
   322.4  SPLIT="openssh openssh-pam:pam"
   322.5  
   322.6  compile_rules() {
   322.7 -	sed -i '/sysconfdir=/ s|^|#|' /etc/slitaz/cook.site # default sysconfdir=/etc
   322.8 -
   322.9  	install -m700 -d /var/lib/sshd
  322.10  	chown   root:sys /var/lib/sshd
  322.11  
  322.12 @@ -41,7 +39,8 @@
  322.13  		--with-privsep-path=/var/lib/sshd \
  322.14  		$SET_ARGS \
  322.15  		$CONFIGURE_ARGS &&
  322.16 -	make && make DESTDIR=$DESTDIR install || return 1
  322.17 +	make &&
  322.18 +	make DESTDIR=$DESTDIR install || return 1
  322.19  
  322.20  	install -vm755 contrib/ssh-copy-id $install/usr/bin/
  322.21  
   323.1 --- a/openvas-client/receipt	Tue Mar 27 12:50:45 2018 +0200
   323.2 +++ b/openvas-client/receipt	Fri Mar 30 19:31:50 2018 +0300
   323.3 @@ -11,28 +11,19 @@
   323.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   323.5  WGET_URL="http://wald.intevation.org/frs/download.php/757/$TARBALL"
   323.6  
   323.7 -#BUILD_DEPENDS="util-linux-uuid libpcap openvas-libraries openvas-libraries-dev \
   323.8 -#libgd-dev libpng16-dev gtk+-dev gnutls-dev"
   323.9  BUILD_DEPENDS="libgd-dev libpng16-dev glib-dev openvas-libraries-dev \
  323.10  gnutls-dev gtk+-dev"
  323.11  
  323.12  compile_rules() {
  323.13  	cp -a $stuff/libopenvas-config /usr/bin
  323.14  
  323.15 -	./configure \
  323.16 -		--sysconfdir=/etc \
  323.17 -		$CONFIGURE_ARGS || return 1
  323.18 -	find -name Makefile | xargs sed -i 's|uname -o|echo GNU/Linux|'
  323.19 +	./configure $CONFIGURE_ARGS &&
  323.20  	make &&
  323.21  	make install
  323.22  }
  323.23  
  323.24 -# Rules to gen a SliTaz package suitable for Tazpkg.
  323.25 -genpkg_rules()
  323.26 -{
  323.27 -	mkdir -p $fs/usr
  323.28 -	cp -a $install/usr/bin $fs/usr
  323.29 -	cp -a $install/etc $fs
  323.30 +genpkg_rules() {
  323.31 +	copy @std
  323.32  	DEPENDS="openvas-libraries gtk+"
  323.33  	CONFIG_FILES="/etc/openvas/"
  323.34  }
   324.1 --- a/openvswitch/receipt	Tue Mar 27 12:50:45 2018 +0200
   324.2 +++ b/openvswitch/receipt	Fri Mar 30 19:31:50 2018 +0300
   324.3 @@ -6,42 +6,28 @@
   324.4  SHORT_DESC="Multilayer virtual switch"
   324.5  MAINTAINER="pascal.bellard@slitaz.org"
   324.6  LICENSE="Apache"
   324.7 +WEB_SITE="http://openvswitch.org/"
   324.8 +
   324.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
  324.10 -WEB_SITE="http://openvswitch.org/"
  324.11  WGET_URL="${WEB_SITE}releases/$TARBALL"
  324.12  
  324.13  BUILD_DEPENDS="openssl-dev zlib-dev perl"
  324.14  SPLIT="openvswitch-dev"
  324.15  
  324.16 -# Rules to configure and make the package.
  324.17 -compile_rules()
  324.18 -{
  324.19 -	./configure --prefix=/usr \
  324.20 -		--sysconfdir=/etc \
  324.21 -		--localstatedir=/var \
  324.22 -		--mandir=/usr/share/man \
  324.23 -		$CONFIGURE_ARGS &&
  324.24 +compile_rules() {
  324.25 +	./configure $CONFIGURE_ARGS &&
  324.26  	make &&
  324.27  	make DESTDIR=$DESTDIR install
  324.28  }
  324.29  
  324.30 -# Rules to gen a SliTaz package suitable for Tazpkg.
  324.31 -genpkg_rules()
  324.32 -{
  324.33 +genpkg_rules() {
  324.34  	case $PACKAGE in
  324.35 -	openvswitch)
  324.36 -		DEPENDS="openssl zlib python bash"
  324.37 -		mkdir -p $fs/usr
  324.38 -		cp -a $install/etc $fs/
  324.39 -		cp -a $install/var $fs/
  324.40 -		cp -a $install/usr/bin $fs/usr/
  324.41 -		cp -a $install/usr/sbin $fs/usr/
  324.42 -		cp -a $install/usr/share $fs/usr/
  324.43 -		;;
  324.44 -	openvswitch-dev)
  324.45 -		mkdir -p $fs/usr
  324.46 -		cp -a $install/usr/lib $fs/usr
  324.47 -		cp -a $install/usr/include $fs/usr
  324.48 -		;;
  324.49 +		openvswitch)
  324.50 +			copy @std
  324.51 +			DEPENDS="openssl zlib python bash"
  324.52 +			;;
  324.53 +		*-dev)
  324.54 +			copy @dev
  324.55 +			;;
  324.56  	esac
  324.57  }
   325.1 --- a/orage/receipt	Tue Mar 27 12:50:45 2018 +0200
   325.2 +++ b/orage/receipt	Fri Mar 30 19:31:50 2018 +0300
   325.3 @@ -16,10 +16,7 @@
   325.4  SPLIT="orage-dev"
   325.5  
   325.6  compile_rules() {
   325.7 -	fix ld
   325.8  	./configure \
   325.9 -		--sysconfdir=/etc \
  325.10 -		--localstatedir=/var \
  325.11  		--disable-debug \
  325.12  		$CONFIGURE_ARGS &&
  325.13  	fix libtool &&
   326.1 --- a/p11-kit/receipt	Tue Mar 27 12:50:45 2018 +0200
   326.2 +++ b/p11-kit/receipt	Fri Mar 30 19:31:50 2018 +0300
   326.3 @@ -16,13 +16,12 @@
   326.4  SPLIT="libp11-kit p11-kit p11-kit-dev"
   326.5  
   326.6  compile_rules() {
   326.7 -	fix ld
   326.8  	./configure \
   326.9 -		--sysconfdir=/etc \
  326.10  		--with-trust-paths=/etc/pki/anchors \
  326.11  		$CONFIGURE_ARGS &&
  326.12  	fix libtool &&
  326.13 -	make && make install
  326.14 +	make &&
  326.15 +	make install
  326.16  }
  326.17  
  326.18  genpkg_rules() {
  326.19 @@ -41,4 +40,3 @@
  326.20  			;;
  326.21  	esac
  326.22  }
  326.23 -
   327.1 --- a/pam/receipt	Tue Mar 27 12:50:45 2018 +0200
   327.2 +++ b/pam/receipt	Fri Mar 30 19:31:50 2018 +0300
   327.3 @@ -7,7 +7,6 @@
   327.4  MAINTAINER="pascal.bellard@slitaz.org"
   327.5  LICENSE="BSD GPL2"
   327.6  WEB_SITE="http://www.linux-pam.org/"
   327.7 -HOST_ARCH="i486 arm x86_64"
   327.8  
   327.9  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  327.10  WGET_URL="http://www.linux-pam.org/library/Linux-PAM-$VERSION.tar.bz2"
  327.11 @@ -17,16 +16,14 @@
  327.12  
  327.13  compile_rules() {
  327.14  	./configure \
  327.15 -		--sysconfdir=/etc \
  327.16  		--libdir=/usr/lib \
  327.17  		--disable-regenerate-docu \
  327.18  		--enable-securedir=/lib/security \
  327.19 -		--docdir=/usr/share/doc/Linux-PAM-$VERSION \
  327.20  		$CONFIGURE_ARGS &&
  327.21 -	make && make install || return 1
  327.22 +	make &&
  327.23 +	make install || return 1
  327.24  
  327.25 -	mkdir -p $install/etc/pam.d
  327.26 -	cp $stuff/other $install/etc/pam.d
  327.27 +	install -Dm644 $stuff/other $install/etc/pam.d/other
  327.28  
  327.29  	chmod -v 4755 $install/sbin/unix_chkpwd
  327.30  
   328.1 --- a/pam_krb5/receipt	Tue Mar 27 12:50:45 2018 +0200
   328.2 +++ b/pam_krb5/receipt	Fri Mar 30 19:31:50 2018 +0300
   328.3 @@ -1,31 +1,25 @@
   328.4 -# SliTaz package receipt.
   328.5 +# SliTaz package receipt v2.
   328.6  
   328.7  PACKAGE="pam_krb5"
   328.8  VERSION="4.6"
   328.9  CATEGORY="system-tools"
  328.10 -SHORT_DESC="Kerberos v5 PAM module."
  328.11 +SHORT_DESC="Kerberos v5 PAM module"
  328.12  MAINTAINER="pascal.bellard@slitaz.org"
  328.13  LICENSE="GPL"
  328.14 -SOURCE="pam-krb5"
  328.15 -TARBALL="$SOURCE-$VERSION.tar.xz"
  328.16  WEB_SITE="http://www.eyrie.org/~eagle/software/pam-krb5/"
  328.17 +
  328.18 +TARBALL="pam-krb5-$VERSION.tar.xz"
  328.19  WGET_URL="http://archives.eyrie.org/software/kerberos/$TARBALL"
  328.20  
  328.21  BUILD_DEPENDS="pam-dev krb5-dev"
  328.22 -DEPENDS="pam libkrb5 libcomerr libcomerr3"
  328.23  
  328.24 -# Rules to configure and make the package.
  328.25 -compile_rules()
  328.26 -{
  328.27 -	cd $src
  328.28 -	./configure --prefix=/usr --infodir=/usr/share/info \
  328.29 -	--sysconfdir=/etc --mandir=/usr/share/man $CONFIGURE_ARGS &&
  328.30 +compile_rules() {
  328.31 +	./configure $CONFIGURE_ARGS &&
  328.32  	make &&
  328.33  	make DESTDIR=$DESTDIR install
  328.34  }
  328.35  
  328.36 -# Rules to gen a SliTaz package suitable for Tazpkg.
  328.37 -genpkg_rules()
  328.38 -{
  328.39 -	cp -a $install/lib $fs
  328.40 +genpkg_rules() {
  328.41 +	copy @std
  328.42 +	DEPENDS="pam libkrb5 libcomerr libcomerr3"
  328.43  }
   329.1 --- a/pam_ldap/receipt	Tue Mar 27 12:50:45 2018 +0200
   329.2 +++ b/pam_ldap/receipt	Fri Mar 30 19:31:50 2018 +0300
   329.3 @@ -1,31 +1,26 @@
   329.4 -# SliTaz package receipt.
   329.5 +# SliTaz package receipt v2.
   329.6  
   329.7  PACKAGE="pam_ldap"
   329.8  VERSION="185"
   329.9  CATEGORY="system-tools"
  329.10 -SHORT_DESC="Get and update authenticate from LDAP."
  329.11 +SHORT_DESC="Get and update authenticate from LDAP"
  329.12  MAINTAINER="pascal.bellard@slitaz.org"
  329.13  LICENSE="GPL2"
  329.14 +WEB_SITE="http://www.padl.com/OSS/pam_ldap.html"
  329.15 +
  329.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  329.17 -WEB_SITE="http://www.padl.com/OSS/pam_ldap.html"
  329.18  WGET_URL="http://www.padl.com/download/$TARBALL"
  329.19  
  329.20  BUILD_DEPENDS="pam-dev perl openldap-dev libldap"
  329.21 -DEPENDS="pam nss_ldap openssl libldap cyrus-sasl libcomerr3"
  329.22  
  329.23 -# Rules to configure and make the package.
  329.24 -compile_rules()
  329.25 -{
  329.26 -	cd $src
  329.27 +compile_rules() {
  329.28  	./vers_string -v
  329.29 -	./configure --prefix=/usr --infodir=/usr/share/info \
  329.30 -	--sysconfdir=/etc --mandir=/usr/share/man $CONFIGURE_ARGS &&
  329.31 +	./configure $CONFIGURE_ARGS &&
  329.32  	make $MAKEFLAGS &&
  329.33  	make DESTDIR=$DESTDIR install
  329.34  }
  329.35  
  329.36 -# Rules to gen a SliTaz package suitable for Tazpkg.
  329.37 -genpkg_rules()
  329.38 -{
  329.39 -	cp -a $install/usr/lib $fs
  329.40 +genpkg_rules() {
  329.41 +	copy @std
  329.42 +	DEPENDS="pam nss_ldap openssl libldap cyrus-sasl libcomerr3"
  329.43  }
   330.1 --- a/pam_mount/receipt	Tue Mar 27 12:50:45 2018 +0200
   330.2 +++ b/pam_mount/receipt	Fri Mar 30 19:31:50 2018 +0300
   330.3 @@ -1,36 +1,26 @@
   330.4 -# SliTaz package receipt.
   330.5 +# SliTaz package receipt v2.
   330.6  
   330.7  PACKAGE="pam_mount"
   330.8  VERSION="2.15"
   330.9  CATEGORY="system-tools"
  330.10 -SHORT_DESC="PAM Module that can mount volumes for a user session."
  330.11 +SHORT_DESC="PAM Module that can mount volumes for a user session"
  330.12  MAINTAINER="pascal.bellard@slitaz.org"
  330.13  LICENSE="GPL2 LGPL"
  330.14 +WEB_SITE="http://pam-mount.sourceforge.net/"
  330.15 +
  330.16  TARBALL="$PACKAGE-$VERSION.tar.xz"
  330.17 -WEB_SITE="http://pam-mount.sourceforge.net/"
  330.18  WGET_URL="$SF_MIRROR/pam-mount/$TARBALL"
  330.19  
  330.20  BUILD_DEPENDS="pam-dev libhx libhx-dev openssl-dev libxml2-dev \
  330.21  util-linux-mount-dev util-linux-blkid-dev util-linux-uuid-dev pcre-dev perl"
  330.22 -DEPENDS="pam openssl libxml2 libhx zlib"
  330.23  
  330.24 -# Rules to configure and make the package.
  330.25 -compile_rules()
  330.26 -{
  330.27 -	./configure --prefix=/usr \
  330.28 -		--sysconfdir=/etc --localstatedir=/var \
  330.29 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
  330.30 +compile_rules() {
  330.31 +	./configure $CONFIGURE_ARGS &&
  330.32  	make &&
  330.33  	make DESTDIR=$DESTDIR install
  330.34  }
  330.35  
  330.36 -# Rules to gen a SliTaz package suitable for Tazpkg.
  330.37 -genpkg_rules()
  330.38 -{
  330.39 -	mkdir -p $fs/usr
  330.40 -	cp -a $install/usr/sbin $fs/usr
  330.41 -	cp -a $install/sbin $fs
  330.42 -	cp -a $install/etc $fs
  330.43 -	cp -a $install/lib $fs
  330.44 -	cp -a $install/var $fs
  330.45 +genpkg_rules() {
  330.46 +	copy @std
  330.47 +	DEPENDS="pam openssl libxml2 libhx zlib"
  330.48  }
   331.1 --- a/pango/receipt	Tue Mar 27 12:50:45 2018 +0200
   331.2 +++ b/pango/receipt	Fri Mar 30 19:31:50 2018 +0300
   331.3 @@ -23,9 +23,11 @@
   331.4  	esac
   331.5  
   331.6  	./configure \
   331.7 -		--sysconfdir=/etc \
   331.8 -		$CONFIGURE_ARGS $ARCH_ARGS &&
   331.9 -	make && make install
  331.10 +		$ARCH_ARGS \
  331.11 +		$CONFIGURE_ARGS &&
  331.12 +	fix libtool &&
  331.13 +	make &&
  331.14 +	make install
  331.15  }
  331.16  
  331.17  genpkg_rules() {
   332.1 --- a/pangox-compat/receipt	Tue Mar 27 12:50:45 2018 +0200
   332.2 +++ b/pangox-compat/receipt	Fri Mar 30 19:31:50 2018 +0300
   332.3 @@ -15,10 +15,7 @@
   332.4  SPLIT="pangox-compat-dev"
   332.5  
   332.6  compile_rules() {
   332.7 -	./configure \
   332.8 -		--prefix=/usr \
   332.9 -		--sysconfdir=/etc \
  332.10 -		$CONFIGURE_ARGS &&
  332.11 +	./configure $CONFIGURE_ARGS &&
  332.12  	make &&
  332.13  	make install
  332.14  }
  332.15 @@ -26,16 +23,11 @@
  332.16  genpkg_rules() {
  332.17  	case $PACKAGE in
  332.18  		pangox-compat)
  332.19 -			mkdir -p $fs/usr/lib
  332.20 -			cp -a $install/etc $fs
  332.21 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
  332.22 +			copy @std
  332.23  			DEPENDS="glib glibc-base libffi pango pcre xorg-libX11"
  332.24  			;;
  332.25  		*-dev)
  332.26 -			mkdir -p $fs/usr/lib
  332.27 -			cp -a $install/usr/include $fs/usr
  332.28 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  332.29 -			cp -a $install/usr/lib/*.*a $fs/usr/lib
  332.30 +			copy @dev
  332.31  			DEPENDS="glib-dev libffi-dev xorg-libxcb-dev pango-dev \
  332.32  			pangox-compat pcre-dev xorg-libX11-dev xorg-libXau-dev \
  332.33  			xorg-libXdmcp-dev"
   333.1 --- a/parole/receipt	Tue Mar 27 12:50:45 2018 +0200
   333.2 +++ b/parole/receipt	Fri Mar 30 19:31:50 2018 +0300
   333.3 @@ -16,10 +16,7 @@
   333.4  SPLIT="parole-dev"
   333.5  
   333.6  compile_rules() {
   333.7 -	fix ld
   333.8  	./configure \
   333.9 -		--sysconfdir=/etc \
  333.10 -		--localstatedir=/var \
  333.11  		--disable-debug \
  333.12  		--disable-gtk-doc \
  333.13  		$CONFIGURE_ARGS &&
   334.1 --- a/parted/receipt	Tue Mar 27 12:50:45 2018 +0200
   334.2 +++ b/parted/receipt	Fri Mar 30 19:31:50 2018 +0300
   334.3 @@ -16,7 +16,6 @@
   334.4  SPLIT="parted-dev"
   334.5  
   334.6  compile_rules() {
   334.7 -	fix ld
   334.8  	./configure \
   334.9  		--disable-device-mapper \
  334.10  		--disable-static \
   335.1 --- a/partimage/receipt	Tue Mar 27 12:50:45 2018 +0200
   335.2 +++ b/partimage/receipt	Fri Mar 30 19:31:50 2018 +0300
   335.3 @@ -11,115 +11,74 @@
   335.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   335.5  
   335.6  BUILD_DEPENDS="newt newt-dev slang-dev bzip2-dev openssl-dev zlib-dev pam-dev"
   335.7 -SPLIT="partimage partimage-pam"
   335.8 +SPLIT="partimage partimage-pam:pam"
   335.9  
  335.10 -# Rules to configure and make the package.
  335.11 -compile_rules()
  335.12 -{
  335.13 +compile_rules() {
  335.14 +	case $SET in
  335.15 +		'')  SET_ARGS='--disable-pam';;
  335.16 +		pam) SET_ARGS='--enable-pam';;
  335.17 +	esac
  335.18 +
  335.19  	sed -i 's/gzFile \*m_gzImageFile/gzFile m_gzImageFile/' src/client/imagefile.h
  335.20  	sed -i 's/(gzFile \*) gzdopen/gzdopen/' src/client/imagefile.cpp
  335.21  
  335.22 -	cp -a $src $src-pam
  335.23 -
  335.24  	./configure \
  335.25 -		--prefix=/usr \
  335.26 -		--disable-pam \
  335.27 -		--sysconfdir=/etc \
  335.28 -		--infodir=/usr/share/info \
  335.29 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
  335.30 +		$SET_ARGS \
  335.31 +		$CONFIGURE_ARGS &&
  335.32  	make &&
  335.33  	make DESTDIR=$DESTDIR install || return 1
  335.34  
  335.35 -	cd $src-pam
  335.36 -	./configure \
  335.37 -		--prefix=/usr \
  335.38 -		--enable-pam \
  335.39 -		--sysconfdir=/etc \
  335.40 -		--infodir=/usr/share/info \
  335.41 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
  335.42 -	make &&
  335.43 -	make DESTDIR=$DESTDIR-pam install
  335.44 +	install -Dm600 $stuff/etc/partimaged/partimaged.cert $install/etc/partimaged/partimaged.cert
  335.45 +	install -Dm600 $stuff/etc/partimaged/partimaged.key  $install/etc/partimaged/partimaged.key
  335.46 +	install -Dm755 $stuff/etc/init.d/partimaged          $install/etc/init.d/partimaged
  335.47 +
  335.48 +	mkdir -p $install/var/lib/partimaged/
  335.49  }
  335.50  
  335.51 -# Rules to gen a SliTaz package suitable for Tazpkg.
  335.52 -genpkg_rules()
  335.53 -{
  335.54 +genpkg_rules() {
  335.55  	case $PACKAGE in
  335.56 -	partimage)
  335.57 -		DEPENDS="newt bzip2 openssl slitaz-base-files zlib gcc-lib-base"
  335.58 -		mkdir -p $fs/usr $fs/etc/init.d $fs/var/lib/partimaged
  335.59 -		cp -a $install/usr/sbin $fs/usr
  335.60 -		cp -a $install/etc $fs/
  335.61 -		install -g root -o root -m 0600 stuff/etc/partimaged/partimaged.* $fs/etc/partimaged
  335.62 -		install -g root -o root -m 0755 stuff/etc/init.d/partimaged $fs/etc/init.d
  335.63 -		;;
  335.64 -	partimage-pam)
  335.65 -		CAT="system-tools|using PAM"
  335.66 -		PROVIDE="partimage:pam"
  335.67 -		DEPENDS="newt bzip2 openssl slitaz-base-files zlib pam gcc-lib-base"
  335.68 -		mkdir -p $fs/usr $fs/etc/init.d $fs/var/lib/partimaged
  335.69 -		cp -a $install-pam/usr/sbin $fs/usr
  335.70 -		cp -a $install-pam/etc $fs/
  335.71 -		install -g root -o root -m 0600 stuff/etc/partimaged/partimaged.* $fs/etc/partimaged
  335.72 -		install -g root -o root -m 0755 stuff/etc/init.d/partimaged $fs/etc/init.d
  335.73 -		;;
  335.74 +		partimage)
  335.75 +			copy @std
  335.76 +			DEPENDS="newt bzip2 openssl slitaz-base-files zlib gcc-lib-base"
  335.77 +			;;
  335.78 +		partimage-pam)
  335.79 +			copy @std
  335.80 +			CAT="system-tools|using PAM"
  335.81 +			PROVIDE="partimage:pam"
  335.82 +			DEPENDS="newt bzip2 openssl slitaz-base-files zlib pam gcc-lib-base"
  335.83 +			;;
  335.84  	esac
  335.85  }
  335.86  
  335.87 -post_install_partimage()
  335.88 -{
  335.89 -	echo
  335.90 -	echo "Adding user/group partimag..."
  335.91 +# The same post-install/remove rules for both PAM/non-PAM packages
  335.92 +
  335.93 +post_install() {
  335.94 +	# Adding user/group partimag...
  335.95  	chroot "$1/" adduser -S -H -D partimag
  335.96  
  335.97 -	echo "Setting permissions for config files"
  335.98 +	# Setting permissions for config files
  335.99  	chmod 0600 "$1"/etc/partimaged/*
 335.100 -	chroot "$1/" chown partimag.partimag "$1"/etc/partimaged/*	
 335.101 +	chroot "$1/" chown partimag.partimag "$1"/etc/partimaged/*
 335.102  
 335.103 -	echo "Creating image files directory"
 335.104 +	# Creating image files directory
 335.105  	chroot "$1/" install -g partimag -o partimag -m 0755 -d "$1/var/lib/partimaged"
 335.106  
 335.107 -	echo ""
 335.108 -	echo -e "\nTo starts partimage server you can run :\n"
 335.109 -	echo "/etc/init.d/partimaged start"
 335.110 -	echo -e "Or add partimaged to RUN_DAEMONS in /etc/rcS.conf\n"
 335.111 +	[ -n "$quiet" ] || cat <<EOT
 335.112 +
 335.113 +	.---------------------------------------------------.
 335.114 +	| To starts partimage server you can run:           |
 335.115 +	|   /etc/init.d/partimaged start                    |
 335.116 +	|                                                   |
 335.117 +	| Or add partimaged to RUN_DAEMONS in /etc/rcS.conf |
 335.118 +	'---------------------------------------------------'
 335.119 +EOT
 335.120  }
 335.121  
 335.122 -post_remove_partimage()
 335.123 -{
 335.124 -	chroot "$1/" deluser partimag
 335.125 +post_remove() {
 335.126 +	chroot "$1/" deluser  partimag
 335.127  	chroot "$1/" delgroup partimag
 335.128  
 335.129  	if [ -f "$1/etc/paritimaged" ]; then
 335.130  		rm -rf "$1/etc/partimaged"
 335.131  	fi
 335.132  }
 335.133 -
 335.134 -post_install_partimage_pam()
 335.135 -{
 335.136 -	echo
 335.137 -	echo "Adding user/group partimag..."
 335.138 -	chroot "$1/" adduser -S -H -D partimag
 335.139 -
 335.140 -	echo "Setting permissions for config files"
 335.141 -	chmod 0600 "$1"/etc/partimaged/*
 335.142 -	chroot "$1/" chown partimag.partimag "$1"/etc/partimaged/*	
 335.143 -
 335.144 -	echo "Creating image files directory"
 335.145 -	chroot "$1/" install -g partimag -o partimag -m 0755 -d "$1/var/lib/partimaged"
 335.146 -
 335.147 -	echo ""
 335.148 -	echo -e "\nTo starts partimage server you can run :\n"
 335.149 -	echo "/etc/init.d/partimaged start"
 335.150 -	echo -e "Or add partimaged to RUN_DAEMONS in /etc/rcS.conf\n"
 335.151 -}
 335.152 -
 335.153 -post_remove_partimage_pam()
 335.154 -{
 335.155 -	chroot "$1/" deluser partimag
 335.156 -	chroot "$1/" delgroup partimag
 335.157 -
 335.158 -	if [ -f "$1/etc/paritimaged" ]; then
 335.159 -		rm -rf "$1/etc/partimaged"
 335.160 -	fi
 335.161 -}
   336.1 --- a/pce/receipt	Tue Mar 27 12:50:45 2018 +0200
   336.2 +++ b/pce/receipt	Fri Mar 30 19:31:50 2018 +0300
   336.3 @@ -1,32 +1,27 @@
   336.4 -# SliTaz package receipt.
   336.5 +# SliTaz package receipt v2.
   336.6  
   336.7  PACKAGE="pce"
   336.8  VERSION="20140222-4b05f0c"
   336.9  CATEGORY="misc"
  336.10 -SHORT_DESC="A collection of microcomputer emulators."
  336.11 +SHORT_DESC="A collection of microcomputer emulators"
  336.12  MAINTAINER="pascal.bellard@slitaz.org"
  336.13  LICENSE="GPL2"
  336.14 +WEB_SITE="http://www.hampa.ch/pce/about.html"
  336.15 +
  336.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  336.17 -WEB_SITE="http://www.hampa.ch/pce/about.html"
  336.18  WGET_URL="http://www.hampa.ch/pub/pce/pre/$TARBALL"
  336.19 -TAGS="emulator atari macplus"
  336.20  
  336.21 -DEPENDS="readline ncurses libsdl xorg-libX11 xorg-libxcb xorg-libXau xorg-libXdmcp"
  336.22  BUILD_DEPENDS="readline-dev ncurses-dev libsdl-dev xorg-dev"
  336.23  
  336.24 -# Rules to configure and make the package.
  336.25 -compile_rules()
  336.26 -{
  336.27 -	./configure --prefix=/usr \
  336.28 -		--sysconfdir=/etc \
  336.29 -		--mandir=/usr/share/man \
  336.30 -		$CONFIGURE_ARGS &&
  336.31 +compile_rules() {
  336.32 +	./configure $CONFIGURE_ARGS &&
  336.33  	make &&
  336.34  	make DESTDIR=$DESTDIR install
  336.35  }
  336.36  
  336.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
  336.38 -genpkg_rules()
  336.39 -{
  336.40 -	cp -a $install/* $fs/
  336.41 +genpkg_rules() {
  336.42 +	copy @std
  336.43 +	DEPENDS="readline ncurses libsdl xorg-libX11 xorg-libxcb xorg-libXau \
  336.44 +	xorg-libXdmcp"
  336.45 +	TAGS="emulator atari macplus"
  336.46  }
   337.1 --- a/pcmanfm/receipt	Tue Mar 27 12:50:45 2018 +0200
   337.2 +++ b/pcmanfm/receipt	Fri Mar 30 19:31:50 2018 +0300
   337.3 @@ -22,10 +22,9 @@
   337.4  	# tarball from git.lxde.org requires this step
   337.5  	[ -e "$src/configure" ] || ./autogen.sh
   337.6  
   337.7 -	./configure \
   337.8 -		--sysconfdir=/etc \
   337.9 -		$CONFIGURE_ARGS &&
  337.10 -	make && make install || return 1
  337.11 +	./configure $CONFIGURE_ARGS &&
  337.12 +	make &&
  337.13 +	make install || return 1
  337.14  
  337.15  	mkdir -p $install/etc/xdg/pcmanfm/
  337.16  	# default settings
   338.1 --- a/pdnsd/receipt	Tue Mar 27 12:50:45 2018 +0200
   338.2 +++ b/pdnsd/receipt	Fri Mar 30 19:31:50 2018 +0300
   338.3 @@ -1,53 +1,50 @@
   338.4 -# SliTaz package receipt.
   338.5 +# SliTaz package receipt v2.
   338.6  
   338.7  PACKAGE="pdnsd"
   338.8  VERSION="1.2.9a"
   338.9  CATEGORY="network"
  338.10 -SHORT_DESC="A proxy DNS server with permanent caching."
  338.11 +SHORT_DESC="A proxy DNS server with permanent caching"
  338.12  MAINTAINER="pascal.bellard@slitaz.org"
  338.13  LICENSE="GPL3"
  338.14  WEB_SITE="http://members.home.nl/p.a.rombouts/pdnsd"
  338.15 +
  338.16  TARBALL="$PACKAGE-$VERSION-par.tar.gz"
  338.17  WGET_URL="$WEB_SITE/releases/$TARBALL"
  338.18 -CONFIG_FILES="/etc/pdnsd.conf"
  338.19  
  338.20 -DEPENDS=""
  338.21 -BUILD_DEPENDS=""
  338.22 +compile_rules() {
  338.23 +	./configure $CONFIGURE_ARGS &&
  338.24 +	make &&
  338.25 +	make DESTDIR=$DESTDIR install || return 1
  338.26  
  338.27 -# Rules to configure and make the package.
  338.28 -compile_rules()
  338.29 -{
  338.30 -	cd $src
  338.31 -	./configure --prefix=/usr --sysconfdir=/etc $CONFIGURE_ARGS &&
  338.32 -	make && make DESTDIR=$DESTDIR install
  338.33 +	mv $install/etc/pdnsd.conf.sample $install/etc/pdnsd.conf
  338.34  }
  338.35  
  338.36 -# Rules to gen a SliTaz package suitable for Tazpkg.
  338.37 -genpkg_rules()
  338.38 -{
  338.39 -	cp -a $install/* $fs
  338.40 -	rm -rf $fs/usr/share
  338.41 -	mv $fs/etc/pdnsd.conf.sample $fs/etc/pdnsd.conf
  338.42 +genpkg_rules() {
  338.43 +	copy @std
  338.44 +	CONFIG_FILES="/etc/pdnsd.conf"
  338.45  }
  338.46  
  338.47 -# Pre and post install commands for Tazpkg.
  338.48 -pre_remove()
  338.49 -{
  338.50 +pre_remove() {
  338.51  	sed -i 's/pdnsd//' "$1/etc/rcS.conf"
  338.52  	rm -f "$1/etc/init.d/pdnsd"
  338.53  }
  338.54  
  338.55 -post_install()
  338.56 -{
  338.57 +post_install() {
  338.58  	local tmp
  338.59 +
  338.60  	tmp=$(route -n | awk '/^0.0.0.0/ { print $8; }')
  338.61  	[ -n "$tmp" ] && sed -i "s/eth0/$tmp/" "$1/etc/pdnsd.conf"
  338.62 +
  338.63  	tmp=$(sed '/nameserver/!d;s/nameserver //;q' < /etc/resolv.conf)
  338.64  	[ -n "$tmp" ] && sed -i "s/192\.168\.0\.1/$tmp/" "$1/etc/pdnsd.conf"
  338.65 -	tmp=
  338.66 -	[ -s "$1/etc/init.d/daemon" ] && ln -s daemon "$1/etc/init.d/pdnsd" &&
  338.67 -		tmp=" and add pdnsd to RUN_DAEMONS in /etc/rcS.conf"
  338.68 -	cat <<EOT
  338.69 -Now you can check /etc/pdnsd.conf$tmp.
  338.70 +
  338.71 +	ln -s daemon "$1/etc/init.d/pdnsd"
  338.72 +
  338.73 +	[ -n "$quiet" ] || cat <<EOT
  338.74 +
  338.75 +	.-----------------------------------------------.
  338.76 +	| Now you can check /etc/pdnsd.conf             |
  338.77 +	| and add pdnsd to RUN_DAEMONS in /etc/rcS.conf |
  338.78 +	'-----------------------------------------------'
  338.79  EOT
  338.80  }
   339.1 --- a/pekwm/receipt	Tue Mar 27 12:50:45 2018 +0200
   339.2 +++ b/pekwm/receipt	Fri Mar 30 19:31:50 2018 +0300
   339.3 @@ -1,48 +1,41 @@
   339.4 -# SliTaz package receipt.
   339.5 +# SliTaz package receipt v2.
   339.6  
   339.7  PACKAGE="pekwm"
   339.8  VERSION="0.1.13"
   339.9  CATEGORY="x-window"
  339.10 -SHORT_DESC="Very light, configurable and themable window manager for X."
  339.11 +SHORT_DESC="Very light, configurable and themable window manager for X"
  339.12  MAINTAINER="jozee@slitaz.org"
  339.13  LICENSE="GPL2"
  339.14 -SUGGESTED="hsetroot tint2 lxpanel wbar xorg-xprop xorg-xev xdotool wmctrl"
  339.15 +WEB_SITE="http://www.pekwm.org/projects/pekwm"
  339.16 +
  339.17  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  339.18 -WEB_SITE="http://www.pekwm.org/projects/pekwm"
  339.19  WGET_URL="$WEB_SITE/files/$TARBALL"
  339.20 -TAGS="window-manager"
  339.21  
  339.22 -DEPENDS="xorg-libX11 xorg-libXinerama xorg-libXft xorg-libXrandr xorg-libXpm"
  339.23  BUILD_DEPENDS="xorg-dev xorg-dev-proto zlib-dev"
  339.24  
  339.25 -# Rules to configure and make the package.
  339.26 -compile_rules()
  339.27 -{
  339.28 -	cd $src
  339.29 -	./configure --prefix=/usr --sysconfdir=/etc $CONFIGURE_ARGS &&
  339.30 +compile_rules() {
  339.31 +	./configure $CONFIGURE_ARGS &&
  339.32  	make &&
  339.33 -	make DESTDIR=$DESTDIR install
  339.34 +	make DESTDIR=$DESTDIR install || return 1
  339.35 +
  339.36 +	# Custom configuration files and scripts
  339.37 +	cp -r $stuff/etc     $install
  339.38 +	cp -r $stuff/scripts $install/usr/share/pekwm/
  339.39 +
  339.40 +	# Set perms.
  339.41 +	chown -R root:root $install
  339.42 +	chmod +x   $install/etc/pekwm/start
  339.43 +	chmod +x   $install/usr/share/pekwm/scripts/*
  339.44  }
  339.45  
  339.46 -# Rules to gen a SliTaz package suitable for Tazpkg.
  339.47 -genpkg_rules()
  339.48 -{
  339.49 -	mkdir -p $fs/usr/bin $fs/usr/share/pekwm $fs/etc
  339.50 -	cp -a $install/usr/bin $fs/usr
  339.51 -	cp -a $install/usr/share/pekwm $fs/usr/share
  339.52 -	cp -a $install/etc $fs
  339.53 -	# Custom configuration files and scripts
  339.54 -	cp -a $stuff/etc $fs
  339.55 -	cp -a $stuff/scripts $fs/usr/share/pekwm
  339.56 -	# Set perms.
  339.57 -	chown -R root.root $fs
  339.58 -	chmod +x $fs/etc/pekwm/start
  339.59 -	chmod +x $fs/usr/share/pekwm/scripts/*
  339.60 -	chmod 0755 $fs/usr/bin/pekwm
  339.61 +genpkg_rules() {
  339.62 +	copy @std
  339.63 +	DEPENDS="xorg-libX11 xorg-libXinerama xorg-libXft xorg-libXrandr xorg-libXpm"
  339.64 +	SUGGESTED="hsetroot tint2 lxpanel wbar xorg-xprop xorg-xev xdotool wmctrl"
  339.65 +	TAGS="window-manager"
  339.66  }
  339.67  
  339.68 -post_install()
  339.69 -{
  339.70 +post_install() {
  339.71  	# Pekwm searches for default font path (100dpi folder) for xsever to render 
  339.72  	# menus; either manually set it in .xinitrc or fake 100dpi folder fonts 
  339.73  	# by linking to ttf-dejavu
  339.74 @@ -55,14 +48,11 @@
  339.75  	res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//)
  339.76  	# Adding WM to SLIM available sessions.
  339.77  	if ! echo "$res" | grep -q $PACKAGE; then
  339.78 -		echo -n "Adding $PACKAGE to /etc/slim.conf..."
  339.79  		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" "$1/etc/slim.conf"
  339.80 -		status
  339.81  	fi
  339.82  }
  339.83  
  339.84 -post_remove()
  339.85 -{
  339.86 +post_remove() {
  339.87  	# Remove WM from SLIM available sessions.
  339.88  	if grep -q $PACKAGE "$1/etc/slim.conf"; then
  339.89  		sed -i s/,$PACKAGE// "$1/etc/slim.conf"
   340.1 --- a/perdition/receipt	Tue Mar 27 12:50:45 2018 +0200
   340.2 +++ b/perdition/receipt	Fri Mar 30 19:31:50 2018 +0300
   340.3 @@ -3,111 +3,105 @@
   340.4  PACKAGE="perdition"
   340.5  VERSION="2.1"
   340.6  CATEGORY="network"
   340.7 -SHORT_DESC="IMAP/POP proxy."
   340.8 +SHORT_DESC="IMAP/POP proxy"
   340.9  MAINTAINER="pascal.bellard@slitaz.org"
  340.10  LICENSE="GPL2"
  340.11 +WEB_SITE="http://www.vergenet.net/linux/$PACKAGE"
  340.12 +
  340.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
  340.14 -WEB_SITE="http://www.vergenet.net/linux/$PACKAGE"
  340.15  WGET_URL="$WEB_SITE/download/$VERSION/$TARBALL"
  340.16 -CONFIG_FILES="/etc/perdition"
  340.17 -BUGS="Very slow: more than 10 seconds for login with squirrelmail, why ?"
  340.18  
  340.19  BUILD_DEPENDS="vanessa_logger-dev vanessa_adt-dev vanessa_socket-dev \
  340.20  openldap-dev popt-dev cyrus-sasl-dev openssl-dev libidn-dev pam-dev"
  340.21 -SPLIT="perdition perdition-pam perdition-dev"
  340.22 +SPLIT="perdition perdition-dev perdition-pam:pam"
  340.23  
  340.24 -# Rules to configure and make the package.
  340.25 -compile_rules()
  340.26 -{
  340.27 -	cp -a $src $src-pam
  340.28 -	./configure --prefix=/usr --infodir=/usr/share/info \
  340.29 -		--disable-ldap-doc --disable-nis \
  340.30 -		--disable-odbc --disable-mysql --disable-pg --disable-bdb \
  340.31 -		--disable-cdb --disable-gdbm --disable-pam \
  340.32 -		--sysconfdir=/etc --localstatedir=/var \
  340.33 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
  340.34 +BUGS="Very slow: more than 10 seconds for login with squirrelmail, why?"
  340.35 +
  340.36 +compile_rules() {
  340.37 +	case $SET in
  340.38 +		'')  SET_ARGS='--disable-pam';;
  340.39 +		pam) SET_ARGS='';;
  340.40 +	esac
  340.41 +
  340.42 +	./configure \
  340.43 +		--disable-ldap-doc \
  340.44 +		--disable-nis \
  340.45 +		--disable-odbc \
  340.46 +		--disable-mysql \
  340.47 +		--disable-pg \
  340.48 +		--disable-bdb \
  340.49 +		--disable-cdb \
  340.50 +		--disable-gdbm \
  340.51 +		$SET_ARGS \
  340.52 +		$CONFIGURE_ARGS &&
  340.53  	make &&
  340.54 -	make DESTDIR=$DESTDIR install || return 1
  340.55 -
  340.56 -	cd $src-pam
  340.57 -	./configure --prefix=/usr --infodir=/usr/share/info \
  340.58 -		--disable-ldap-doc --disable-nis \
  340.59 -		--disable-odbc --disable-mysql --disable-pg --disable-bdb \
  340.60 -		--disable-cdb --disable-gdbm \
  340.61 -		--sysconfdir=/etc --localstatedir=/var \
  340.62 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
  340.63 -	make &&
  340.64 -	make DESTDIR=$DESTDIR-pam install
  340.65 +	make DESTDIR=$DESTDIR install
  340.66  }
  340.67  
  340.68 -# Rules to gen a SliTaz package suitable for Tazpkg.
  340.69 -genpkg_rules()
  340.70 -{
  340.71 +genpkg_rules() {
  340.72  	case $PACKAGE in
  340.73 -	perdition|perdition-pam)
  340.74 -		DEPENDS="vanessa_logger vanessa_adt vanessa_socket libldap \
  340.75 +		perdition|perdition-pam)
  340.76 +			DEPENDS="vanessa_logger vanessa_adt vanessa_socket libldap \
  340.77  			openssl cyrus-sasl glibc-base libkrb5 libcomerr3 gdbm"
  340.78 -		if [ $PACKAGE == 'perdition-pam' ]; then
  340.79 -			CAT="network|with PAM support"
  340.80 -			DEPENDS="$DEPENDS pam"
  340.81 -			PROVIDE="perdition:pam"
  340.82 -			install=$install-pam
  340.83 -		fi
  340.84 -		mkdir -p $fs/usr/lib $fs/etc/openldap/schema
  340.85 -		cp -a $install/etc $fs
  340.86 -		rm -f $fs/etc/perdition/perdition.conf
  340.87 -		cp -a $stuff/etc $fs
  340.88 -		cp -a $install/usr/sbin $fs/usr
  340.89 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
  340.90 -		for i in pop3 pop3s imap4 imap4s imaps; do
  340.91 -			mkdir -p $fs/var/run/perdition.$i
  340.92 -		done
  340.93 -		cp $src/perdition/db/ldap/perdition.schema $fs/etc/openldap/schema
  340.94 -		;;
  340.95 -	perdition-dev)
  340.96 -		DEPENDS="perdition"
  340.97 -		mkdir -p $fs/usr/lib
  340.98 -		cp -a $install/usr/lib/*.a $fs/usr/lib
  340.99 -		;;
 340.100 +			if [ $PACKAGE == 'perdition-pam' ]; then
 340.101 +				CAT="network|with PAM support"
 340.102 +				DEPENDS="$DEPENDS pam"
 340.103 +				PROVIDE="perdition:pam"
 340.104 +			fi
 340.105 +			mkdir -p $fs/usr/lib $fs/etc/openldap/schema
 340.106 +			cp -a $install/etc $fs
 340.107 +			rm -f $fs/etc/perdition/perdition.conf
 340.108 +			cp -a $stuff/etc $fs
 340.109 +			cp -a $install/usr/sbin $fs/usr
 340.110 +			cp -a $install/usr/lib/*.so* $fs/usr/lib
 340.111 +			for i in pop3 pop3s imap4 imap4s imaps; do
 340.112 +				mkdir -p $fs/var/run/perdition.$i
 340.113 +			done
 340.114 +			cp $src/perdition/db/ldap/perdition.schema $fs/etc/openldap/schema
 340.115 +			CONFIG_FILES="/etc/perdition"
 340.116 +			;;
 340.117 +		perdition-dev)
 340.118 +			copy @dev
 340.119 +			DEPENDS="perdition"
 340.120 +			;;
 340.121  	esac
 340.122  }
 340.123  
 340.124 -# Pre and post install commands for Tazpkg.
 340.125 -post_install_perdition()
 340.126 -{
 340.127 +post_install_perdition() {
 340.128  	for i in pop3 pop3s imap4 imap4s imaps; do
 340.129  		chown nobody.nogroup "$1/var/run/perdition.$i"
 340.130  	done
 340.131 -	cat <<EOF
 340.132 -----
 340.133 -Perdition will forward to the 127.0.0.1:50143 imap server.
 340.134 -Can you change listen="imap" to listen="50143" in /etc/cyrus.conf
 340.135 -and restart cyrus-imap, or modify files in /etc/perdition.
 340.136 -To start perdition server you can run :
 340.137  
 340.138 -    /etc/init.d/perdition start
 340.139 -    
 340.140 -Or add perdition to RUN_DAEMONS in /etc/rcS.conf
 340.141 -----
 340.142 +	[ -n "$quiet " ] || cat <<EOF
 340.143 +
 340.144 +	.-------------------------------------------------------------------.
 340.145 +	| Perdition will forward to the 127.0.0.1:50143 imap server.        |
 340.146 +	| Can you change listen="imap" to listen="50143" in /etc/cyrus.conf |
 340.147 +	| and restart cyrus-imap, or modify files in /etc/perdition.        |
 340.148 +	|                                                                   |
 340.149 +	| To start perdition server you can run:                            |
 340.150 +	|   /etc/init.d/perdition start                                     |
 340.151 +	|                                                                   |
 340.152 +	| Or add perdition to RUN_DAEMONS in /etc/rcS.conf                  |
 340.153 +	'-------------------------------------------------------------------'
 340.154  EOF
 340.155  }
 340.156  
 340.157 -# Pre and post install commands for Tazpkg.
 340.158 -post_install_perdition_pam()
 340.159 -{
 340.160 +post_install_perdition_pam() {
 340.161  	for i in pop3 pop3s imap4 imap4s imaps; do
 340.162  		chown nobody.nogroup "$1/var/run/perdition.$i"
 340.163  	done
 340.164 -	cat <<EOF
 340.165 -----
 340.166 -Perdition will forward to the 127.0.0.1:50143 imap server.
 340.167 -Can you change listen="imap" to listen="50143" in /etc/cyrus.conf
 340.168 -and restart cyrus-imap, or modify files in /etc/perdition.
 340.169 -To start perdition server you can run :
 340.170 +	[ -n "$quiet" ] || cat <<EOF
 340.171  
 340.172 -    /etc/init.d/perdition start
 340.173 -    
 340.174 -Or add perdition to RUN_DAEMONS in /etc/rcS.conf
 340.175 -----
 340.176 +	.-------------------------------------------------------------------.
 340.177 +	| Perdition will forward to the 127.0.0.1:50143 imap server.        |
 340.178 +	| Can you change listen="imap" to listen="50143" in /etc/cyrus.conf |
 340.179 +	| and restart cyrus-imap, or modify files in /etc/perdition.        |
 340.180 +	|                                                                   |
 340.181 +	| To start perdition server you can run:                            |
 340.182 +	|   /etc/init.d/perdition start                                     |
 340.183 +	|                                                                   |
 340.184 +	| Or add perdition to RUN_DAEMONS in /etc/rcS.conf                  |
 340.185 +	'-------------------------------------------------------------------'
 340.186  EOF
 340.187  }
   341.1 --- a/php/receipt	Tue Mar 27 12:50:45 2018 +0200
   341.2 +++ b/php/receipt	Fri Mar 30 19:31:50 2018 +0300
   341.3 @@ -3,13 +3,15 @@
   341.4  PACKAGE="php"
   341.5  VERSION="5.5.13"
   341.6  CATEGORY="development"
   341.7 -SHORT_DESC="PHP web programming language."
   341.8 +SHORT_DESC="PHP web programming language"
   341.9  MAINTAINER="pankso@slitaz.org"
  341.10  LICENSE="BSD"
  341.11 +WEB_SITE="http://www.php.net/"
  341.12 +
  341.13  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  341.14 -WEB_SITE="http://www.php.net/"
  341.15  WGET_URL="http://www.php.net/distributions/$TARBALL"
  341.16  
  341.17 +BUILD_DEPENDS_arm="sqlite3-dev libxml2-dev zlib-dev curl-dev"
  341.18  BUILD_DEPENDS="sqlite3-dev libxml2-dev zlib-dev libmysqlclient mysql-dev \
  341.19  net-snmp-dev postgresql-dev gettext openssl-dev apache-dev apr-util-dev \
  341.20  c-client mhash-dev libpng16-dev libunixODBC unixODBC-dev openldap-dev \
  341.21 @@ -19,13 +21,37 @@
  341.22  php-gd php-imap php-ldap php-mcrypt php-mysqli php-mysql php-odbc php-openssl \
  341.23  php-pdo-mysql php-pdo-pgsql php-pear php-pgsql php-snmp php-soap php-sqlite"
  341.24  
  341.25 -case "$ARCH" in
  341.26 -	i?86)
  341.27 -		ARCH_ARGS="\
  341.28 +
  341.29 +compile_rules() {
  341.30 +	case "$ARCH" in
  341.31 +		arm*)
  341.32 +			ARCH_ARGS="\
  341.33  			--prefix=/usr \
  341.34  			--sysconfdir=/etc \
  341.35  			--infodir=/usr/share/info \
  341.36  			--mandir=/usr/share/man \
  341.37 +			--config-cache \
  341.38 +			--enable-mbstring \
  341.39 +			--enable-sockets \
  341.40 +			--enable-ftp \
  341.41 +			--enable-zip \
  341.42 +			--enable-calendar \
  341.43 +			--enable-exif \
  341.44 +			--enable-dba=shared \
  341.45 +			--enable-sqlite-utf8 \
  341.46 +			--with-mhash \
  341.47 +			--with-sqlite=shared \
  341.48 +			--with-config-file-path=/etc \
  341.49 +			--with-zlib \
  341.50 +			--with-gettext \
  341.51 +			--with-curl=shared \
  341.52 +			--with-openssl=shared \
  341.53 +			--with-jpeg-dir=/usr \
  341.54 +			--with-png-dir=/usr \
  341.55 +			--with-apxs2=/usr/bin/apxs"
  341.56 +			;;
  341.57 +		*)
  341.58 +			ARCH_ARGS="\
  341.59  			--enable-mbstring \
  341.60  			--enable-sockets \
  341.61  			--enable-ftp \
  341.62 @@ -60,267 +86,221 @@
  341.63  			--with-pdo-pgsql=shared \
  341.64  			--with-curl=shared \
  341.65  			--with-sqlite3=shared,/usr \
  341.66 -			--enable-maintainer-zts" ;;
  341.67 -	arm*)
  341.68 -		BUILD_DEPENDS="sqlite3-dev libxml2-dev zlib-dev curl-dev"
  341.69 -		ARCH_ARGS="\
  341.70 -			--prefix=/usr \
  341.71 -			--sysconfdir=/etc \
  341.72 -			--infodir=/usr/share/info \
  341.73 -			--mandir=/usr/share/man \
  341.74 -			--config-cache \
  341.75 -			--enable-mbstring \
  341.76 -			--enable-sockets \
  341.77 -			--enable-ftp \
  341.78 -			--enable-zip \
  341.79 -			--enable-calendar \
  341.80 -			--enable-exif \
  341.81 -			--enable-dba=shared \
  341.82 -			--enable-sqlite-utf8 \
  341.83 -			--with-mhash \
  341.84 -			--with-sqlite=shared \
  341.85 -			--with-config-file-path=/etc \
  341.86 -			--with-zlib \
  341.87 -			--with-gettext \
  341.88 -			--with-curl=shared \
  341.89 -			--with-openssl=shared \
  341.90 -			--with-jpeg-dir=/usr \
  341.91 -			--with-png-dir=/usr \
  341.92 -			--with-apxs2=/usr/bin/apxs" ;;
  341.93 -esac
  341.94 +			--enable-maintainer-zts"
  341.95 +			;;
  341.96 +	esac
  341.97  
  341.98 -# Rules to configure and make the package.
  341.99 -compile_rules()
 341.100 -{
 341.101  	sed -i 's|PLANE_[UVY]\]|VPX_&|;s|IMG_FMT_I420|VPX_&|' ext/gd/libgd/webpimg.c
 341.102  	sed -i 's/pam_start/pam_nostart/' configure
 341.103 -	./configure $ARCH_ARGS $CONFIGURE_ARGS && \
 341.104 -	make $MAKEFLAGS && make -j1 INSTALL_ROOT=$DESTDIR install
 341.105 -	./configure $ARCH_ARGS $CONFIGURE_ARGS --with-apxs2=/usr/bin/apxs && \
 341.106 -	make $MAKEFLAGS && {
 341.107 -		mkdir -p $DESTDIR/etc/apache
 341.108 -		cp /etc/apache/httpd.conf $DESTDIR/etc/apache/httpd.conf
 341.109 -		make -j1 INSTALL_ROOT=$DESTDIR install
 341.110 -	}
 341.111 +
 341.112 +	./configure \
 341.113 +		$ARCH_ARGS \
 341.114 +		$CONFIGURE_ARGS &&
 341.115 +	make $MAKEFLAGS &&
 341.116 +	make -j1 INSTALL_ROOT=$DESTDIR install
 341.117 +
 341.118 +	./configure \
 341.119 +		$ARCH_ARGS \
 341.120 +		$CONFIGURE_ARGS \
 341.121 +		--with-apxs2=/usr/bin/apxs &&
 341.122 +	make $MAKEFLAGS &&
 341.123 +	mkdir -p $DESTDIR/etc/apache &&
 341.124 +	cp /etc/apache/httpd.conf $DESTDIR/etc/apache/httpd.conf &&
 341.125 +	make -j1 INSTALL_ROOT=$DESTDIR install || return 1
 341.126 +
 341.127  	# Production config file.
 341.128  	mkdir -p $DESTDIR/etc
 341.129  	cp $src/php.ini-production $DESTDIR/etc/php.ini || exit 1
 341.130  	sed -e 's|extension_dir = "./"|extension_dir = "/usr/share/php/"|' \
 341.131  		-i $DESTDIR/etc/php.ini
 341.132 +
 341.133 +	install -Dm755 $src/sapi/cgi/php-cgi    $install/usr/bin/php-cgi
 341.134 +
 341.135 +	install -Dm644 $stuff/phpinfo/index.php $install/usr/share/phpinfo/index.php
 341.136 +	install -Dm644 $stuff/php.desktop       $install/usr/share/applications/php.desktop
 341.137 +	install -Dm644 $stuff/php.png           $install/usr/share/pixmaps/php.png
 341.138  }
 341.139  
 341.140 -# Rules to gen a SliTaz package suitable for Tazpkg.
 341.141 -genpkg_rules()
 341.142 -{
 341.143 +genpkg_rules() {
 341.144  	case $PACKAGE in
 341.145 -	php)
 341.146 -		PROVIDE="php:lighttpd"
 341.147 -		DEPENDS="php-common lighttpd zlib libxml2 sqlite3 openssl"
 341.148 -		mkdir -p $fs/usr/bin $fs/usr/share/php
 341.149 -		cp -a $src/sapi/cgi/php-cgi $fs/usr/bin
 341.150 -		;;
 341.151 -	php-apache)
 341.152 -		CAT="development|PHP module for apache."
 341.153 -		PROVIDE="php:apache"
 341.154 -		DEPENDS="php-common apache libxml2 zlib"
 341.155 -		mkdir -p $fs/usr/share
 341.156 -		cp -a $install/usr/share/apache $fs/usr/share
 341.157 -		;;
 341.158 -	php-cherokee)
 341.159 -		CAT="development|PHP module for cherokee."
 341.160 -		PROVIDE="php:cherokee"
 341.161 -		DEPENDS="php-common cherokee libxml2 zlib"
 341.162 -		mkdir -p $fs/usr/bin $fs/usr/share/php
 341.163 -		cp -a $src/sapi/cgi/php-cgi $fs/usr/bin
 341.164 -		;;
 341.165 -	php-cli)
 341.166 -		CAT="development|PHP web programming language command line interpreter."
 341.167 -		DEPENDS="php-common"
 341.168 -		mkdir -p $fs/usr/bin
 341.169 -		cp -a $install/usr/bin/php $fs/usr/bin
 341.170 -		;;
 341.171 -	php-common)
 341.172 -		CAT="development|Common files for PHP modules."
 341.173 -		CONFIG_FILES="/etc/php.ini"
 341.174 -		mkdir -p $fs/etc \
 341.175 -			$fs/usr/share/applications \
 341.176 -			$fs/usr/share/pixmaps
 341.177 -		cp -a $stuff/phpinfo $fs/usr/share
 341.178 -		cp $stuff/php.desktop $fs/usr/share/applications 
 341.179 -		cp $stuff/php.png $fs/usr/share/pixmaps 
 341.180 -		cp $install/etc/php.ini $fs/etc
 341.181 -		;;
 341.182 -	php-curl)
 341.183 -		CAT="development|curl module for PHP web programming language."
 341.184 -		DEPENDS="curl php"
 341.185 -		mkdir -p $fs/usr/share/php
 341.186 -		cp $(find $install | grep curl.so) $fs/usr/share/php/
 341.187 -		;;
 341.188 -	php-dba)
 341.189 -		CAT="development|dba module for PHP web programming language."
 341.190 -		mkdir -p $fs/usr/share/php
 341.191 -		cp $(find $install | grep dba.so) $fs/usr/share/php/
 341.192 -		;;
 341.193 -	php-dev)
 341.194 -		CAT="development|PHP web programming language development files."
 341.195 -		DEPENDS="php cyrus-sasl libldap libmysqlclient libpng16 \
 341.196 +		php)
 341.197 +			copy usr/bin/php-cgi
 341.198 +			DEPENDS="php-common lighttpd zlib libxml2 sqlite3 openssl"
 341.199 +			PROVIDE="php:lighttpd"
 341.200 +			;;
 341.201 +		php-apache)
 341.202 +			copy usr/share/apache/
 341.203 +			CAT="development|module for apache"
 341.204 +			DEPENDS="php-common apache libxml2 zlib"
 341.205 +			PROVIDE="php:apache"
 341.206 +			;;
 341.207 +		php-cherokee)
 341.208 +			copy usr/bin/php-cgi # FIXME! the same file in "php" package
 341.209 +			CAT="development|module for cherokee"
 341.210 +			DEPENDS="php-common cherokee libxml2 zlib"
 341.211 +			PROVIDE="php:cherokee"
 341.212 +			;;
 341.213 +		php-cli)
 341.214 +			copy usr/bin/php
 341.215 +			CAT="development|command line interpreter"
 341.216 +			DEPENDS="php-common"
 341.217 +			;;
 341.218 +		php-common)
 341.219 +			copy phpinfo/ php.desktop php.png php.ini
 341.220 +			CAT="development|common files for PHP modules"
 341.221 +			DEPENDS=" "
 341.222 +			CONFIG_FILES="/etc/php.ini"
 341.223 +			;;
 341.224 +		php-curl)
 341.225 +			copy curl.so
 341.226 +			CAT="development|curl module"
 341.227 +			DEPENDS="curl php"
 341.228 +			;;
 341.229 +		php-dba)
 341.230 +			copy dba.so
 341.231 +			CAT="development|dba module"
 341.232 +			DEPENDS=" "
 341.233 +			;;
 341.234 +		php-dev)
 341.235 +			copy @dev
 341.236 +			DEPENDS="php cyrus-sasl libldap libmysqlclient libpng16 \
 341.237  			libpostgresqlclient libunixODBC mhash openssl jpeg \
 341.238  			libmcrypt libtool libkrb5 libcomerr3 net-snmp"
 341.239 -		mkdir -p $fs/usr/lib/php $fs/usr/bin
 341.240 -		cp -a $install/usr/lib/php/extensions $fs/usr/lib/php
 341.241 -		rm -f $fs/usr/lib/php/*so
 341.242 -		cp -a $install/usr/lib/php/build $fs/usr/lib/php
 341.243 -		cp -a $install/usr/include $fs/usr
 341.244 -		cp -a $install/usr/bin/php-config $install/usr/bin/phpize $fs/usr/bin
 341.245 -		;;
 341.246 -	php-gd)
 341.247 -		CAT="development|gd module for PHP web programming language."
 341.248 -		DEPENDS="libpng16 php jpeg libvpx"
 341.249 -		mkdir -p $fs/usr/share/php
 341.250 -		cp $(find $install | grep gd.so) $fs/usr/share/php/
 341.251 -		;;
 341.252 -	php-imap)
 341.253 -		CAT="development|imap module for PHP web programming language."
 341.254 -		DEPENDS="php openssl"
 341.255 -		mkdir -p $fs/usr/share/php
 341.256 -		cp $(find $install | grep imap.so) $fs/usr/share/php/
 341.257 -		;;
 341.258 -	php-ldap)
 341.259 -		CAT="development|ldap module for PHP web programming language."
 341.260 -		DEPENDS="libldap php openssl cyrus-sasl libkrb5 libcomerr3"
 341.261 -		mkdir -p $fs/usr/share/php
 341.262 -		cp $(find $install | grep ldap.so) $fs/usr/share/php/
 341.263 -		;;
 341.264 -	php-mcrypt)
 341.265 -		CAT="development|mcrypt module for PHP web programming language."
 341.266 -		DEPENDS="libmcrypt php libtool"
 341.267 -		mkdir -p $fs/usr/share/php
 341.268 -		cp $(find $install | grep mcrypt.so) $fs/usr/share/php/
 341.269 -		;;
 341.270 -	php-mysqli)
 341.271 -		CAT="development|mysqli module for PHP web programming language."
 341.272 -		DEPENDS="libmysqlclient php"
 341.273 -		mkdir -p $fs/usr/share/php
 341.274 -		cp $(find $install | grep mysqli.so) $fs/usr/share/php/
 341.275 -		;;
 341.276 -	php-mysql)
 341.277 -		CAT="development|mysql module for PHP web programming language."
 341.278 -		DEPENDS="libmysqlclient php"
 341.279 -		mkdir -p $fs/usr/share/php
 341.280 -		cp $(find $install | grep mysql.so) $fs/usr/share/php/
 341.281 -		;;
 341.282 -	php-odbc)
 341.283 -		CAT="development|ODBC module for PHP web programming language."
 341.284 -		DEPENDS="unixODBC php"
 341.285 -		mkdir -p $fs/usr/share/php
 341.286 -		cp $(find $install | grep odbc.so) $fs/usr/share/php/
 341.287 -		;;
 341.288 -	php-openssl)
 341.289 -		CAT="development|Openssl module for PHP web programming language."
 341.290 -		DEPENDS="php openssl"
 341.291 -		mkdir -p $fs/usr/share/php
 341.292 -		cp $(find $install | grep openssl.so) $fs/usr/share/php/
 341.293 -		;;
 341.294 -	php-pdo-mysql)
 341.295 -		CAT="development|PDO MySQL module for PHP web programming language."
 341.296 -		DEPENDS="php php-mysql"
 341.297 -		mkdir -p $fs/usr/share/php
 341.298 -		cp $(find $install | grep pdo_mysql.so) $fs/usr/share/php/
 341.299 -		;;
 341.300 -	php-pdo-pgsql)
 341.301 -		CAT="development|PDO PgSQL module for PHP web programming language."
 341.302 -		DEPENDS="php php-mysql libpostgresqlclient"
 341.303 -		mkdir -p $fs/usr/share/php
 341.304 -		cp $(find $install | grep pdo_pgsql.so) $fs/usr/share/php/
 341.305 -		;;
 341.306 -	php-pear)
 341.307 -		CAT="development|PHP web programming language pear libs."
 341.308 -		DEPENDS="php-cli"
 341.309 -	        mkdir -p $fs/usr/share $fs/usr/bin $fs/etc
 341.310 -		cp -a $install/usr/share/php $fs/usr/share
 341.311 -		cp -a $install/etc/pear.conf $fs/etc
 341.312 -		cp -a $install/usr/bin/pe* $fs/usr/bin
 341.313 -		;;
 341.314 -	php-pgsql)
 341.315 -		CAT="development|postgresql module for PHP web programming language."
 341.316 -		DEPENDS="postgresql php"
 341.317 -		mkdir -p $fs/usr/share/php
 341.318 -		cp $(find $install | grep pgsql.so) $fs/usr/share/php/
 341.319 -		;;
 341.320 -	php-snmp)
 341.321 -		CAT="development|snmp module for PHP web programming language."
 341.322 -		DEPENDS="net-snmp php openssl"
 341.323 -		mkdir -p $fs/usr/share/php
 341.324 -		cp $(find $install | grep snmp.so) $fs/usr/share/php/
 341.325 -		;;
 341.326 -	php-soap)
 341.327 -		CAT="development|soap module for PHP web programming language."
 341.328 -		DEPENDS="php libxml2"
 341.329 -		mkdir -p $fs/usr/share/php
 341.330 -		cp $(find $install | grep soap.so) $fs/usr/share/php/
 341.331 -		;;
 341.332 -	php-sqlite)
 341.333 -		CAT="development|sqlite module for PHP web programming language."
 341.334 -		DEPENDS="php sqlite3"
 341.335 -		mkdir -p $fs/usr/share/php
 341.336 -		cp $(find $install | grep sqlite.so) $fs/usr/share/php/
 341.337 -		cp $(find $install | grep sqlite3.so) $fs/usr/share/php/
 341.338 -		cp $(find $install | grep pdo_sqlite.so) $fs/usr/share/php/
 341.339 -		;;
 341.340 +			;;
 341.341 +		php-gd)
 341.342 +			copy gd.so
 341.343 +			CAT="development|gd module"
 341.344 +			DEPENDS="libpng16 php jpeg libvpx"
 341.345 +			;;
 341.346 +		php-imap)
 341.347 +			copy imap.so
 341.348 +			CAT="development|imap module"
 341.349 +			DEPENDS="php openssl"
 341.350 +			;;
 341.351 +		php-ldap)
 341.352 +			copy ldap.so
 341.353 +			CAT="development|ldap module"
 341.354 +			DEPENDS="libldap php openssl cyrus-sasl libkrb5 libcomerr3"
 341.355 +			;;
 341.356 +		php-mcrypt)
 341.357 +			copy mcrypt.so
 341.358 +			CAT="development|mcrypt module"
 341.359 +			DEPENDS="libmcrypt php libtool"
 341.360 +			;;
 341.361 +		php-mysqli)
 341.362 +			copy mysqli.so
 341.363 +			CAT="development|mysqli module"
 341.364 +			DEPENDS="libmysqlclient php"
 341.365 +			;;
 341.366 +		php-mysql)
 341.367 +			copy mysql.so
 341.368 +			CAT="development|mysql module"
 341.369 +			DEPENDS="libmysqlclient php"
 341.370 +			;;
 341.371 +		php-odbc)
 341.372 +			copy odbc.so
 341.373 +			CAT="development|ODBC module"
 341.374 +			DEPENDS="unixODBC php"
 341.375 +			;;
 341.376 +		php-openssl)
 341.377 +			copy openssl.so
 341.378 +			CAT="development|OpenSSL module"
 341.379 +			DEPENDS="php openssl"
 341.380 +			;;
 341.381 +		php-pdo-mysql)
 341.382 +			copy pdo_mysql.so
 341.383 +			CAT="development|PDO MySQL module"
 341.384 +			DEPENDS="php php-mysql"
 341.385 +			;;
 341.386 +		php-pdo-pgsql)
 341.387 +			copy pdo_pgsql.so
 341.388 +			CAT="development|PDO PgSQL module"
 341.389 +			DEPENDS="php php-mysql libpostgresqlclient"
 341.390 +			;;
 341.391 +		php-pear)
 341.392 +			copy etc/pear.conf usr/bin/pe* usr/share/php/
 341.393 +			CAT="development|PEAR libs"
 341.394 +			DEPENDS="php-cli"
 341.395 +			;;
 341.396 +		php-pgsql)
 341.397 +			copy pgsql.so
 341.398 +			CAT="development|postgresql module"
 341.399 +			DEPENDS="postgresql php"
 341.400 +			;;
 341.401 +		php-snmp)
 341.402 +			copy snmp.so
 341.403 +			CAT="development|snmp module"
 341.404 +			DEPENDS="net-snmp php openssl"
 341.405 +			;;
 341.406 +		php-soap)
 341.407 +			copy soap.so
 341.408 +			CAT="development|soap module"
 341.409 +			DEPENDS="php libxml2"
 341.410 +			;;
 341.411 +		php-sqlite)
 341.412 +			copy sqlite.so sqlite3.so pdo_sqlite.so
 341.413 +			CAT="development|sqlite module"
 341.414 +			DEPENDS="php sqlite3"
 341.415 +			;;
 341.416  	esac
 341.417  }
 341.418  
 341.419 -# Post and pre install commands to stop
 341.420 -# and restart Web server if needed.
 341.421 -pre_install_php()
 341.422 -{
 341.423 +# -----------------------------------------------------------------------------
 341.424 +pre_install_php() {
 341.425  	if [ -z "$1" -a ! -f "/var/run/lighttpd.pid" ]; then
 341.426  		/etc/init.d/lighttpd stop
 341.427  	fi
 341.428  }
 341.429  
 341.430 -post_install_php()
 341.431 -{
 341.432 +post_install_php() {
 341.433  	# Enable php
 341.434  	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
 341.435 -	  [ -f "$1/usr/lib/lighttpd/mod_fastcgi.so" ] || \
 341.436 -	  	tazpkg get-install lighttpd-modules --root="$1/"
 341.437 -	  sed -e 's|#fastcgi.server = ( ".php"|fastcgi.server = ( ".php"|' \
 341.438 -	    -e 's|#"bin-path" => "/usr/bin/php-cgi"|"bin-path" => "/usr/bin/php-cgi"|' \
 341.439 -	    -e 's|#"socket" => "/tmp/php.socket"|"socket" => "/tmp/php.socket"\n  )))|' \
 341.440 -	    -i "$1/etc/lighttpd/lighttpd.conf"
 341.441 -	  grep -q mod_fastcgi "$1/etc/lighttpd/lighttpd.conf" || \
 341.442 -	  	sed -e 's|server.modules = (|server.modules = (\n  "mod_fastcgi",|' \
 341.443 -	  	    -i "$1/etc/lighttpd/lighttpd.conf"
 341.444 -	  grep -q php3 "$1/etc/lighttpd/lighttpd.conf" || \
 341.445 -	  	sed -e 's|for PHP.*|for PHP.\nfastcgi.map-extensions = ( ".php3" => ".php", ".php4" => ".php", ".php5" => ".php" )|' \
 341.446 -	  	    -i "$1/etc/lighttpd/lighttpd.conf"
 341.447 +
 341.448 +		[ -f "$1/usr/lib/lighttpd/mod_fastcgi.so" ] ||
 341.449 +		tazpkg get-install lighttpd-modules --root="$1/"
 341.450 +
 341.451 +		sed \
 341.452 +			-e 's|#fastcgi.server = ( ".php"|fastcgi.server = ( ".php"|' \
 341.453 +			-e 's|#"bin-path" => "/usr/bin/php-cgi"|"bin-path" => "/usr/bin/php-cgi"|' \
 341.454 +			-e 's|#"socket" => "/tmp/php.socket"|"socket" => "/tmp/php.socket"\n  )))|' \
 341.455 +			-i "$1/etc/lighttpd/lighttpd.conf"
 341.456 +
 341.457 +		grep -q mod_fastcgi "$1/etc/lighttpd/lighttpd.conf" ||
 341.458 +		sed \
 341.459 +			-e 's|server.modules = (|server.modules = (\n  "mod_fastcgi",|' \
 341.460 +			-i "$1/etc/lighttpd/lighttpd.conf"
 341.461 +
 341.462 +		grep -q php3 "$1/etc/lighttpd/lighttpd.conf" ||
 341.463 +		sed \
 341.464 +			-e 's|for PHP.*|for PHP.\nfastcgi.map-extensions = ( ".php3" => ".php", ".php4" => ".php", ".php5" => ".php" )|' \
 341.465 +			-i "$1/etc/lighttpd/lighttpd.conf"
 341.466 +
 341.467  	fi
 341.468 +
 341.469  	# Start Web server.
 341.470 -	if [ -z "$1" -a ! -f /var/run/lighttpd.pid \
 341.471 -		     -a -f /etc/init.d/lighttpd ]; then
 341.472 +	if [ -z "$1" -a ! -f /var/run/lighttpd.pid -a -f /etc/init.d/lighttpd ]; then
 341.473  		/etc/init.d/lighttpd start
 341.474  	fi
 341.475  }
 341.476  
 341.477 -# Post and pre install commans to stop
 341.478 -# and restart Web server if needed.
 341.479 -pre_installi_php_apache()
 341.480 -{
 341.481 +# -----------------------------------------------------------------------------
 341.482 +pre_installi_php_apache() {
 341.483  	if [ -z "$1" -a -f "/var/run/apache/httpd.pid" ]; then
 341.484  		/etc/init.d/apache stop
 341.485  	fi
 341.486  }
 341.487  
 341.488 -post_install_php_apache()
 341.489 -{
 341.490 -	grep -q php5_module "$1/etc/apache/httpd.conf" || {
 341.491 -	    sed -e 's|mod_rewrite.so|mod_rewrite.so\nLoadModule php5_module share/apache/modules/libphp5.so|' \
 341.492 -	    	-e 's|DirectoryIndex index.html|DirectoryIndex index.html index.php|' \
 341.493 -		-e 's|mime.types|mime.types\n    AddType application/x-httpd-php .php .php3 .php4 .php5\n    AddType application/x-httpd-php-source .phps|' \
 341.494 -	        -i "$1/etc/apache/httpd.conf"
 341.495 +post_install_php_apache() {
 341.496 +	grep -q php5_module "$1/etc/apache/httpd.conf" ||
 341.497 +	{
 341.498 +		sed \
 341.499 +			-e 's|mod_rewrite.so|mod_rewrite.so\nLoadModule php5_module share/apache/modules/libphp5.so|' \
 341.500 +			-e 's|DirectoryIndex index.html|DirectoryIndex index.html index.php|' \
 341.501 +			-e 's|mime.types|mime.types\n    AddType application/x-httpd-php .php .php3 .php4 .php5\n    AddType application/x-httpd-php-source .phps|' \
 341.502 +			-i "$1/etc/apache/httpd.conf"
 341.503  	}
 341.504 -	[ -f "$1/etc/apache/conf.d/phpinfo" ] || \
 341.505 +
 341.506 +	[ -f "$1/etc/apache/conf.d/phpinfo" ] ||
 341.507  		cat > "$1/etc/apache/conf.d/phpinfo" <<EOT
 341.508  <IfModule mod_alias.c>
 341.509      Alias /phpinfo /usr/share/phpinfo
 341.510 @@ -333,6 +313,7 @@
 341.511      Allow from all
 341.512  </DirectoryMatch>
 341.513  EOT
 341.514 +
 341.515  	# Restart Web server.
 341.516  	if [ -z "$1" -a -f "/var/run/apache/httpd.pid" ]; then
 341.517  		/etc/init.d/apache stop
 341.518 @@ -343,17 +324,14 @@
 341.519  	fi
 341.520  }
 341.521  
 341.522 -# Post and pre install commands to stop
 341.523 -# and restart Web server if needed.
 341.524 -pre_install_php_cherokee()
 341.525 -{
 341.526 +# -----------------------------------------------------------------------------
 341.527 +pre_install_php_cherokee() {
 341.528  	if [ -z "$1" -a ! -f "/var/run/cherokee.pid" ]; then
 341.529  		/etc/init.d/cherokee stop
 341.530  	fi
 341.531  }
 341.532  
 341.533 -post_install_php_cherokee()
 341.534 -{
 341.535 +post_install_php_cherokee() {
 341.536  	# Enable php
 341.537  #	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
 341.538  #	  [ -f "$1/usr/lib/lighttpd/mod_fastcgi.so" ] || \
 341.539 @@ -370,52 +348,43 @@
 341.540  #	  	    -i "$1/etc/lighttpd/lighttpd.conf"
 341.541  #	fi
 341.542  
 341.543 -
 341.544  	# Start Web server.
 341.545 -	if [ -z "$1" -a ! -f /var/run/cherokee.pid \
 341.546 -		     -a -f /etc/init.d/cherokee ]; then
 341.547 +	if [ -z "$1" -a ! -f /var/run/cherokee.pid -a -f /etc/init.d/cherokee ]; then
 341.548  		/etc/init.d/cherokee start
 341.549  	fi
 341.550  }
 341.551  
 341.552 -# Post and pre install commands
 341.553 -pre_install_php_common()
 341.554 -{
 341.555 +# -----------------------------------------------------------------------------
 341.556 +pre_install_php_common() {
 341.557  	# Backup existing php.ini
 341.558  	if [ -f "$1/etc/php.ini" ]; then
 341.559 -		echo -n "Creating php.ini backup..."
 341.560  		cp "$1/etc/php.ini" "$1/etc/php.ini.bak"
 341.561 -		status
 341.562 -	fi
 341.563 -}
 341.564 -post_install_php_common()
 341.565 -{
 341.566 -	# Restore original php.ini
 341.567 -	if [ -f "$1/etc/php.ini.bak" ]; then
 341.568 -		echo -n "Restoring php.ini backup..."
 341.569 -		mv -f "$1/etc/php.ini.bak" "$1/etc/php.ini"
 341.570 -		status
 341.571  	fi
 341.572  }
 341.573  
 341.574 -# Post and pre install commans to stop
 341.575 -# and restart Web server if needed.
 341.576 -pre_install_php_curl()
 341.577 -{
 341.578 +post_install_php_common() {
 341.579 +	# Restore original php.ini
 341.580 +	if [ -f "$1/etc/php.ini.bak" ]; then
 341.581 +		mv -f "$1/etc/php.ini.bak" "$1/etc/php.ini"
 341.582 +	fi
 341.583 +}
 341.584 +
 341.585 +# -----------------------------------------------------------------------------
 341.586 +pre_install_php_curl() {
 341.587  	while read daemon file; do
 341.588  		if [ -z "$1" -a -f "/var/run/$file" ]; then
 341.589  			/etc/init.d/$daemon stop
 341.590  		fi
 341.591  	done <<EOT
 341.592 -apache apache/httpd.pid
 341.593 +apache   apache/httpd.pid
 341.594  lighttpd lighttpd.pid
 341.595  EOT
 341.596  }
 341.597  
 341.598 -post_install_php_curl()
 341.599 -{
 341.600 -	grep -q ^extension=curl.so "$1/etc/php.ini" || \
 341.601 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=curl.so|' -i "$1/etc/php.ini"
 341.602 +post_install_php_curl() {
 341.603 +	grep -q ^extension=curl.so "$1/etc/php.ini" ||
 341.604 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=curl.so|' -i "$1/etc/php.ini"
 341.605 +
 341.606  	# Start Web server.
 341.607  	while read daemon file; do
 341.608  		[ -z "$1" ] || continue
 341.609 @@ -427,14 +396,12 @@
 341.610  			/etc/init.d/$daemon start
 341.611  		fi
 341.612  	done <<EOT
 341.613 -apache apache/httpd.pid
 341.614 +apache   apache/httpd.pid
 341.615  lighttpd lighttpd.pid
 341.616  EOT
 341.617  }
 341.618  
 341.619 -# Pre and post remove commands for Tazpkg.
 341.620 -pre_remove_php_curl()
 341.621 -{
 341.622 +pre_remove_php_curl() {
 341.623  	sed -i '/.*=curl.so.*/d' /etc/php.ini
 341.624  
 341.625  	# Start Web server.
 341.626 @@ -448,29 +415,27 @@
 341.627  			/etc/init.d/$daemon start
 341.628  		fi
 341.629  	done <<EOT
 341.630 -apache apache/httpd.pid
 341.631 +apache   apache/httpd.pid
 341.632  lighttpd lighttpd.pid
 341.633  EOT
 341.634  }
 341.635  
 341.636 -# Post and pre install commans to stop
 341.637 -# and restart Web server if needed.
 341.638 -pre_install_php_dba()
 341.639 -{
 341.640 +# -----------------------------------------------------------------------------
 341.641 +pre_install_php_dba() {
 341.642  	while read daemon file; do
 341.643  		if [ -z "$1" -a -f "/var/run/$file" ]; then
 341.644  			/etc/init.d/$daemon stop
 341.645  		fi
 341.646  	done <<EOT
 341.647 -apache apache/httpd.pid
 341.648 +apache   apache/httpd.pid
 341.649  lighttpd lighttpd.pid
 341.650  EOT
 341.651  }
 341.652  
 341.653 -post_install_php_dba()
 341.654 -{
 341.655 -	grep -q ^extension=dba.so "$1/etc/php.ini" || \
 341.656 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=dba.so|' -i "$1/etc/php.ini"
 341.657 +post_install_php_dba() {
 341.658 +	grep -q ^extension=dba.so "$1/etc/php.ini" ||
 341.659 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=dba.so|' -i "$1/etc/php.ini"
 341.660 +
 341.661  	# Start Web server.
 341.662  	while read daemon file; do
 341.663  		[ -z "$1" ] || continue
 341.664 @@ -482,14 +447,12 @@
 341.665  			/etc/init.d/$daemon start
 341.666  		fi
 341.667  	done <<EOT
 341.668 -apache apache/httpd.pid
 341.669 +apache   apache/httpd.pid
 341.670  lighttpd lighttpd.pid
 341.671  EOT
 341.672  }
 341.673  
 341.674 -# Pre and post remove commands for Tazpkg.
 341.675 -pre_remove_php_dba()
 341.676 -{
 341.677 +pre_remove_php_dba() {
 341.678  	sed -i '/.*=dba.so.*/d' /etc/php.ini
 341.679  
 341.680  	# Start Web server.
 341.681 @@ -503,29 +466,27 @@
 341.682  			/etc/init.d/$daemon start
 341.683  		fi
 341.684  	done <<EOT
 341.685 -apache apache/httpd.pid
 341.686 +apache   apache/httpd.pid
 341.687  lighttpd lighttpd.pid
 341.688  EOT
 341.689  }
 341.690  
 341.691 -# Post and pre install commans to stop
 341.692 -# and restart Web server if needed.
 341.693 -pre_install_php_gd()
 341.694 -{
 341.695 +# -----------------------------------------------------------------------------
 341.696 +pre_install_php_gd() {
 341.697  	while read daemon file; do
 341.698  		if [ -z "$1" -a -f "/var/run/$file" ]; then
 341.699  			/etc/init.d/$daemon stop
 341.700  		fi
 341.701  	done <<EOT
 341.702 -apache apache/httpd.pid
 341.703 +apache   apache/httpd.pid
 341.704  lighttpd lighttpd.pid
 341.705  EOT
 341.706  }
 341.707  
 341.708 -post_install_php_gd()
 341.709 -{
 341.710 -	grep -q ^extension=gd.so "$1/etc/php.ini" || \
 341.711 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=gd.so|' -i "$1/etc/php.ini"
 341.712 +post_install_php_gd() {
 341.713 +	grep -q ^extension=gd.so "$1/etc/php.ini" ||
 341.714 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=gd.so|' -i "$1/etc/php.ini"
 341.715 +
 341.716  	# Start Web server.
 341.717  	while read daemon file; do
 341.718  		[ -z "$1" ] || continue
 341.719 @@ -537,14 +498,12 @@
 341.720  			/etc/init.d/$daemon start
 341.721  		fi
 341.722  	done <<EOT
 341.723 -apache apache/httpd.pid
 341.724 +apache   apache/httpd.pid
 341.725  lighttpd lighttpd.pid
 341.726  EOT
 341.727  }
 341.728  
 341.729 -# Pre and post remove commands for Tazpkg.
 341.730 -pre_remove_php_gd()
 341.731 -{
 341.732 +pre_remove_php_gd() {
 341.733  	sed -i '/.*=gd.so.*/d' "$1/etc/php.ini"
 341.734  
 341.735  	# Start Web server.
 341.736 @@ -560,29 +519,27 @@
 341.737  			fi
 341.738  		fi
 341.739  	done <<EOT
 341.740 -apache apache/httpd.pid
 341.741 +apache   apache/httpd.pid
 341.742  lighttpd lighttpd.pid
 341.743  EOT
 341.744  }
 341.745  
 341.746 -# Post and pre install commans to stop
 341.747 -# and restart Web server if needed.
 341.748 -pre_install_php_imap()
 341.749 -{
 341.750 +# -----------------------------------------------------------------------------
 341.751 +pre_install_php_imap() {
 341.752  	while read daemon file; do
 341.753  		if [ -z "$1" -a -f "/var/run/$file" ]; then
 341.754  			/etc/init.d/$daemon stop
 341.755  		fi
 341.756  	done <<EOT
 341.757 -apache apache/httpd.pid
 341.758 +apache   apache/httpd.pid
 341.759  lighttpd lighttpd.pid
 341.760  EOT
 341.761  }
 341.762  
 341.763 -post_install_php_imap()
 341.764 -{
 341.765 -	grep -q ^extension=imap.so "$1/etc/php.ini" || \
 341.766 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=imap.so|' -i "$1/etc/php.ini"
 341.767 +post_install_php_imap() {
 341.768 +	grep -q ^extension=imap.so "$1/etc/php.ini" ||
 341.769 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=imap.so|' -i "$1/etc/php.ini"
 341.770 +
 341.771  	# Start Web server.
 341.772  	while read daemon file; do
 341.773  		[ -z "$1" ] || continue
 341.774 @@ -594,14 +551,12 @@
 341.775  			/etc/init.d/$daemon start
 341.776  		fi
 341.777  	done <<EOT
 341.778 -apache apache/httpd.pid
 341.779 +apache   apache/httpd.pid
 341.780  lighttpd lighttpd.pid
 341.781  EOT
 341.782  }
 341.783  
 341.784 -# Pre and post remove commands for Tazpkg.
 341.785 -pre_remove_php_imap()
 341.786 -{
 341.787 +pre_remove_php_imap() {
 341.788  	sed -i '/.*=imap.so.*/d' /etc/php.ini
 341.789  
 341.790  	# Start Web server.
 341.791 @@ -615,29 +570,27 @@
 341.792  			/etc/init.d/$daemon start
 341.793  		fi
 341.794  	done <<EOT
 341.795 -apache apache/httpd.pid
 341.796 +apache   apache/httpd.pid
 341.797  lighttpd lighttpd.pid
 341.798  EOT
 341.799  }
 341.800  
 341.801 -# Post and pre install commans to stop
 341.802 -# and restart Web server if needed.
 341.803 -pre_install_php_ldap()
 341.804 -{
 341.805 +# -----------------------------------------------------------------------------
 341.806 +pre_install_php_ldap() {
 341.807  	while read daemon file; do
 341.808  		if [ -z "$1" -a -f "/var/run/$file" ]; then
 341.809  			/etc/init.d/$daemon stop
 341.810  		fi
 341.811  	done <<EOT
 341.812 -apache apache/httpd.pid
 341.813 +apache   apache/httpd.pid
 341.814  lighttpd lighttpd.pid
 341.815  EOT
 341.816  }
 341.817  
 341.818 -post_install_php_ldap()
 341.819 -{
 341.820 -	grep -q ^extension=ldap.so "$1/etc/php.ini" || \
 341.821 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=ldap.so|' -i "$1/etc/php.ini"
 341.822 +post_install_php_ldap() {
 341.823 +	grep -q ^extension=ldap.so "$1/etc/php.ini" ||
 341.824 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=ldap.so|' -i "$1/etc/php.ini"
 341.825 +
 341.826  	# Start Web server.
 341.827  	while read daemon file; do
 341.828  		[ -z "$1" ] || continue
 341.829 @@ -649,14 +602,12 @@
 341.830  			/etc/init.d/$daemon start
 341.831  		fi
 341.832  	done <<EOT
 341.833 -apache apache/httpd.pid
 341.834 +apache   apache/httpd.pid
 341.835  lighttpd lighttpd.pid
 341.836  EOT
 341.837  }
 341.838  
 341.839 -# Pre and post remove commands for Tazpkg.
 341.840 -pre_remove_php_ldap()
 341.841 -{
 341.842 +pre_remove_php_ldap() {
 341.843  	sed -i '/.*=ldap.so.*/d' /etc/php.ini
 341.844  
 341.845  	# Start Web server.
 341.846 @@ -670,29 +621,27 @@
 341.847  			/etc/init.d/$daemon start
 341.848  		fi
 341.849  	done <<EOT
 341.850 -apache apache/httpd.pid
 341.851 +apache   apache/httpd.pid
 341.852  lighttpd lighttpd.pid
 341.853  EOT
 341.854  }
 341.855  
 341.856 -# Post and pre install commans to stop
 341.857 -# and restart Web server if needed.
 341.858 -pre_install_php_mcrypt()
 341.859 -{
 341.860 +# -----------------------------------------------------------------------------
 341.861 +pre_install_php_mcrypt() {
 341.862  	while read daemon file; do
 341.863  		if [ -z "$1" -a -f "/var/run/$file" ]; then
 341.864  			/etc/init.d/$daemon stop
 341.865  		fi
 341.866  	done <<EOT
 341.867 -apache apache/httpd.pid
 341.868 +apache   apache/httpd.pid
 341.869  lighttpd lighttpd.pid
 341.870  EOT
 341.871  }
 341.872  
 341.873 -post_install_php_mcrypt()
 341.874 -{
 341.875 -	grep -q ^extension=mcrypt.so "$1/etc/php.ini" || \
 341.876 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=mcrypt.so|' -i "$1/etc/php.ini"
 341.877 +post_install_php_mcrypt() {
 341.878 +	grep -q ^extension=mcrypt.so "$1/etc/php.ini" ||
 341.879 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=mcrypt.so|' -i "$1/etc/php.ini"
 341.880 +
 341.881  	# Start Web server.
 341.882  	while read daemon file; do
 341.883  		[ -z "$1" ] || continue
 341.884 @@ -704,14 +653,12 @@
 341.885  			/etc/init.d/$daemon start
 341.886  		fi
 341.887  	done <<EOT
 341.888 -apache apache/httpd.pid
 341.889 +apache   apache/httpd.pid
 341.890  lighttpd lighttpd.pid
 341.891  EOT
 341.892  }
 341.893  
 341.894 -# Pre and post remove commands for Tazpkg.
 341.895 -pre_remove_php_mcrypt()
 341.896 -{
 341.897 +pre_remove_php_mcrypt() {
 341.898  	sed -i '/.*=mcrypt.so.*/d' /etc/php.ini
 341.899  
 341.900  	# Start Web server.
 341.901 @@ -725,29 +672,27 @@
 341.902  			/etc/init.d/$daemon start
 341.903  		fi
 341.904  	done <<EOT
 341.905 -apache apache/httpd.pid
 341.906 +apache   apache/httpd.pid
 341.907  lighttpd lighttpd.pid
 341.908  EOT
 341.909  }
 341.910  
 341.911 -# Post and pre install commans to stop
 341.912 -# and restart Web server if needed.
 341.913 -pre_install_php_mysqli()
 341.914 -{
 341.915 +# -----------------------------------------------------------------------------
 341.916 +pre_install_php_mysqli() {
 341.917  	while read daemon file; do
 341.918  		if [ -z "$1" -a -f "/var/run/$file" ]; then
 341.919  			/etc/init.d/$daemon stop
 341.920  		fi
 341.921  	done <<EOT
 341.922 -apache apache/httpd.pid
 341.923 +apache   apache/httpd.pid
 341.924  lighttpd lighttpd.pid
 341.925  EOT
 341.926  }
 341.927  
 341.928 -post_install_php_mysqli()
 341.929 -{
 341.930 -	grep -q ^extension=mysqli.so "$1/etc/php.ini" || \
 341.931 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=mysqli.so|' -i "$1/etc/php.ini"
 341.932 +post_install_php_mysqli() {
 341.933 +	grep -q ^extension=mysqli.so "$1/etc/php.ini" ||
 341.934 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=mysqli.so|' -i "$1/etc/php.ini"
 341.935 +
 341.936  	# Start Web server.
 341.937  	while read daemon file; do
 341.938  		[ -z "$1" ] || continue
 341.939 @@ -759,14 +704,12 @@
 341.940  			/etc/init.d/$daemon start
 341.941  		fi
 341.942  	done <<EOT
 341.943 -apache apache/httpd.pid
 341.944 +apache   apache/httpd.pid
 341.945  lighttpd lighttpd.pid
 341.946  EOT
 341.947  }
 341.948  
 341.949 -# Pre and post remove commands for Tazpkg.
 341.950 -pre_remove_php_mysqli()
 341.951 -{
 341.952 +pre_remove_php_mysqli() {
 341.953  	sed -i '/.*=mysqli.so.*/d' /etc/php.ini
 341.954  
 341.955  	# Start Web server.
 341.956 @@ -780,29 +723,27 @@
 341.957  			/etc/init.d/$daemon start
 341.958  		fi
 341.959  	done <<EOT
 341.960 -apache apache/httpd.pid
 341.961 +apache   apache/httpd.pid
 341.962  lighttpd lighttpd.pid
 341.963  EOT
 341.964  }
 341.965  
 341.966 -# Post and pre install commans to stop
 341.967 -# and restart Web server if needed.
 341.968 -pre_install_php_mysql()
 341.969 -{
 341.970 +# -----------------------------------------------------------------------------
 341.971 +pre_install_php_mysql() {
 341.972  	while read daemon file; do
 341.973  		if [ -z "$1" -a -f "/var/run/$file" ]; then
 341.974  			/etc/init.d/$daemon stop
 341.975  		fi
 341.976  	done <<EOT
 341.977 -apache apache/httpd.pid
 341.978 +apache   apache/httpd.pid
 341.979  lighttpd lighttpd.pid
 341.980  EOT
 341.981  }
 341.982  
 341.983 -post_install_php_mysql()
 341.984 -{
 341.985 -	grep -q ^extension=mysql.so "$1/etc/php.ini" || \
 341.986 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=mysql.so|' -i "$1/etc/php.ini"
 341.987 +post_install_php_mysql() {
 341.988 +	grep -q ^extension=mysql.so "$1/etc/php.ini" ||
 341.989 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=mysql.so|' -i "$1/etc/php.ini"
 341.990 +
 341.991  	# Start Web server.
 341.992  	while read daemon file; do
 341.993  		[ -z "$1" ] || continue
 341.994 @@ -814,14 +755,12 @@
 341.995  			/etc/init.d/$daemon start
 341.996  		fi
 341.997  	done <<EOT
 341.998 -apache apache/httpd.pid
 341.999 +apache   apache/httpd.pid
341.1000  lighttpd lighttpd.pid
341.1001  EOT
341.1002  }
341.1003  
341.1004 -# Pre and post remove commands for Tazpkg.
341.1005 -pre_remove_php_mysql()
341.1006 -{
341.1007 +pre_remove_php_mysql() {
341.1008  	sed -i '/.*=mysql.so.*/d' /etc/php.ini
341.1009  
341.1010  	# Start Web server.
341.1011 @@ -835,29 +774,27 @@
341.1012  			/etc/init.d/$daemon start
341.1013  		fi
341.1014  	done <<EOT
341.1015 -apache apache/httpd.pid
341.1016 +apache   apache/httpd.pid
341.1017  lighttpd lighttpd.pid
341.1018  EOT
341.1019  }
341.1020  
341.1021 -# Post and pre install commans to stop
341.1022 -# and restart Web server if needed.
341.1023 -pre_install_php_odbc()
341.1024 -{
341.1025 +# -----------------------------------------------------------------------------
341.1026 +pre_install_php_odbc() {
341.1027  	while read daemon file; do
341.1028  		if [ -z "$1" -a -f "/var/run/$file" ]; then
341.1029  			/etc/init.d/$daemon stop
341.1030  		fi
341.1031  	done <<EOT
341.1032 -apache apache/httpd.pid
341.1033 +apache   apache/httpd.pid
341.1034  lighttpd lighttpd.pid
341.1035  EOT
341.1036  }
341.1037  
341.1038 -post_install_php_odbc()
341.1039 -{
341.1040 -	grep -q ^extension=odbc.so "$1/etc/php.ini" || \
341.1041 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=odbc.so|' -i "$1/etc/php.ini"
341.1042 +post_install_php_odbc() {
341.1043 +	grep -q ^extension=odbc.so "$1/etc/php.ini" ||
341.1044 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=odbc.so|' -i "$1/etc/php.ini"
341.1045 +
341.1046  	# Start Web server.
341.1047  	while read daemon file; do
341.1048  		[ -z "$1" ] || continue
341.1049 @@ -869,14 +806,12 @@
341.1050  			/etc/init.d/$daemon start
341.1051  		fi
341.1052  	done <<EOT
341.1053 -apache apache/httpd.pid
341.1054 +apache   apache/httpd.pid
341.1055  lighttpd lighttpd.pid
341.1056  EOT
341.1057  }
341.1058  
341.1059 -# Pre and post remove commands for Tazpkg.
341.1060 -pre_remove_php_odbc()
341.1061 -{
341.1062 +pre_remove_php_odbc() {
341.1063  	sed -i '/.*=odbc.so.*/d' /etc/php.ini
341.1064  
341.1065  	# Start Web server.
341.1066 @@ -890,29 +825,27 @@
341.1067  			/etc/init.d/$daemon start
341.1068  		fi
341.1069  	done <<EOT
341.1070 -apache apache/httpd.pid
341.1071 +apache   apache/httpd.pid
341.1072  lighttpd lighttpd.pid
341.1073  EOT
341.1074  }
341.1075  
341.1076 -# Post and pre install commans to stop
341.1077 -# and restart Web server if needed.
341.1078 -pre_install_php_openssl()
341.1079 -{
341.1080 +# -----------------------------------------------------------------------------
341.1081 +pre_install_php_openssl() {
341.1082  	while read daemon file; do
341.1083  		if [ -z "$1" -a -f "/var/run/$file" ]; then
341.1084  			/etc/init.d/$daemon stop
341.1085  		fi
341.1086  	done <<EOT
341.1087 -apache apache/httpd.pid
341.1088 +apache   apache/httpd.pid
341.1089  lighttpd lighttpd.pid
341.1090  EOT
341.1091  }
341.1092  
341.1093 -post_install_php_openssl()
341.1094 -{
341.1095 -	grep -q ^extension=openssl.so "$1/etc/php.ini" || \
341.1096 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=openssl.so|' -i "$1/etc/php.ini"
341.1097 +post_install_php_openssl() {
341.1098 +	grep -q ^extension=openssl.so "$1/etc/php.ini" ||
341.1099 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=openssl.so|' -i "$1/etc/php.ini"
341.1100 +
341.1101  	# Start Web server.
341.1102  	while read daemon file; do
341.1103  		[ -z "$1" ] || continue
341.1104 @@ -924,14 +857,12 @@
341.1105  			/etc/init.d/$daemon start
341.1106  		fi
341.1107  	done <<EOT
341.1108 -apache apache/httpd.pid
341.1109 +apache   apache/httpd.pid
341.1110  lighttpd lighttpd.pid
341.1111  EOT
341.1112  }
341.1113  
341.1114 -# Pre and post remove commands for Tazpkg.
341.1115 -pre_remove_php_openssl()
341.1116 -{
341.1117 +pre_remove_php_openssl() {
341.1118  	sed -i '/.*=openssl.so.*/d' /etc/php.ini
341.1119  
341.1120  	# Start Web server.
341.1121 @@ -945,29 +876,27 @@
341.1122  			/etc/init.d/$daemon start
341.1123  		fi
341.1124  	done <<EOT
341.1125 -apache apache/httpd.pid
341.1126 +apache   apache/httpd.pid
341.1127  lighttpd lighttpd.pid
341.1128  EOT
341.1129  }
341.1130  
341.1131 -# Post and pre install commans to stop
341.1132 -# and restart Web server if needed.
341.1133 -pre_install_pdo_mysql()
341.1134 -{
341.1135 +# -----------------------------------------------------------------------------
341.1136 +pre_install_pdo_mysql() {
341.1137  	while read daemon file; do
341.1138  		if [ -z "$1" -a -f "/var/run/$file" ]; then
341.1139  			/etc/init.d/$daemon stop
341.1140  		fi
341.1141  	done <<EOT
341.1142 -apache apache/httpd.pid
341.1143 +apache   apache/httpd.pid
341.1144  lighttpd lighttpd.pid
341.1145  EOT
341.1146  }
341.1147  
341.1148 -post_install_pdo_mysql()
341.1149 -{
341.1150 -	grep -q ^extension=pdo_mysql.so "$1/etc/php.ini" || \
341.1151 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=pdo_mysql.so|' -i "$1/etc/php.ini"
341.1152 +post_install_pdo_mysql() {
341.1153 +	grep -q ^extension=pdo_mysql.so "$1/etc/php.ini" ||
341.1154 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=pdo_mysql.so|' -i "$1/etc/php.ini"
341.1155 +
341.1156  	# Start Web server.
341.1157  	while read daemon file; do
341.1158  		[ -z "$1" ] || continue
341.1159 @@ -979,14 +908,12 @@
341.1160  			/etc/init.d/$daemon start
341.1161  		fi
341.1162  	done <<EOT
341.1163 -apache apache/httpd.pid
341.1164 +apache   apache/httpd.pid
341.1165  lighttpd lighttpd.pid
341.1166  EOT
341.1167  }
341.1168  
341.1169 -# Pre and post remove commands for Tazpkg.
341.1170 -pre_remove_pdo_mysql()
341.1171 -{
341.1172 +pre_remove_pdo_mysql() {
341.1173  	sed -i '/.*=pdo_mysql.so.*/d' /etc/php.ini
341.1174  
341.1175  	# Start Web server.
341.1176 @@ -1000,29 +927,27 @@
341.1177  			/etc/init.d/$daemon start
341.1178  		fi
341.1179  	done <<EOT
341.1180 -apache apache/httpd.pid
341.1181 +apache   apache/httpd.pid
341.1182  lighttpd lighttpd.pid
341.1183  EOT
341.1184  }
341.1185  
341.1186 -# Post and pre install commans to stop
341.1187 -# and restart Web server if needed.
341.1188 -pre_install_pdo_pgsql()
341.1189 -{
341.1190 +# -----------------------------------------------------------------------------
341.1191 +pre_install_pdo_pgsql() {
341.1192  	while read daemon file; do
341.1193  		if [ -z "$1" -a -f "/var/run/$file" ]; then
341.1194  			/etc/init.d/$daemon stop
341.1195  		fi
341.1196  	done <<EOT
341.1197 -apache apache/httpd.pid
341.1198 +apache   apache/httpd.pid
341.1199  lighttpd lighttpd.pid
341.1200  EOT
341.1201  }
341.1202  
341.1203 -post_install_pdo_pgsql()
341.1204 -{
341.1205 -	grep -q ^extension=pdo_pgsql.so "$1/etc/php.ini" || \
341.1206 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=pdo_pgsql.so|' -i "$1/etc/php.ini"
341.1207 +post_install_pdo_pgsql() {
341.1208 +	grep -q ^extension=pdo_pgsql.so "$1/etc/php.ini" ||
341.1209 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=pdo_pgsql.so|' -i "$1/etc/php.ini"
341.1210 +
341.1211  	# Start Web server.
341.1212  	while read daemon file; do
341.1213  		[ -z "$1" ] || continue
341.1214 @@ -1034,14 +959,12 @@
341.1215  			/etc/init.d/$daemon start
341.1216  		fi
341.1217  	done <<EOT
341.1218 -apache apache/httpd.pid
341.1219 +apache   apache/httpd.pid
341.1220  lighttpd lighttpd.pid
341.1221  EOT
341.1222  }
341.1223  
341.1224 -# Pre and post remove commands for Tazpkg.
341.1225 -pre_remove_pdo_pgsql()
341.1226 -{
341.1227 +pre_remove_pdo_pgsql() {
341.1228  	sed -i '/.*=pdo_pgsql.so.*/d' /etc/php.ini
341.1229  
341.1230  	# Start Web server.
341.1231 @@ -1055,26 +978,24 @@
341.1232  			/etc/init.d/$daemon start
341.1233  		fi
341.1234  	done <<EOT
341.1235 -apache apache/httpd.pid
341.1236 +apache   apache/httpd.pid
341.1237  lighttpd lighttpd.pid
341.1238  EOT
341.1239  }
341.1240  
341.1241 -# Pre and post install commands for Tazpkg.
341.1242 -pre_install_php_pear()
341.1243 -{
341.1244 +# -----------------------------------------------------------------------------
341.1245 +pre_install_php_pear() {
341.1246  	while read daemon file; do
341.1247  		if [ -z "$1" -a -f "/var/run/$file" ]; then
341.1248  			/etc/init.d/$daemon stop
341.1249  		fi
341.1250  	done <<EOT
341.1251 -apache apache/httpd.pid
341.1252 +apache   apache/httpd.pid
341.1253  lighttpd lighttpd.pid
341.1254  EOT
341.1255  }
341.1256  
341.1257 -post_install_php_pear()
341.1258 -{
341.1259 +post_install_php_pear() {
341.1260  	grep ^include_path "$1/etc/php.ini"
341.1261  	sed -i 's|/php/includes"|/php/includes"\ninclude_path = ".:/usr/share/php"|' "$1/etc/php.ini"
341.1262  	# Restart Web server.
341.1263 @@ -1088,29 +1009,27 @@
341.1264  			/etc/init.d/$daemon start
341.1265  		fi
341.1266  	done <<EOT
341.1267 -apache apache/httpd.pid
341.1268 +apache   apache/httpd.pid
341.1269  lighttpd lighttpd.pid
341.1270  EOT
341.1271  }
341.1272  
341.1273 -# Post and pre install commans to stop
341.1274 -# and restart Web server if needed.
341.1275 -pre_install_php_pgsql()
341.1276 -{
341.1277 +# -----------------------------------------------------------------------------
341.1278 +pre_install_php_pgsql() {
341.1279  	while read daemon file; do
341.1280  		if [ -z "$1" -a -f "/var/run/$file" ]; then
341.1281  			/etc/init.d/$daemon stop
341.1282  		fi
341.1283  	done <<EOT
341.1284 -apache apache/httpd.pid
341.1285 +apache   apache/httpd.pid
341.1286  lighttpd lighttpd.pid
341.1287  EOT
341.1288  }
341.1289  
341.1290 -post_install_php_pgsql()
341.1291 -{
341.1292 -	grep -q ^extension=pgsql.so "$1/etc/php.ini" || \
341.1293 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=pgsql.so|' -i "$1/etc/php.ini"
341.1294 +post_install_php_pgsql() {
341.1295 +	grep -q ^extension=pgsql.so "$1/etc/php.ini" ||
341.1296 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=pgsql.so|' -i "$1/etc/php.ini"
341.1297 +
341.1298  	# Start Web server.
341.1299  	while read daemon file; do
341.1300  		[ -z "$1" ] || continue
341.1301 @@ -1122,14 +1041,12 @@
341.1302  			/etc/init.d/$daemon start
341.1303  		fi
341.1304  	done <<EOT
341.1305 -apache apache/httpd.pid
341.1306 +apache   apache/httpd.pid
341.1307  lighttpd lighttpd.pid
341.1308  EOT
341.1309  }
341.1310  
341.1311 -# Pre and post remove commands for Tazpkg.
341.1312 -pre_remove_php_pgsql()
341.1313 -{
341.1314 +pre_remove_php_pgsql() {
341.1315  	sed -i '/.*=pgsql.so.*/d' /etc/php.ini
341.1316  
341.1317  	# Start Web server.
341.1318 @@ -1143,29 +1060,27 @@
341.1319  			/etc/init.d/$daemon start
341.1320  		fi
341.1321  	done <<EOT
341.1322 -apache apache/httpd.pid
341.1323 +apache   apache/httpd.pid
341.1324  lighttpd lighttpd.pid
341.1325  EOT
341.1326  }
341.1327  
341.1328 -# Post and pre install commans to stop
341.1329 -# and restart Web server if needed.
341.1330 -pre_install_php_snmp()
341.1331 -{
341.1332 +# -----------------------------------------------------------------------------
341.1333 +pre_install_php_snmp() {
341.1334  	while read daemon file; do
341.1335  		if [ -z "$1" -a -f "/var/run/$file" ]; then
341.1336  			/etc/init.d/$daemon stop
341.1337  		fi
341.1338  	done <<EOT
341.1339 -apache apache/httpd.pid
341.1340 +apache   apache/httpd.pid
341.1341  lighttpd lighttpd.pid
341.1342  EOT
341.1343  }
341.1344  
341.1345 -post_install_php_snmp()
341.1346 -{
341.1347 -	grep -q ^extension=snmp.so "$1/etc/php.ini" || \
341.1348 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=snmp.so|' -i "$1/etc/php.ini"
341.1349 +post_install_php_snmp() {
341.1350 +	grep -q ^extension=snmp.so "$1/etc/php.ini" ||
341.1351 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=snmp.so|' -i "$1/etc/php.ini"
341.1352 +
341.1353  	# Start Web server.
341.1354  	while read daemon file; do
341.1355  		[ -z "$1" ] || continue
341.1356 @@ -1177,14 +1092,12 @@
341.1357  			/etc/init.d/$daemon start
341.1358  		fi
341.1359  	done <<EOT
341.1360 -apache apache/httpd.pid
341.1361 +apache   apache/httpd.pid
341.1362  lighttpd lighttpd.pid
341.1363  EOT
341.1364  }
341.1365  
341.1366 -# Pre and post remove commands for Tazpkg.
341.1367 -pre_remove_php_snmp()
341.1368 -{
341.1369 +pre_remove_php_snmp() {
341.1370  	sed -i '/.*=snmp.so.*/d' /etc/php.ini
341.1371  
341.1372  	# Start Web server.
341.1373 @@ -1198,29 +1111,27 @@
341.1374  			/etc/init.d/$daemon start
341.1375  		fi
341.1376  	done <<EOT
341.1377 -apache apache/httpd.pid
341.1378 +apache   apache/httpd.pid
341.1379  lighttpd lighttpd.pid
341.1380  EOT
341.1381  }
341.1382  
341.1383 -# Post and pre install commans to stop
341.1384 -# and restart Web server if needed.
341.1385 -pre_install_php_soap()
341.1386 -{
341.1387 +# -----------------------------------------------------------------------------
341.1388 +pre_install_php_soap() {
341.1389  	while read daemon file; do
341.1390  		if [ -z "$1" -a -f "/var/run/$file" ]; then
341.1391  			/etc/init.d/$daemon stop
341.1392  		fi
341.1393  	done <<EOT
341.1394 -apache apache/httpd.pid
341.1395 +apache   apache/httpd.pid
341.1396  lighttpd lighttpd.pid
341.1397  EOT
341.1398  }
341.1399  
341.1400 -post_install_php_soap()
341.1401 -{
341.1402 -	grep -q ^extension=soap.so "$1/etc/php.ini" || \
341.1403 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=soap.so|' -i "$1/etc/php.ini"
341.1404 +post_install_php_soap() {
341.1405 +	grep -q ^extension=soap.so "$1/etc/php.ini" ||
341.1406 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=soap.so|' -i "$1/etc/php.ini"
341.1407 +
341.1408  	# Start Web server.
341.1409  	while read daemon file; do
341.1410  		[ -z "$1" ] || continue
341.1411 @@ -1232,14 +1143,12 @@
341.1412  			/etc/init.d/$daemon start
341.1413  		fi
341.1414  	done <<EOT
341.1415 -apache apache/httpd.pid
341.1416 +apache   apache/httpd.pid
341.1417  lighttpd lighttpd.pid
341.1418  EOT
341.1419  }
341.1420  
341.1421 -# Pre and post remove commands for Tazpkg.
341.1422 -pre_remove_php_soap()
341.1423 -{
341.1424 +pre_remove_php_soap() {
341.1425  	sed -i '/.*=soap.so.*/d' /etc/php.ini
341.1426  
341.1427  	# Start Web server.
341.1428 @@ -1253,15 +1162,16 @@
341.1429  			/etc/init.d/$daemon start
341.1430  		fi
341.1431  	done <<EOT
341.1432 -apache apache/httpd.pid
341.1433 +apache   apache/httpd.pid
341.1434  lighttpd lighttpd.pid
341.1435  EOT
341.1436  }
341.1437  
341.1438 -post_install_php_sqlite()
341.1439 -{
341.1440 -	grep -q ^extension=sqlite3.so "$1/etc/php.ini" || \
341.1441 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=sqlite3.so|' -i "$1/etc/php.ini"
341.1442 +# -----------------------------------------------------------------------------
341.1443 +post_install_php_sqlite() {
341.1444 +	grep -q ^extension=sqlite3.so "$1/etc/php.ini" ||
341.1445 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=sqlite3.so|' -i "$1/etc/php.ini"
341.1446 +
341.1447  	# Start Web server.
341.1448  	while read daemon file; do
341.1449  		[ -z "$1" ] || continue
341.1450 @@ -1273,14 +1183,12 @@
341.1451  			/etc/init.d/$daemon start
341.1452  		fi
341.1453  	done <<EOT
341.1454 -apache apache/httpd.pid
341.1455 +apache   apache/httpd.pid
341.1456  lighttpd lighttpd.pid
341.1457  EOT
341.1458  }
341.1459  
341.1460 -# Pre and post remove commands for Tazpkg.
341.1461 -pre_remove_php_sqlite()
341.1462 -{
341.1463 +pre_remove_php_sqlite() {
341.1464  	sed -i '/.*=sqlite3.so.*/d' /etc/php.ini
341.1465  
341.1466  	# Start Web server.
341.1467 @@ -1294,7 +1202,7 @@
341.1468  			/etc/init.d/$daemon start
341.1469  		fi
341.1470  	done <<EOT
341.1471 -apache apache/httpd.pid
341.1472 +apache   apache/httpd.pid
341.1473  lighttpd lighttpd.pid
341.1474  EOT
341.1475  }
   342.1 --- a/pluma/receipt	Tue Mar 27 12:50:45 2018 +0200
   342.2 +++ b/pluma/receipt	Fri Mar 30 19:31:50 2018 +0300
   342.3 @@ -17,10 +17,7 @@
   342.4  SPLIT="pluma-dev pluma-plugins pluma"
   342.5  
   342.6  compile_rules() {
   342.7 -	fix ld
   342.8  	./autogen.sh \
   342.9 -		--sysconfdir=/etc \
  342.10 -		--localstatedir=/var \
  342.11  		$CONFIGURE_ARGS &&
  342.12  	fix libtool &&
  342.13  	make &&
   343.1 --- a/plymouth/receipt	Tue Mar 27 12:50:45 2018 +0200
   343.2 +++ b/plymouth/receipt	Fri Mar 30 19:31:50 2018 +0300
   343.3 @@ -1,48 +1,31 @@
   343.4 -# SliTaz package receipt.
   343.5 +# SliTaz package receipt v2.
   343.6  
   343.7  PACKAGE="plymouth"
   343.8  VERSION="0.8.6.1"
   343.9  CATEGORY="base-system"
  343.10 -SHORT_DESC="A graphical boot splash screen with KMS support."
  343.11 +SHORT_DESC="A graphical boot splash screen with KMS support"
  343.12  MAINTAINER="pankso@slitaz.org"
  343.13  LICENSE="GPL2"
  343.14 +WEB_SITE="http://www.freedesktop.org/wiki/Software/Plymouth"
  343.15 +
  343.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  343.17 -WEB_SITE="http://www.freedesktop.org/wiki/Software/Plymouth"
  343.18  WGET_URL="http://www.freedesktop.org/software/plymouth/releases/$TARBALL"
  343.19  
  343.20 -DEPENDS="libpng16 pango gtk+ xorg-libpciaccess libdrm"
  343.21  BUILD_DEPENDS="libpng16-dev pango-dev gtk+-dev xorg-libpciaccess-dev libdrm-dev"
  343.22  
  343.23 -# Rules to configure and make the package.
  343.24 -compile_rules()
  343.25 -{
  343.26 -	cd $src
  343.27 +compile_rules() {
  343.28  	./configure \
  343.29 -		--sysconfdir=/etc \
  343.30 -		--localstatedir=/var \
  343.31  		--libexecdir=/usr/lib \
  343.32  		--with-system-root-install \
  343.33  		--with-log-viewer \
  343.34  		--with-release-file=/etc/slitaz-release \
  343.35  		--disable-libdrm_nouveau \
  343.36  		$CONFIGURE_ARGS &&
  343.37 -	make && make install
  343.38 +	make &&
  343.39 +	make install
  343.40  }
  343.41  
  343.42 -# Rules to gen a SliTaz package suitable for Tazpkg.
  343.43 -genpkg_rules()
  343.44 -{
  343.45 -	mkdir -p $fs/lib $fs/usr/lib $fs/usr/share
  343.46 -	cp -a $install/bin $fs
  343.47 -	cp -a $install/etc $fs
  343.48 -	cp -a $install/sbin $fs
  343.49 -	cp -a $install/lib/*.so* $fs/lib
  343.50 -	cp -a $install/usr/bin $fs/usr
  343.51 -	cp -a $install/usr/sbin $fs/usr
  343.52 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
  343.53 -	cp -a $install/usr/lib/plymouth $fs/usr/lib
  343.54 -	rm $fs/usr/lib/plymouth/*.*a
  343.55 -	rm $fs/usr/lib/plymouth/*/*.*a
  343.56 +genpkg_rules() {
  343.57 +	copy @std
  343.58 +	DEPENDS="libpng16 pango gtk+ xorg-libpciaccess libdrm"
  343.59  }
  343.60 -
  343.61 -
   344.1 --- a/pm-utils/receipt	Tue Mar 27 12:50:45 2018 +0200
   344.2 +++ b/pm-utils/receipt	Fri Mar 30 19:31:50 2018 +0300
   344.3 @@ -1,43 +1,28 @@
   344.4 -# SliTaz package receipt.
   344.5 +# SliTaz package receipt v2.
   344.6  
   344.7  PACKAGE="pm-utils"
   344.8  VERSION="1.4.1"
   344.9  CATEGORY="system-tools"
  344.10 -SHORT_DESC="Collection of scripts that handle suspend and resume."
  344.11 +SHORT_DESC="Collection of scripts that handle suspend and resume"
  344.12  MAINTAINER="domcox@slitaz.org"
  344.13  LICENSE="GPL2"
  344.14 +WEB_SITE="http://pm-utils.freedesktop.org/"
  344.15 +
  344.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  344.17 -WEB_SITE="http://pm-utils.freedesktop.org/"
  344.18  WGET_URL="http://pm-utils.freedesktop.org/releases/$TARBALL"
  344.19 -CONFIG_FILES="/etc/pm"
  344.20 -TAGS="power-management"
  344.21  
  344.22 -DEPENDS="bash kbd"
  344.23 +compile_rules() {
  344.24 +	# workaround grep -x not implemented in busybox
  344.25 +	patch -p1 pm/functions.in $stuff/grep-x.patch
  344.26 +	# remove acoustic management not implemented in busybox
  344.27 +	patch -p1 pm/power.d/harddrive $stuff/harddrive.patch
  344.28  
  344.29 -# Rules to configure and make the package.
  344.30 -compile_rules()
  344.31 -{
  344.32 -	cd $src
  344.33 -	# workaround grep -x not implemented in busybox
  344.34 -	echo -n "Applying grep -x patch.."
  344.35 -	patch -p1 pm/functions.in $stuff/grep-x.patch > /dev/null \
  344.36 -		&& echo done. || echo failed.
  344.37 -	# remove acoustic management not implemented in busybox
  344.38 -	echo -n "Applying harddrive patch.."
  344.39 -	patch -p1 pm/power.d/harddrive $stuff/harddrive.patch > /dev/null \
  344.40 -		&& echo done. || echo failed.
  344.41 -	# build
  344.42 -	./configure \
  344.43 -		--prefix=/usr \
  344.44 -		--sysconfdir=/etc \
  344.45 -		$CONFIGURE_ARGS &&
  344.46 +	./configure $CONFIGURE_ARGS &&
  344.47  	make &&
  344.48  	make DESTDIR=$DESTDIR install
  344.49  }
  344.50  
  344.51 -# Rules to gen a SliTaz package suitable for Tazpkg.
  344.52 -genpkg_rules()
  344.53 -{
  344.54 +genpkg_rules() {
  344.55  	# main
  344.56  	mkdir -p $fs/usr/lib
  344.57  	cp -a $install/usr/bin $fs/usr
  344.58 @@ -49,7 +34,6 @@
  344.59  	cp -a $install/etc/pm $fs/etc
  344.60  
  344.61  	# remove incompatible hooks
  344.62 -	echo "remove incompatible hooks"
  344.63  	# NetworkManager hook
  344.64  	rm -f $fs/usr/lib/pm-utils/sleep.d/55NetworkManager
  344.65  	# grub hook (Redhat specific)
  344.66 @@ -60,20 +44,22 @@
  344.67  	rm -f $fs/usr/lib/pm-utils/power.d/sata_alpm
  344.68  
  344.69  	# add video quirks
  344.70 -	echo -n "Add video quirks"
  344.71  	cp -a $stuff/video-quirks $fs/usr/lib/pm-utils
  344.72 -	status
  344.73 +
  344.74 +	DEPENDS="bash kbd"
  344.75 +	CONFIG_FILES="/etc/pm"
  344.76 +	TAGS="power-management"
  344.77  }
  344.78  
  344.79 -pre_remove()
  344.80 -{
  344.81 +pre_remove() {
  344.82  	[ -s "$1/etc/slim.conf" ] &&
  344.83  	sed -i 's|.*/usr/sbin/pm-suspend|#&|' "$1/etc/slim.conf"
  344.84 +	:
  344.85  }
  344.86  
  344.87 -post_install()
  344.88 -{
  344.89 +post_install() {
  344.90  	[ -s "$1/etc/slim.conf" ] &&
  344.91  	sed -i 's|^#suspend_cmd.*|suspend_cmd         /usr/sbin/pm-suspend|' \
  344.92  		"$1/etc/slim.conf"
  344.93 +	:
  344.94  }
   345.1 --- a/poedit/receipt	Tue Mar 27 12:50:45 2018 +0200
   345.2 +++ b/poedit/receipt	Fri Mar 30 19:31:50 2018 +0300
   345.3 @@ -7,43 +7,35 @@
   345.4  MAINTAINER="pankso@slitaz.org"
   345.5  LICENSE="MIT"
   345.6  WEB_SITE="http://poedit.net/"
   345.7 +
   345.8  TARBALL="$PACKAGE-$VERSION.tar.gz"
   345.9  WGET_URL="https://github.com/vslavik/$PACKAGE/archive/v$VERSION-oss.tar.gz"
  345.10  
  345.11  BUILD_DEPENDS="automake gettext asciidoc libxslt xmlto util-linux-getopt \
  345.12  docbook-xsl gcc49 wxWidgets-dev icu-dev gtkspell-dev \
  345.13  lucene++-dev db-dev libdb libdb-cxx expat-dev"
  345.14 -SPLIT="poedit poedit-i18n"
  345.15 +SPLIT="poedit-i18n poedit"
  345.16  
  345.17 -# Rules to configure and make the package.
  345.18 -compile_rules()
  345.19 -{
  345.20 +compile_rules() {
  345.21  	export CXX=/usr/bin/i486-slitaz-linux-g++-49
  345.22  	#export CXXFLAGS="$CFLAGS -std=gnu++11"
  345.23  	./bootstrap &&
  345.24 -	./configure \
  345.25 -		--prefix=/usr \
  345.26 -		--sysconfdir=/etc \
  345.27 -		$CONFIGURE_ARGS &&
  345.28 +	./configure $CONFIGURE_ARGS &&
  345.29  	make &&
  345.30  	make DESTDIR=$DESTDIR install
  345.31  }
  345.32  
  345.33 -# Rules to gen a SliTaz package suitable for Tazpkg.
  345.34 -genpkg_rules()
  345.35 -{
  345.36 +genpkg_rules() {
  345.37  	case $PACKAGE in
  345.38 -	poedit)
  345.39 -		SUGGESTED="aspell"
  345.40 -		DEPENDS="wxWidgets lucene++ gtkspell gcc49-lib-base gettext-tools"
  345.41 -		cp -a $install/* $fs
  345.42 -		rm -r $fs/usr/share/locale $fs/usr/share/man
  345.43 -		;;
  345.44 -	poedit-18n)
  345.45 -		CAT="localization|Translations for Poedit"
  345.46 -		DEPENDS="poedit"
  345.47 -		mkdir -p $fs/usr/share
  345.48 -		cp -a $install/usr/share/locale $fs/usr/share
  345.49 -		;;
  345.50 +		poedit-18n)
  345.51 +			copy locale/
  345.52 +			CAT="localization|translations"
  345.53 +			DEPENDS="poedit"
  345.54 +			;;
  345.55 +		poedit)
  345.56 +			copy @std @rm
  345.57 +			DEPENDS="wxWidgets lucene++ gtkspell gcc49-lib-base gettext-tools"
  345.58 +			SUGGESTED="aspell"
  345.59 +			;;
  345.60  	esac
  345.61  }
   346.1 --- a/polkit/receipt	Tue Mar 27 12:50:45 2018 +0200
   346.2 +++ b/polkit/receipt	Fri Mar 30 19:31:50 2018 +0300
   346.3 @@ -31,8 +31,6 @@
   346.4  	esac
   346.5  
   346.6  	./configure \
   346.7 -		--sysconfdir=/etc \
   346.8 -		--localstatedir=/var \
   346.9  		--enable-libsystemd-login=no \
  346.10  		$SET_ARGS \
  346.11  		$CONFIGURE_ARGS &&
   347.1 --- a/poppler/receipt	Tue Mar 27 12:50:45 2018 +0200
   347.2 +++ b/poppler/receipt	Fri Mar 30 19:31:50 2018 +0300
   347.3 @@ -15,28 +15,21 @@
   347.4  fontconfig-dev cairo-dev lcms2-dev"
   347.5  SPLIT="poppler-apps poppler-dev"
   347.6  
   347.7 -# Rules to configure and make the package.
   347.8 -compile_rules()
   347.9 -{
  347.10 +compile_rules() {
  347.11  	./configure \
  347.12 -		--sysconfdir=/etc \
  347.13  		--disable-static \
  347.14  		--enable-build-type=release \
  347.15  		--enable-cmyk \
  347.16  		--enable-xpdf-headers \
  347.17  		--with-testdatadir=$PWD/testfiles \
  347.18  		$CONFIGURE_ARGS &&
  347.19 -	make && make install &&
  347.20 +	make &&
  347.21 +	make install || return 1
  347.22  
  347.23 -	docdir="$install/usr/share/doc/poppler-$VERSION" &&
  347.24 -	install -v -m755 -d        $docdir &&
  347.25 -	install -v -m644 README*   $docdir &&
  347.26 -	cp -vr glib/reference/html $docdir
  347.27 +	cook_pick_docs README* glib/reference/html/
  347.28  }
  347.29  
  347.30 -# Rules to gen a SliTaz package suitable for Tazpkg.
  347.31 -genpkg_rules()
  347.32 -{
  347.33 +genpkg_rules() {
  347.34  	case $PACKAGE in
  347.35  		poppler)
  347.36  			copy *.so*
   348.1 --- a/privoxy/receipt	Tue Mar 27 12:50:45 2018 +0200
   348.2 +++ b/privoxy/receipt	Fri Mar 30 19:31:50 2018 +0300
   348.3 @@ -1,80 +1,59 @@
   348.4 -# SliTaz package receipt.
   348.5 +# SliTaz package receipt v2.
   348.6  
   348.7  PACKAGE="privoxy"
   348.8  VERSION="3.0.23-stable"
   348.9  CATEGORY="network"
  348.10 -SHORT_DESC="Non-caching web privacy proxy."
  348.11 +SHORT_DESC="Non-caching web privacy proxy"
  348.12  MAINTAINER="paul@slitaz.org"
  348.13  LICENSE="GPL2"
  348.14 +WEB_SITE="http://www.privoxy.org/"
  348.15 +
  348.16  TARBALL="$PACKAGE-$VERSION-src.tar.gz"
  348.17 -WEB_SITE="http://www.privoxy.org/"
  348.18  WGET_URL="http://downloads.sourceforge.net/ijbswa/$TARBALL"
  348.19  
  348.20 -DEPENDS="zlib pcre"
  348.21  BUILD_DEPENDS="zlib-dev autoconf perl m4 coreutils"
  348.22  
  348.23 -# Rules to configure and make the package.
  348.24 -compile_rules()
  348.25 -{
  348.26 +compile_rules() {
  348.27  	# Have to create privoxy user/group to be able to compile
  348.28  	adduser -s /bin/false -H -D -u 42 privoxy
  348.29  	addgroup -g 42 privoxy
  348.30 -	
  348.31 -	cd $src
  348.32  
  348.33 -	# Needs autoconf
  348.34  	autoheader
  348.35  	autoconf
  348.36  
  348.37  	./configure \
  348.38 -		--prefix=/usr \
  348.39  		--sysconfdir=/etc/privoxy \
  348.40 -		--infodir=/usr/share/info \
  348.41 -		--mandir=/usr/share/man \
  348.42 -		--localstatedir=/var \
  348.43  		$CONFIGURE_ARGS &&
  348.44 -	make && make DESTDIR=$DESTDIR install
  348.45 +	make &&
  348.46 +	make DESTDIR=$DESTDIR install || return 1
  348.47 +
  348.48 +	install -Dm755 $stuff/daemon-privoxy $install/etc/init.d/privoxy
  348.49  }
  348.50  
  348.51 -# Rules to gen a SliTaz package suitable for Tazpkg.
  348.52 -genpkg_rules()
  348.53 -{
  348.54 -	mkdir -p $fs/etc/init.d $fs/usr
  348.55 -	cp -a $install/usr/sbin $fs/usr
  348.56 -	cp -a $install/var $fs
  348.57 -	cp -a $install/etc $fs
  348.58 -
  348.59 -	# Copy daemon from stuff
  348.60 -	cp $stuff/daemon-privoxy $fs/etc/init.d/privoxy
  348.61 +genpkg_rules() {
  348.62 +	copy @std
  348.63 +	DEPENDS="zlib pcre"
  348.64  }
  348.65  
  348.66 -post_install()
  348.67 -{
  348.68 +post_install() {
  348.69  	# adduser privoxy if needed
  348.70  	if ! grep -q privoxy "$1/etc/passwd"; then
  348.71 -		echo -n "Adding user privoxy..."
  348.72  		chroot "$1/" adduser -s /bin/false -H -D -u 42 privoxy
  348.73 -		status
  348.74  	fi
  348.75  
  348.76  	if ! grep -q privoxy "$1/etc/group"; then
  348.77 -		echo -n "Adding group privoxy..."
  348.78  		chroot "$1/" addgroup -g 42 privoxy
  348.79 -		status
  348.80  	fi
  348.81  
  348.82  	# and change file permissions
  348.83 -	echo -n "Changing file permissions..."
  348.84  	chroot "$1/" chown -R privoxy.privoxy /etc/privoxy
  348.85  	chown -R root.root "$1/etc/privoxy/templates"
  348.86  	chown root.root "$1/etc/privoxy"
  348.87  	chroot "$1/" chown privoxy.privoxy /var/log/privoxy/logfile
  348.88 -	status
  348.89  }
  348.90  
  348.91  # Del user privoxy when pkg is removed.
  348.92 -post_remove()
  348.93 -{
  348.94 +post_remove() {
  348.95  	deluser privoxy
  348.96  	delgroup privoxy
  348.97  }
   349.1 --- a/proftpd/receipt	Tue Mar 27 12:50:45 2018 +0200
   349.2 +++ b/proftpd/receipt	Fri Mar 30 19:31:50 2018 +0300
   349.3 @@ -14,13 +14,8 @@
   349.4  BUILD_DEPENDS="acl-dev attr-dev"
   349.5  SPLIT="proftpd-dev"
   349.6  
   349.7 -# Rules to configure and make the package.
   349.8 -compile_rules()
   349.9 -{
  349.10 -	./configure \
  349.11 -		--sysconfdir=/etc \
  349.12 -		--localstatedir=/var \
  349.13 -		$CONFIGURE_ARGS &&
  349.14 +compile_rules() {
  349.15 +	./configure $CONFIGURE_ARGS &&
  349.16  	make &&
  349.17  	make DESTDIR=$DESTDIR install
  349.18  
  349.19 @@ -31,9 +26,7 @@
  349.20  EOT
  349.21  }
  349.22  
  349.23 -# Rules to gen a SliTaz package suitable for Tazpkg.
  349.24 -genpkg_rules()
  349.25 -{
  349.26 +genpkg_rules() {
  349.27  	case $PACKAGE in
  349.28  		proftpd)
  349.29  			copy @std
   350.1 --- a/proxychains-ng/receipt	Tue Mar 27 12:50:45 2018 +0200
   350.2 +++ b/proxychains-ng/receipt	Fri Mar 30 19:31:50 2018 +0300
   350.3 @@ -3,20 +3,18 @@
   350.4  PACKAGE="proxychains-ng"
   350.5  VERSION="4.8.1"
   350.6  CATEGORY="network"
   350.7 -SHORT_DESC="Forces any tcp connection made by a client to follow through proxy."
   350.8 +SHORT_DESC="Forces any tcp connection made by a client to follow through proxy"
   350.9  MAINTAINER="pascal.bellard@slitaz.org"
  350.10  LICENSE="GPL2"
  350.11 +WEB_SITE="https://github.com/rofl0r/proxychains-ng"
  350.12 +
  350.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
  350.14 -WEB_SITE="https://github.com/rofl0r/proxychains-ng"
  350.15  WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
  350.16 -CONFIG_FILES="/etc/proxychains.conf"
  350.17  
  350.18 -BUILD_DEPENDS="wget"
  350.19 -
  350.20 -# Rules to configure and make the package.
  350.21 -compile_rules()
  350.22 -{
  350.23 -	./configure --prefix=/usr \
  350.24 +compile_rules() {
  350.25 +	# site script isn't used
  350.26 +	./configure \
  350.27 +		--prefix=/usr \
  350.28  		--sysconfdir=/etc \
  350.29  		$CONFIGURE_ARGS &&
  350.30  	make &&
  350.31 @@ -24,9 +22,7 @@
  350.32  	make DESTDIR=$DESTDIR install-config
  350.33  }
  350.34  
  350.35 -# Rules to gen a SliTaz package suitable for Tazpkg.
  350.36 -genpkg_rules()
  350.37 -{
  350.38 -	cp -a $install/usr $fs
  350.39 +genpkg_rules() {
  350.40 +	copy @std
  350.41 +	CONFIG_FILES="/etc/proxychains.conf"
  350.42  }
  350.43 -
   351.1 --- a/pulseaudio/receipt	Tue Mar 27 12:50:45 2018 +0200
   351.2 +++ b/pulseaudio/receipt	Fri Mar 30 19:31:50 2018 +0300
   351.3 @@ -21,8 +21,6 @@
   351.4  
   351.5  compile_rules() {
   351.6  	./configure \
   351.7 -		--sysconfdir=/etc \
   351.8 -		--localstatedir=/var \
   351.9  		--disable-bluez4 \
  351.10  		--disable-bluez5 \
  351.11  		--disable-rpath \
   352.1 --- a/pygtk/receipt	Tue Mar 27 12:50:45 2018 +0200
   352.2 +++ b/pygtk/receipt	Fri Mar 30 19:31:50 2018 +0300
   352.3 @@ -16,12 +16,12 @@
   352.4  SPLIT="pygtk-dev"
   352.5  
   352.6  compile_rules() {
   352.7 -	fix ld
   352.8  	./configure \
   352.9  		--disable-docs \
  352.10  		$CONFIGURE_ARGS &&
  352.11  	fix libtool &&
  352.12 -	make $MAKEFLAGS && make install
  352.13 +	make $MAKEFLAGS &&
  352.14 +	make install
  352.15  }
  352.16  
  352.17  genpkg_rules() {
   353.1 --- a/pygtksourceview/receipt	Tue Mar 27 12:50:45 2018 +0200
   353.2 +++ b/pygtksourceview/receipt	Fri Mar 30 19:31:50 2018 +0300
   353.3 @@ -16,7 +16,6 @@
   353.4  
   353.5  compile_rules() {
   353.6  	CFLAGS="$CFLAGS $(pkg-config --cflags pygtk-2.0 gtksourceview-2.0)"
   353.7 -	fix ld
   353.8  	./configure \
   353.9  		--disable-docs \
  353.10  		$CONFIGURE_ARGS &&
   354.1 --- a/python-caja/receipt	Tue Mar 27 12:50:45 2018 +0200
   354.2 +++ b/python-caja/receipt	Fri Mar 30 19:31:50 2018 +0300
   354.3 @@ -16,9 +16,8 @@
   354.4  
   354.5  compile_rules() {
   354.6  	./autogen.sh \
   354.7 -		--sysconfdir=/etc \
   354.8 -		--localstatedir=/var \
   354.9  		$CONFIGURE_ARGS &&
  354.10 +	fix libtool &&
  354.11  	make &&
  354.12  	make install
  354.13  }
   355.1 --- a/qemu-light/receipt	Tue Mar 27 12:50:45 2018 +0200
   355.2 +++ b/qemu-light/receipt	Fri Mar 30 19:31:50 2018 +0300
   355.3 @@ -1,25 +1,20 @@
   355.4 -# SliTaz package receipt.
   355.5 +# SliTaz package receipt v2.
   355.6  
   355.7  PACKAGE="qemu-light"
   355.8  VERSION="2.0.2"
   355.9  CATEGORY="misc"
  355.10 -SHORT_DESC="Light Qemu i386-softmmu target (without xen, vde, bluez, blobs, tls)."
  355.11 +SHORT_DESC="Light Qemu i386-softmmu target (without xen, vde, bluez, blobs, tls)"
  355.12  MAINTAINER="pankso@slitaz.org"
  355.13  LICENSE="GPL2"
  355.14 -SOURCE="qemu"
  355.15 -TARBALL="$SOURCE-$VERSION.tar.bz2"
  355.16  WEB_SITE="http://www.qemu.org/"
  355.17 +
  355.18 +TARBALL="qemu-$VERSION.tar.bz2"
  355.19  WGET_URL="http://wiki.qemu.org/download/$TARBALL"
  355.20 -TAGS="virtualization"
  355.21 -CONFLICT="qemu"
  355.22  
  355.23 -DEPENDS="alsa-lib libsdl util-linux-uuid"
  355.24  BUILD_DEPENDS="gettext perl alsa-lib-dev libsdl-dev util-linux-uuid-dev python \
  355.25  glib-dev zlib-dev autoconf automake libtool bison flex"
  355.26  
  355.27 -# Rules to configure and make the package.
  355.28 -compile_rules()
  355.29 -{
  355.30 +compile_rules() {
  355.31  	mkdir -p $DESTIDR/usr/share/qemu/ia32
  355.32  
  355.33  	[ -s $SRC/$UEFIZIP ] || wget -P $SRC \
  355.34 @@ -33,8 +28,6 @@
  355.35  	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
  355.36  	#--cross-prefix= --host-cc=
  355.37  	./configure \
  355.38 -		--prefix=/usr \
  355.39 -		--sysconfdir=/etc \
  355.40  		--disable-xen \
  355.41  		--disable-vnc-sasl \
  355.42  		--disable-vnc-tls \
  355.43 @@ -45,12 +38,11 @@
  355.44  		--audio-drv-list=alsa \
  355.45  		--target-list="$TARGET" \
  355.46  		--cc=$BUILD_SYSTEM-gcc &&
  355.47 -	make && make DESTDIR=$DESTDIR install
  355.48 +	make &&
  355.49 +	make DESTDIR=$DESTDIR install
  355.50  }
  355.51  
  355.52 -# Rules to gen a SliTaz package suitable for Tazpkg.
  355.53 -genpkg_rules()
  355.54 -{
  355.55 +genpkg_rules() {
  355.56  	mkdir -p $fs/usr/share/qemu
  355.57  	cp -a $install/usr/bin $fs/usr
  355.58  	cp -a $install/usr/share/qemu/keymaps $fs/usr/share/qemu
  355.59 @@ -60,4 +52,7 @@
  355.60  	done
  355.61  	# Create qemu symlink
  355.62  	cd $fs/usr/bin && ln -s qemu-system-i386 qemu
  355.63 +	DEPENDS="alsa-lib libsdl util-linux-uuid"
  355.64 +	TAGS="virtualization"
  355.65 +	CONFLICT="qemu"
  355.66  }
   356.1 --- a/qemu/receipt	Tue Mar 27 12:50:45 2018 +0200
   356.2 +++ b/qemu/receipt	Fri Mar 30 19:31:50 2018 +0300
   356.3 @@ -3,26 +3,31 @@
   356.4  PACKAGE="qemu"
   356.5  VERSION="2.0.2"
   356.6  CATEGORY="misc"
   356.7 -SHORT_DESC="General-purpose full virtualizer for x86 hardware."
   356.8 +SHORT_DESC="General-purpose full virtualizer"
   356.9  MAINTAINER="pascal.bellard@slitaz.org"
  356.10  LICENSE="GPL2"
  356.11 +WEB_SITE="http://qemu.org"
  356.12 +
  356.13  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  356.14 -WEB_SITE="http://qemu.org"
  356.15  WGET_URL="http://wiki.qemu.org/download/$TARBALL"
  356.16  
  356.17  BUILD_DEPENDS="gettext perl alsa-lib-dev gnutls-dev libsdl-dev bluez-dev \
  356.18  libtasn1-dev vde2-dev curl-dev attr-dev util-linux-uuid-dev \
  356.19  glib-dev autoconf automake libtool bison flex libusb-dev ncurses-dev"
  356.20 -SPLIT="qemu qemu-arm qemu-mips qemu-x86_64"
  356.21 +SPLIT="qemu-arm qemu-mips qemu-x86_64 qemu"
  356.22  
  356.23 -# Rules to configure and make the package.
  356.24 -compile_rules()
  356.25 -{
  356.26 -	mkdir -p $DESTIDR/usr/share/qemu/ia32
  356.27 +compile_rules() {
  356.28 +	UEFIZIP="OVMF-IA32-r15214.zip"
  356.29 +	[ -s $SRC/$UEFIZIP ] ||
  356.30 +	wget -P $SRC $SF_MIRROR/edk2/$UEFIZIP
  356.31 +	mkdir -p                       $install/usr/share/qemu/ia32/
  356.32 +	unzip $SRC/$UEFIZIP OVMF.fd -d $install/usr/share/qemu/ia32/
  356.33  
  356.34 -	[ -s $SRC/$UEFIZIP ] || wget -P $SRC \
  356.35 -		http://netassist.dl.sourceforge.net/project/edk2/OVMF/$UEFIZIP
  356.36 -	unzip $SRC/$UEFIZIP OVMF.fd -d $DESTIDR/usr/share/qemu/ia32
  356.37 +	UEFIZIP="OVMF-X64-r15214.zip"
  356.38 +	[ -s $SRC/$UEFIZIP ] ||
  356.39 +	wget -P $SRC $SF_MIRROR/edk2/$UEFIZIP
  356.40 +	mkdir -p                       $install/usr/share/qemu/x64/
  356.41 +	unzip $SRC/$UEFIZIP OVMF.fd -d $install/usr/share/qemu/x64/
  356.42  
  356.43  	patch -p0 < $stuff/cloop.u
  356.44  
  356.45 @@ -32,75 +37,48 @@
  356.46  	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
  356.47  	#--cross-prefix= --host-cc=
  356.48  	./configure \
  356.49 -		--prefix=/usr \
  356.50 -		--sysconfdir=/etc \
  356.51  		--enable-sdl \
  356.52  		--enable-curses \
  356.53  		--audio-drv-list=alsa,oss \
  356.54  		--target-list="$TARGET" \
  356.55  		--cc=$BUILD_SYSTEM-gcc &&
  356.56 -	make && make DESTDIR=$DESTDIR install
  356.57 +	make &&
  356.58 +	make DESTDIR=$DESTDIR install || return 1
  356.59 +
  356.60 +	ln -s qemu-system-i386   $install/usr/bin/qemu
  356.61 +	ln -s qemu-system-arm    $install/usr/bin/qemu-arm
  356.62 +	ln -s qemu-system-mips   $install/usr/bin/qemu-mips
  356.63 +	ln -s qemu-system-x86_64 $install/usr/bin/qemu-x86_64
  356.64  }
  356.65  
  356.66 -# Rules to gen a SliTaz package suitable for Tazpkg.
  356.67 -genpkg_rules()
  356.68 -{
  356.69 +genpkg_rules() {
  356.70  	case $PACKAGE in
  356.71 -	qemu)
  356.72 -		UEFIZIP="OVMF-IA32-r15214.zip"
  356.73 -		EXTRA_SOURCE_FILES="$UEFIZIP"
  356.74 -		TAGS="virtualization emulator"
  356.75 -		DEPENDS="alsa-lib gnutls libsdl bluez libtasn1 libsasl vde2 \
  356.76 +		qemu-arm)
  356.77 +			copy qemu-system-arm qemu-arm
  356.78 +			CAT="misc|for ARM hardware"
  356.79 +			DEPENDS="qemu"
  356.80 +			TAGS="virtualization"
  356.81 +			;;
  356.82 +		qemu-mips)
  356.83 +			copy qemu-system-mips qemu-mips
  356.84 +			CAT="misc|for MIPS hardware"
  356.85 +			DEPENDS="qemu"
  356.86 +			TAGS="virtualization"
  356.87 +			;;
  356.88 +		qemu-x86_64)
  356.89 +			copy qemu-system-x86_64 qemu-x86_64 x64/OVMF.fd target-x86_64.conf
  356.90 +			CAT="misc|for X86_64 CPU"
  356.91 +			DEPENDS="qemu"
  356.92 +			TAGS="virtualization"
  356.93 +			;;
  356.94 +		qemu)
  356.95 +			copy @std @rm
  356.96 +			# Remove unneeded bios binaries
  356.97 +			rm -f $fs/usr/share/qemu/*ppc* $fs/usr/share/qemu/*sparc*
  356.98 +			CATEGORY="misc|for x86 hardware"
  356.99 +			DEPENDS="alsa-lib gnutls libsdl bluez libtasn1 libsasl vde2 \
 356.100  			libcurl ncurses attr util-linux-uuid glib libusb"
 356.101 -		mkdir -p $fs/usr/bin $fs/usr/share
 356.102 -
 356.103 -		# /etc/qemu is for x86_64
 356.104 -		#cp -a $install/etc $fs
 356.105 -
 356.106 -		cp -a $install/usr/bin/qemu-*-i386 $fs/usr/bin
 356.107 -		cp -a $install/usr/bin/qemu-ga $fs/usr/bin
 356.108 -		cp -a $install/usr/bin/qemu-io $fs/usr/bin
 356.109 -		cp -a $install/usr/bin/qemu-img $fs/usr/bin
 356.110 -		cp -a $install/usr/bin/qemu-nbd $fs/usr/bin
 356.111 -
 356.112 -		cp -a $install/usr/share/qemu $fs/usr/share
 356.113 -
 356.114 -		# Remove unneeded bios binaries
 356.115 -		rm -f $fs/usr/share/qemu/*ppc*
 356.116 -		rm -f $fs/usr/share/qemu/*sparc*
 356.117 -
 356.118 -		# Create qemu symlink
 356.119 -		cd $fs/usr/bin && ln -s qemu-system-i386 $PACKAGE
 356.120 -		;;
 356.121 -	qemu-arm)
 356.122 -		CAT="misc|General-purpose full virtualizer for ARM hardware."
 356.123 -		TAGS="virtualization"
 356.124 -		DEPENDS="qemu"
 356.125 -		mkdir -p $fs/usr/bin
 356.126 -		cp -a $install/usr/bin/qemu-*${PACKAGE#qemu-} $fs/usr/bin
 356.127 -		cd $fs/usr/bin && ln -s qemu-system-${PACKAGE#qemu-} $PACKAGE
 356.128 -		;;
 356.129 -	qemu-mips)
 356.130 -		CAT="misc|General-purpose full virtualizer for MIPS hardware."
 356.131 -		TAGS="virtualization"
 356.132 -		DEPENDS="qemu"
 356.133 -		mkdir -p $fs/usr/bin
 356.134 -		cp -a $install/usr/bin/qemu-*${PACKAGE#qemu-} $fs/usr/bin
 356.135 -		cd $fs/usr/bin && ln -s qemu-system-${PACKAGE#qemu-} $PACKAGE
 356.136 -		;;
 356.137 -	qemu-x86_64)
 356.138 -		CAT="misc|General-purpose full virtualizer for X86_64 CPU."
 356.139 -		TAGS="virtualization"
 356.140 -		UEFIZIP="OVMF-X64-r15214.zip"
 356.141 -		EXTRA_SOURCE_FILES="$UEFIZIP"
 356.142 -		DEPENDS="qemu"
 356.143 -		mkdir -p $fs/usr/bin $fs/usr/share/qemu/x64 $fs/etc
 356.144 -		cp -a $install/etc/qemu $fs/etc
 356.145 -		cp -a $install/usr/bin/qemu-*${PACKAGE#qemu-} $fs/usr/bin
 356.146 -		cd $fs/usr/bin && ln -s qemu-system-${PACKAGE#qemu-} $PACKAGE
 356.147 -		[ -s $SRC/$UEFIZIP ] || wget -P $SRC \
 356.148 -			http://netassist.dl.sourceforge.net/project/edk2/OVMF/$UEFIZIP
 356.149 -		unzip $SRC/$UEFIZIP OVMF.fd -d $fs/usr/share/qemu/x64
 356.150 -		;;
 356.151 +			TAGS="virtualization emulator"
 356.152 +			;;
 356.153  	esac
 356.154  }
   357.1 --- a/qt4-base/receipt	Tue Mar 27 12:50:45 2018 +0200
   357.2 +++ b/qt4-base/receipt	Fri Mar 30 19:31:50 2018 +0300
   357.3 @@ -7,8 +7,9 @@
   357.4  SHORT_DESC="Qt4 less deps rebuild (without gstreamer, phonon etc.)"
   357.5  MAINTAINER="psychomaniak@xakep.ru"
   357.6  LICENSE="GPL3 LGPL2.1"
   357.7 +WEB_SITE="http://qt-project.org/"
   357.8 +
   357.9  TARBALL="$SOURCE-$VERSION.tar.gz"
  357.10 -WEB_SITE="http://qt-project.org/"
  357.11  WGET_URL="http://download.qt-project.org/archive/qt/${VERSION%.*}/$VERSION/$TARBALL"
  357.12  
  357.13  BUILD_DEPENDS="xorg-libX11-dev dbus-dev libmng-dev \
  357.14 @@ -22,11 +23,10 @@
  357.15  sqlite3-dev libQtClucene wayland-dev"
  357.16  SPLIT="qt-base libQtWebkit qtconfig"
  357.17  
  357.18 -# Rules to configure and make the package.
  357.19 -compile_rules()
  357.20 -{
  357.21 +compile_rules() {
  357.22  	export CXXFLAGS="$CXXFLAGS -std=gnu++98"
  357.23  
  357.24 +	# site script isn't used
  357.25  	./configure\
  357.26  		-silent \
  357.27  		-prefix /usr \
  357.28 @@ -64,9 +64,7 @@
  357.29  	make INSTALL_ROOT=$DESTDIR install
  357.30  }
  357.31  
  357.32 -# Rules to gen a SliTaz package suitable for Tazpkg.
  357.33 -genpkg_rules()
  357.34 -{
  357.35 +genpkg_rules() {
  357.36  	case $PACKAGE in
  357.37  	qt4-base)
  357.38  		# PROVIDE="qt-x11-opensource-src Qt4"
  357.39 @@ -75,10 +73,9 @@
  357.40  		mkdir -p $fs/etc/xdg
  357.41  		;;
  357.42  	libQtWebkit)
  357.43 +		copy libQtWebKit.so*
  357.44  		CAT="network|Web browser engine for Qt"
  357.45  		DEPENDS="libQtCore libQtGui libQtNetwork libpng16"
  357.46 -		mkdir -p $fs/usr/lib
  357.47 -		cp -a $install/usr/lib/libQtWebKit.so* $fs/usr/lib
  357.48  		;;
  357.49  	qtconfig)
  357.50  		CAT="x-window|Qtconfig is a tool that allows users to customize the default settings for Qt applications"
   358.1 --- a/quota/receipt	Tue Mar 27 12:50:45 2018 +0200
   358.2 +++ b/quota/receipt	Fri Mar 30 19:31:50 2018 +0300
   358.3 @@ -1,4 +1,4 @@
   358.4 -# SliTaz package receipt.
   358.5 +# SliTaz package receipt v2.
   358.6  
   358.7  PACKAGE="quota"
   358.8  VERSION="4.01"
   358.9 @@ -6,30 +6,20 @@
  358.10  SHORT_DESC="Tools for the Linux Diskquota system"
  358.11  MAINTAINER="pascal.bellard@slitaz.org"
  358.12  LICENSE="GPL2"
  358.13 +WEB_SITE="http://quota.sourceforge.net/"
  358.14 +
  358.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
  358.16 -WEB_SITE="http://quota.sourceforge.net/"
  358.17  WGET_URL="$SF_MIRROR/linuxquota/quota-tools/$VERSION/$TARBALL"
  358.18  
  358.19 -DEPENDS="e2fsprogs"
  358.20  BUILD_DEPENDS="gettext e2fsprogs-dev"
  358.21  
  358.22 -# Rules to configure and make the package.
  358.23 -compile_rules()
  358.24 -{
  358.25 -	cd $src
  358.26 -	./configure --prefix=/usr \
  358.27 -		--sysconfdir=/etc \
  358.28 -		--mandir=/usr/share/man \
  358.29 -		$CONFIGURE_ARGS &&
  358.30 +compile_rules() {
  358.31 +	./configure $CONFIGURE_ARGS &&
  358.32  	make &&
  358.33 -	make ROOTDIR=$DESTDIR install 2>&1 | grep -v '*.2'
  358.34 +	make ROOTDIR=$DESTDIR install
  358.35  }
  358.36  
  358.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
  358.38 -genpkg_rules()
  358.39 -{
  358.40 -	mkdir -p $fs/usr
  358.41 -	cp -a $install/usr/bin $fs/usr
  358.42 -	cp -a $install/usr/sbin $fs/usr
  358.43 -	cp -a $install/etc $fs
  358.44 +genpkg_rules() {
  358.45 +	copy @std
  358.46 +	DEPENDS="e2fsprogs"
  358.47  }
   359.1 --- a/radiusclient-ng/receipt	Tue Mar 27 12:50:45 2018 +0200
   359.2 +++ b/radiusclient-ng/receipt	Fri Mar 30 19:31:50 2018 +0300
   359.3 @@ -14,29 +14,15 @@
   359.4  SPLIT="radiusclient-ng-dev"
   359.5  
   359.6  compile_rules() {
   359.7 -	./configure \
   359.8 -		--prefix=/usr \
   359.9 -		--infodir=/usr/share/info \
  359.10 -		--sysconfdir=/etc \
  359.11 -		--mandir=/usr/share/man \
  359.12 -		$CONFIGURE_ARGS &&
  359.13 +	./configure $CONFIGURE_ARGS &&
  359.14  	make &&
  359.15  	make -j 1 DESTDIR=$DESTDIR install
  359.16  }
  359.17  
  359.18  genpkg_rules() {
  359.19  	case $PACKAGE in
  359.20 -		radiusclient-ng)
  359.21 -			mkdir -p $fs/usr/lib
  359.22 -			cp -a $install/etc $fs
  359.23 -			cp -a $install/usr/sbin $fs/usr
  359.24 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
  359.25 -			;;
  359.26 -		*-dev)
  359.27 -			mkdir -p $fs/usr/lib
  359.28 -			cp -a $install/usr/lib/*.*a $fs/usr/lib
  359.29 -			cp -a $install/usr/include $fs/usr
  359.30 -			;;
  359.31 +		radiusclient-ng) copy @std;;
  359.32 +		*-dev)           copy @dev;;
  359.33  	esac
  359.34  }
  359.35  
   360.1 --- a/radvd/receipt	Tue Mar 27 12:50:45 2018 +0200
   360.2 +++ b/radvd/receipt	Fri Mar 30 19:31:50 2018 +0300
   360.3 @@ -6,30 +6,24 @@
   360.4  SHORT_DESC="IPv6 Router Advertisement Daemon"
   360.5  MAINTAINER="pascal.bellard@slitaz.org"
   360.6  LICENSE="BSD"
   360.7 +WEB_SITE="http://www.litech.org/radvd/"
   360.8 +
   360.9  TARBALL="$PACKAGE-$VERSION.tar.xz"
  360.10 -WEB_SITE="http://www.litech.org/radvd/"
  360.11  WGET_URL="${WEB_SITE}dist/$TARBALL"
  360.12 -CONFIG_FILES="/etc/radvd.conf"
  360.13 -TAGS="ipv6"
  360.14  
  360.15  BUILD_DEPENDS="flex"
  360.16  
  360.17 -# Rules to configure and make the package.
  360.18 -compile_rules()
  360.19 -{
  360.20 -	./configure --prefix=/usr \
  360.21 -		--sysconfdir=/etc \
  360.22 -		--mandir=/usr/share/man \
  360.23 -		$CONFIGURE_ARGS &&
  360.24 +compile_rules() {
  360.25 +	./configure $CONFIGURE_ARGS &&
  360.26  	make &&
  360.27 -	make DESTDIR=$DESTDIR install
  360.28 +	make DESTDIR=$DESTDIR install || return 1
  360.29 +
  360.30 +	mkdir -p $install/etc
  360.31 +	touch $install/etc/radvd.conf
  360.32  }
  360.33  
  360.34 -# Rules to gen a SliTaz package suitable for Tazpkg.
  360.35 -genpkg_rules()
  360.36 -{
  360.37 -	mkdir -p $fs/usr $fs/etc
  360.38 -	touch $fs/etc/radvd.conf
  360.39 -	cp -a $install/usr/sbin $fs/usr
  360.40 +genpkg_rules() {
  360.41 +	copy @std
  360.42 +	CONFIG_FILES="/etc/radvd.conf"
  360.43 +	TAGS="ipv6"
  360.44  }
  360.45 -
   361.1 --- a/rarian/receipt	Tue Mar 27 12:50:45 2018 +0200
   361.2 +++ b/rarian/receipt	Fri Mar 30 19:31:50 2018 +0300
   361.3 @@ -3,35 +3,29 @@
   361.4  PACKAGE="rarian"
   361.5  VERSION="0.8.1"
   361.6  CATEGORY="misc"
   361.7 -SHORT_DESC="Documentation meta-data library, designed as a replacement for Scrollkeeper."
   361.8 +SHORT_DESC="Documentation meta-data library, designed as a replacement for \
   361.9 +Scrollkeeper"
  361.10  MAINTAINER="slaxemulator@gmail.com"
  361.11  LICENSE="GPL2 LGPL2.1"
  361.12 +WEB_SITE="http://rarian.freedesktop.org/"
  361.13 +
  361.14  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  361.15 -WEB_SITE="http://rarian.freedesktop.org/"
  361.16  WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
  361.17  
  361.18  BUILD_DEPENDS="libxslt-dev"
  361.19  SPLIT="rarian-dev"
  361.20  
  361.21 -# Rules to configure and make the package.
  361.22 -compile_rules()
  361.23 -{
  361.24 -	cd $src
  361.25 +compile_rules() {
  361.26  	patch -p0 -i $stuff/user-segfault.patch
  361.27 +
  361.28  	./configure \
  361.29 -		--prefix=/usr \
  361.30 -		--infodir=/usr/share/info \
  361.31 -		--mandir=/usr/share/man \
  361.32 -		--sysconfdir=/etc \
  361.33 -		--localstatedir=/var \
  361.34  		--disable-static \
  361.35  		$CONFIGURE_ARGS &&
  361.36 -	make && make DESTDIR=$DESTDIR install
  361.37 +	make &&
  361.38 +	make DESTDIR=$DESTDIR install
  361.39  }
  361.40  
  361.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
  361.42 -genpkg_rules()
  361.43 -{
  361.44 +genpkg_rules() {
  361.45  	case $PACKAGE in
  361.46  		rarian)
  361.47  			copy @std
   362.1 --- a/ristretto/receipt	Tue Mar 27 12:50:45 2018 +0200
   362.2 +++ b/ristretto/receipt	Fri Mar 30 19:31:50 2018 +0300
   362.3 @@ -15,10 +15,7 @@
   362.4  libxfce4ui-dev libmagic-dev"
   362.5  
   362.6  compile_rules() {
   362.7 -	fix ld
   362.8  	./configure \
   362.9 -		--sysconfdir=/etc \
  362.10 -		--localstatedir=/var \
  362.11  		--disable-debug \
  362.12  		$CONFIGURE_ARGS &&
  362.13  	make &&
   363.1 --- a/rsnapshot/receipt	Tue Mar 27 12:50:45 2018 +0200
   363.2 +++ b/rsnapshot/receipt	Fri Mar 30 19:31:50 2018 +0300
   363.3 @@ -1,4 +1,4 @@
   363.4 -# SliTaz package receipt.
   363.5 +# SliTaz package receipt v2.
   363.6  
   363.7  PACKAGE="rsnapshot"
   363.8  VERSION="1.4.2"
   363.9 @@ -6,31 +6,24 @@
  363.10  SHORT_DESC="A remote filesystem snapshot utility"
  363.11  MAINTAINER="slaxemulator@gmail.com"
  363.12  LICENSE="GPL2"
  363.13 +WEB_SITE="http://www.rsnapshot.org"
  363.14 +
  363.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
  363.16 -WEB_SITE="http://www.rsnapshot.org"
  363.17  WGET_URL="https://github.com/rsnapshot/rsnapshot/archive/$VERSION.tar.gz"
  363.18 -CONFIG_FILES="/etc/rsnapshot.conf"
  363.19  
  363.20 -DEPENDS="perl rsync"
  363.21  BUILD_DEPENDS="perl rsync autoconf automake libtool"
  363.22  
  363.23 -# Rules to configure and make the package.
  363.24 -compile_rules()
  363.25 -{
  363.26 +compile_rules() {
  363.27  	./autogen.sh
  363.28 -	./configure \
  363.29 -		--prefix=/usr \
  363.30 -		--infodir=/usr/share/info \
  363.31 -		--mandir=/usr/share/man \
  363.32 -		--sysconfdir=/etc \
  363.33 -		$CONFIGURE_ARGS &&
  363.34 -	make && make DESTDIR=$DESTDIR install
  363.35 +	./configure $CONFIGURE_ARGS &&
  363.36 +	make &&
  363.37 +	make DESTDIR=$DESTDIR install || return 1
  363.38 +
  363.39 +	mv $install/etc/rsnapshot.conf.default $install/etc/rsnapshot.conf
  363.40  }
  363.41  
  363.42 -# Rules to gen a SliTaz package suitable for Tazpkg.
  363.43 -genpkg_rules()
  363.44 -{
  363.45 -	mkdir -p $fs/usr $fs/etc
  363.46 -	cp -a $install/usr/bin $fs/usr
  363.47 -	cp -a $install/etc/rsnapshot.conf.default $fs/etc/rsnapshot.conf
  363.48 +genpkg_rules() {
  363.49 +	copy @std
  363.50 +	CONFIG_FILES="/etc/rsnapshot.conf"
  363.51 +	DEPENDS="perl rsync"
  363.52  }
   364.1 --- a/rust-musl/receipt	Tue Mar 27 12:50:45 2018 +0200
   364.2 +++ b/rust-musl/receipt	Fri Mar 30 19:31:50 2018 +0300
   364.3 @@ -11,9 +11,7 @@
   364.4  TARBALL="rust-std-$VERSION-i686-unknown-linux-musl.tar.xz"
   364.5  WGET_URL="https://static.rust-lang.org/dist/$TARBALL"
   364.6  
   364.7 -# Rules to configure and make the package.
   364.8 -compile_rules()
   364.9 -{
  364.10 +compile_rules() {
  364.11  	./install.sh \
  364.12  		--prefix=$install/usr \
  364.13  		--sysconfdir=$install/etc \
  364.14 @@ -21,9 +19,7 @@
  364.15  		--without=rust-docs
  364.16  }
  364.17  
  364.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
  364.19 -genpkg_rules()
  364.20 -{
  364.21 +genpkg_rules() {
  364.22  	copy @std
  364.23  	DEPENDS="rust"
  364.24  }
   365.1 --- a/sagan-mysql/receipt	Tue Mar 27 12:50:45 2018 +0200
   365.2 +++ b/sagan-mysql/receipt	Fri Mar 30 19:31:50 2018 +0300
   365.3 @@ -1,4 +1,4 @@
   365.4 -# SliTaz package receipt.
   365.5 +# SliTaz package receipt v2.
   365.6  
   365.7  PACKAGE="sagan-mysql"
   365.8  VERSION="0.2.0"
   365.9 @@ -7,33 +7,26 @@
  365.10  MAINTAINER="erjo@slitaz.org"
  365.11  LICENSE="GPL2"
  365.12  WEB_SITE="http://sagan.softwink.com/"
  365.13 -SOURCE="sagan"
  365.14 -TARBALL="$SOURCE-$VERSION.tar.gz"
  365.15 +
  365.16 +TARBALL="sagan-$VERSION.tar.gz"
  365.17  WGET_URL="http://sagan.softwink.com/download/$TARBALL"
  365.18  
  365.19 -DEPENDS="libesmtp libpcap libdnet libmysqlclient liblognorm sagan-rules pcre"
  365.20  BUILD_DEPENDS="libesmtp-dev libpcap-dev libdnet-dev mysql-dev liblognorm-dev \
  365.21  pcre-dev"
  365.22 -PROVIDE="sagan"
  365.23  
  365.24 -# Rules to configure and make the package.
  365.25 -compile_rules()
  365.26 -{
  365.27 -	./configure $CONFIGURE_ARGS \
  365.28 +compile_rules() {
  365.29 +	./configure \
  365.30  		--sysconfdir=/etc/sagan \
  365.31  		--disable-postgresql \
  365.32  		--disable-prelude \
  365.33  		--disable-lognorm \
  365.34 -	&& make && make install
  365.35 +		$CONFIGURE_ARGS &&
  365.36 +	make &&
  365.37 +	make install
  365.38  }
  365.39  
  365.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
  365.41 -genpkg_rules()
  365.42 -{
  365.43 -	mkdir $fs/usr
  365.44 -	
  365.45 -	cp -a $install/usr/bin $fs/usr
  365.46 -	cp -a $install/var $fs/
  365.47 -	cp -a $install/etc $fs/
  365.48 -	
  365.49 +genpkg_rules() {
  365.50 +	copy @std
  365.51 +	DEPENDS="libesmtp libpcap libdnet libmysqlclient liblognorm sagan-rules pcre"
  365.52 +	PROVIDE="sagan"
  365.53  }
   366.1 --- a/sagan-pgsql/receipt	Tue Mar 27 12:50:45 2018 +0200
   366.2 +++ b/sagan-pgsql/receipt	Fri Mar 30 19:31:50 2018 +0300
   366.3 @@ -1,41 +1,35 @@
   366.4 -# SliTaz package receipt.
   366.5 +# SliTaz package receipt v2.
   366.6  
   366.7  PACKAGE="sagan-pgsql"
   366.8  VERSION="0.2.0"
   366.9  CATEGORY="security"
  366.10 -SHORT_DESC="Real time system and event log monitoring system with PostgreSQL support"
  366.11 +SHORT_DESC="Real time system and event log monitoring system with PostgreSQL \
  366.12 +support"
  366.13  MAINTAINER="erjo@slitaz.org"
  366.14  LICENSE="GPL2"
  366.15  WEB_SITE="http://sagan.softwink.com/"
  366.16 -SOURCE="sagan"
  366.17 -TARBALL="$SOURCE-$VERSION.tar.gz"
  366.18 +
  366.19 +TARBALL="sagan-$VERSION.tar.gz"
  366.20  WGET_URL="http://sagan.softwink.com/download/$TARBALL"
  366.21  
  366.22 -DEPENDS="libesmtp libpcap libdnet libpostgresqlclient liblognorm sagan-rules"
  366.23  BUILD_DEPENDS="libesmtp-dev libpcap-dev libdnet-dev postgresql-dev \
  366.24  liblognorm-dev pcre-dev"
  366.25 -PROVIDE="sagan"
  366.26  
  366.27 -# Rules to configure and make the package.
  366.28 -compile_rules()
  366.29 -{
  366.30 -	cd $src
  366.31 -	./configure $CONFIGURE_ARGS \
  366.32 +compile_rules() {
  366.33 +	./configure \
  366.34  		--sysconfdir=/etc/sagan \
  366.35  		--with-postgresql-includes=/usr/include/postgresql \
  366.36  		--with-postgresql-libraries=/usr/lib/postgresql \
  366.37  		--disable-mysql \
  366.38  		--disable-prelude \
  366.39  		--disable-lognorm \
  366.40 -	&& make && make install
  366.41 +		$CONFIGURE_ARGS &&
  366.42 +	make &&
  366.43 +	make install
  366.44  }
  366.45  
  366.46 -# Rules to gen a SliTaz package suitable for Tazpkg.
  366.47 -genpkg_rules()
  366.48 -{
  366.49 -	mkdir $fs/usr
  366.50 -	
  366.51 -	cp -a $install/usr/bin $fs/usr
  366.52 -	cp -a $install/var $fs/
  366.53 -	cp -a $install/etc $fs/
  366.54 +genpkg_rules() {
  366.55 +	copy @std
  366.56 +	DEPENDS="libesmtp libpcap libdnet libpostgresqlclient liblognorm sagan-rules"
  366.57 +	PROVIDE="sagan"
  366.58  }
   367.1 --- a/sagan/receipt	Tue Mar 27 12:50:45 2018 +0200
   367.2 +++ b/sagan/receipt	Fri Mar 30 19:31:50 2018 +0300
   367.3 @@ -1,4 +1,4 @@
   367.4 -# SliTaz package receipt.
   367.5 +# SliTaz package receipt v2.
   367.6  
   367.7  PACKAGE="sagan"
   367.8  VERSION="0.2.0"
   367.9 @@ -7,31 +7,25 @@
  367.10  MAINTAINER="erjo@slitaz.org"
  367.11  LICENSE="GPL2"
  367.12  WEB_SITE="http://sagan.softwink.com/"
  367.13 +
  367.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
  367.15  WGET_URL="http://sagan.softwink.com/download/$TARBALL"
  367.16  
  367.17 -DEPENDS="libesmtp libpcap libdnet liblognorm sagan-rules pcre"
  367.18  BUILD_DEPENDS="libesmtp-dev libpcap-dev libdnet-dev liblognorm-dev pcre-dev"
  367.19  
  367.20 -# Rules to configure and make the package.
  367.21 -compile_rules()
  367.22 -{
  367.23 -	./configure $CONFIGURE_ARGS \
  367.24 +compile_rules() {
  367.25 +	./configure \
  367.26  		--sysconfdir=/etc/sagan \
  367.27  		--disable-mysql \
  367.28  		--disable-postgresql \
  367.29  		--disable-prelude \
  367.30  		--disable-lognorm \
  367.31 -	&& make && make install
  367.32 +		$CONFIGURE_ARGS &&
  367.33 +	make &&
  367.34 +	make install
  367.35  }
  367.36  
  367.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
  367.38 -genpkg_rules()
  367.39 -{
  367.40 -	mkdir $fs/usr
  367.41 -	
  367.42 -	cp -a $install/usr/bin $fs/usr
  367.43 -	cp -a $install/var $fs/
  367.44 -	cp -a $install/etc $fs/
  367.45 -	
  367.46 +genpkg_rules() {
  367.47 +	copy @std
  367.48 +	DEPENDS="libesmtp libpcap libdnet liblognorm sagan-rules pcre"
  367.49  }
   368.1 --- a/samba/receipt	Tue Mar 27 12:50:45 2018 +0200
   368.2 +++ b/samba/receipt	Fri Mar 30 19:31:50 2018 +0300
   368.3 @@ -31,6 +31,7 @@
   368.4  		pam) SET_ARGS='--with-pam';;
   368.5  	esac
   368.6  
   368.7 +	# site script isn't used
   368.8  	./configure \
   368.9  		--prefix=/usr \
  368.10  		--sysconfdir=/etc \
   369.1 --- a/sane-backends/receipt	Tue Mar 27 12:50:45 2018 +0200
   369.2 +++ b/sane-backends/receipt	Fri Mar 30 19:31:50 2018 +0300
   369.3 @@ -20,13 +20,10 @@
   369.4  	patch -Np1 -i $stuff/libv4l-0.8.3.patch
   369.5  	# fix https://bugs.archlinux.org/task/26114
   369.6  	patch -Np1 -i $stuff/xerox_mfp_fix_usb_devices.patch
   369.7 -	./configure \
   369.8 -		--prefix=/usr \
   369.9 -		--sysconfdir=/etc \
  369.10 -		--mandir=/usr/share/man \
  369.11 -		$CONFIGURE_ARGS &&
  369.12 +
  369.13 +	./configure $CONFIGURE_ARGS &&
  369.14  	make &&
  369.15 -	make -j 1 DESTDIR=$install install || return 1
  369.16 +	make -j1 DESTDIR=$install install || return 1
  369.17  
  369.18  	# copy the missing udev rule
  369.19  	mkdir -p $install/etc/udev/rules.d
  369.20 @@ -82,5 +79,5 @@
  369.21  }
  369.22  
  369.23  post_remove_sane_backends() {
  369.24 -	chroot "$1/" delgroup scanner & >/dev/null
  369.25 +	chroot "$1/" delgroup scanner >/dev/null
  369.26  }
   370.1 --- a/sarg/receipt	Tue Mar 27 12:50:45 2018 +0200
   370.2 +++ b/sarg/receipt	Fri Mar 30 19:31:50 2018 +0300
   370.3 @@ -21,7 +21,9 @@
   370.4  		--enable-fontdir=/usr/share/sarg/fonts \
   370.5  		--enable-imagedir=/usr/share/sarg/images \
   370.6  		--enable-sargphp=/var/www/sarg-php \
   370.7 -		&&	make && make install
   370.8 +		&&
   370.9 +	make &&
  370.10 +	make install
  370.11  }
  370.12  
  370.13  genpkg_rules() {
  370.14 @@ -50,4 +52,3 @@
  370.15  			;;
  370.16  	esac
  370.17  }
  370.18 -
   371.1 --- a/scim/receipt	Tue Mar 27 12:50:45 2018 +0200
   371.2 +++ b/scim/receipt	Fri Mar 30 19:31:50 2018 +0300
   371.3 @@ -15,22 +15,18 @@
   371.4  libxslt docbook-xsl gtk+-dev xorg-libX11-dev"
   371.5  SPLIT="scim-dev"
   371.6  
   371.7 -# Rules to configure and make the package.
   371.8 -compile_rules()
   371.9 -{
  371.10 +compile_rules() {
  371.11  	./bootstrap &&
  371.12  
  371.13  	./configure \
  371.14 -		--sysconfdir=/etc \
  371.15  		--with-x \
  371.16  		$CONFIGURE_ARGS &&
  371.17 +	fix libtool &&
  371.18  	make $MAKEFLAGS &&
  371.19  	make install
  371.20  }
  371.21  
  371.22 -# Rules to gen a SliTaz package suitable for Tazpkg.
  371.23 -genpkg_rules()
  371.24 -{
  371.25 +genpkg_rules() {
  371.26  	case $PACKAGE in
  371.27  		scim)
  371.28  			copy @std
  371.29 @@ -52,12 +48,8 @@
  371.30  	esac
  371.31  }
  371.32  
  371.33 -post_install_scim()
  371.34 -{
  371.35 -	[ -n "$quiet" ] || newline
  371.36 -	action 'Updating gtk.immodules... '
  371.37 +post_install_scim() {
  371.38  	chroot "$1/" /usr/bin/gtk-query-immodules-2.0 > $1/etc/gtk-2.0/gtk.immodules
  371.39 -	status
  371.40  
  371.41  	[ -n "$quiet" ] || cat <<EOT
  371.42  In order to start scim and use chinese after boot time,
  371.43 @@ -74,7 +66,6 @@
  371.44  EOT
  371.45  }
  371.46  
  371.47 -post_remove_scim()
  371.48 -{
  371.49 +post_remove_scim() {
  371.50  	chroot "$1/" /usr/bin/gtk-query-immodules-2.0 > $1/etc/gtk-2.0/gtk.immodules
  371.51  }
   372.1 --- a/sgml-common/receipt	Tue Mar 27 12:50:45 2018 +0200
   372.2 +++ b/sgml-common/receipt	Fri Mar 30 19:31:50 2018 +0300
   372.3 @@ -16,9 +16,7 @@
   372.4  compile_rules() {
   372.5  	autoreconf -fi &&
   372.6  
   372.7 -	./configure \
   372.8 -		--sysconfdir=/etc \
   372.9 -		$CONFIGURE_ARGS &&
  372.10 +	./configure $CONFIGURE_ARGS &&
  372.11  	make &&
  372.12  	make docdir=/usr/share/doc install
  372.13  }
   373.1 --- a/shadow/receipt	Tue Mar 27 12:50:45 2018 +0200
   373.2 +++ b/shadow/receipt	Fri Mar 30 19:31:50 2018 +0300
   373.3 @@ -27,9 +27,9 @@
   373.4  	sed -i 's|bash|sh|' etc/useradd
   373.5  
   373.6  	./configure \
   373.7 -		--sysconfdir=/etc \
   373.8  		--with-group-name-max-length=32 &&
   373.9 -	make && make install
  373.10 +	make &&
  373.11 +	make install || return 1
  373.12  
  373.13  	mv $install/usr/bin/passwd $install/bin
  373.14  }
   374.1 --- a/silc-server/receipt	Tue Mar 27 12:50:45 2018 +0200
   374.2 +++ b/silc-server/receipt	Fri Mar 30 19:31:50 2018 +0300
   374.3 @@ -1,40 +1,35 @@
   374.4 -# SliTaz package receipt.
   374.5 +# SliTaz package receipt v2.
   374.6  
   374.7  PACKAGE="silc-server"
   374.8  VERSION="1.1.18"
   374.9  CATEGORY="network"
  374.10 -SHORT_DESC="Secure Internet Live Conferencing server."
  374.11 +SHORT_DESC="Secure Internet Live Conferencing server"
  374.12  MAINTAINER="pascal.bellard@slitaz.org"
  374.13  LICENSE="GPL2"
  374.14 +WEB_SITE="http://www.silcnet.org"
  374.15 +
  374.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  374.17 -WEB_SITE="http://www.silcnet.org"
  374.18  WGET_URL="$WEB_SITE/download/server/sources/$TARBALL"
  374.19 -CONFIG_FILES="/etc/silcalgs.conf /etc/silcd.conf"
  374.20  
  374.21 -# Rules to configure and make the package.
  374.22 -compile_rules()
  374.23 -{
  374.24 -	cd $src
  374.25 -	mkdir -p $DESTDIR/etc $DESTDIR/usr/share/man/man5 $DESTDIR/usr/share/man/man8
  374.26 +compile_rules() {
  374.27 +	mkdir -p \
  374.28 +		$DESTDIR/etc \
  374.29 +		$DESTDIR/usr/share/man/man5 \
  374.30 +		$DESTDIR/usr/share/man/man8
  374.31  	touch $DESTDIR/etc/silcd.pub
  374.32 -	./configure --prefix=/usr --infodir=/usr/share/info \
  374.33 -	--mandir=/usr/share/man --sysconfdir=/etc \
  374.34 -	--with-logsdir=/var/log/silc \
  374.35 -	$CONFIGURE_ARGS &&
  374.36 +
  374.37 +	./configure \
  374.38 +		--with-logsdir=/var/log/silc \
  374.39 +		$CONFIGURE_ARGS &&
  374.40  	make &&
  374.41  	make DESTDIR=$DESTDIR install
  374.42  }
  374.43  
  374.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
  374.45 -genpkg_rules()
  374.46 -{
  374.47 -	mkdir -p $fs/usr $fs/var/log/silc
  374.48 -	cp -a $install/etc $fs
  374.49 -	cp -a $install/usr/sbin $fs/usr
  374.50 +genpkg_rules() {
  374.51 +	copy @std
  374.52 +	CONFIG_FILES="/etc/silcalgs.conf /etc/silcd.conf"
  374.53  }
  374.54  
  374.55 -# Pre and post install commands for Tazpkg.
  374.56 -post_install()
  374.57 -{
  374.58 +post_install() {
  374.59  	[ -s "$1/etc/silcd.pub" ] || chroot "$1/" /usr/sbin/silcd -C /etc
  374.60  }
   375.1 --- a/siproxd/receipt	Tue Mar 27 12:50:45 2018 +0200
   375.2 +++ b/siproxd/receipt	Fri Mar 30 19:31:50 2018 +0300
   375.3 @@ -1,37 +1,30 @@
   375.4 -# SliTaz package receipt.
   375.5 +# SliTaz package receipt v2.
   375.6  
   375.7  PACKAGE="siproxd"
   375.8  VERSION="0.8.1"
   375.9  CATEGORY="network"
  375.10 -SHORT_DESC="A masquerading SIP Proxy Server."
  375.11 +SHORT_DESC="A masquerading SIP Proxy Server"
  375.12  MAINTAINER="pascal.bellard@slitaz.org"
  375.13  LICENSE="GPL2"
  375.14 +WEB_SITE="http://siproxd.sourceforge.net/"
  375.15 +
  375.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  375.17 -WEB_SITE="http://siproxd.sourceforge.net/"
  375.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  375.19 -CONFIG_FILES="/etc/siproxd"
  375.20  
  375.21 -DEPENDS="osip"
  375.22  BUILD_DEPENDS="osip-dev libtool"
  375.23  
  375.24 -# Rules to configure and make the package.
  375.25 -compile_rules()
  375.26 -{
  375.27 -	cd $src
  375.28 +compile_rules() {
  375.29  	sed -i 's/.*const ident.*/#undef lt_preloaded_symbols\n#define lt_preloaded_symbols lt_libltdl_LTX_preloaded_symbols\nextern const lt_dlsymlist lt_preloaded_symbols[];\n&/' src/plugins.c
  375.30 -	./configure --prefix=/usr --mandir=/usr/share/man \
  375.31 +
  375.32 +	./configure \
  375.33  		--sysconfdir=/etc/siproxd \
  375.34 -		--localstatedir=/var \
  375.35 -	$CONFIGURE_ARGS &&
  375.36 +		$CONFIGURE_ARGS &&
  375.37  	make &&
  375.38  	make DESTDIR=$DESTDIR install
  375.39  }
  375.40  
  375.41 -# Rules to gen a SliTaz package suitable for Tazpkg.   
  375.42 -genpkg_rules()                                      
  375.43 -{
  375.44 -	mkdir -p $fs/usr
  375.45 -	cp -a $install/etc $fs
  375.46 -	cp -a $install/usr/sbin $fs/usr
  375.47 -	cp -a $install/usr/lib $fs/usr
  375.48 +genpkg_rules() {
  375.49 +	copy @std
  375.50 +	DEPENDS="osip"
  375.51 +	CONFIG_FILES="/etc/siproxd/"
  375.52  }
   376.1 --- a/slang/receipt	Tue Mar 27 12:50:45 2018 +0200
   376.2 +++ b/slang/receipt	Fri Mar 30 19:31:50 2018 +0300
   376.3 @@ -14,11 +14,8 @@
   376.4  BUILD_DEPENDS="pcre-dev oniguruma-dev libpng16-dev zlib-dev readline-dev"
   376.5  SPLIT="slang-dev"
   376.6  
   376.7 -# Rules to configure and make the package.
   376.8 -compile_rules()
   376.9 -{
  376.10 +compile_rules() {
  376.11  	./configure \
  376.12 -		--sysconfdir=/etc \
  376.13  		--with-readline=gnu \
  376.14  		$CONFIGURE_ARGS &&
  376.15  	make -j1 &&
  376.16 @@ -31,9 +28,7 @@
  376.17  		$install/usr/lib/slang/v2/modules/*.so
  376.18  }
  376.19  
  376.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  376.21 -genpkg_rules()
  376.22 -{
  376.23 +genpkg_rules() {
  376.24  	case $PACKAGE in
  376.25  		slang)
  376.26  			copy @std
   377.1 --- a/smartmontools/receipt	Tue Mar 27 12:50:45 2018 +0200
   377.2 +++ b/smartmontools/receipt	Fri Mar 30 19:31:50 2018 +0300
   377.3 @@ -1,4 +1,4 @@
   377.4 -# SliTaz package receipt.
   377.5 +# SliTaz package receipt v2.
   377.6  
   377.7  PACKAGE="smartmontools"
   377.8  VERSION="5.41"
   377.9 @@ -6,28 +6,19 @@
  377.10  SHORT_DESC="Monitors disk and tape health via S.M.A.R.T."
  377.11  MAINTAINER="erjo@slitaz.org"
  377.12  LICENSE="GPL2"
  377.13 +WEB_SITE="http://smartmontools.sourceforge.net/"
  377.14 +
  377.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
  377.16 -WEB_SITE="http://smartmontools.sourceforge.net/"
  377.17  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  377.18  
  377.19 -DEPENDS="gcc-lib-base"
  377.20 +compile_rules() {
  377.21 +	./configure $CONFIGURE_ARGS &&
  377.22 +	make &&
  377.23 +	make DESTDIR=$DESTDIR install || return 1
  377.24  
  377.25 -# Rules to configure and make the package.
  377.26 -compile_rules()
  377.27 -{
  377.28 -	cd $src
  377.29 -	./configure --prefix=/usr \
  377.30 -	 --sysconfdir=/etc $CONFIGURE_ARGS &&
  377.31 -	make &&
  377.32 -	make DESTDIR=$DESTDIR install
  377.33 +	install -Dm755 $stuff/etc/init.d/smartd $install/etc/init.d/smartd
  377.34  }
  377.35  
  377.36 -# Rules to gen a SliTaz package suitable for Tazpkg.
  377.37 -genpkg_rules()
  377.38 -{
  377.39 -	mkdir -p $fs/usr $fs/etc/init.d
  377.40 -	cp -a $install/usr/sbin $fs/usr
  377.41 -	cp $install/etc/smartd.conf $fs/etc/smartd.conf
  377.42 -	install -g root -o root -m 755 $stuff/etc/init.d/smartd $fs/etc/init.d
  377.43 +genpkg_rules() {
  377.44 +	copy @std
  377.45  }
  377.46 -
   378.1 --- a/speech-dispatcher/receipt	Tue Mar 27 12:50:45 2018 +0200
   378.2 +++ b/speech-dispatcher/receipt	Fri Mar 30 19:31:50 2018 +0300
   378.3 @@ -1,22 +1,20 @@
   378.4 -# SliTaz package receipt.
   378.5 +# SliTaz package receipt v2.
   378.6  
   378.7  PACKAGE="speech-dispatcher"
   378.8  VERSION="0.6.7"
   378.9  CATEGORY="utilities"
  378.10 -SHORT_DESC="Common interface to speech synthesis."
  378.11 +SHORT_DESC="Common interface to speech synthesis"
  378.12  MAINTAINER="paul@slitaz.org"
  378.13  LICENSE="LGPL2.1"
  378.14 +WEB_SITE="http://www.freebsoft.org/speechd"
  378.15 +
  378.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  378.17 -WEB_SITE="http://www.freebsoft.org/speechd"
  378.18  WGET_URL="http://www.freebsoft.org/pub/projects/speechd/$TARBALL"
  378.19  
  378.20 -DEPENDS="glib alsa-lib espeak dotconf python libsndfile"
  378.21  BUILD_DEPENDS="glib-dev alsa-lib-dev dotconf-dev python \
  378.22  python-dev espeak-dev sed espeak dotconf"
  378.23  
  378.24 -# Rules to configure and make the package.
  378.25 -compile_rules()
  378.26 -{
  378.27 +compile_rules() {
  378.28  	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
  378.29  	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
  378.30  
  378.31 @@ -30,18 +28,13 @@
  378.32  	cd ../../
  378.33  
  378.34  	./configure \
  378.35 -		--prefix=/usr \
  378.36 -		--infodir=/usr/share/info \
  378.37 -		--mandir=/usr/share/man \
  378.38 -		--sysconfdir=/etc \
  378.39  		--with-espeak \
  378.40  		$CONFIGURE_ARGS &&
  378.41 -	make && make DESTDIR=$DESTDIR install
  378.42 +	make &&
  378.43 +	make DESTDIR=$DESTDIR install
  378.44  }
  378.45  
  378.46 -# Rules to gen a SliTaz package suitable for Tazpkg.
  378.47 -genpkg_rules()
  378.48 -{
  378.49 +genpkg_rules() {
  378.50  	mkdir -p $fs/usr/share/sounds/speech-dispatcher
  378.51  	cp -a $install/usr/bin $fs/usr
  378.52  	cp -a $install/etc $fs
  378.53 @@ -56,4 +49,5 @@
  378.54  	rm -rf $fs/usr/share/info
  378.55  	rm -rf $fs/usr/lib/*.*a
  378.56  	rm -rf $fs/usr/lib/speech-dispatcher/*.*a
  378.57 +	DEPENDS="glib alsa-lib espeak dotconf python libsndfile"
  378.58  }
   379.1 --- a/speedtouch/receipt	Tue Mar 27 12:50:45 2018 +0200
   379.2 +++ b/speedtouch/receipt	Fri Mar 30 19:31:50 2018 +0300
   379.3 @@ -1,41 +1,27 @@
   379.4 -# SliTaz package receipt.
   379.5 +# SliTaz package receipt v2.
   379.6  
   379.7  PACKAGE="speedtouch"
   379.8  VERSION="1.3.1"
   379.9  CATEGORY="misc"
  379.10 +SHORT_DESC="Driver for the ADSL Speed Touch USB modem"
  379.11  MAINTAINER="jozee@slitaz.org"
  379.12  LICENSE="GPL2"
  379.13 -SHORT_DESC="Driver for the ADSL Speed Touch USB modem"
  379.14  WEB_SITE="http://speedtouch.sourceforge.net/"
  379.15 -DEPENDS="bash"
  379.16 +
  379.17  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  379.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  379.19  
  379.20 +compile_rules() {
  379.21 +	./configure $CONFIGURE_ARGS &&
  379.22 +	make &&
  379.23 +	make \
  379.24 +		prefix=$DESTDIR/usr \
  379.25 +		sysconfdir=$DESTDIR/etc \
  379.26 +		mandir=$DESTDIR/usr/share/man \
  379.27 +		install
  379.28 +}
  379.29  
  379.30 -# Rules to configure and make the package.
  379.31 -
  379.32 -compile_rules() {
  379.33 -  cd $src
  379.34 -  while read file; do
  379.35 -    	[ -f done.$file ] && continue
  379.36 -    	echo "Apply $file..."
  379.37 -    	patch -p1 < $stuff/$PACKAGE-$VERSION-$file || return 1
  379.38 -	touch done.$file
  379.39 -    done <<EOT
  379.40 -	gcc4.u
  379.41 -EOT
  379.42 -   ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
  379.43 -		$CONFIGURE_ARGS &&
  379.44 -  make &&
  379.45 -  make prefix=$DESTDIR/usr sysconfdir=$DESTDIR/etc mandir=$DESTDIR/usr/share/man install
  379.46 +genpkg_rules() {
  379.47 +	copy @std
  379.48 +	DEPENDS="bash"
  379.49  }
  379.50 -	
  379.51 -# Rules to gen a SliTaz package suitable for Tazpkg.
  379.52 -genpkg_rules()
  379.53 -{
  379.54 -	mkdir -p $fs/usr/share
  379.55 -	cp -a $install/usr/bin $fs/usr
  379.56 -	cp -a $install/usr/sbin $fs/usr
  379.57 -	cp -a $install/etc $fs
  379.58 -	cp -a $install/usr/share/$PACKAGE $fs/usr/share	
  379.59 -}
   380.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   380.2 +++ b/speedtouch/stuff/patches/series	Fri Mar 30 19:31:50 2018 +0300
   380.3 @@ -0,0 +1,1 @@
   380.4 +-p1|speedtouch-1.3.1-gcc4.u
   381.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   381.2 +++ b/speedtouch/stuff/patches/speedtouch-1.3.1-gcc4.u	Fri Mar 30 19:31:50 2018 +0300
   381.3 @@ -0,0 +1,10 @@
   381.4 +--- speedtouch-1.3.1/src/modem.h	Wed Sep 29 20:56:31 2004
   381.5 ++++ speedtouch-1.3.1/src/modem.h	Wed Nov  4 19:00:20 2009
   381.6 +@@ -38,7 +38,5 @@
   381.7 + #define EP_CODE_IN  0x85
   381.8 + #define EP_CODE_OUT 0x05
   381.9 + 
  381.10 +-/* Global Variables */
  381.11 +-extern int verbose;
  381.12 + 
  381.13 + #endif
   382.1 --- a/speedtouch/stuff/speedtouch-1.3.1-gcc4.u	Tue Mar 27 12:50:45 2018 +0200
   382.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   382.3 @@ -1,10 +0,0 @@
   382.4 ---- speedtouch-1.3.1/src/modem.h	Wed Sep 29 20:56:31 2004
   382.5 -+++ speedtouch-1.3.1/src/modem.h	Wed Nov  4 19:00:20 2009
   382.6 -@@ -38,7 +38,5 @@
   382.7 - #define EP_CODE_IN  0x85
   382.8 - #define EP_CODE_OUT 0x05
   382.9 - 
  382.10 --/* Global Variables */
  382.11 --extern int verbose;
  382.12 - 
  382.13 - #endif
   383.1 --- a/spice-protocol/receipt	Tue Mar 27 12:50:45 2018 +0200
   383.2 +++ b/spice-protocol/receipt	Fri Mar 30 19:31:50 2018 +0300
   383.3 @@ -1,4 +1,4 @@
   383.4 -# SliTaz package receipt.
   383.5 +# SliTaz package receipt v2.
   383.6  
   383.7  PACKAGE="spice-protocol"
   383.8  VERSION="0.12.13"
   383.9 @@ -13,19 +13,12 @@
  383.10  
  383.11  PKG_RULE="dev"
  383.12  
  383.13 -# Rules to configure and make the package.
  383.14 -compile_rules()
  383.15 -{
  383.16 -	./configure \
  383.17 -		--sysconfdir=/etc \
  383.18 -		--localstatedir=/var \
  383.19 -		$CONFIGURE_ARGS &&
  383.20 +compile_rules() {
  383.21 +	./configure $CONFIGURE_ARGS &&
  383.22  	make &&
  383.23  	make install
  383.24  }
  383.25  
  383.26 -# Rules to gen a SliTaz package suitable for Tazpkg.
  383.27 -genpkg_rules()
  383.28 -{
  383.29 +genpkg_rules() {
  383.30  	copy @dev
  383.31  }
   384.1 --- a/splashutils/receipt	Tue Mar 27 12:50:45 2018 +0200
   384.2 +++ b/splashutils/receipt	Fri Mar 30 19:31:50 2018 +0300
   384.3 @@ -1,4 +1,4 @@
   384.4 -# SliTaz package receipt.
   384.5 +# SliTaz package receipt v2.
   384.6  
   384.7  PACKAGE="splashutils"
   384.8  VERSION="1.5.4.4"
   384.9 @@ -6,33 +6,26 @@
  384.10  SHORT_DESC="Framebuffer boot splash screen"
  384.11  MAINTAINER="devel@slitaz.org"
  384.12  LICENSE="LGPL2 GPL2"
  384.13 +WEB_SITE="https://sourceforge.net/projects/fbsplash.berlios/"
  384.14 +
  384.15  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  384.16 -WEB_SITE="https://sourceforge.net/projects/fbsplash.berlios/"
  384.17  WGET_URL="$SF_MIRROR/fbsplash.berlios/$TARBALL"
  384.18  
  384.19 -DEPENDS="bzlib freetype libjpeg gpm"
  384.20  BUILD_DEPENDS="autoconf automake libtool jpeg-dev gpm-dev libpng16-dev \
  384.21  freetype-dev"
  384.22  
  384.23 -# Rules to configure and make the package.
  384.24 -compile_rules()
  384.25 -{
  384.26 +compile_rules() {
  384.27  	autoreconf --install --force
  384.28  	LIBS="-lbz2"
  384.29  	./configure \
  384.30 -		--sysconfdir=/etc \
  384.31  		--without-klibc \
  384.32  		$CONFIGURE_ARGS || exit 1
  384.33  	sed -i 's|-all-static||' $src/src/Makefile
  384.34 -	make -j 1 && make DESTDIR=$DESTDIR install
  384.35 +	make -j1 &&
  384.36 +	make DESTDIR=$DESTDIR install
  384.37  }
  384.38  
  384.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  384.40 -genpkg_rules()
  384.41 -{
  384.42 -	mkdir -p $fs/usr/lib
  384.43 -	cp -a $install/sbin $fs
  384.44 -	cp -a $install/usr/bin $fs/usr
  384.45 -	cp -a $install/usr/sbin $fs/usr
  384.46 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
  384.47 +genpkg_rules() {
  384.48 +	copy @std
  384.49 +	DEPENDS="bzlib freetype libjpeg gpm"
  384.50  }
   385.1 --- a/squid/receipt	Tue Mar 27 12:50:45 2018 +0200
   385.2 +++ b/squid/receipt	Fri Mar 30 19:31:50 2018 +0300
   385.3 @@ -3,26 +3,24 @@
   385.4  PACKAGE="squid"
   385.5  VERSION="3.5.27"
   385.6  CATEGORY="network"
   385.7 -SHORT_DESC="Web/ftp proxy."
   385.8 +SHORT_DESC="Web/FTP proxy"
   385.9  MAINTAINER="pascal.bellard@slitaz.org"
  385.10  LICENSE="GPL2"
  385.11 +WEB_SITE="http://www.squid-cache.org/"
  385.12 +
  385.13  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  385.14 -WEB_SITE="http://www.squid-cache.org/"
  385.15  WGET_URL="${WEB_SITE}Versions/v3/${VERSION%.*}/$TARBALL"
  385.16  
  385.17  BUILD_DEPENDS="perl openssl-dev openldap-dev cyrus-sasl-dev libcap-dev"
  385.18  SPLIT="squid squid-auth-helpers squid-langpack"
  385.19  
  385.20 -# Rules to configure and make the package.
  385.21 -compile_rules()
  385.22 -{
  385.23 +compile_rules() {
  385.24  	touch scripts/boilerplate.h
  385.25 +
  385.26  	./configure \
  385.27 -		--prefix=/usr \
  385.28  		--sysconfdir=/etc/squid \
  385.29  		--datadir=/usr/share/squid \
  385.30  		--libexecdir=/usr/lib/squid \
  385.31 -		--localstatedir=/var \
  385.32  		--with-logdir=/var/log/squid \
  385.33  		--with-openssl \
  385.34  		--disable-poll \
  385.35 @@ -45,12 +43,11 @@
  385.36  		--enable-icap-client \
  385.37  		--with-pthreads ac_cv_header_linux_netfilter_ipv4_h="yes" \
  385.38  		$CONFIGURE_ARGS &&
  385.39 -	make $MAKEFLAGS && make install
  385.40 +	make $MAKEFLAGS &&
  385.41 +	make install
  385.42  }
  385.43  
  385.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
  385.45 -genpkg_rules()
  385.46 -{
  385.47 +genpkg_rules() {
  385.48  	case $PACKAGE in
  385.49  	squid)
  385.50  		CONFIG_FILES="/etc/squid"
  385.51 @@ -91,7 +88,7 @@
  385.52  		cat <<EOF>>$fs/etc/squid/squid.conf
  385.53  	
  385.54  cache_effective_user squid
  385.55 -cache_effective_group squid 
  385.56 +cache_effective_group squid
  385.57  
  385.58  access_log /var/log/squid/access.log
  385.59  cache_log /var/log/squid/cache.log
  385.60 @@ -117,46 +114,34 @@
  385.61  	esac
  385.62  }
  385.63  
  385.64 -# Pre and post install commands for Tazpkg.
  385.65 -post_install_squid()
  385.66 -{
  385.67 -	local user
  385.68 -	local group
  385.69 -	
  385.70 -	user=squid
  385.71 -	group=squid
  385.72 -	
  385.73 +post_install_squid() {
  385.74 +	local user=squid group=squid
  385.75 +
  385.76  	if ! grep -q $user "$1/etc/passwd"; then
  385.77 -		echo -n "Adding user/group $user..."
  385.78  		chroot "$1/" addgroup -S $group
  385.79  		chroot "$1/" adduser -S -D -H -G $group $user
  385.80 -		status
  385.81  	fi
  385.82 -	
  385.83  
  385.84  	# Set perms for files and directories
  385.85 -	chroot "$1/" chown -R ${user}.${group} /var/log/squid \
  385.86 -		/var/cache/squid 
  385.87 +	chroot "$1/" chown -R $user:$group /var/log/squid /var/cache/squid
  385.88  
  385.89 -	cat <<EOF
  385.90 -----
  385.91 -To start $PACKAGE server you can run :
  385.92 +	[ -n "$quiet" ] || cat <<EOF
  385.93  
  385.94 -    /etc/init.d/$PACKAGE start
  385.95 -
  385.96 -Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf
  385.97 -----
  385.98 +	.----------------------------------------------.
  385.99 +	| To start squid server you can run:           |
 385.100 +	|   /etc/init.d/squid start                    |
 385.101 +	|                                              |
 385.102 +	| Or add squid to RUN_DAEMONS in /etc/rcS.conf |
 385.103 +	'----------------------------------------------'
 385.104  EOF
 385.105  }
 385.106  
 385.107 +post_remove_squid() {
 385.108 +	# Removing stalled files...
 385.109 +	test -d /var/cache/squid && rm -rf /var/cache/squid
 385.110 +	test -d /var/log/squid   && rm -rf /var/log/squid
 385.111 +	test -d /usr/share/squid && rm -rf /usr/share/squid
 385.112  
 385.113 -post_remove_squid()
 385.114 -{
 385.115 -	echo "Removing stalled files..."
 385.116 -	test -d /var/cache/squid && rm -rf /var/cache/squid
 385.117 -	test -d /var/log/squid && rm -rf /var/log/squid
 385.118 -	test -d /usr/share/squid && rm -rf /usr/share/squid
 385.119 -	
 385.120 -	echo "Removing user/group squid"
 385.121 +	# Removing user/group squid
 385.122  	deluser squid
 385.123  }
   386.1 --- a/squidclamav/receipt	Tue Mar 27 12:50:45 2018 +0200
   386.2 +++ b/squidclamav/receipt	Fri Mar 30 19:31:50 2018 +0300
   386.3 @@ -1,71 +1,53 @@
   386.4 -# SliTaz package receipt.
   386.5 +# SliTaz package receipt v2.
   386.6  
   386.7  PACKAGE="squidclamav"
   386.8  VERSION="6.10"
   386.9  CATEGORY="security"
  386.10 -SHORT_DESC="Antivirus redirector for Squid proxy."
  386.11 +SHORT_DESC="Antivirus redirector for Squid proxy"
  386.12  MAINTAINER="pascal.bellard@slitaz.org"
  386.13  LICENSE="GPL3"
  386.14 +WEB_SITE="http://squidclamav.darold.net/"
  386.15 +
  386.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  386.17 -WEB_SITE="http://squidclamav.darold.net/"
  386.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  386.19 -CONFIG_FILES="/etc/squidclamav.conf"
  386.20  
  386.21 -DEPENDS="squid libcurl clamav c_icap squidguard"
  386.22  BUILD_DEPENDS="curl-dev c_icap-dev"
  386.23  
  386.24 -# Rules to configure and make the package.
  386.25 -compile_rules()
  386.26 -{
  386.27 -	cd $src
  386.28 +compile_rules() {
  386.29  	mkdir -p $DESTDIR/etc
  386.30  	./configure \
  386.31 -		--prefix=/usr \
  386.32  		--libdir=/usr/lib \
  386.33  		--libexecdir=/var/www/cgi-bin \
  386.34 -		--sysconfdir=/etc \
  386.35  		$CONFIGURE_ARGS &&
  386.36 -	make && make install
  386.37 +	make &&
  386.38 +	make install || return 1
  386.39 +
  386.40 +	install -Dm644 $stuff/icap-clamav.conf $install/etc/squid/conf.d/icap-clamav.conf
  386.41  }
  386.42  
  386.43 -# Rules to gen a SliTaz package suitable for Tazpkg.
  386.44 -genpkg_rules()
  386.45 -{
  386.46 -	mkdir -p $fs/usr \
  386.47 -		$fs/etc/squid/conf.d
  386.48 -	
  386.49 -	cp -a $install/etc $fs
  386.50 -	cp -a $install/usr/lib $fs/usr
  386.51 -	cp -a $install/var $fs/
  386.52 -	cp -a $stuff/icap-clamav.conf $fs/etc/squid/conf.d
  386.53 -	
  386.54 +genpkg_rules() {
  386.55 +	copy @std
  386.56  	# Customise config file
  386.57  	sed -i -e "s|^redirect.*|redirect http://localhost/cgi-bin/squidclamav/clwarn.cgi|" \
  386.58  		-e "s|^#squidguard.*|squidguard /usr/bin/squidGuard|" \
  386.59  		$fs/etc/squidclamav.conf
  386.60 -		
  386.61 -	rm -f $fs/usr/lib/c_icap/*.la		
  386.62 -
  386.63 -
  386.64 +	DEPENDS="squid libcurl clamav c_icap squidguard"
  386.65 +	CONFIG_FILES="/etc/squidclamav.conf"
  386.66  }
  386.67  
  386.68 -#Post install command
  386.69 -post_install()
  386.70 -{
  386.71 +post_install() {
  386.72  	echo 'Service squidclamav squidclamav.so' >> "$1/etc/c-icap/c-icap.conf"
  386.73  	[ "$1" ] || if ( ps | grep -q squid ); then
  386.74  		/etc/init.d/squid restart
  386.75  	fi
  386.76  }
  386.77  
  386.78 -#Post remove command
  386.79 -post_remove()
  386.80 -{
  386.81 +post_remove() {
  386.82  	sed -i -e "s/.*squidclamav.*//" "$1/etc/c-icap/c-icap.conf"
  386.83 -	[ "$1" ] || if ( ps | grep -q squid ); then
  386.84 +	[ -n "$1" ] || if ( ps | grep -q squid ); then
  386.85  		/etc/init.d/squid restart
  386.86  	fi
  386.87 -	[ "$1" ] || if ( ps | grep -q c-icap ); then
  386.88 +	[ -n "$1" ] || if ( ps | grep -q c-icap ); then
  386.89  		/etc/init.d/c-icapd restart
  386.90  	fi
  386.91  }
   387.1 --- a/squidguard/receipt	Tue Mar 27 12:50:45 2018 +0200
   387.2 +++ b/squidguard/receipt	Fri Mar 30 19:31:50 2018 +0300
   387.3 @@ -1,24 +1,20 @@
   387.4 -# SliTaz package receipt.
   387.5 +# SliTaz package receipt v2.
   387.6  
   387.7  PACKAGE="squidguard"
   387.8  VERSION="1.4"
   387.9  CATEGORY="network"
  387.10 -SHORT_DESC="Web filter."
  387.11 +SHORT_DESC="Web filter"
  387.12  MAINTAINER="pascal.bellard@slitaz.org"
  387.13  LICENSE="GPL"
  387.14 -SOURCE="squidGuard"
  387.15 -TARBALL="$SOURCE-$VERSION.tar.gz"
  387.16  WEB_SITE="http://www.squidguard.org/"
  387.17 +
  387.18 +TARBALL="squidGuard-$VERSION.tar.gz"
  387.19  WGET_URL="${WEB_SITE}Downloads/$TARBALL"
  387.20 -DEPENDS="squid libdb"
  387.21 +
  387.22  BUILD_DEPENDS="db-dev"
  387.23  
  387.24 -# Rules to configure and make the package.
  387.25 -compile_rules()
  387.26 -{
  387.27 -	cd $src
  387.28 -	
  387.29 -	# Security patches 
  387.30 +compile_rules() {
  387.31 +	# Security patches
  387.32  	while read patch_file; do
  387.33  		echo "Apply $patch_file"
  387.34  		tar xvzf  $stuff/$patch_file || return 1
  387.35 @@ -31,14 +27,13 @@
  387.36  	# Add support for squid 3.4
  387.37  	patch -p1 < $stuff/squidGuard-1.4_upgrade.patch
  387.38  	patch -p1 < $stuff/squidGuard-1.4-dnsbl.patch
  387.39 -	
  387.40 -	./configure --prefix=/usr --infodir=/usr/share/info \
  387.41 -	--sysconfdir=/etc --with-sg-config=/etc/squidGuard/squidGuard.conf \
  387.42 -	--with-sg-logdir=/var/lib/squidGuard/log \
  387.43 -	--with-sg-dbhome=/var/lib/squidGuard/db \
  387.44 -	--mandir=/usr/share/man $CONFIGURE_ARGS
  387.45 -	
  387.46 -	make
  387.47 +
  387.48 +	./configure \
  387.49 +		--with-sg-config=/etc/squidGuard/squidGuard.conf \
  387.50 +		--with-sg-logdir=/var/lib/squidGuard/log \
  387.51 +		--with-sg-dbhome=/var/lib/squidGuard/db \
  387.52 +		$CONFIGURE_ARGS &&
  387.53 +	make &&
  387.54  	sed -e "s|^prefix =.*|prefix = $DESTDIR/usr|" \
  387.55  	    -e "s|^logdir =.*|logdir = $DESTDIR/var/lib/squidGuard/log|" \
  387.56  	    -e "s|^configfile =.*|configfile = $DESTDIR/etc/squidGuard/squidGuard.conf|" \
  387.57 @@ -49,9 +44,7 @@
  387.58  	make -f Makefile.slitaz-install install
  387.59  }
  387.60  
  387.61 -# Rules to gen a SliTaz package suitable for Tazpkg.
  387.62 -genpkg_rules()
  387.63 -{
  387.64 +genpkg_rules() {
  387.65  	mkdir -p $fs/etc/squid/conf.d
  387.66  	
  387.67  	cp -a $install/* $fs/
  387.68 @@ -60,24 +53,21 @@
  387.69  	# Cleanup.
  387.70  	rmdir $fs/usr/squidGuard
  387.71  	
  387.72 +	DEPENDS="squid libdb"
  387.73  }
  387.74  
  387.75 -# Pre and post install commands for Tazpkg.
  387.76 -post_install()
  387.77 -{
  387.78 +post_install() {
  387.79  	chown -R nobody "$1"/var/lib/squidGuard/*
  387.80  	# Recharge squid config
  387.81  	[ "$1" ] || { [ -x $(which squid) ] && $(which squid) -k reconfigure 2> /dev/null; }
  387.82  }
  387.83  
  387.84 -post_remove()
  387.85 -{
  387.86 +post_remove() {
  387.87  	# Recharge squid config
  387.88  	[ "$1" ] || { [ -x $(which squid) ] && $(which squid) -k reconfigure 2> /dev/null; }
  387.89  }
  387.90  
  387.91 -check_config()
  387.92 -{
  387.93 +check_config() {
  387.94  	su -c 'echo "http://www.example.com 192.168.0.6/- - GET" | \
  387.95  		squidGuard -c /etc/squidGuard/squidGuard.conf -d' nobody
  387.96  }
   388.1 --- a/srcpd/receipt	Tue Mar 27 12:50:45 2018 +0200
   388.2 +++ b/srcpd/receipt	Fri Mar 30 19:31:50 2018 +0300
   388.3 @@ -1,34 +1,26 @@
   388.4 -# SliTaz package receipt.
   388.5 +# SliTaz package receipt v2.
   388.6  
   388.7  PACKAGE="srcpd"
   388.8  VERSION="2.1.1"
   388.9  CATEGORY="games"
  388.10 -SHORT_DESC="Simple Railroad Command Protocl Daemon."
  388.11 +SHORT_DESC="Simple Railroad Command Protocl Daemon"
  388.12  MAINTAINER="rcx@zoominternet.net"
  388.13  LICENSE="GPL2"
  388.14 +WEB_SITE="http://srcpd.sourceforge.net/"
  388.15 +
  388.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  388.17 -WEB_SITE="http://srcpd.sourceforge.net/"
  388.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  388.19 -CONFIG_FILES="/etc/srcpd.conf"
  388.20  
  388.21 -DEPENDS="glibc-base libxml2 zlib"
  388.22  BUILD_DEPENDS="libxml2-dev zlib-dev"
  388.23  
  388.24 -# Rules to configure and make the package.
  388.25 -compile_rules()
  388.26 -{
  388.27 -	cd $src
  388.28 -
  388.29 -	./configure $CONFIGURE_ARGS \
  388.30 -		--sysconfdir=/etc &&
  388.31 +compile_rules() {
  388.32 +	./configure $CONFIGURE_ARGS &&
  388.33  	make &&
  388.34  	make install
  388.35  }
  388.36  
  388.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
  388.38 -genpkg_rules()
  388.39 -{
  388.40 -	mkdir -p $fs/usr
  388.41 -	cp -a $install/usr/sbin $fs/usr
  388.42 -	cp -a $install/etc $fs
  388.43 +genpkg_rules() {
  388.44 +	copy @std
  388.45 +	DEPENDS="glibc-base libxml2 zlib"
  388.46 +	CONFIG_FILES="/etc/srcpd.conf"
  388.47  }
   389.1 --- a/sshguard/receipt	Tue Mar 27 12:50:45 2018 +0200
   389.2 +++ b/sshguard/receipt	Fri Mar 30 19:31:50 2018 +0300
   389.3 @@ -1,4 +1,4 @@
   389.4 -# SliTaz package receipt.
   389.5 +# SliTaz package receipt v2.
   389.6  
   389.7  PACKAGE="sshguard"
   389.8  VERSION="2.0.0"
   389.9 @@ -6,29 +6,21 @@
  389.10  SHORT_DESC="Protects networked hosts from brute force attacks"
  389.11  MAINTAINER="pascal.bellard@slitaz.org"
  389.12  LICENSE="BSD"
  389.13 +WEB_SITE="http://www.sshguard.net/"
  389.14 +
  389.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
  389.16 -WEB_SITE="http://www.sshguard.net/"
  389.17 -WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$VERSION/$TARBALL"
  389.18 -TAGS="ssh"
  389.19 +WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  389.20  
  389.21 -DEPENDS="iptables"
  389.22 -BUILD_DEPENDS=""
  389.23 -
  389.24 -# Rules to configure and make the package.
  389.25 -compile_rules()
  389.26 -{
  389.27 -	./configure --prefix=/usr \
  389.28 -		--sysconfdir=/etc \
  389.29 -		--mandir=/usr/share/man \
  389.30 +compile_rules() {
  389.31 +	./configure \
  389.32  		--with-firewall=iptables \
  389.33  		$CONFIGURE_ARGS &&
  389.34  	make &&
  389.35  	make DESTDIR=$DESTDIR install
  389.36  }
  389.37  
  389.38 -# Rules to gen a SliTaz package suitable for Tazpkg.
  389.39 -genpkg_rules()
  389.40 -{
  389.41 -	mkdir -p $fs/usr
  389.42 -	cp -a $install/usr/sbin $fs/usr
  389.43 +genpkg_rules() {
  389.44 +	copy @std
  389.45 +	DEPENDS="iptables"
  389.46 +	TAGS="ssh"
  389.47  }
   390.1 --- a/ssmtp/receipt	Tue Mar 27 12:50:45 2018 +0200
   390.2 +++ b/ssmtp/receipt	Fri Mar 30 19:31:50 2018 +0300
   390.3 @@ -1,55 +1,39 @@
   390.4 -# SliTaz package receipt.
   390.5 +# SliTaz package receipt v2.
   390.6  
   390.7  PACKAGE="ssmtp"
   390.8  VERSION="2.64"
   390.9  CATEGORY="network"
  390.10 -SHORT_DESC="Extremely simple MTA to get mail off the system to a mailhub."
  390.11 +SHORT_DESC="Extremely simple MTA to get mail off the system to a mailhub"
  390.12  MAINTAINER="rocky@slitaz.org"
  390.13  LICENSE="GPL2"
  390.14 +WEB_SITE="http://packages.debian.org/stable/mail/ssmtp"
  390.15 +
  390.16  TARBALL="${PACKAGE}_${VERSION}.orig.tar.bz2"
  390.17 -WEB_SITE="http://packages.debian.org/stable/mail/ssmtp"
  390.18  WGET_URL="http://ftp.debian.org/debian/pool/main/s/ssmtp/$TARBALL"
  390.19 -CONFIG_FILES="/etc/ssmtp/ssmtp.conf /etc/ssmtp/revaliases"
  390.20  
  390.21 -DEPENDS="openssl"
  390.22  BUILD_DEPENDS="openssl-dev"
  390.23  
  390.24 -# Rules to configure and make the package.
  390.25 -compile_rules()
  390.26 -{
  390.27 +compile_rules() {
  390.28  	sed -i 's|@LIBS@|& -lcrypto|' Makefile.in
  390.29 -	./configure --prefix=/usr \
  390.30 -		--sysconfdir=/etc \
  390.31 -		--mandir=/usr/share/man \
  390.32 +
  390.33 +	./configure \
  390.34  		--enable-md5auth \
  390.35  		--enable-ssl \
  390.36  		$CONFIGURE_ARGS &&
  390.37 -	make
  390.38 +	make || return 1
  390.39  
  390.40  	# Install
  390.41  	mkdir -p $DESTDIR/usr/sbin $DESTDIR/etc/ssmtp
  390.42  	cp ssmtp $DESTDIR/usr/sbin
  390.43  	cp revaliases ssmtp.conf $DESTDIR/etc/ssmtp
  390.44 +
  390.45 +	ln -sf ssmtp "$install/usr/sbin/sendmail"
  390.46 +	ln -sf ssmtp "$install/usr/sbin/newaliases"
  390.47 +	ln -sf ssmtp "$install/usr/sbin/mailq"
  390.48  }
  390.49  
  390.50 -# Rules to gen a SliTaz package suitable for Tazpkg.
  390.51 -genpkg_rules()
  390.52 -{
  390.53 -	mkdir -p $fs/usr
  390.54 -	cp -a $install/usr/sbin/ $fs/usr/
  390.55 -	cp -a $install/etc/ $fs/
  390.56 +genpkg_rules() {
  390.57 +	copy @std
  390.58 +	DEPENDS="openssl"
  390.59 +	CONFIG_FILES="/etc/ssmtp/ssmtp.conf /etc/ssmtp/revaliases"
  390.60  }
  390.61 -
  390.62 -post_install()
  390.63 -{
  390.64 -	ln -sf /usr/sbin/ssmtp "$1/usr/sbin/sendmail"
  390.65 -	ln -sf /usr/sbin/ssmtp "$1/usr/sbin/newaliases"
  390.66 -	ln -sf /usr/sbin/ssmtp "$1/usr/sbin/mailq"
  390.67 -}
  390.68 -
  390.69 -post_remove()
  390.70 -{
  390.71 -	rm -f "$1/usr/sbin/sendmail"
  390.72 -	rm -f "$1/usr/sbin/newaliases"
  390.73 -	rm -f "$1/usr/sbin/mailq"
  390.74 -}
   391.1 --- a/stardict/receipt	Tue Mar 27 12:50:45 2018 +0200
   391.2 +++ b/stardict/receipt	Fri Mar 30 19:31:50 2018 +0300
   391.3 @@ -1,4 +1,4 @@
   391.4 -# SliTaz package receipt.
   391.5 +# SliTaz package receipt v2.
   391.6  
   391.7  PACKAGE="stardict"
   391.8  VERSION="3.0.1"
   391.9 @@ -6,27 +6,22 @@
  391.10  SHORT_DESC="A powerful international dictionary written in Gtk2"
  391.11  MAINTAINER="lufeng369@slitaz.org"
  391.12  LICENSE="GPL3"
  391.13 +WEB_SITE="http://code.google.com/p/stardict-3/"
  391.14 +
  391.15  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  391.16 -WEB_SITE="http://code.google.com/p/stardict-3/"
  391.17  WGET_URL="http://stardict-3.googlecode.com/files/$TARBALL"
  391.18  
  391.19 -DEPENDS="enchant libsigc++ gtk+ xorg-libSM"
  391.20  BUILD_DEPENDS="bzip2 enchant-dev tar intltool popt libsigc++-dev gtk+-dev \
  391.21  xorg-libSM-dev zlib-dev util-linux-uuid-dev libffi"
  391.22  
  391.23 -# Rules to configure and make the package.
  391.24 -compile_rules()
  391.25 -{
  391.26 -	cd $src
  391.27 +compile_rules() {
  391.28  	sed -i 's/<vector>/&\n#include <stdio.h>/' stardict-plugins/stardict-wordnet-plugin/scene.hpp
  391.29  	patch -p1 < $stuff/sigc++.patch || return 1
  391.30  	patch -p1 < $stuff/stardict_gcc43.patch || return 1
  391.31  
  391.32  	./configure \
  391.33 -		--prefix=/usr \
  391.34  		--disable-man \
  391.35  		--disable-qqwry \
  391.36 -		--sysconfdir=/etc \
  391.37  		--disable-gnome-support \
  391.38  		--disable-schemas-install \
  391.39  		--disable-espeak \
  391.40 @@ -34,13 +29,12 @@
  391.41  		--disable-festival \
  391.42  		--disable-advertisement \
  391.43  		--disable-updateinfo \
  391.44 -	$CONFIGURE_ARGS &&
  391.45 -	make && make DESTDIR=$DESTDIR install
  391.46 +		$CONFIGURE_ARGS &&
  391.47 +	make &&
  391.48 +	make DESTDIR=$DESTDIR install
  391.49  }
  391.50  
  391.51 -# Rules to gen a SliTaz package suitable for Tazpkg.
  391.52 -genpkg_rules()
  391.53 -{
  391.54 -	mkdir -p $fs/usr
  391.55 -	cp -a $install/usr $fs/
  391.56 +genpkg_rules() {
  391.57 +	copy @std
  391.58 +	DEPENDS="enchant libsigc++ gtk+ xorg-libSM"
  391.59  }
   392.1 --- a/startup-notification/receipt	Tue Mar 27 12:50:45 2018 +0200
   392.2 +++ b/startup-notification/receipt	Fri Mar 30 19:31:50 2018 +0300
   392.3 @@ -16,12 +16,12 @@
   392.4  SPLIT="startup-notification-dev"
   392.5  
   392.6  compile_rules() {
   392.7 -	fix ld
   392.8  	./configure \
   392.9  		--disable-static \
  392.10  		$CONFIGURE_ARGS &&
  392.11  	fix libtool &&
  392.12 -	make && make install || return 1
  392.13 +	make &&
  392.14 +	make install || return 1
  392.15  
  392.16  	cook_pick_docs doc/startup-notification.txt
  392.17  }
   393.1 --- a/sudo/receipt	Tue Mar 27 12:50:45 2018 +0200
   393.2 +++ b/sudo/receipt	Fri Mar 30 19:31:50 2018 +0300
   393.3 @@ -12,67 +12,53 @@
   393.4  WGET_URL="${WEB_SITE}dist/$TARBALL"
   393.5  
   393.6  BUILD_DEPENDS="gettext groff pam-dev"
   393.7 -SPLIT="sudo sudo-pam sudo-dev sudo-pam-dev"
   393.8 +SPLIT="sudo sudo-dev sudo-pam:pam sudo-pam-dev:pam"
   393.9  
  393.10 -# Rules to configure and make the package.
  393.11 -compile_rules()
  393.12 -{
  393.13 -	cp -a $src $src-pam
  393.14 +compile_rules() {
  393.15 +	case $SET in
  393.16 +		'')  SET_ARGS='--without-pam';;
  393.17 +		pam) SET_ARGS='--with-pam';;
  393.18 +	esac
  393.19 +
  393.20  	./configure \
  393.21 -		--sysconfdir=/etc \
  393.22  		--libexecdir=/usr/lib \
  393.23  		--with-secure-path \
  393.24  		--with-all-insults \
  393.25  		--with-env-editor \
  393.26  		--docdir=/usr/share/doc/sudo-$VERSION \
  393.27  		--with-passprompt="[sudo] password for %p" \
  393.28 -		--without-pam \
  393.29 +		$SET_ARGS \
  393.30  		$CONFIGURE_ARGS &&
  393.31  	make &&
  393.32 -	make install &&
  393.33 +	make install || return 1
  393.34  
  393.35 -	cd $src-pam &&
  393.36 -	./configure \
  393.37 -		--sysconfdir=/etc \
  393.38 -		--libexecdir=/usr/lib \
  393.39 -		--with-secure-path \
  393.40 -		--with-all-insults \
  393.41 -		--with-env-editor \
  393.42 -		--docdir=/usr/share/doc/sudo-$VERSION \
  393.43 -		--with-passprompt="[sudo] password for %p" \
  393.44 -		--with-pam \
  393.45 -		$CONFIGURE_ARGS &&
  393.46 -	make &&
  393.47 -	make DESTDIR=$DESTDIR-pam install &&
  393.48 +	ln -sfv libsudo_util.so.0.0.0 $install/usr/lib/sudo/libsudo_util.so.0
  393.49  
  393.50 -	ln -sfv libsudo_util.so.0.0.0 $install/usr/lib/sudo/libsudo_util.so.0 &&
  393.51 -	ln -sfv libsudo_util.so.0.0.0 $install-pam/usr/lib/sudo/libsudo_util.so.0 &&
  393.52 -	
  393.53 -	mkdir -p $install-pam/etc/pam.d &&
  393.54 -	cp $stuff/sudo $install-pam/etc/pam.d/
  393.55 +	if [ "$SET" == 'pam' ]; then
  393.56 +		install -Dm644 $stuff/sudo $install/etc/pam.d/sudo
  393.57 +	fi
  393.58  }
  393.59  
  393.60 -# Rules to gen a SliTaz package suitable for Tazpkg.
  393.61 -genpkg_rules()
  393.62 -{
  393.63 +genpkg_rules() {
  393.64  	case $PACKAGE in
  393.65  		sudo)
  393.66  			copy @std
  393.67  			DEPENDS="zlib"
  393.68  			CONFIG_FILES="/etc/sudoers"
  393.69  			;;
  393.70 +		sudo-dev)
  393.71 +			copy @dev
  393.72 +			DEPENDS="zlib-dev"
  393.73 +			;;
  393.74 +
  393.75  		sudo-pam)
  393.76 -			install=$install-pam copy @std
  393.77 +			copy @std
  393.78  			DEPENDS="zlib pam"
  393.79  			PROVIDE="sudo:pam"
  393.80  			CONFIG_FILES="/etc/sudoers /etc/pam.d/sudo"
  393.81  			;;
  393.82 -		sudo-dev)
  393.83 +		sudo-pam-dev)
  393.84  			copy @dev
  393.85 -			DEPENDS="zlib-dev"
  393.86 -			;;
  393.87 -		sudo-pam-dev)
  393.88 -			install=$install-pam copy @dev
  393.89  			DEPENDS="zlib-dev pam-dev"
  393.90  			PROVIDE="sudo-dev:pam"
  393.91  			;;
   394.1 --- a/system-tools-backends/receipt	Tue Mar 27 12:50:45 2018 +0200
   394.2 +++ b/system-tools-backends/receipt	Fri Mar 30 19:31:50 2018 +0300
   394.3 @@ -1,4 +1,4 @@
   394.4 -# SliTaz package receipt.
   394.5 +# SliTaz package receipt v2.
   394.6  
   394.7  PACKAGE="system-tools-backends"
   394.8  VERSION="2.10.2"
   394.9 @@ -7,24 +7,19 @@
  394.10  MAINTAINER="al.bobylev@gmail.com"
  394.11  LICENSE="GPL3"
  394.12  WEB_SITE="http://system-tools-backends.freedesktop.org/"
  394.13 +
  394.14  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  394.15  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
  394.16  
  394.17 -DEPENDS="dbus dbus-glib glib glibc-base libffi pcre polkit zlib"
  394.18  BUILD_DEPENDS="dbus-dev polkit-dev dbus-glib-dev glib-dev intltool perl-dev"
  394.19  
  394.20 -# Rules to configure and make the package.
  394.21 -compile_rules()
  394.22 -{
  394.23 -	./configure \
  394.24 -		--sysconfdir=/etc \
  394.25 -		$CONFIGURE_ARGS &&
  394.26 -	make && make install
  394.27 +compile_rules() {
  394.28 +	./configure $CONFIGURE_ARGS &&
  394.29 +	make &&
  394.30 +	make install
  394.31  }
  394.32  
  394.33 -# Rules to gen a SliTaz package suitable for Tazpkg.
  394.34 -genpkg_rules()
  394.35 -{
  394.36 -	cp -a $install/* $fs
  394.37 -	rm -rf $fs/usr/share/locale
  394.38 +genpkg_rules() {
  394.39 +	copy @std
  394.40 +	DEPENDS="dbus dbus-glib glib glibc-base libffi pcre polkit zlib"
  394.41  }
   395.1 --- a/systemd/receipt	Tue Mar 27 12:50:45 2018 +0200
   395.2 +++ b/systemd/receipt	Fri Mar 30 19:31:50 2018 +0300
   395.3 @@ -1,17 +1,16 @@
   395.4 -# SliTaz package receipt.
   395.5 +# SliTaz package receipt v2.
   395.6  
   395.7  PACKAGE="systemd"
   395.8  VERSION="195"
   395.9  CATEGORY="base-system"
  395.10 -SHORT_DESC="System and service manager for Linux."
  395.11 +SHORT_DESC="System and service manager for Linux"
  395.12  MAINTAINER="pankso@slitaz.org"
  395.13  LICENSE="GPL2 LGPL2.1 MIT"
  395.14 +WEB_SITE="http://freedesktop.org/wiki/Software/systemd/"
  395.15 +
  395.16  TARBALL="$PACKAGE-$VERSION.tar.xz"
  395.17 -WEB_SITE="http://freedesktop.org/wiki/Software/systemd/"
  395.18  WGET_URL="http://www.freedesktop.org/software/systemd/$TARBALL"
  395.19 -PROVIDE="udev"
  395.20  
  395.21 -DEPENDS="dbus kmod libcap util-linux-blkid usbutils pciutils glib acl"
  395.22  BUILD_DEPENDS="dbus-dev kmod-dev libcap-dev util-linux-blkid-dev usbutils-dev \
  395.23  pciutils-dev gperf glib-dev acl-dev intltool m4 util-linux-uuid-dev \
  395.24  pam-dev"
  395.25 @@ -26,14 +25,8 @@
  395.26  # Actually we can have automount using the Kernel Polling feature and spacefm
  395.27  #
  395.28  
  395.29 -# Rules to configure and make the package.
  395.30 -compile_rules()
  395.31 -{
  395.32 -	cd $src
  395.33 +compile_rules() {
  395.34  	./configure \
  395.35 -		--prefix=/usr \
  395.36 -		--sysconfdir=/etc \
  395.37 -		--localstatedir=/var \
  395.38  		--libexecdir=/usr/lib \
  395.39  		--with-sysvinit-path= \
  395.40  		--with-sysvrcd-path= \
  395.41 @@ -42,24 +35,16 @@
  395.42  		--disable-ima \
  395.43  		--with-distro=other \
  395.44  		$CONFIGURE_ARGS &&
  395.45 -	make && make install
  395.46 +	make &&
  395.47 +	make install || return 1
  395.48 +
  395.49 +	# For kernel opt: init=/bin/systemd
  395.50 +	mkdir -p $fs/bin
  395.51 +	ln -s ../usr/lib/systemd/systemd $fs/bin/systemd
  395.52  }
  395.53  
  395.54 -# Rules to gen a SliTaz package suitable for Tazpkg.
  395.55 -genpkg_rules()
  395.56 -{
  395.57 -	mkdir -p $fs/usr/lib $fs/usr/share
  395.58 -	cp -a $install/etc $fs
  395.59 -	rm -rf $fs/etc/bash_*
  395.60 -	cp -a $install/var $fs
  395.61 -	cp -a $install/usr/bin $fs/usr
  395.62 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
  395.63 -	cp -a $install/usr/lib/*d $fs/usr/lib
  395.64 -	cp -a $install/usr/lib/udev $fs/usr/lib
  395.65 -	mkdir -p $fs/usr/lib/security
  395.66 -	cp -a $install/usr/share/*-1 $fs/usr/share
  395.67 -	cp -a $install/usr/share/systemd $fs/usr/share
  395.68 -	# For kernel opt: init=/bin/systemd
  395.69 -	mkdir -p $fs/bin
  395.70 -	cd $fs/bin && ln -s ../usr/lib/systemd/systemd systemd
  395.71 +genpkg_rules() {
  395.72 +	copy @std
  395.73 +	DEPENDS="dbus kmod libcap util-linux-blkid usbutils pciutils glib acl"
  395.74 +	PROVIDE="udev"
  395.75  }
   396.1 --- a/thermald/receipt	Tue Mar 27 12:50:45 2018 +0200
   396.2 +++ b/thermald/receipt	Fri Mar 30 19:31:50 2018 +0300
   396.3 @@ -1,31 +1,26 @@
   396.4 -# SliTaz package receipt.
   396.5 +# SliTaz package receipt v2.
   396.6  
   396.7  PACKAGE="thermald"
   396.8  VERSION="1.3.rc1"
   396.9  CATEGORY="system-tools"
  396.10  LICENSE="GPL2"
  396.11 -SHORT_DESC="Linux thermal daemon (thermald) monitors and controls temperature."
  396.12 +SHORT_DESC="Linux thermal daemon (thermald) monitors and controls temperature"
  396.13  MAINTAINER="yuripourre@gmail.com"
  396.14 +WEB_SITE="https://01.org/linux-thermal-daemon"
  396.15 +
  396.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  396.17 -WEB_SITE="https://01.org/linux-thermal-daemon"
  396.18  WGET_URL="https://github.com/01org/thermal_daemon/archive/v$VERSION.tar.gz"
  396.19  
  396.20 -DEPENDS="dbus dbus-glib"
  396.21  BUILD_DEPENDS="dbus-dev dbus-glib-dev libxml2-dev automake"
  396.22  
  396.23 -# Rules to configure and make the package.
  396.24 -compile_rules()
  396.25 -{
  396.26 +compile_rules() {
  396.27  	./autogen.sh
  396.28 -	./configure \
  396.29 -		--prefix=/usr \
  396.30 -		--sysconfdir=/etc \
  396.31 -		$CONFIGURE_ARGS &&
  396.32 +	./configure $CONFIGURE_ARGS &&
  396.33  	make &&
  396.34  	make DESTDIR=$DESTDIR install
  396.35  }
  396.36  
  396.37 -genpkg_rules()
  396.38 -{
  396.39 -	cp -a $install/usr $fs
  396.40 +genpkg_rules() {
  396.41 +	copy @std
  396.42 +	DEPENDS="dbus dbus-glib"
  396.43  }
   397.1 --- a/thunar-vfs/receipt	Tue Mar 27 12:50:45 2018 +0200
   397.2 +++ b/thunar-vfs/receipt	Fri Mar 30 19:31:50 2018 +0300
   397.3 @@ -17,10 +17,7 @@
   397.4  SPLIT="thunar-vfs-dev"
   397.5  
   397.6  compile_rules() {
   397.7 -	fix ld
   397.8  	./configure \
   397.9 -		--prefix=/usr \
  397.10 -		--sysconfdir=/etc \
  397.11  		--enable-dbus \
  397.12  		--enable-startup-notification \
  397.13  		--disable-gnome-thumbnailers \
   398.1 --- a/thunar-volman/receipt	Tue Mar 27 12:50:45 2018 +0200
   398.2 +++ b/thunar-volman/receipt	Fri Mar 30 19:31:50 2018 +0300
   398.3 @@ -15,10 +15,7 @@
   398.4  eudev-dev xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
   398.5  
   398.6  compile_rules() {
   398.7 -	fix ld
   398.8  	./configure \
   398.9 -		--sysconfdir=/etc \
  398.10 -		--localstatedir=/var \
  398.11  		--disable-debug \
  398.12  		$CONFIGURE_ARGS &&
  398.13  	fix libtool &&
   399.1 --- a/thunar/receipt	Tue Mar 27 12:50:45 2018 +0200
   399.2 +++ b/thunar/receipt	Fri Mar 30 19:31:50 2018 +0300
   399.3 @@ -17,10 +17,7 @@
   399.4  SPLIT="thunar-dev"
   399.5  
   399.6  compile_rules() {
   399.7 -	fix ld
   399.8  	./configure \
   399.9 -		--sysconfdir=/etc \
  399.10 -		--localstatedir=/var \
  399.11  		--disable-debug \
  399.12  		--disable-gtk-doc \
  399.13  		$CONFIGURE_ARGS &&
   400.1 --- a/tig/receipt	Tue Mar 27 12:50:45 2018 +0200
   400.2 +++ b/tig/receipt	Fri Mar 30 19:31:50 2018 +0300
   400.3 @@ -1,33 +1,26 @@
   400.4 -# SliTaz package receipt.
   400.5 +# SliTaz package receipt v2.
   400.6  
   400.7  PACKAGE="tig"
   400.8  VERSION="2.2"
   400.9  CATEGORY="network"
  400.10 -SHORT_DESC="A console UI for git."
  400.11 +SHORT_DESC="A console UI for git"
  400.12  MAINTAINER="paul@slitaz.org"
  400.13  LICENSE="GPL2"
  400.14 +WEB_SITE="http://jonas.nitro.dk/tig/"
  400.15 +
  400.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  400.17 -WEB_SITE="http://jonas.nitro.dk/tig/"
  400.18  WGET_URL="$WEB_SITE/releases/$TARBALL"
  400.19  
  400.20 -DEPENDS="ncurses"
  400.21  BUILD_DEPENDS="ncurses-dev"
  400.22  
  400.23 -# Rules to configure and make the package.
  400.24 -compile_rules()
  400.25 -{
  400.26 -	cd $src
  400.27 -	./configure \
  400.28 -		--prefix=/usr \
  400.29 -		--sysconfdir=/etc \
  400.30 -	make && make DESTDIR=$DESTDIR install
  400.31 +compile_rules() {
  400.32 +	./configure $CONFIGURE_ARGS &&
  400.33 +	make &&
  400.34 +	make DESTDIR=$DESTDIR install
  400.35  }
  400.36  
  400.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
  400.38 -genpkg_rules()
  400.39 -{
  400.40 -	mkdir -p $fs/usr $fs/etc
  400.41 -	cp -a $install/usr/bin $fs/usr
  400.42 -	cp -a $install/etc/tigrc $fs/etc
  400.43 +genpkg_rules() {
  400.44 +	copy @std
  400.45 +	DEPENDS="ncurses"
  400.46  }
  400.47  
   401.1 --- a/tinc/receipt	Tue Mar 27 12:50:45 2018 +0200
   401.2 +++ b/tinc/receipt	Fri Mar 30 19:31:50 2018 +0300
   401.3 @@ -1,35 +1,29 @@
   401.4 -# SliTaz package receipt.
   401.5 +# SliTaz package receipt v2.
   401.6  
   401.7  PACKAGE="tinc"
   401.8  VERSION="1.0.25"
   401.9  CATEGORY="network"
  401.10 -SHORT_DESC="Virtual Private Network daemon with pseudo STUN support."
  401.11 +SHORT_DESC="Virtual Private Network daemon with pseudo STUN support"
  401.12  MAINTAINER="pascal.bellard@slitaz.org"
  401.13  LICENSE="GPL2"
  401.14 +WEB_SITE="http://www.tinc-vpn.org/"
  401.15 +
  401.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  401.17 -WEB_SITE="http://www.tinc-vpn.org/"
  401.18  WGET_URL="${WEB_SITE}packages/$TARBALL"
  401.19 -CONFIG_FILES="/etc/tinc"
  401.20 -TAGS="vpn tunnel"
  401.21  
  401.22  BUILD_DEPENDS="openssl-dev zlib-dev lzo-dev"
  401.23 -DEPENDS="openssl zlib lzo"
  401.24  
  401.25 -# Rules to configure and make the package.
  401.26 -compile_rules()
  401.27 -{
  401.28 -	./configure --prefix=/usr --sysconfdir=/etc \
  401.29 -		--localstatedir=/var \
  401.30 -		--mandir=/usr/share/man \
  401.31 -		$CONFIGURE_ARGS &&
  401.32 +compile_rules() {
  401.33 +	./configure $CONFIGURE_ARGS &&
  401.34  	make &&
  401.35 -	make DESTDIR=$DESTDIR install
  401.36 +	make DESTDIR=$DESTDIR install || return 1
  401.37 +
  401.38 +	cp -a $stuff/* $install
  401.39  }
  401.40  
  401.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
  401.42 -genpkg_rules()
  401.43 -{
  401.44 -	mkdir -p $fs/usr
  401.45 -	cp -a $install/usr/sbin $fs/usr
  401.46 -	cp -a $stuff/* $fs
  401.47 +genpkg_rules() {
  401.48 +	copy @std
  401.49 +	DEPENDS="openssl zlib lzo"
  401.50 +	CONFIG_FILES="/etc/tinc"
  401.51 +	TAGS="vpn tunnel"
  401.52  }
   402.1 --- a/tinyproxy/receipt	Tue Mar 27 12:50:45 2018 +0200
   402.2 +++ b/tinyproxy/receipt	Fri Mar 30 19:31:50 2018 +0300
   402.3 @@ -1,39 +1,31 @@
   402.4 -# SliTaz package receipt.
   402.5 +# SliTaz package receipt v2.
   402.6  
   402.7  PACKAGE="tinyproxy"
   402.8  VERSION="1.8.3"
   402.9  CATEGORY="network"
  402.10 -SHORT_DESC="A light-weight HTTP proxy daemon for POSIX operating systems."
  402.11 +SHORT_DESC="A light-weight HTTP proxy daemon for POSIX operating systems"
  402.12  MAINTAINER="slaxemulator@gmail.com"
  402.13  LICENSE="GPL2"
  402.14 +WEB_SITE="https://banu.com/tinyproxy/"
  402.15 +
  402.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  402.17 -WEB_SITE="https://banu.com/tinyproxy/"
  402.18  WGET_URL="https://banu.com/pub/$PACKAGE/${VERSION%.*}/$TARBALL"
  402.19  
  402.20 -# Rules to configure and make the package.
  402.21 -compile_rules()
  402.22 -{
  402.23 +compile_rules() {
  402.24  	patch -Np1 -i $stuff/no-docs-and-tests.diff
  402.25 +
  402.26  	./configure \
  402.27 -		--prefix=/usr \
  402.28 -		--infodir=/usr/share/info \
  402.29 -		--mandir=/usr/share/man \
  402.30  		--sysconfdir=/etc/tinyproxy \
  402.31 -		--localstatedir=/var \
  402.32  		$CONFIGURE_ARGS &&
  402.33 -	make && make DESTDIR=$DESTDIR install
  402.34 +	make &&
  402.35 +	make DESTDIR=$DESTDIR install || return 1
  402.36 +
  402.37  	# Provide sane defaults
  402.38 -	find $DESTDIR/etc -name tinyproxy.conf | xargs sed -i '/^#Listen/a\Listen 127.0.0.1'
  402.39 +	sed -i '/^#Listen/a\Listen 127.0.0.1' $install/etc/tinyproxy/tinyproxy.conf
  402.40  
  402.41 +	install -Dm755 $stuff/tinyproxy $install/etc/init.d/tinyproxy
  402.42  }
  402.43  
  402.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
  402.45 -genpkg_rules()
  402.46 -{
  402.47 -	mkdir -p $fs/usr/share $fs/etc/init.d
  402.48 -	cp -a $install/usr/sbin $fs/usr
  402.49 -	cp -a $install/usr/share/tinyproxy $fs/usr/share
  402.50 -	cp -a $install/etc $fs
  402.51 -	cp -a $stuff/tinyproxy $fs/etc/init.d
  402.52 +genpkg_rules() {
  402.53 +	copy @std
  402.54  }
  402.55 -
   403.1 --- a/tor/receipt	Tue Mar 27 12:50:45 2018 +0200
   403.2 +++ b/tor/receipt	Fri Mar 30 19:31:50 2018 +0300
   403.3 @@ -1,35 +1,27 @@
   403.4 -# SliTaz package receipt.
   403.5 +# SliTaz package receipt v2.
   403.6  
   403.7  PACKAGE="tor"
   403.8 -VERSION="0.2.8.8"
   403.9 +VERSION="0.3.2.10"
  403.10  CATEGORY="network"
  403.11 -SHORT_DESC="An anonymizing overlay network for TCP."
  403.12 +SHORT_DESC="An anonymizing overlay network for TCP"
  403.13  MAINTAINER="0dddba11@googlemail.com"
  403.14  LICENSE="BSD"
  403.15 +WEB_SITE="http://www.torproject.org/"
  403.16 +
  403.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
  403.18 -WEB_SITE="http://www.torproject.org/"
  403.19  WGET_URL="https://www.torproject.org/dist/$TARBALL"
  403.20  
  403.21 -DEPENDS="libevent openssl"
  403.22  BUILD_DEPENDS="libevent-dev openssl-dev perl zlib-dev"
  403.23  
  403.24 -# Rules to configure and make the package.
  403.25 -compile_rules()
  403.26 -{
  403.27 -	./configure \
  403.28 -		--sysconfdir=/etc \
  403.29 -		$CONFIGURE_ARGS &&
  403.30 -	make && make install
  403.31 +compile_rules() {
  403.32 +	./configure $CONFIGURE_ARGS &&
  403.33 +	make &&
  403.34 +	make install || return 1
  403.35 +
  403.36 +	mv $install/etc/tor/torrc.sample $install/etc/tor/torrc
  403.37  }
  403.38  
  403.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  403.40 -genpkg_rules()
  403.41 -{
  403.42 -	mkdir -p $fs/usr
  403.43 -	cp -a $install/usr/bin $fs/usr
  403.44 -	#cp -a $install/usr/share/tor $fs/usr/share
  403.45 -	
  403.46 -	# config file.
  403.47 -	cp -a $install/etc $fs
  403.48 -	mv $fs/etc/tor/torrc.sample $fs/etc/tor/torrc
  403.49 +genpkg_rules() {
  403.50 +	copy @std
  403.51 +	DEPENDS="libevent openssl"
  403.52  }
   404.1 --- a/tslib/receipt	Tue Mar 27 12:50:45 2018 +0200
   404.2 +++ b/tslib/receipt	Fri Mar 30 19:31:50 2018 +0300
   404.3 @@ -20,10 +20,9 @@
   404.4  	esac
   404.5  
   404.6  	./autogen.sh &&
   404.7 -	./configure \
   404.8 -		--sysconfdir=/etc \
   404.9 -		$CONFIGURE_ARGS &&
  404.10 -	make && make install
  404.11 +	./configure $CONFIGURE_ARGS &&
  404.12 +	make &&
  404.13 +	make install
  404.14  }
  404.15  
  404.16  genpkg_rules() {
   405.1 --- a/tumbler/receipt	Tue Mar 27 12:50:45 2018 +0200
   405.2 +++ b/tumbler/receipt	Fri Mar 30 19:31:50 2018 +0300
   405.3 @@ -24,8 +24,6 @@
   405.4  	sed -i 's|libopenraw-gnome-1\.0|libopenraw-gnome-0.1|g' configure
   405.5  
   405.6  	./configure \
   405.7 -		--sysconfdir=/etc \
   405.8 -		--localstatedir=/var \
   405.9  		--disable-debug \
  405.10  		--enable-gtk-doc \
  405.11  		$CONFIGURE_ARGS &&
   406.1 --- a/tuxtype/receipt	Tue Mar 27 12:50:45 2018 +0200
   406.2 +++ b/tuxtype/receipt	Fri Mar 30 19:31:50 2018 +0300
   406.3 @@ -1,56 +1,39 @@
   406.4 -# SliTaz package receipt.
   406.5 +# SliTaz package receipt v2.
   406.6  
   406.7  PACKAGE="tuxtype"
   406.8 -SOURCE="tuxtype_w_fonts"
   406.9  VERSION="1.8.1"
  406.10  CATEGORY="games"
  406.11 -SHORT_DESC="Educational typing tutor for kids."
  406.12 +SHORT_DESC="Educational typing tutor for kids"
  406.13  MAINTAINER="claudinei@slitaz.org"
  406.14  LICENSE="GPL2"
  406.15 -TARBALL="$SOURCE-$VERSION.tar.gz"
  406.16  WEB_SITE="http://tux4kids.alioth.debian.org"
  406.17 +
  406.18 +TARBALL="tuxtype_w_fonts-$VERSION.tar.gz"
  406.19  WGET_URL="https://alioth.debian.org/frs/download.php/3270/$TARBALL"
  406.20  
  406.21 -DEPENDS="libt4k_common libsdl librsvg libsdl-image libsdl-mixer libsdl-ttf \
  406.22 -libsdl-net libsdl-pango"
  406.23  BUILD_DEPENDS="libt4k_common-dev libsdl-dev librsvg-dev libsdl-image-dev \
  406.24 -libsdl-mixer-dev libsdl-ttf-dev libsdl-net-dev libsdl-pango-dev wget"
  406.25 -TAGS="education"
  406.26 +libsdl-mixer-dev libsdl-ttf-dev libsdl-net-dev libsdl-pango-dev"
  406.27  
  406.28 -# Rules to configure and make the package.
  406.29 -compile_rules()
  406.30 -{
  406.31 -	cd $src
  406.32 -	./configure --sysconfdir=/etc \
  406.33 -		--prefix=/usr \
  406.34 +compile_rules() {
  406.35 +	./configure \
  406.36  		--localstatedir=/var/games
  406.37  		$CONFIGURE_ARGS &&
  406.38 -	make 
  406.39 +	make || return 1
  406.40 +
  406.41  	# Adding the games group satisfies the install script.
  406.42 -	addgroup games 
  406.43 -	make DESTDIR=$DESTDIR install 
  406.44 +	addgroup games
  406.45 +	make DESTDIR=$DESTDIR install
  406.46  	# We don't need to leave this behind in the build environment.
  406.47  	delgroup games
  406.48  }
  406.49  
  406.50 -# Rules to gen a SliTaz package suitable for Tazpkg.
  406.51 -genpkg_rules()
  406.52 -{
  406.53 -	mkdir -p $fs/usr/share $fs/var/games/tuxtype/words
  406.54 -	cp -a $install/usr/bin $fs/usr
  406.55 -	cp -a $install/usr/share/tuxtype $fs/usr/share
  406.56 -
  406.57 -	for lang in de es fr pt; do
  406.58 -		mkdir -p $fs/usr/share/locale/$lang/LC_MESSAGES
  406.59 -		cp -a $install/usr/share/locale/$lang/LC_MESSAGES/tuxtype.mo \
  406.60 -			$fs/usr/share/locale/$lang/LC_MESSAGES
  406.61 -	done
  406.62 -	
  406.63 -	cp -ar $install/usr $fs
  406.64 +genpkg_rules() {
  406.65 +	copy @std *.mo
  406.66 +	DEPENDS="libt4k_common libsdl librsvg libsdl-image libsdl-mixer libsdl-ttf \
  406.67 +	libsdl-net libsdl-pango"
  406.68 +	TAGS="education"
  406.69  }
  406.70  
  406.71 -post_install()
  406.72 -{
  406.73 -	echo "Adding games group if not already created:"
  406.74 +post_install() {
  406.75  	chroot "$1/" addgroup games
  406.76  }
   407.1 --- a/udev/receipt	Tue Mar 27 12:50:45 2018 +0200
   407.2 +++ b/udev/receipt	Fri Mar 30 19:31:50 2018 +0300
   407.3 @@ -35,7 +35,6 @@
   407.4  		--exec-prefix="" \
   407.5  		--with-rootprefix="" \
   407.6  		--bindir=/sbin \
   407.7 -		--sysconfdir=/etc \
   407.8  		--libexecdir=/lib \
   407.9  		--disable-manpages \
  407.10  		--disable-introspection \
  407.11 @@ -46,7 +45,8 @@
  407.12  		--with-usb-ids-path=/usr/share/misc/usb.ids.gz \
  407.13  		--with-systemdsystemunitdir=no \
  407.14  		$CONFIGURE_ARGS &&
  407.15 -	make && make install
  407.16 +	make &&
  407.17 +	make install
  407.18  }
  407.19  
  407.20  genpkg_rules() {
   408.1 --- a/udisks/receipt	Tue Mar 27 12:50:45 2018 +0200
   408.2 +++ b/udisks/receipt	Fri Mar 30 19:31:50 2018 +0300
   408.3 @@ -18,15 +18,13 @@
   408.4  
   408.5  compile_rules() {
   408.6  	./configure \
   408.7 -		--prefix=/usr \
   408.8  		--libexecdir=/usr/lib/udisks \
   408.9 -		--sysconfdir=/etc \
  408.10 -		--localstatedir=/var \
  408.11  		--disable-static \
  408.12  		--disable-remote-access \
  408.13  		--disable-gtk-doc-html \
  408.14  		$CONFIGURE_ARGS &&
  408.15 -	make && make install
  408.16 +	make &&
  408.17 +	make install
  408.18  }
  408.19  
  408.20  genpkg_rules() {
   409.1 --- a/udisks2-kitless/receipt	Tue Mar 27 12:50:45 2018 +0200
   409.2 +++ b/udisks2-kitless/receipt	Fri Mar 30 19:31:50 2018 +0300
   409.3 @@ -1,4 +1,4 @@
   409.4 -# SliTaz package receipt.
   409.5 +# SliTaz package receipt v2.
   409.6  
   409.7  PACKAGE="udisks2-kitless"
   409.8  VERSION="2.1.8"
   409.9 @@ -7,29 +7,24 @@
  409.10  MAINTAINER="psychomaniak@xakep.ru"
  409.11  LICENSE="GPL2"
  409.12  WEB_SITE="https://github.com/ehegnes/udisks-kitless/"
  409.13 +
  409.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
  409.15  WGET_URL="${WEB_SITE}archive/v${TARBALL/*-/}"
  409.16  
  409.17 -DEPENDS="libatasmart libgudev"
  409.18  BUILD_DEPENDS="docbook-xsl gtk-doc libgudev-dev libatasmart-dev \
  409.19  gobject-introspection-dev intltool"
  409.20  
  409.21 -# Rules to configure and make the package.
  409.22 -compile_rules()
  409.23 -{
  409.24 +compile_rules() {
  409.25  	./configure \
  409.26 -		--sysconfdir=/etc \
  409.27 -		--localstatedir=/var \
  409.28  		--enable-fhs-media \
  409.29  		--with-udevdir=/etc/udev \
  409.30  		--with-systemdsystemunitdir=no \
  409.31  		$CONFIGURE_ARGS &&
  409.32 -	make && make install
  409.33 +	make &&
  409.34 +	make install
  409.35  }
  409.36  
  409.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
  409.38 -genpkg_rules()
  409.39 -{
  409.40 +genpkg_rules() {
  409.41  	copy etc/ bin/ sbin/ libexec/ dbus-1/ polkit-1/ var/ *.so*
  409.42  
  409.43  	sed '/lang=/d' -i \
  409.44 @@ -42,4 +37,5 @@
  409.45  
  409.46  	# mount to "/media" instead of "/media/<user>"
  409.47  	cp $stuff/99-udisks2.rules $fs/etc/udev/rules.d/
  409.48 +	DEPENDS="libatasmart libgudev"
  409.49  }
   410.1 --- a/udisks2/receipt	Tue Mar 27 12:50:45 2018 +0200
   410.2 +++ b/udisks2/receipt	Fri Mar 30 19:31:50 2018 +0300
   410.3 @@ -18,12 +18,11 @@
   410.4  
   410.5  compile_rules() {
   410.6  	./configure \
   410.7 -		--sysconfdir=/etc \
   410.8 -		--localstatedir=/var \
   410.9  		--disable-static \
  410.10  		--enable-fhs-media \
  410.11  		$CONFIGURE_ARGS &&
  410.12 -	make && make install || return 1
  410.13 +	make &&
  410.14 +	make install || return 1
  410.15  
  410.16  	# mount to "/media" instead of "/media/<user>"
  410.17  	mkdir -p $install/etc/udev/rules.d/
   411.1 --- a/uget/receipt	Tue Mar 27 12:50:45 2018 +0200
   411.2 +++ b/uget/receipt	Fri Mar 30 19:31:50 2018 +0300
   411.3 @@ -1,4 +1,4 @@
   411.4 -# SliTaz package receipt.
   411.5 +# SliTaz package receipt v2.
   411.6  
   411.7  PACKAGE="uget"
   411.8  VERSION="1.10.4"
   411.9 @@ -6,35 +6,25 @@
  411.10  SHORT_DESC="Download manager using gtk+ and libcurl"
  411.11  MAINTAINER="devl547@gmail.com"
  411.12  LICENSE="LGPL2.1"
  411.13 +WEB_SITE="http://urlget.sourceforge.net/"
  411.14 +
  411.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
  411.16 -WEB_SITE="http://urlget.sourceforge.net/"
  411.17  WGET_URL="$SF_MIRROR/urlget/$TARBALL"
  411.18  
  411.19 -DEPENDS="pcre glib curl gtk+3"
  411.20  BUILD_DEPENDS="pcre-dev glib-dev curl-dev gtk+3-dev intltool"
  411.21  
  411.22 -# Rules to configure and make the package.
  411.23 -compile_rules()
  411.24 -{
  411.25 -	cd $src
  411.26 +compile_rules() {
  411.27  	./configure \
  411.28 -		--prefix=/usr \
  411.29 -		--sysconfdir=/etc \
  411.30  		--disable-gstreamer \
  411.31  		--disable-notify \
  411.32  		--with-gtk3 \
  411.33 -		$CONFIGURE_ARGS \
  411.34 -		LDFLAGS='-Wl,-O1 -Wl,--as-needed' &&
  411.35 +		LDFLAGS='-Wl,-O1 -Wl,--as-needed' \
  411.36 +		$CONFIGURE_ARGS &&
  411.37  	make -j2 -s &&
  411.38  	make DESTDIR=$DESTDIR install
  411.39  }
  411.40  
  411.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
  411.42 -genpkg_rules()
  411.43 -{
  411.44 -	mkdir -p $fs/usr/share
  411.45 -	cp -a $install/usr/bin $fs/usr/
  411.46 -	cp -a $install/usr/share/applications/ $fs/usr/share
  411.47 -	cp -a $install/usr/share/icons/ $fs/usr/share
  411.48 -	cp -a $install/usr/share/sounds/ $fs/usr/share
  411.49 +genpkg_rules() {
  411.50 +	copy @std
  411.51 +	DEPENDS="pcre glib curl gtk+3"
  411.52  }
   412.1 --- a/unbound/receipt	Tue Mar 27 12:50:45 2018 +0200
   412.2 +++ b/unbound/receipt	Fri Mar 30 19:31:50 2018 +0300
   412.3 @@ -26,7 +26,6 @@
   412.4  	#   ar -x $i; ar -crD $(basename $i) *
   412.5  
   412.6  	./configure \
   412.7 -		--sysconfdir=/etc \
   412.8  		--disable-static \
   412.9  		$CONFIGURE_ARGS &&
  412.10  	make &&
  412.11 @@ -54,4 +53,3 @@
  412.12  	chroot "$1/" unbound-anchor -a /var/lib/unbound/root.key
  412.13  	:
  412.14  }
  412.15 -
   413.1 --- a/unfs3/receipt	Tue Mar 27 12:50:45 2018 +0200
   413.2 +++ b/unfs3/receipt	Fri Mar 30 19:31:50 2018 +0300
   413.3 @@ -1,4 +1,4 @@
   413.4 -# SliTaz package receipt.
   413.5 +# SliTaz package receipt v2.
   413.6  
   413.7  PACKAGE="unfs3"
   413.8  VERSION="0.9.22"
   413.9 @@ -6,40 +6,38 @@
  413.10  SHORT_DESC="User-land NFSv3 Server"
  413.11  MAINTAINER="erjo@slitaz.org"
  413.12  LICENSE="BSD"
  413.13 +WEB_SITE="http://unfs3.sourceforge.net/"
  413.14 +
  413.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
  413.16 -WEB_SITE="http://unfs3.sourceforge.net/"
  413.17  WGET_URL="http://ovh.dl.sourceforge.net/sourceforge/unfs3/${TARBALL}"
  413.18 -TAGS="network nfs"
  413.19 -CONFIG_FILES="/etc/exports"
  413.20  
  413.21 -DEPENDS="portmap"
  413.22  BUILD_DEPENDS="flex"
  413.23  
  413.24 -# Rules to configure and make the package.
  413.25 -compile_rules()
  413.26 -{
  413.27 -	cd $src
  413.28 -	./configure --prefix=/usr --infodir=/usr/share/info \
  413.29 -	--sysconfdir=/etc \
  413.30 -	--mandir=/usr/share/man $CONFIGURE_ARGS &&
  413.31 -	make
  413.32 +compile_rules() {
  413.33 +	./configure $CONFIGURE_ARGS &&
  413.34 +	make || return 1
  413.35 +
  413.36 +	install -Dm755 $src/unfsd              $install/usr/bin/unfsd
  413.37 +	install -Dm644 $stuff/etc/exports      $install/etc/exports
  413.38 +	install -Dm755 $stuff/etc/init.d/unfsd $install/etc/init.d/unfsd
  413.39  }
  413.40  
  413.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
  413.42 -genpkg_rules()
  413.43 -{
  413.44 -	mkdir -p $fs/usr/bin
  413.45 -	install -g root -o root -m 0755 -s $src/unfsd $fs/usr/bin
  413.46 -	
  413.47 -	mkdir -p $fs/etc/init.d
  413.48 -	install -g root -o root -m 0644 stuff/etc/exports $fs/etc
  413.49 -	install -g root -o root -m 0755 stuff/etc/init.d/unfsd $fs/etc/init.d
  413.50 +genpkg_rules() {
  413.51 +	copy @std
  413.52 +	DEPENDS="portmap"
  413.53 +	TAGS="network nfs"
  413.54 +	CONFIG_FILES="/etc/exports"
  413.55  }
  413.56  
  413.57 -post_install()
  413.58 -{
  413.59 +post_install() {
  413.60 +	[ -n "$quiet" ] ||
  413.61 +	cat <<EOT
  413.62  
  413.63 -       echo -e "\nTo starts $PACKAGE server you can run :\n"
  413.64 -       echo "/etc/init.d/$PACKAGE start"
  413.65 -       echo -e "Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf\n"
  413.66 +	.----------------------------------------------.
  413.67 +	| To start unfs3 server you can run:           |
  413.68 +	|   /etc/init.d/unfsd start                    |
  413.69 +	|                                              |
  413.70 +	| Or add unfsd to RUN_DAEMONS in /etc/rcS.conf |
  413.71 +	'----------------------------------------------'
  413.72 +EOT
  413.73  }
   414.1 --- a/unixODBC/receipt	Tue Mar 27 12:50:45 2018 +0200
   414.2 +++ b/unixODBC/receipt	Fri Mar 30 19:31:50 2018 +0300
   414.3 @@ -3,49 +3,38 @@
   414.4  PACKAGE="unixODBC"
   414.5  VERSION="2.3.4"
   414.6  CATEGORY="system-tools"
   414.7 -SHORT_DESC="ODBC for unix."
   414.8 +SHORT_DESC="ODBC for UNIX"
   414.9  MAINTAINER="pascal.bellard@slitaz.org"
  414.10  LICENSE="LGPL2.1"
  414.11 +WEB_SITE="http://www.unixodbc.org/"
  414.12 +
  414.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
  414.14 -WEB_SITE="http://www.unixodbc.org/"
  414.15  WGET_URL="ftp://ftp.unixodbc.org/pub/unixODBC/$TARBALL"
  414.16  
  414.17  BUILD_DEPENDS="readline-dev"
  414.18 -SPLIT="unixODBC libunixODBC unixODBC-dev"
  414.19 +SPLIT="libunixODBC unixODBC unixODBC-dev"
  414.20  
  414.21 -# Rules to configure and make the package.
  414.22 -compile_rules()
  414.23 -{
  414.24 +compile_rules() {
  414.25  	./configure \
  414.26 -		--sysconfdir=/etc \
  414.27  		--disable-gui \
  414.28  		$CONFIGURE_ARGS &&
  414.29  	make $MAKEFLAGS &&
  414.30  	make DESTDIR=$DESTDIR install
  414.31  }
  414.32  
  414.33 -# Rules to gen a SliTaz package suitable for Tazpkg.
  414.34 -genpkg_rules()
  414.35 -{
  414.36 +genpkg_rules() {
  414.37  	case $PACKAGE in
  414.38 -	unixODBC)
  414.39 -		TAGS="database"
  414.40 -		DEPENDS="libunixODBC readline"
  414.41 -		mkdir -p $fs/usr/lib
  414.42 -		cp -a $install/etc $fs
  414.43 -		cp -a $install/usr/bin $fs/usr
  414.44 -		;;
  414.45 -	libunixODBC)
  414.46 -		CAT="system-tools|ODBC for unix libraries."
  414.47 -		mkdir -p $fs/usr/lib
  414.48 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
  414.49 -		;;
  414.50 -	unixODBC-dev)
  414.51 -		CAT="development|ODBC for unix development files."
  414.52 -		DEPENDS="unixODBC"
  414.53 -		mkdir -p $fs/usr/lib
  414.54 -		cp -a $install/usr/include $fs/usr
  414.55 -		cp -a $install/usr/lib/*a $fs/usr/lib
  414.56 -		;;
  414.57 +		libunixODBC)
  414.58 +			copy *.so*
  414.59 +			CAT="system-tools|libraries"
  414.60 +			;;
  414.61 +		unixODBC)
  414.62 +			copy @std @rm
  414.63 +			DEPENDS="libunixODBC readline"
  414.64 +			TAGS="database"
  414.65 +			;;
  414.66 +		*-dev)
  414.67 +			copy @dev
  414.68 +			;;
  414.69  	esac
  414.70  }
   415.1 --- a/upower/receipt	Tue Mar 27 12:50:45 2018 +0200
   415.2 +++ b/upower/receipt	Fri Mar 30 19:31:50 2018 +0300
   415.3 @@ -16,21 +16,16 @@
   415.4  libgudev-dev libusb-dev intltool dbus-introspect"
   415.5  SPLIT="upower-dev"
   415.6  
   415.7 -# Rules to configure and make the package.
   415.8 -compile_rules()
   415.9 -{
  415.10 +compile_rules() {
  415.11  	./configure \
  415.12 -		--sysconfdir=/etc \
  415.13 -		--localstatedir=/var \
  415.14  		--enable-deprecated \
  415.15  		--disable-static \
  415.16  		$CONFIGURE_ARGS &&
  415.17 -	make && make install
  415.18 +	make &&
  415.19 +	make install
  415.20  }
  415.21  
  415.22 -# Rules to gen a SliTaz package suitable for Tazpkg.
  415.23 -genpkg_rules()
  415.24 -{
  415.25 +genpkg_rules() {
  415.26  	case $PACKAGE in
  415.27  		upower)
  415.28  			copy @std
   416.1 --- a/vde2/receipt	Tue Mar 27 12:50:45 2018 +0200
   416.2 +++ b/vde2/receipt	Fri Mar 30 19:31:50 2018 +0300
   416.3 @@ -16,10 +16,7 @@
   416.4  
   416.5  compile_rules() {
   416.6  	./configure \
   416.7 -		--prefix=/usr \
   416.8  		--libexecdir=/usr/lib/$PACKAGE \
   416.9 -		--sysconfdir=/etc \
  416.10 -		--mandir=/usr/share/man \
  416.11  		$CONFIGURE_ARGS &&
  416.12  	make &&
  416.13  	make DESTDIR=$DESTDIR install
  416.14 @@ -28,20 +25,11 @@
  416.15  genpkg_rules() {
  416.16  	case $PACKAGE in
  416.17  		vde2)
  416.18 -			mkdir -p $fs/usr/lib/vde2
  416.19 -			cp -a $install/etc $fs
  416.20 -			cp -a $install/usr/bin $fs/usr
  416.21 -			cp -a $install/usr/sbin $fs/usr
  416.22 -			cp -a $install/usr/lib/*.so* $fs/usr/lib
  416.23 -			cp -a $install/usr/lib/vde2/*.so* $fs/usr/lib/vde2
  416.24 +			copy @std
  416.25  			DEPENDS="openssl"
  416.26  			;;
  416.27  		*-dev)
  416.28 -			mkdir -p $fs/usr/lib/vde2
  416.29 -			cp -a $install/usr/lib/*a $fs/usr/lib
  416.30 -			cp -a $install/usr/lib/vde2/*a $fs/usr/lib/vde2
  416.31 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  416.32 -			cp -a $install/usr/include $fs/usr
  416.33 +			copy @dev
  416.34  			;;
  416.35  	esac
  416.36  }
   417.1 --- a/visualboyadvance/receipt	Tue Mar 27 12:50:45 2018 +0200
   417.2 +++ b/visualboyadvance/receipt	Fri Mar 30 19:31:50 2018 +0300
   417.3 @@ -6,17 +6,16 @@
   417.4  SHORT_DESC="An emulator for Gameboy and GameboyAdvance systems"
   417.5  MAINTAINER="gokhlayeh@slitaz.org"
   417.6  LICENSE="GPL2"
   417.7 +WEB_SITE="http://vba.ngemu.com/"
   417.8 +
   417.9  TARBALL="VisualBoyAdvance-src-$VERSION.tar.gz"
  417.10 -WEB_SITE="http://vba.ngemu.com/"
  417.11  WGET_URL="http://downloads.sourceforge.net/sourceforge/vba/$TARBALL"
  417.12  
  417.13  BUILD_DEPENDS="libglademm-dev libglademm libsdl-dev patch nasm gtk+-dev gtkmm-dev \
  417.14  cairomm-dev libglade-dev libxml2-dev zlib-dev bison flex"
  417.15 -SPLIT="visualboyadvance visualboyadvance-gtk"
  417.16 +SPLIT="visualboyadvance-gtk visualboyadvance"
  417.17  
  417.18 -# Rules to configure and make the package.
  417.19 -compile_rules()
  417.20 -{
  417.21 +compile_rules() {
  417.22  	sed -i 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/Util.cpp
  417.23  	sed -i 's/int i = 0; i < 16; i++/int ii = 0; ii < 16; ii++/' \
  417.24  		src/sdl/debugger.cpp
  417.25 @@ -24,33 +23,32 @@
  417.26  	for i in $stuff/$VERSION-*.patch; do
  417.27  		patch -Np0 < $i
  417.28  	done
  417.29 +
  417.30  	./configure \
  417.31 -		--prefix=/usr \
  417.32 -		--sysconfdir=/etc \
  417.33  		--disable-profiling \
  417.34  		--enable-gtk=2.4 \
  417.35  		--disable-dev \
  417.36  		$CONFIGURE_ARGS &&
  417.37 -	make $MAKEFLAGS && make DESTDIR=$DESTDIR install
  417.38 +	make $MAKEFLAGS &&
  417.39 +	make DESTDIR=$DESTDIR install || return 1
  417.40 +
  417.41 +	install -Dm644 $stuff/visualboyadvance-gtk.desktop \
  417.42 +		$install/usr/share/applications/visualboyadvance-gtk.desktop
  417.43  }
  417.44  
  417.45 -# Rules to gen a SliTaz package suitable for Tazpkg.
  417.46 -genpkg_rules()
  417.47 -{
  417.48 +genpkg_rules() {
  417.49  	case $PACKAGE in
  417.50 -	visualboyadvance)
  417.51 -		CONFIG_FILES="/etc/VisualBoyAdvance.cfg"
  417.52 -		TAGS="emulator gameboy"
  417.53 -		DEPENDS="libsdl"
  417.54 -		cp -a $install/* $fs
  417.55 -		;;
  417.56 -	visualboyadvance-gtk)
  417.57 -		CAT="games|An emulator for Gameboy and Gameboy Advance systems (GTK frontend)."
  417.58 -		TAGS="emulator gameboy"
  417.59 -		DEPENDS="libglademm visualboyadvance"
  417.60 -		mkdir -p $fs/usr/bin $fs/usr/share/applications
  417.61 -		cp -a $install/usr/bin/gvba $fs/usr/bin
  417.62 -		cp $stuff/visualboyadvance-gtk.desktop $fs/usr/share/applications
  417.63 -		;;
  417.64 +		visualboyadvance-gtk)
  417.65 +			copy gvba visualboyadvance-gtk.desktop vba-64.png vba.glade *.mo
  417.66 +			DEPENDS="libglademm visualboyadvance"
  417.67 +			CAT="games|GTK frontend"
  417.68 +			TAGS="emulator gameboy"
  417.69 +			;;
  417.70 +		visualboyadvance)
  417.71 +			copy @std @rm
  417.72 +			CONFIG_FILES="/etc/VisualBoyAdvance.cfg"
  417.73 +			TAGS="emulator gameboy"
  417.74 +			DEPENDS="libsdl"
  417.75 +			;;
  417.76  	esac
  417.77  }
   418.1 --- a/vnstat/receipt	Tue Mar 27 12:50:45 2018 +0200
   418.2 +++ b/vnstat/receipt	Fri Mar 30 19:31:50 2018 +0300
   418.3 @@ -1,4 +1,4 @@
   418.4 -# SliTaz package receipt.
   418.5 +# SliTaz package receipt v2.
   418.6  
   418.7  PACKAGE="vnstat"
   418.8  VERSION="1.15"
   418.9 @@ -7,34 +7,28 @@
  418.10  MAINTAINER="al.bobylev@gmail.com"
  418.11  LICENSE="GPL2"
  418.12  WEB_SITE="http://humdi.net/vnstat/"
  418.13 +
  418.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
  418.15  WGET_URL="${WEB_SITE}$TARBALL"
  418.16  
  418.17 -DEPENDS="busybox"
  418.18 -SUGGESTED="libgd"
  418.19  BUILD_DEPENDS="libgd-dev"
  418.20  
  418.21 -# Rules to configure and make the package.
  418.22 -compile_rules()
  418.23 -{
  418.24 -	./configure \
  418.25 -		--prefix=/usr \
  418.26 -		--sysconfdir=/etc \
  418.27 -	$CONFIGURE_ARGS &&
  418.28 -	make && make install
  418.29 -	find $install/usr/share/man -type f -exec gzip \{\} \;
  418.30 +compile_rules() {
  418.31 +	./configure $CONFIGURE_ARGS &&
  418.32 +	make &&
  418.33 +	make install || return 1
  418.34 +
  418.35  	mkdir -p $install/etc/init.d
  418.36  	ln -s daemon $install/etc/init.d/vnstatd
  418.37  }
  418.38  
  418.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  418.40 -genpkg_rules()
  418.41 -{
  418.42 -	cp -a $install/* $fs
  418.43 +genpkg_rules() {
  418.44 +	copy @std
  418.45 +	DEPENDS="busybox"
  418.46 +	SUGGESTED="libgd"
  418.47  }
  418.48  
  418.49 -post_install()
  418.50 -{
  418.51 +post_install() {
  418.52  	# Start vnstat daemon and edit daemons.conf
  418.53  	if [ -z "$1" -a ! -s /aufs-umount.sh ]; then
  418.54  		/etc/init.d/vnstatd start || continue
  418.55 @@ -48,9 +42,8 @@
  418.56  	fi
  418.57  }
  418.58  
  418.59 -pre_remove()
  418.60 -{
  418.61 -	# Stop vnstat daemon before rm.
  418.62 +# Stop vnstat daemon before rm.
  418.63 +pre_remove() {
  418.64  	[ -z "$1" -a -x /etc/init.d/vnstatd ] && /etc/init.d/vnstatd stop
  418.65  	:
  418.66  }
   419.1 --- a/vte-gtk2/receipt	Tue Mar 27 12:50:45 2018 +0200
   419.2 +++ b/vte-gtk2/receipt	Fri Mar 30 19:31:50 2018 +0300
   419.3 @@ -15,29 +15,26 @@
   419.4  BUILD_DEPENDS="intltool gtk+-dev python-dev gobject-introspection-dev pygtk-dev"
   419.5  SPLIT="vte-gtk2-terminal vte-gtk2-python vte-gtk2 vte-gtk2-dev"
   419.6  
   419.7 -# Rules to configure and make the package.
   419.8 -compile_rules()
   419.9 -{
  419.10 +compile_rules() {
  419.11  	# http://www.linuxfromscratch.org/blfs/view/stable/gnome/vte.html (for gtk+3 version)
  419.12  
  419.13  	case "$ARCH" in
  419.14 -		i?86) ARCH_ARGS="--enable-introspection=yes";;
  419.15 -		arm)  ARCH_ARGS="--enable-introspection=no";;
  419.16 +		arm*) ARCH_ARGS="--enable-introspection=no";;
  419.17 +		*)    ARCH_ARGS="--enable-introspection=yes";;
  419.18  	esac
  419.19  
  419.20  	./configure \
  419.21 -		--sysconfdir=/etc \
  419.22  		--disable-static \
  419.23 -		$CONFIGURE_ARGS $ARCH_ARGS &&
  419.24 -	make -j1 && make install
  419.25 +		$ARCH_ARGS \
  419.26 +		$CONFIGURE_ARGS &&
  419.27 +	make -j1 &&
  419.28 +	make install
  419.29  
  419.30  	# add 'Home' and 'End' keys
  419.31  	#sed -i '9i\ \ \ \ :kh=\\E[H:@7=\\E[F:\\' $install/usr/share/vte/termcap-0.0/xterm
  419.32  }
  419.33  
  419.34 -# Rules to gen a SliTaz package suitable for Tazpkg.
  419.35 -genpkg_rules()
  419.36 -{
  419.37 +genpkg_rules() {
  419.38  	case $PACKAGE in
  419.39  		vte-gtk2-terminal)
  419.40  			copy bin/
   420.1 --- a/vte/receipt	Tue Mar 27 12:50:45 2018 +0200
   420.2 +++ b/vte/receipt	Fri Mar 30 19:31:50 2018 +0300
   420.3 @@ -7,6 +7,7 @@
   420.4  MAINTAINER="pankso@slitaz.org"
   420.5  LICENSE="GPL2"
   420.6  WEB_SITE="https://www.gnome.org/"
   420.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/vte.html"
   420.8  
   420.9  TARBALL="$PACKAGE-$VERSION.tar.xz"
  420.10  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
  420.11 @@ -16,32 +17,28 @@
  420.12  pango-dev gtk+3-dev pcre2-dev gnutls-dev"
  420.13  SPLIT="vte-terminal vte vte-dev"
  420.14  
  420.15 -# Rules to configure and make the package.
  420.16 -compile_rules()
  420.17 -{
  420.18 -	# http://www.linuxfromscratch.org/blfs/view/stable/gnome/vte.html
  420.19 -
  420.20 +compile_rules() {
  420.21  	case "$ARCH" in
  420.22 -		i?86) ARCH_ARGS="--enable-introspection=yes";;
  420.23 -		arm)  ARCH_ARGS="--enable-introspection=no";;
  420.24 +		arm*) ARCH_ARGS="--enable-introspection=no";;
  420.25 +		*)    ARCH_ARGS="--enable-introspection=yes";;
  420.26  	esac
  420.27  
  420.28  	sed -i '/Werror/d' configure.ac &&
  420.29  	autoreconf &&
  420.30  
  420.31  	./configure \
  420.32 -		--sysconfdir=/etc \
  420.33  		--disable-static \
  420.34 -		$CONFIGURE_ARGS $ARCH_ARGS &&
  420.35 -	make -j1 && make install
  420.36 +		$ARCH_ARGS \
  420.37 +		$CONFIGURE_ARGS &&
  420.38 +	fix libtool &&
  420.39 +	make -j1 &&
  420.40 +	make install
  420.41  
  420.42  	# add 'Home' and 'End' keys
  420.43  	#sed -i '9i\ \ \ \ :kh=\\E[H:@7=\\E[F:\\' $install/usr/share/vte/termcap-0.0/xterm
  420.44  }
  420.45  
  420.46 -# Rules to gen a SliTaz package suitable for Tazpkg.
  420.47 -genpkg_rules()
  420.48 -{
  420.49 +genpkg_rules() {
  420.50  	case $PACKAGE in
  420.51  		vte-terminal)
  420.52  			copy bin/
   421.1 --- a/waterline-plugin-multiload/receipt	Tue Mar 27 12:50:45 2018 +0200
   421.2 +++ b/waterline-plugin-multiload/receipt	Fri Mar 30 19:31:50 2018 +0300
   421.3 @@ -7,9 +7,9 @@
   421.4  MAINTAINER="psychomaniak@xakep.ru"
   421.5  LICENSE="GPL2"
   421.6  WEB_SITE="http://git.make-linux.org/sde/waterline-plugin-multiload"
   421.7 +
   421.8  TARBALL="$PACKAGE-$VERSION.tar.xz"
   421.9  WGET_URL="http://git.make-linux.org/sde/$PACKAGE.git/snapshot/$TARBALL"
  421.10 -TAGS="desktop panel"
  421.11  
  421.12  BUILD_DEPENDS="automake libtool intltool gtk+-dev jansson-dev libsde-utils \
  421.13  libsde-utils-x11 libsde-utils-jansson libsde-utils-gtk \
  421.14 @@ -17,17 +17,12 @@
  421.15  libgtop-dev lxpanel-dev waterline-dev xorg-dev intltool gettext"
  421.16  SPLIT="waterline-plugin-multiload lxpanel-plugin-multiload"
  421.17  
  421.18 -# Rules to configure and make the package.
  421.19 -compile_rules()
  421.20 -{
  421.21 +compile_rules() {
  421.22  	rm -rf $src/.git
  421.23  	./autogen.sh || return 1
  421.24  	sed 's#ls $srcdir/po/\*.po #& 2>/dev/null#' -i configure
  421.25  	./configure \
  421.26 -		--prefix=/usr \
  421.27  		--libexec=/usr/lib \
  421.28 -		--sysconfdir=/etc \
  421.29 -		--localstatedir=/var \
  421.30  		--disable-static \
  421.31  		--disable-maintainer-mode \
  421.32  		--enable-silent-rules \
  421.33 @@ -39,19 +34,16 @@
  421.34  	make install
  421.35  }
  421.36  
  421.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
  421.38 -genpkg_rules()
  421.39 -{
  421.40 +genpkg_rules() {
  421.41  	case $PACKAGE in
  421.42 -	waterline-plugin-multiload)
  421.43 -		DEPENDS="waterline libgtop"
  421.44 -		mkdir -p $fs/usr/lib/waterline/plugins
  421.45 -		cp -a $install/usr/lib/waterline/plugins/*.so $fs/usr/lib/waterline/plugins
  421.46 -		;;
  421.47 -	lxpanel-plugin-multiload)
  421.48 -		DEPENDS="lxpanel libgtop"
  421.49 -		mkdir -p $fs/usr/lib/lxpanel/plugins
  421.50 -		cp -a $install/usr/lib/lxpanel/plugins/*.so $fs/usr/lib/lxpanel/plugins
  421.51 -		;;
  421.52 +		waterline-plugin-multiload)
  421.53 +			copy waterline/plugins/*.so
  421.54 +			DEPENDS="waterline libgtop"
  421.55 +			;;
  421.56 +		lxpanel-plugin-multiload)
  421.57 +			copy lxpanel/plugins/*.so
  421.58 +			DEPENDS="lxpanel libgtop"
  421.59 +			;;
  421.60  	esac
  421.61 +	TAGS="desktop panel"
  421.62  }
   422.1 --- a/waterline/receipt	Tue Mar 27 12:50:45 2018 +0200
   422.2 +++ b/waterline/receipt	Fri Mar 30 19:31:50 2018 +0300
   422.3 @@ -22,10 +22,7 @@
   422.4  	sed 's/lxsession-logout/tazbox logout/' -i src/defaultapplications.c
   422.5  	./autogen.sh || return 1
   422.6  	./configure \
   422.7 -		--prefix=/usr \
   422.8  		--libexec=/usr/lib \
   422.9 -		--sysconfdir=/etc \
  422.10 -		--localstatedir=/var \
  422.11  		--disable-static \
  422.12  		--disable-maintainer-mode \
  422.13  		--enable-silent-rules \
  422.14 @@ -37,7 +34,7 @@
  422.15  genpkg_rules() {
  422.16  	case $PACKAGE in
  422.17  		waterline)
  422.18 -			cp -a $install/* $fs
  422.19 +			copy @std
  422.20  			mkdir -p $fs/etc/xdg/autostart
  422.21  			cat > $fs/etc/xdg/autostart/waterline.desktop <<EOT
  422.22  [Desktop Entry]
  422.23 @@ -45,17 +42,11 @@
  422.24  Name=Waterline Desktop panel
  422.25  Exec=waterline
  422.26  EOT
  422.27 -			rm -rf $fs/usr/include
  422.28 -			rm -rf $fs/usr/lib/pkgconfig
  422.29 -			rm -r $fs/usr/lib/waterline/internals/*.la
  422.30  			DEPENDS="libsde-utils-jansson libsde-utils-x11"
  422.31  			TAGS="desktop panel taskbar"
  422.32  			;;
  422.33  		*-dev)
  422.34 -			mkdir -p $fs/usr/lib/waterline/internals
  422.35 -			cp -a $install/usr/include $fs/usr
  422.36 -			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
  422.37 -			cp -a $install/usr/lib/waterline/internals/*.la $fs/usr/lib/waterline/internals
  422.38 +			copy @dev
  422.39  			DEPENDS="waterline libsde-utils-jansson libsde-utils-x11"
  422.40  			;;
  422.41  	esac
   423.1 --- a/wbar2/receipt	Tue Mar 27 12:50:45 2018 +0200
   423.2 +++ b/wbar2/receipt	Fri Mar 30 19:31:50 2018 +0300
   423.3 @@ -22,9 +22,9 @@
   423.4  	./configure \
   423.5  		CXXFLAGS="-Wno-error=literal-suffix" \
   423.6  		--exec-prefix=/usr \
   423.7 -		--sysconfdir=/etc \
   423.8  		$CONFIGURE_ARGS &&
   423.9 -	make && make install || return 1
  423.10 +	make &&
  423.11 +	make install || return 1
  423.12  
  423.13  	mkdir -p $install/usr/share/applications/
  423.14  	mv $install/etc/wbar.d/wbar.desktop $install/usr/share/applications/
   424.1 --- a/webalizer/receipt	Tue Mar 27 12:50:45 2018 +0200
   424.2 +++ b/webalizer/receipt	Fri Mar 30 19:31:50 2018 +0300
   424.3 @@ -1,54 +1,44 @@
   424.4 -# SliTaz package receipt.
   424.5 +# SliTaz package receipt v2.
   424.6  
   424.7  PACKAGE="webalizer"
   424.8  VERSION="2.23-08"
   424.9  CATEGORY="network"
  424.10 -SHORT_DESC="Web server log file analysis program."
  424.11 +SHORT_DESC="Web server log file analysis program"
  424.12  MAINTAINER="pascal.bellard@slitaz.org"
  424.13  LICENSE="GPL2"
  424.14 +WEB_SITE="http://www.webalizer.com/"
  424.15 +
  424.16  TARBALL="$PACKAGE-$VERSION-src.tar.bz2"
  424.17 -WEB_SITE="http://www.webalizer.com/"
  424.18  WGET_URL="ftp://ftp.mrunix.net/pub/$PACKAGE/$TARBALL"
  424.19 -TAGS="logs"
  424.20  
  424.21 -DEPENDS="libgd zlib db apache"
  424.22  BUILD_DEPENDS="libgd libgd-dev zlib-dev db db-dev libjpeg-turbo"
  424.23  
  424.24 +compile_rules() {
  424.25 +	./configure &&
  424.26 +	make &&
  424.27 +	make DESTDIR=$DESTDIR install || return 1
  424.28  
  424.29 -# Rules to configure and make the package.
  424.30 -compile_rules()
  424.31 -{
  424.32 -	./configure  \
  424.33 -		--sysconfdir=/etc &&
  424.34 -	make &&
  424.35 -	make DESTDIR=$DESTDIR install
  424.36 +	mv $install/etc/webalizer.conf.sample $install/etc/webalizer.conf
  424.37 +	install -Dm755 $stuff/webalizer $install/etc/initcron.d/webalizer
  424.38 +	install -Dd -o80 -g80 $install/var/www/webalizer/
  424.39  }
  424.40  
  424.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
  424.42 -genpkg_rules()
  424.43 -{
  424.44 -	mkdir -p $fs/usr $fs/etc $fs/var/www/webalizer $fs/etc/initcron.d
  424.45 -	chown 80 $fs/var/www/webalizer
  424.46 -	cp -a $install/etc/webalizer.conf.sample $fs/etc/webalizer.conf
  424.47 -	cp -a $install/usr/bin $fs/usr
  424.48 -	cat > $fs/etc/initcron.d/webalizer << EOT
  424.49 -
  424.50 -30 0 * * * /usr/bin/webalizer -o /var/www/webalizer /var/log/apache/access_log
  424.51 -EOT
  424.52 -	chmod +x $fs/etc/initcron.d/webalizer
  424.53 +genpkg_rules() {
  424.54 +	copy @std
  424.55 +	DEPENDS="libgd zlib db apache"
  424.56 +	TAGS="logs"
  424.57  }
  424.58  
  424.59 -# Pre and post install commands for Tazpkg.
  424.60 -post_install()
  424.61 -{
  424.62 +post_install() {
  424.63  	grep -q webalizer "$1/etc/init.d/local.sh" || \
  424.64  	cat >> "$1/etc/init.d/local.sh" <<EOT
  424.65  [ -f /var/www/webalizer/index.html ] || /usr/bin/webalizer -o /var/www/webalizer /var/log/apache/access_log
  424.66  EOT
  424.67 +
  424.68  	if [ -z "$1" ]; then
  424.69 -		webalizer -o /var/www/webalizer /var/log/apache/access_log 
  424.70 -		crontab -l 2> /dev/null | grep -q webalizer || crontab - << EOT
  424.71 -$(crontab -l 2> /dev/null)
  424.72 +		webalizer -o /var/www/webalizer /var/log/apache/access_log
  424.73 +		crontab -l 2>/dev/null | grep -q webalizer || crontab - << EOT
  424.74 +$(crontab -l 2>/dev/null)
  424.75  $(cat /etc/initcron.d/webalizer)
  424.76  EOT
  424.77  	fi
   425.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   425.2 +++ b/webalizer/stuff/webalizer	Fri Mar 30 19:31:50 2018 +0300
   425.3 @@ -0,0 +1,2 @@
   425.4 +
   425.5 +30 0 * * * /usr/bin/webalizer -o /var/www/webalizer /var/log/apache/access_log
   426.1 --- a/weston/receipt	Tue Mar 27 12:50:45 2018 +0200
   426.2 +++ b/weston/receipt	Fri Mar 30 19:31:50 2018 +0300
   426.3 @@ -18,14 +18,14 @@
   426.4  SPLIT="weston-dev"
   426.5  
   426.6  compile_rules() {
   426.7 -	fix ld
   426.8  	./configure \
   426.9  		--prefix=/usr \
  426.10  		--libexec=/usr/lib/weston \
  426.11  		--disable-documentation \
  426.12  		--enable-fbdev-compositor &&
  426.13  	fix libtool &&
  426.14 -	make && make install || return 1
  426.15 +	make &&
  426.16 +	make install || return 1
  426.17  
  426.18  	# Custom weston-session
  426.19  	cp -f $stuff/weston-session $install/usr/bin
   427.1 --- a/wget/receipt	Tue Mar 27 12:50:45 2018 +0200
   427.2 +++ b/wget/receipt	Fri Mar 30 19:31:50 2018 +0300
   427.3 @@ -22,13 +22,13 @@
   427.4  	./configure \
   427.5  		--with-ssl=openssl \
   427.6  		--with-openssl \
   427.7 -		--sysconfdir=/etc \
   427.8 -		$CONFIGURE_ARGS $ARCH_ARGS &&
   427.9 +		$ARCH_ARGS \
  427.10 +		$CONFIGURE_ARGS &&
  427.11  	make DESTDIR=$DESTDIR install
  427.12  }
  427.13  
  427.14  genpkg_rules() {
  427.15 -	copy wget wgetrc
  427.16 +	copy @std
  427.17  	DEPENDS="openssl libidn pcre util-linux-uuid zlib"
  427.18  	CONFIG_FILES="/etc/wgetrc"
  427.19  }
   428.1 --- a/wyrd/receipt	Tue Mar 27 12:50:45 2018 +0200
   428.2 +++ b/wyrd/receipt	Fri Mar 30 19:31:50 2018 +0300
   428.3 @@ -1,34 +1,25 @@
   428.4 -# SliTaz package receipt.
   428.5 +# SliTaz package receipt v2.
   428.6  
   428.7  PACKAGE="wyrd"
   428.8  VERSION="1.4.5"
   428.9  CATEGORY="utilities"
  428.10 -SHORT_DESC="Wyrd is a text-based front-end to Remind."
  428.11 +SHORT_DESC="Wyrd is a text-based front-end to Remind"
  428.12  MAINTAINER="paul@slitaz.org"
  428.13  LICENSE="GPL2"
  428.14 +WEB_SITE="http://pessimization.com/software/wyrd/"
  428.15 +
  428.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
  428.17 -WEB_SITE="http://pessimization.com/software/wyrd/"
  428.18  WGET_URL="http://pessimization.com/software/wyrd/$TARBALL"
  428.19  
  428.20 -DEPENDS="ncurses remind ocaml"
  428.21  BUILD_DEPENDS="ncurses-dev remind ocaml"
  428.22  
  428.23 -# Rules to configure and make the package.
  428.24 -compile_rules()
  428.25 -{
  428.26 -	./configure \
  428.27 -		--prefix=/usr \
  428.28 -		--sysconfdir=/etc \
  428.29 -		--infodir=/usr/share/info \
  428.30 -		--mandir=/usr/share/man \
  428.31 -		$CONFIGURE_ARGS &&
  428.32 -	make -j1 && make -j1 DESTDIR=$DESTDIR install
  428.33 +compile_rules() {
  428.34 +	./configure $CONFIGURE_ARGS &&
  428.35 +	make -j1 &&
  428.36 +	make -j1 DESTDIR=$DESTDIR install
  428.37  }
  428.38  
  428.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
  428.40 -genpkg_rules()
  428.41 -{
  428.42 -	mkdir -p $fs/usr $fs/etc
  428.43 -	cp -a $install/usr/bin $fs/usr
  428.44 -	cp -a $install/etc/wyrdrc $fs/etc
  428.45 +genpkg_rules() {
  428.46 +	copy @std
  428.47 +	DEPENDS="ncurses remind ocaml"
  428.48  }
   429.1 --- a/xdg-user-dirs/receipt	Tue Mar 27 12:50:45 2018 +0200
   429.2 +++ b/xdg-user-dirs/receipt	Fri Mar 30 19:31:50 2018 +0300
   429.3 @@ -15,9 +15,7 @@
   429.4  BUILD_DEPENDS="gettext libxslt docbook-xsl"
   429.5  
   429.6  compile_rules() {
   429.7 -	./configure \
   429.8 -		--sysconfdir=/etc \
   429.9 -		$CONFIGURE_ARGS &&
  429.10 +	./configure $CONFIGURE_ARGS &&
  429.11  	make &&
  429.12  	make install
  429.13  }
   430.1 --- a/xfburn/receipt	Tue Mar 27 12:50:45 2018 +0200
   430.2 +++ b/xfburn/receipt	Fri Mar 30 19:31:50 2018 +0300
   430.3 @@ -16,10 +16,7 @@
   430.4  COOKOPTS="!uiz" # headers of the *.ui disappeared
   430.5  
   430.6  compile_rules() {
   430.7 -	fix ld
   430.8  	./configure \
   430.9 -		--sysconfdir=/etc \
  430.10 -		--localstatedir=/var \
  430.11  		--disable-debug \
  430.12  		$CONFIGURE_ARGS &&
  430.13  	fix libtool &&
   431.1 --- a/xfce-utils/receipt	Tue Mar 27 12:50:45 2018 +0200
   431.2 +++ b/xfce-utils/receipt	Fri Mar 30 19:31:50 2018 +0300
   431.3 @@ -1,4 +1,4 @@
   431.4 -# SliTaz package receipt.
   431.5 +# SliTaz package receipt v2.
   431.6  
   431.7  PACKAGE="xfce-utils"
   431.8  VERSION="4.8.3"
   431.9 @@ -6,40 +6,26 @@
  431.10  SHORT_DESC="Xfce utilities"
  431.11  MAINTAINER="erjo@slitaz.org"
  431.12  LICENSE="GPL2"
  431.13 +WEB_SITE="http://www.xfce.org"
  431.14 +
  431.15  TARBALL="$PACKAGE-$VERSION.tar.bz2"
  431.16 -WEB_SITE="http://www.xfce.org"
  431.17  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
  431.18  
  431.19 -DEPENDS="libxfce4util libxfce4ui startup-notification dbus-glib"
  431.20  BUILD_DEPENDS="libxfce4util-dev libxfce4ui-dev intltool startup-notification-dev \
  431.21 - util-linux-uuid-dev dbus-glib-dev"
  431.22 +util-linux-uuid-dev dbus-glib-dev"
  431.23  
  431.24 -# Rules to configure and make the package.
  431.25 -compile_rules()
  431.26 -{
  431.27 -	cd $src
  431.28 -	./configure --prefix=/usr \
  431.29 -		--sysconfdir=/etc \
  431.30 +compile_rules() {
  431.31 +	./configure \
  431.32  		--enable-dbus \
  431.33  		--disable-debug \
  431.34  		--with-browser=browser \
  431.35 -  		--with-terminal=xterm \
  431.36 -		--mandir=/usr/share/man $CONFIGURE_ARGS && \
  431.37 -	make && make DESTDIR=$DESTDIR install
  431.38 +		--with-terminal=xterm \
  431.39 +		$CONFIGURE_ARGS &&
  431.40 +	make &&
  431.41 +	make DESTDIR=$DESTDIR install
  431.42  }
  431.43  
  431.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
  431.45 -genpkg_rules()
  431.46 -{
  431.47 -	mkdir -p $fs/usr $fs/usr/share/locale
  431.48 -	cp -a $install/usr/bin $fs/usr
  431.49 -	cp -a $install/etc $fs/
  431.50 -	cp -a $install/usr/share/icons $fs/usr/share
  431.51 -	cp -a $install/usr/share/dbus* $fs/usr/share
  431.52 -	cp -a $install/usr/share/icons $fs/usr/share
  431.53 -	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
  431.54 -	
  431.55 -	#Fix perms
  431.56 -	chmod 755 $fs/usr/bin/*
  431.57 +genpkg_rules() {
  431.58 +	copy @std
  431.59 +	DEPENDS="libxfce4util libxfce4ui startup-notification dbus-glib"
  431.60  }
  431.61 -
   432.1 --- a/xfce4-appfinder/receipt	Tue Mar 27 12:50:45 2018 +0200
   432.2 +++ b/xfce4-appfinder/receipt	Fri Mar 30 19:31:50 2018 +0300
   432.3 @@ -15,8 +15,6 @@
   432.4  
   432.5  compile_rules() {
   432.6  	./configure \
   432.7 -		--sysconfdir=/etc \
   432.8 -		--localstatedir=/var \
   432.9  		--disable-debug \
  432.10  		$CONFIGURE_ARGS &&
  432.11  	make &&
   433.1 --- a/xfce4-battery-plugin/receipt	Tue Mar 27 12:50:45 2018 +0200
   433.2 +++ b/xfce4-battery-plugin/receipt	Fri Mar 30 19:31:50 2018 +0300
   433.3 @@ -16,10 +16,7 @@
   433.4  SPLIT="xfce4-battery-plugin-dev"
   433.5  
   433.6  compile_rules() {
   433.7 -	fix ld
   433.8  	./configure \
   433.9 -		--sysconfdir=/etc \
  433.10 -		--localstatedir=/var \
  433.11  		--disable-debug \
  433.12  		$CONFIGURE_ARGS &&
  433.13  	fix libtool &&
   434.1 --- a/xfce4-dev-tools/receipt	Tue Mar 27 12:50:45 2018 +0200
   434.2 +++ b/xfce4-dev-tools/receipt	Fri Mar 30 19:31:50 2018 +0300
   434.3 @@ -14,10 +14,7 @@
   434.4  BUILD_DEPENDS="glib-dev"
   434.5  
   434.6  compile_rules() {
   434.7 -	./configure \
   434.8 -		--sysconfdir=/etc \
   434.9 -		--localstatedir=/var \
  434.10 -		$CONFIGURE_ARGS &&
  434.11 +	./configure $CONFIGURE_ARGS &&
  434.12  	make &&
  434.13  	make install
  434.14  }
   435.1 --- a/xfce4-dict/receipt	Tue Mar 27 12:50:45 2018 +0200
   435.2 +++ b/xfce4-dict/receipt	Fri Mar 30 19:31:50 2018 +0300
   435.3 @@ -16,10 +16,7 @@
   435.4  SPLIT="xfce4-dict-dev"
   435.5  
   435.6  compile_rules() {
   435.7 -	fix ld
   435.8  	./configure \
   435.9 -		--sysconfdir=/etc \
  435.10 -		--localstatedir=/var \
  435.11  		--disable-debug \
  435.12  		$CONFIGURE_ARGS &&
  435.13  	fix libtool &&
   436.1 --- a/xfce4-icon-theme/receipt	Tue Mar 27 12:50:45 2018 +0200
   436.2 +++ b/xfce4-icon-theme/receipt	Fri Mar 30 19:31:50 2018 +0300
   436.3 @@ -15,23 +15,15 @@
   436.4  SPLIT="xfce4-icon-theme-dev"
   436.5  
   436.6  compile_rules() {
   436.7 -	./configure \
   436.8 -		--sysconfdir=/etc \
   436.9 -		--localstatedir=/var \
  436.10 -		--disable-debug \
  436.11 -		$CONFIGURE_ARGS &&
  436.12 +	./configure $CONFIGURE_ARGS &&
  436.13  	make &&
  436.14  	make install
  436.15  }
  436.16  
  436.17  genpkg_rules() {
  436.18  	case $PACKAGE in
  436.19 -		xfce4-icon-theme)
  436.20 -			copy @std
  436.21 -			;;
  436.22 -		*-dev)
  436.23 -			copy @dev
  436.24 -			;;
  436.25 +		xfce4-icon-theme) copy @std;;
  436.26 +		*-dev)            copy @dev;;
  436.27  	esac
  436.28  	TAGS="Xfce"
  436.29  }
   437.1 --- a/xfce4-mixer/receipt	Tue Mar 27 12:50:45 2018 +0200
   437.2 +++ b/xfce4-mixer/receipt	Fri Mar 30 19:31:50 2018 +0300
   437.3 @@ -17,10 +17,7 @@
   437.4  SPLIT="xfce4-mixer-dev"
   437.5  
   437.6  compile_rules() {
   437.7 -	fix ld
   437.8  	./configure \
   437.9 -		--sysconfdir=/etc \
  437.10 -		--localstatedir=/var \
  437.11  		--disable-debug \
  437.12  		$CONFIGURE_ARGS &&
  437.13  	fix libtool &&
   438.1 --- a/xfce4-notifyd/receipt	Tue Mar 27 12:50:45 2018 +0200
   438.2 +++ b/xfce4-notifyd/receipt	Fri Mar 30 19:31:50 2018 +0300
   438.3 @@ -15,10 +15,7 @@
   438.4  libxfce4ui-dev libnotify-dev"
   438.5  
   438.6  compile_rules() {
   438.7 -	fix ld
   438.8  	./configure \
   438.9 -		--sysconfdir=/etc \
  438.10 -		--localstatedir=/var \
  438.11  		--disable-debug \
  438.12  		$CONFIGURE_ARGS &&
  438.13  	fix libtool &&
   439.1 --- a/xfce4-panel/receipt	Tue Mar 27 12:50:45 2018 +0200
   439.2 +++ b/xfce4-panel/receipt	Fri Mar 30 19:31:50 2018 +0300
   439.3 @@ -16,10 +16,7 @@
   439.4  SPLIT="xfce4-panel-dev"
   439.5  
   439.6  compile_rules() {
   439.7 -	fix ld
   439.8  	./configure \
   439.9 -		--sysconfdir=/etc \
  439.10 -		--localstatedir=/var \
  439.11  		--disable-debug \
  439.12  		--disable-gtk-doc \
  439.13  		$CONFIGURE_ARGS &&
   440.1 --- a/xfce4-power-manager/receipt	Tue Mar 27 12:50:45 2018 +0200
   440.2 +++ b/xfce4-power-manager/receipt	Fri Mar 30 19:31:50 2018 +0300
   440.3 @@ -17,10 +17,7 @@
   440.4  SPLIT="xfce4-power-manager-dev"
   440.5  
   440.6  compile_rules() {
   440.7 -	fix ld
   440.8  	./configure \
   440.9 -		--sysconfdir=/etc \
  440.10 -		--localstatedir=/var \
  440.11  		--disable-debug \
  440.12  		$CONFIGURE_ARGS &&
  440.13  	fix libtool &&
   441.1 --- a/xfce4-screenshooter/receipt	Tue Mar 27 12:50:45 2018 +0200
   441.2 +++ b/xfce4-screenshooter/receipt	Fri Mar 30 19:31:50 2018 +0300
   441.3 @@ -17,10 +17,7 @@
   441.4  SPLIT="xfce4-screenshooter-dev"
   441.5  
   441.6  compile_rules() {
   441.7 -	fix ld
   441.8  	./configure \
   441.9 -		--sysconfdir=/etc \
  441.10 -		--localstatedir=/var \
  441.11  		--disable-debug \
  441.12  		$CONFIGURE_ARGS &&
  441.13  	fix libtool &&
   442.1 --- a/xfce4-session/receipt	Tue Mar 27 12:50:45 2018 +0200
   442.2 +++ b/xfce4-session/receipt	Fri Mar 30 19:31:50 2018 +0300
   442.3 @@ -18,10 +18,7 @@
   442.4  compile_rules() {
   442.5  	touch libtoolT
   442.6  
   442.7 -	fix ld
   442.8  	./configure \
   442.9 -		--sysconfdir=/etc \
  442.10 -		--localstatedir=/var \
  442.11  		--disable-debug \
  442.12  		$CONFIGURE_ARGS &&
  442.13  	fix libtool &&
   443.1 --- a/xfce4-settings/receipt	Tue Mar 27 12:50:45 2018 +0200
   443.2 +++ b/xfce4-settings/receipt	Fri Mar 30 19:31:50 2018 +0300
   443.3 @@ -16,10 +16,7 @@
   443.4  libxklavier-dev"
   443.5  
   443.6  compile_rules() {
   443.7 -	fix ld
   443.8  	./configure \
   443.9 -		--sysconfdir=/etc \
  443.10 -		--localstatedir=/var \
  443.11  		--disable-debug \
  443.12  		--enable-pluggable-dialogs \
  443.13  		--enable-sound-settings \
   444.1 --- a/xfce4-taskmanager/receipt	Tue Mar 27 12:50:45 2018 +0200
   444.2 +++ b/xfce4-taskmanager/receipt	Fri Mar 30 19:31:50 2018 +0300
   444.3 @@ -1,4 +1,4 @@
   444.4 -# SliTaz package receipt.
   444.5 +# SliTaz package receipt v2.
   444.6  
   444.7  PACKAGE="xfce4-taskmanager"
   444.8  VERSION="1.0.1"
   444.9 @@ -14,10 +14,7 @@
  444.10  BUILD_DEPENDS="intltool gtk+-dev libwnck2-dev"
  444.11  
  444.12  compile_rules(){
  444.13 -	fix ld
  444.14  	./configure \
  444.15 -		--sysconfdir=/etc \
  444.16 -		--localstatedir=/var \
  444.17  		--disable-debug \
  444.18  		$CONFIGURE_ARGS &&
  444.19  	fix libtool &&
   445.1 --- a/xfce4-terminal/receipt	Tue Mar 27 12:50:45 2018 +0200
   445.2 +++ b/xfce4-terminal/receipt	Fri Mar 30 19:31:50 2018 +0300
   445.3 @@ -18,10 +18,7 @@
   445.4  	# warning: internationalized messages should not contain the '\r' escape sequence
   445.5  	sed -i 's|\\r||g' po/hr.po po/sv.po
   445.6  
   445.7 -	fix ld
   445.8  	./configure \
   445.9 -		--sysconfdir=/etc \
  445.10 -		--localstatedir=/var \
  445.11  		--disable-debug \
  445.12  		$CONFIGURE_ARGS &&
  445.13  	fix libtool &&
   446.1 --- a/xfce4-volumed/receipt	Tue Mar 27 12:50:45 2018 +0200
   446.2 +++ b/xfce4-volumed/receipt	Fri Mar 30 19:31:50 2018 +0300
   446.3 @@ -15,8 +15,9 @@
   446.4  libkeybinder-dev libxml2-dev libnotify-dev"
   446.5  
   446.6  compile_rules() {
   446.7 -	fix ld
   446.8 -	./configure $CONFIGURE_ARGS && make && make install
   446.9 +	./configure $CONFIGURE_ARGS &&
  446.10 +	make &&
  446.11 +	make install
  446.12  }
  446.13  
  446.14  genpkg_rules() {
   447.1 --- a/xfconf/receipt	Tue Mar 27 12:50:45 2018 +0200
   447.2 +++ b/xfconf/receipt	Fri Mar 30 19:31:50 2018 +0300
   447.3 @@ -16,10 +16,7 @@
   447.4  SPLIT="xfconf-dev xfconf-perl xfconf"
   447.5  
   447.6  compile_rules() {
   447.7 -	fix ld
   447.8  	./configure \
   447.9 -		--sysconfdir=/etc \
  447.10 -		--localstatedir=/var \
  447.11  		--disable-debug \
  447.12  		--disable-gtk-doc \
  447.13  		$CONFIGURE_ARGS &&
   448.1 --- a/xfdesktop/receipt	Tue Mar 27 12:50:45 2018 +0200
   448.2 +++ b/xfdesktop/receipt	Fri Mar 30 19:31:50 2018 +0300
   448.3 @@ -17,10 +17,7 @@
   448.4  SPLIT="xfdesktop-extras xfdesktop"
   448.5  
   448.6  compile_rules() {
   448.7 -	fix ld
   448.8  	./configure \
   448.9 -		--sysconfdir=/etc \
  448.10 -		--localstatedir=/var \
  448.11  		--disable-debug \
  448.12  		$CONFIGURE_ARGS &&
  448.13  	fix libtool &&
   449.1 --- a/xfmedia/receipt	Tue Mar 27 12:50:45 2018 +0200
   449.2 +++ b/xfmedia/receipt	Fri Mar 30 19:31:50 2018 +0300
   449.3 @@ -21,16 +21,14 @@
   449.4  	patch -Np1 -i $stuff/xfmedia-empty-prev-next-fix.patch
   449.5  	patch -Np1 -i $stuff/xfmedia-exo-0.6.patch
   449.6  
   449.7 -	fix ld
   449.8  	./configure \
   449.9 -		--prefix=/usr \
  449.10 -		--sysconfdir=/etc \
  449.11  		--enable-exo \
  449.12  		--disable-startup-notification \
  449.13  		$CONFIGURE_ARGS || return 1
  449.14  	sed -i 's/define HAVE_XSCREENSAVER_EXTENSION .*/undef HAVE_XSCREENSAVER_EXTENSION/' config.h
  449.15  	fix libtool &&
  449.16 -	make && make install
  449.17 +	make &&
  449.18 +	make install
  449.19  }
  449.20  
  449.21  genpkg_rules() {
   450.1 --- a/xfmpc/receipt	Tue Mar 27 12:50:45 2018 +0200
   450.2 +++ b/xfmpc/receipt	Fri Mar 30 19:31:50 2018 +0300
   450.3 @@ -18,10 +18,7 @@
   450.4  compile_rules() {
   450.5  	sed -i 's|\\r||' po/es.po # tiny patch
   450.6  
   450.7 -	fix ld
   450.8  	./configure \
   450.9 -		--sysconfdir=/etc \
  450.10 -		--localstatedir=/var \
  450.11  		--disable-debug \
  450.12  		$CONFIGURE_ARGS &&
  450.13  	fix libtool &&
   451.1 --- a/xfprint/receipt	Tue Mar 27 12:50:45 2018 +0200
   451.2 +++ b/xfprint/receipt	Fri Mar 30 19:31:50 2018 +0300
   451.3 @@ -19,7 +19,6 @@
   451.4  compile_rules() {
   451.5  	patch -p1 < $stuff/xfprint-4.6.1-cups-1.6.patch
   451.6  
   451.7 -	fix ld
   451.8  	./configure \
   451.9  		--prefix=/usr \
  451.10  		$CONFIGURE_ARGS &&
   452.1 --- a/xfwm4/receipt	Tue Mar 27 12:50:45 2018 +0200
   452.2 +++ b/xfwm4/receipt	Fri Mar 30 19:31:50 2018 +0300
   452.3 @@ -18,10 +18,7 @@
   452.4  SPLIT="xfwm4-themes xfwm4"
   452.5  
   452.6  compile_rules() {
   452.7 -	fix ld
   452.8  	./configure \
   452.9 -		--sysconfdir=/etc \
  452.10 -		--localstatedir=/var \
  452.11  		--disable-debug \
  452.12  		$CONFIGURE_ARGS &&
  452.13  	fix libtool &&
   453.1 --- a/xorg-bdftopcf/receipt	Tue Mar 27 12:50:45 2018 +0200
   453.2 +++ b/xorg-bdftopcf/receipt	Fri Mar 30 19:31:50 2018 +0300
   453.3 @@ -15,20 +15,13 @@
   453.4  BUILD_DEPENDS="xorg-util-macros xorg-libXfont-dev xorg-xtrans"
   453.5  PKG_RULE="std"
   453.6  
   453.7 -# Rules to configure and make the package.
   453.8 -compile_rules()
   453.9 -{
  453.10 -	./configure \
  453.11 -		--sysconfdir=/etc \
  453.12 -		--localstatedir=/var \
  453.13 -		$CONFIGURE_ARGS &&
  453.14 +compile_rules() {
  453.15 +	./configure $CONFIGURE_ARGS &&
  453.16  	make &&
  453.17  	make install
  453.18  }
  453.19  
  453.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  453.21 -genpkg_rules()
  453.22 -{
  453.23 +genpkg_rules() {
  453.24  	copy @std
  453.25  	DEPENDS="xorg-libXfont"
  453.26  	TAGS="utility xorg fonts"
   454.1 --- a/xorg-bigreqsproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   454.2 +++ b/xorg-bigreqsproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   454.3 @@ -15,10 +15,7 @@
   454.4  BUILD_DEPENDS="xorg-util-macros"
   454.5  
   454.6  compile_rules() {
   454.7 -	./configure \
   454.8 -		--sysconfdir=/etc \
   454.9 -		--localstatedir=/var \
  454.10 -		$CONFIGURE_ARGS &&
  454.11 +	./configure $CONFIGURE_ARGS &&
  454.12  	make &&
  454.13  	make install
  454.14  }
   455.1 --- a/xorg-bitmap/receipt	Tue Mar 27 12:50:45 2018 +0200
   455.2 +++ b/xorg-bitmap/receipt	Fri Mar 30 19:31:50 2018 +0300
   455.3 @@ -15,20 +15,13 @@
   455.4  xorg-xbitmaps xorg-libXaw-dev"
   455.5  PKG_RULE="std+dev"
   455.6  
   455.7 -# Rules to configure and make the package.
   455.8 -compile_rules()
   455.9 -{
  455.10 -	./configure \
  455.11 -		--sysconfdir=/etc \
  455.12 -		--localstatedir=/var \
  455.13 -	$CONFIGURE_ARGS &&
  455.14 +compile_rules() {
  455.15 +	./configure $CONFIGURE_ARGS &&
  455.16  	make &&
  455.17  	make install
  455.18  }
  455.19  
  455.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  455.21 -genpkg_rules()
  455.22 -{
  455.23 +genpkg_rules() {
  455.24  	copy @std @dev
  455.25  	DEPENDS="xorg-libX11 xorg-libXaw xorg-libXmu xorg-libXt"
  455.26  	CONFIG_FILES="/etc/X11/app-defaults/Bitmap \
   456.1 --- a/xorg-cf-files/receipt	Tue Mar 27 12:50:45 2018 +0200
   456.2 +++ b/xorg-cf-files/receipt	Fri Mar 30 19:31:50 2018 +0300
   456.3 @@ -13,19 +13,12 @@
   456.4  
   456.5  PKG_RULE="std"
   456.6  
   456.7 -# Rules to configure and make the package.
   456.8 -compile_rules()
   456.9 -{
  456.10 -	./configure \
  456.11 -		--sysconfdir=/etc \
  456.12 -		--localstatedir=/var \
  456.13 -	$CONFIGURE_ARGS &&
  456.14 +compile_rules() {
  456.15 +	./configure $CONFIGURE_ARGS &&
  456.16  	make &&
  456.17  	make install
  456.18  }
  456.19  
  456.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  456.21 -genpkg_rules()
  456.22 -{
  456.23 +genpkg_rules() {
  456.24  	copy @std
  456.25  }
   457.1 --- a/xorg-compositeproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   457.2 +++ b/xorg-compositeproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   457.3 @@ -15,10 +15,7 @@
   457.4  BUILD_DEPENDS="xorg-util-macros"
   457.5  
   457.6  compile_rules() {
   457.7 -	./configure \
   457.8 -		--sysconfdir=/etc \
   457.9 -		--localstatedir=/var \
  457.10 -		$CONFIGURE_ARGS &&
  457.11 +	./configure $CONFIGURE_ARGS &&
  457.12  	make &&
  457.13  	make install
  457.14  }
   458.1 --- a/xorg-damageproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   458.2 +++ b/xorg-damageproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   458.3 @@ -15,10 +15,7 @@
   458.4  BUILD_DEPENDS="xorg-util-macros"
   458.5  
   458.6  compile_rules() {
   458.7 -	./configure \
   458.8 -		--sysconfdir=/etc \
   458.9 -		--localstatedir=/var \
  458.10 -		$CONFIGURE_ARGS &&
  458.11 +	./configure $CONFIGURE_ARGS &&
  458.12  	make &&
  458.13  	make install
  458.14  }
   459.1 --- a/xorg-dmxproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   459.2 +++ b/xorg-dmxproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   459.3 @@ -15,10 +15,7 @@
   459.4  BUILD_DEPENDS="xorg-util-macros"
   459.5  
   459.6  compile_rules() {
   459.7 -	./configure \
   459.8 -		--sysconfdir=/etc \
   459.9 -		--localstatedir=/var \
  459.10 -		$CONFIGURE_ARGS &&
  459.11 +	./configure $CONFIGURE_ARGS &&
  459.12  	make &&
  459.13  	make install
  459.14  }
   460.1 --- a/xorg-dri2proto/receipt	Tue Mar 27 12:50:45 2018 +0200
   460.2 +++ b/xorg-dri2proto/receipt	Fri Mar 30 19:31:50 2018 +0300
   460.3 @@ -15,10 +15,7 @@
   460.4  BUILD_DEPENDS="xorg-util-macros"
   460.5  
   460.6  compile_rules() {
   460.7 -	./configure \
   460.8 -		--sysconfdir=/etc \
   460.9 -		--localstatedir=/var \
  460.10 -		$CONFIGURE_ARGS &&
  460.11 +	./configure $CONFIGURE_ARGS &&
  460.12  	make &&
  460.13  	make install
  460.14  }
   461.1 --- a/xorg-dri3proto/receipt	Tue Mar 27 12:50:45 2018 +0200
   461.2 +++ b/xorg-dri3proto/receipt	Fri Mar 30 19:31:50 2018 +0300
   461.3 @@ -15,10 +15,7 @@
   461.4  BUILD_DEPENDS="xorg-util-macros"
   461.5  
   461.6  compile_rules() {
   461.7 -	./configure \
   461.8 -		--sysconfdir=/etc \
   461.9 -		--localstatedir=/var \
  461.10 -		$CONFIGURE_ARGS &&
  461.11 +	./configure $CONFIGURE_ARGS &&
  461.12  	make &&
  461.13  	make install
  461.14  }
   462.1 --- a/xorg-encodings/receipt	Tue Mar 27 12:50:45 2018 +0200
   462.2 +++ b/xorg-encodings/receipt	Fri Mar 30 19:31:50 2018 +0300
   462.3 @@ -15,10 +15,7 @@
   462.4  BUILD_DEPENDS="xorg-util-macros xorg-mkfontscale xorg-font-util-dev"
   462.5  
   462.6  compile_rules() {
   462.7 -	./configure \
   462.8 -		--sysconfdir=/etc \
   462.9 -		--localstatedir=/var \
  462.10 -		$CONFIGURE_ARGS &&
  462.11 +	./configure $CONFIGURE_ARGS &&
  462.12  	make &&
  462.13  	make install
  462.14  }
   463.1 --- a/xorg-evieext/receipt	Tue Mar 27 12:50:45 2018 +0200
   463.2 +++ b/xorg-evieext/receipt	Fri Mar 30 19:31:50 2018 +0300
   463.3 @@ -14,20 +14,13 @@
   463.4  BUILD_DEPENDS="xorg-util-macros"
   463.5  PKG_RULE="dev"
   463.6  
   463.7 -# Rules to configure and make the package.
   463.8 -compile_rules()
   463.9 -{
  463.10 -	./configure \
  463.11 -		--sysconfdir=/etc \
  463.12 -		--localstatedir=/var \
  463.13 -		$CONFIGURE_ARGS &&
  463.14 +compile_rules() {
  463.15 +	./configure $CONFIGURE_ARGS &&
  463.16  	make &&
  463.17  	make install
  463.18  }
  463.19  
  463.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  463.21 -genpkg_rules()
  463.22 -{
  463.23 +genpkg_rules() {
  463.24  	copy @dev
  463.25  	DEPENDS="xorg-util-macros"
  463.26  }
   464.1 --- a/xorg-fixesproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   464.2 +++ b/xorg-fixesproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   464.3 @@ -15,10 +15,7 @@
   464.4  BUILD_DEPENDS="xorg-util-macros"
   464.5  
   464.6  compile_rules() {
   464.7 -	./configure \
   464.8 -		--sysconfdir=/etc \
   464.9 -		--localstatedir=/var \
  464.10 -		$CONFIGURE_ARGS &&
  464.11 +	./configure $CONFIGURE_ARGS &&
  464.12  	make &&
  464.13  	make install
  464.14  }
   465.1 --- a/xorg-font-adobe-100dpi/receipt	Tue Mar 27 12:50:45 2018 +0200
   465.2 +++ b/xorg-font-adobe-100dpi/receipt	Fri Mar 30 19:31:50 2018 +0300
   465.3 @@ -8,29 +8,23 @@
   465.4  MAINTAINER="al.bobylev@gmail.com"
   465.5  LICENSE="MIT"
   465.6  WEB_SITE="https://www.x.org/wiki/"
   465.7 -COOKOPTS="!gz" # too long
   465.8  
   465.9  TARBALL="font-adobe-100dpi-$VERSION.tar.bz2"
  465.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  465.11  
  465.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  465.13 +COOKOPTS="!gz" # too long
  465.14  PKG_RULE="std"
  465.15  
  465.16 -# Rules to configure and make the package.
  465.17 -compile_rules()
  465.18 -{
  465.19 +compile_rules() {
  465.20  	./configure \
  465.21 -		--sysconfdir=/etc \
  465.22 -		--localstatedir=/var \
  465.23  		--disable-all-encodings \
  465.24  		$CONFIGURE_ARGS &&
  465.25  	make &&
  465.26  	make install
  465.27  }
  465.28  
  465.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  465.30 -genpkg_rules()
  465.31 -{
  465.32 +genpkg_rules() {
  465.33  	copy @std
  465.34  	TAGS="font"
  465.35  }
   466.1 --- a/xorg-font-adobe-75dpi/receipt	Tue Mar 27 12:50:45 2018 +0200
   466.2 +++ b/xorg-font-adobe-75dpi/receipt	Fri Mar 30 19:31:50 2018 +0300
   466.3 @@ -8,29 +8,23 @@
   466.4  MAINTAINER="al.bobylev@gmail.com"
   466.5  LICENSE="MIT"
   466.6  WEB_SITE="https://www.x.org/wiki/"
   466.7 -COOKOPTS="!gz" # too long
   466.8  
   466.9  TARBALL="font-adobe-75dpi-$VERSION.tar.bz2"
  466.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  466.11  
  466.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  466.13 +COOKOPTS="!gz" # too long
  466.14  PKG_RULE="std"
  466.15  
  466.16 -# Rules to configure and make the package.
  466.17 -compile_rules()
  466.18 -{
  466.19 +compile_rules() {
  466.20  	./configure \
  466.21 -		--sysconfdir=/etc \
  466.22 -		--localstatedir=/var \
  466.23  		--disable-all-encodings \
  466.24  		$CONFIGURE_ARGS &&
  466.25  	make &&
  466.26  	make install
  466.27  }
  466.28  
  466.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  466.30 -genpkg_rules()
  466.31 -{
  466.32 +genpkg_rules() {
  466.33  	copy @std
  466.34  	TAGS="font"
  466.35  }
   467.1 --- a/xorg-font-adobe-utopia-100dpi/receipt	Tue Mar 27 12:50:45 2018 +0200
   467.2 +++ b/xorg-font-adobe-utopia-100dpi/receipt	Fri Mar 30 19:31:50 2018 +0300
   467.3 @@ -7,29 +7,23 @@
   467.4  MAINTAINER="al.bobylev@gmail.com"
   467.5  LICENSE="other"
   467.6  WEB_SITE="https://www.x.org/wiki/"
   467.7 -COOKOPTS="!gz" # too long
   467.8  
   467.9  TARBALL="font-adobe-utopia-100dpi-$VERSION.tar.bz2"
  467.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  467.11  
  467.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  467.13 +COOKOPTS="!gz" # too long
  467.14  PKG_RULE="std"
  467.15  
  467.16 -# Rules to configure and make the package.
  467.17 -compile_rules()
  467.18 -{
  467.19 +compile_rules() {
  467.20  	./configure \
  467.21 -		--sysconfdir=/etc \
  467.22 -		--localstatedir=/var \
  467.23  		--disable-all-encodings \
  467.24  		$CONFIGURE_ARGS &&
  467.25  	make &&
  467.26  	make install
  467.27  }
  467.28  
  467.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  467.30 -genpkg_rules()
  467.31 -{
  467.32 +genpkg_rules() {
  467.33  	copy @std
  467.34  	TAGS="font"
  467.35  }
   468.1 --- a/xorg-font-adobe-utopia-75dpi/receipt	Tue Mar 27 12:50:45 2018 +0200
   468.2 +++ b/xorg-font-adobe-utopia-75dpi/receipt	Fri Mar 30 19:31:50 2018 +0300
   468.3 @@ -7,29 +7,23 @@
   468.4  MAINTAINER="al.bobylev@gmail.com"
   468.5  LICENSE="other"
   468.6  WEB_SITE="https://www.x.org/wiki/"
   468.7 -COOKOPTS="!gz" # too long
   468.8  
   468.9  TARBALL="font-adobe-utopia-75dpi-$VERSION.tar.bz2"
  468.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  468.11  
  468.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  468.13 +COOKOPTS="!gz" # too long
  468.14  PKG_RULE="std"
  468.15  
  468.16 -# Rules to configure and make the package.
  468.17 -compile_rules()
  468.18 -{
  468.19 +compile_rules() {
  468.20  	./configure \
  468.21 -		--sysconfdir=/etc \
  468.22 -		--localstatedir=/var \
  468.23  		--disable-all-encodings \
  468.24  		$CONFIGURE_ARGS &&
  468.25  	make &&
  468.26  	make install
  468.27  }
  468.28  
  468.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  468.30 -genpkg_rules()
  468.31 -{
  468.32 +genpkg_rules() {
  468.33  	copy @std
  468.34  	TAGS="font"
  468.35  }
   469.1 --- a/xorg-font-adobe-utopia-type1/receipt	Tue Mar 27 12:50:45 2018 +0200
   469.2 +++ b/xorg-font-adobe-utopia-type1/receipt	Fri Mar 30 19:31:50 2018 +0300
   469.3 @@ -15,10 +15,7 @@
   469.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir"
   469.5  
   469.6  compile_rules() {
   469.7 -	./configure \
   469.8 -		--sysconfdir=/etc \
   469.9 -		--localstatedir=/var \
  469.10 -		$CONFIGURE_ARGS &&
  469.11 +	./configure $CONFIGURE_ARGS &&
  469.12  	make &&
  469.13  	make install
  469.14  }
   470.1 --- a/xorg-font-alias/receipt	Tue Mar 27 12:50:45 2018 +0200
   470.2 +++ b/xorg-font-alias/receipt	Fri Mar 30 19:31:50 2018 +0300
   470.3 @@ -15,10 +15,7 @@
   470.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev"
   470.5  
   470.6  compile_rules() {
   470.7 -	./configure \
   470.8 -		--sysconfdir=/etc \
   470.9 -		--localstatedir=/var \
  470.10 -		$CONFIGURE_ARGS &&
  470.11 +	./configure $CONFIGURE_ARGS &&
  470.12  	make &&
  470.13  	make install
  470.14  }
   471.1 --- a/xorg-font-arabic-misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   471.2 +++ b/xorg-font-arabic-misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   471.3 @@ -14,20 +14,13 @@
   471.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
   471.5  PKG_RULE="std"
   471.6  
   471.7 -# Rules to configure and make the package.
   471.8 -compile_rules()
   471.9 -{
  471.10 -	./configure \
  471.11 -		--sysconfdir=/etc \
  471.12 -		--localstatedir=/var \
  471.13 -		$CONFIGURE_ARGS &&
  471.14 +compile_rules() {
  471.15 +	./configure $CONFIGURE_ARGS &&
  471.16  	make &&
  471.17  	make install
  471.18  }
  471.19  
  471.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  471.21 -genpkg_rules()
  471.22 -{
  471.23 +genpkg_rules() {
  471.24  	copy @std
  471.25  	TAGS="font"
  471.26  }
   472.1 --- a/xorg-font-bh-100dpi/receipt	Tue Mar 27 12:50:45 2018 +0200
   472.2 +++ b/xorg-font-bh-100dpi/receipt	Fri Mar 30 19:31:50 2018 +0300
   472.3 @@ -7,29 +7,23 @@
   472.4  MAINTAINER="al.bobylev@gmail.com"
   472.5  LICENSE="MIT"
   472.6  WEB_SITE="https://www.x.org/wiki/"
   472.7 -COOKOPTS="!gz" # too long
   472.8  
   472.9  TARBALL="font-bh-100dpi-$VERSION.tar.bz2"
  472.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  472.11  
  472.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  472.13 +COOKOPTS="!gz" # too long
  472.14  PKG_RULE="std"
  472.15  
  472.16 -# Rules to configure and make the package.
  472.17 -compile_rules()
  472.18 -{
  472.19 +compile_rules() {
  472.20  	./configure \
  472.21 -		--sysconfdir=/etc \
  472.22 -		--localstatedir=/var \
  472.23  		--disable-all-encodings \
  472.24  		$CONFIGURE_ARGS &&
  472.25  	make &&
  472.26  	make install
  472.27  }
  472.28  
  472.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  472.30 -genpkg_rules()
  472.31 -{
  472.32 +genpkg_rules() {
  472.33  	copy @std
  472.34  	TAGS="font"
  472.35  }
   473.1 --- a/xorg-font-bh-75dpi/receipt	Tue Mar 27 12:50:45 2018 +0200
   473.2 +++ b/xorg-font-bh-75dpi/receipt	Fri Mar 30 19:31:50 2018 +0300
   473.3 @@ -7,29 +7,23 @@
   473.4  MAINTAINER="al.bobylev@gmail.com"
   473.5  LICENSE="MIT"
   473.6  WEB_SITE="https://www.x.org/wiki/"
   473.7 -COOKOPTS="!gz" # too long
   473.8  
   473.9  TARBALL="font-bh-75dpi-$VERSION.tar.bz2"
  473.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  473.11  
  473.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  473.13 +COOKOPTS="!gz" # too long
  473.14  PKG_RULE="std"
  473.15  
  473.16 -# Rules to configure and make the package.
  473.17 -compile_rules()
  473.18 -{
  473.19 +compile_rules() {
  473.20  	./configure \
  473.21 -		--sysconfdir=/etc \
  473.22 -		--localstatedir=/var \
  473.23  		--disable-all-encodings \
  473.24  		$CONFIGURE_ARGS &&
  473.25  	make &&
  473.26  	make install
  473.27  }
  473.28  
  473.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  473.30 -genpkg_rules()
  473.31 -{
  473.32 +genpkg_rules() {
  473.33  	copy @std
  473.34  	TAGS="font"
  473.35  }
   474.1 --- a/xorg-font-bh-lucidatypewriter-100dpi/receipt	Tue Mar 27 12:50:45 2018 +0200
   474.2 +++ b/xorg-font-bh-lucidatypewriter-100dpi/receipt	Fri Mar 30 19:31:50 2018 +0300
   474.3 @@ -7,29 +7,23 @@
   474.4  MAINTAINER="al.bobylev@gmail.com"
   474.5  LICENSE="other"
   474.6  WEB_SITE="https://www.x.org/wiki/"
   474.7 -COOKOPTS="!gz" # too long
   474.8  
   474.9  TARBALL="font-bh-lucidatypewriter-100dpi-$VERSION.tar.bz2"
  474.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  474.11  
  474.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  474.13 +COOKOPTS="!gz" # too long
  474.14  PKG_RULE="std"
  474.15  
  474.16 -# Rules to configure and make the package.
  474.17 -compile_rules()
  474.18 -{
  474.19 +compile_rules() {
  474.20  	./configure \
  474.21 -		--sysconfdir=/etc \
  474.22 -		--localstatedir=/var \
  474.23  		--disable-all-encodings \
  474.24  		$CONFIGURE_ARGS &&
  474.25  	make &&
  474.26  	make install
  474.27  }
  474.28  
  474.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  474.30 -genpkg_rules()
  474.31 -{
  474.32 +genpkg_rules() {
  474.33  	copy @std
  474.34  	TAGS="font"
  474.35  }
   475.1 --- a/xorg-font-bh-lucidatypewriter-75dpi/receipt	Tue Mar 27 12:50:45 2018 +0200
   475.2 +++ b/xorg-font-bh-lucidatypewriter-75dpi/receipt	Fri Mar 30 19:31:50 2018 +0300
   475.3 @@ -7,29 +7,23 @@
   475.4  MAINTAINER="al.bobylev@gmail.com"
   475.5  LICENSE="other"
   475.6  WEB_SITE="https://www.x.org/wiki/"
   475.7 -COOKOPTS="!gz" # too long
   475.8  
   475.9  TARBALL="font-bh-lucidatypewriter-75dpi-$VERSION.tar.bz2"
  475.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  475.11  
  475.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  475.13 +COOKOPTS="!gz" # too long
  475.14  PKG_RULE="std"
  475.15  
  475.16 -# Rules to configure and make the package.
  475.17 -compile_rules()
  475.18 -{
  475.19 +compile_rules() {
  475.20  	./configure \
  475.21 -		--sysconfdir=/etc \
  475.22 -		--localstatedir=/var \
  475.23  		--disable-all-encodings \
  475.24  		$CONFIGURE_ARGS &&
  475.25  	make &&
  475.26  	make install
  475.27  }
  475.28  
  475.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  475.30 -genpkg_rules()
  475.31 -{
  475.32 +genpkg_rules() {
  475.33  	copy @std
  475.34  	TAGS="font"
  475.35  }
   476.1 --- a/xorg-font-bh-ttf/receipt	Tue Mar 27 12:50:45 2018 +0200
   476.2 +++ b/xorg-font-bh-ttf/receipt	Fri Mar 30 19:31:50 2018 +0300
   476.3 @@ -16,10 +16,7 @@
   476.4  fontconfig-dev"
   476.5  
   476.6  compile_rules() {
   476.7 -	./configure \
   476.8 -		--sysconfdir=/etc \
   476.9 -		--localstatedir=/var \
  476.10 -		$CONFIGURE_ARGS &&
  476.11 +	./configure $CONFIGURE_ARGS &&
  476.12  	make &&
  476.13  	make install
  476.14  }
   477.1 --- a/xorg-font-bh-type1/receipt	Tue Mar 27 12:50:45 2018 +0200
   477.2 +++ b/xorg-font-bh-type1/receipt	Fri Mar 30 19:31:50 2018 +0300
   477.3 @@ -15,10 +15,7 @@
   477.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir"
   477.5  
   477.6  compile_rules() {
   477.7 -	./configure \
   477.8 -		--sysconfdir=/etc \
   477.9 -		--localstatedir=/var \
  477.10 -		$CONFIGURE_ARGS &&
  477.11 +	./configure $CONFIGURE_ARGS &&
  477.12  	make &&
  477.13  	make install
  477.14  }
   478.1 --- a/xorg-font-bitstream-100dpi/receipt	Tue Mar 27 12:50:45 2018 +0200
   478.2 +++ b/xorg-font-bitstream-100dpi/receipt	Fri Mar 30 19:31:50 2018 +0300
   478.3 @@ -7,28 +7,21 @@
   478.4  MAINTAINER="al.bobylev@gmail.com"
   478.5  LICENSE="MIT"
   478.6  WEB_SITE="https://www.x.org/wiki/"
   478.7 -COOKOPTS="!gz" # too long
   478.8  
   478.9  TARBALL="font-bitstream-100dpi-$VERSION.tar.bz2"
  478.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  478.11  
  478.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  478.13 +COOKOPTS="!gz" # too long
  478.14  PKG_RULE="std"
  478.15  
  478.16 -# Rules to configure and make the package.
  478.17 -compile_rules()
  478.18 -{
  478.19 -	./configure \
  478.20 -		--sysconfdir=/etc \
  478.21 -		--localstatedir=/var \
  478.22 -		$CONFIGURE_ARGS &&
  478.23 +compile_rules() {
  478.24 +	./configure $CONFIGURE_ARGS &&
  478.25  	make &&
  478.26  	make install
  478.27  }
  478.28  
  478.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  478.30 -genpkg_rules()
  478.31 -{
  478.32 +genpkg_rules() {
  478.33  	copy @std
  478.34  	TAGS="font"
  478.35  }
   479.1 --- a/xorg-font-bitstream-75dpi/receipt	Tue Mar 27 12:50:45 2018 +0200
   479.2 +++ b/xorg-font-bitstream-75dpi/receipt	Fri Mar 30 19:31:50 2018 +0300
   479.3 @@ -7,28 +7,21 @@
   479.4  MAINTAINER="al.bobylev@gmail.com"
   479.5  LICENSE="MIT"
   479.6  WEB_SITE="https://www.x.org/wiki/"
   479.7 -COOKOPTS="!gz" # too long
   479.8  
   479.9  TARBALL="font-bitstream-75dpi-$VERSION.tar.bz2"
  479.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  479.11  
  479.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  479.13 +COOKOPTS="!gz" # too long
  479.14  PKG_RULE="std"
  479.15  
  479.16 -# Rules to configure and make the package.
  479.17 -compile_rules()
  479.18 -{
  479.19 -	./configure \
  479.20 -		--sysconfdir=/etc \
  479.21 -		--localstatedir=/var \
  479.22 -		$CONFIGURE_ARGS &&
  479.23 +compile_rules() {
  479.24 +	./configure $CONFIGURE_ARGS &&
  479.25  	make &&
  479.26  	make install
  479.27  }
  479.28  
  479.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  479.30 -genpkg_rules()
  479.31 -{
  479.32 +genpkg_rules() {
  479.33  	copy @std
  479.34  	TAGS="font"
  479.35  }
   480.1 --- a/xorg-font-bitstream-type1/receipt	Tue Mar 27 12:50:45 2018 +0200
   480.2 +++ b/xorg-font-bitstream-type1/receipt	Fri Mar 30 19:31:50 2018 +0300
   480.3 @@ -14,20 +14,13 @@
   480.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir"
   480.5  PKG_RULE="std"
   480.6  
   480.7 -# Rules to configure and make the package.
   480.8 -compile_rules()
   480.9 -{
  480.10 -	./configure \
  480.11 -		--sysconfdir=/etc \
  480.12 -		--localstatedir=/var \
  480.13 -		$CONFIGURE_ARGS &&
  480.14 +compile_rules() {
  480.15 +	./configure $CONFIGURE_ARGS &&
  480.16  	make &&
  480.17  	make install
  480.18  }
  480.19  
  480.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  480.21 -genpkg_rules()
  480.22 -{
  480.23 +genpkg_rules() {
  480.24  	copy @std
  480.25  	TAGS="font"
  480.26  }
   481.1 --- a/xorg-font-cronyx-cyrillic/receipt	Tue Mar 27 12:50:45 2018 +0200
   481.2 +++ b/xorg-font-cronyx-cyrillic/receipt	Fri Mar 30 19:31:50 2018 +0300
   481.3 @@ -7,28 +7,21 @@
   481.4  MAINTAINER="al.bobylev@gmail.com"
   481.5  LICENSE="other"
   481.6  WEB_SITE="https://www.x.org/wiki/"
   481.7 -COOKOPTS="!gz" # too long
   481.8  
   481.9  TARBALL="font-cronyx-cyrillic-$VERSION.tar.bz2"
  481.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  481.11  
  481.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  481.13 +COOKOPTS="!gz" # too long
  481.14  PKG_RULE="std"
  481.15  
  481.16 -# Rules to configure and make the package.
  481.17 -compile_rules()
  481.18 -{
  481.19 -	./configure \
  481.20 -		--sysconfdir=/etc \
  481.21 -		--localstatedir=/var \
  481.22 -		$CONFIGURE_ARGS &&
  481.23 +compile_rules() {
  481.24 +	./configure $CONFIGURE_ARGS &&
  481.25  	make &&
  481.26  	make install
  481.27  }
  481.28  
  481.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  481.30 -genpkg_rules()
  481.31 -{
  481.32 +genpkg_rules() {
  481.33  	copy @std
  481.34  	TAGS="font"
  481.35  }
   482.1 --- a/xorg-font-cursor-misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   482.2 +++ b/xorg-font-cursor-misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   482.3 @@ -14,20 +14,13 @@
   482.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
   482.5  PKG_RULE="std"
   482.6  
   482.7 -# Rules to configure and make the package.
   482.8 -compile_rules()
   482.9 -{
  482.10 -	./configure \
  482.11 -		--sysconfdir=/etc \
  482.12 -		--localstatedir=/var \
  482.13 -		$CONFIGURE_ARGS &&
  482.14 +compile_rules() {
  482.15 +	./configure $CONFIGURE_ARGS &&
  482.16  	make &&
  482.17  	make install
  482.18  }
  482.19  
  482.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  482.21 -genpkg_rules()
  482.22 -{
  482.23 +genpkg_rules() {
  482.24  	copy @std
  482.25  	TAGS="font"
  482.26  }
   483.1 --- a/xorg-font-daewoo-misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   483.2 +++ b/xorg-font-daewoo-misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   483.3 @@ -7,28 +7,21 @@
   483.4  MAINTAINER="al.bobylev@gmail.com"
   483.5  LICENSE="other"
   483.6  WEB_SITE="https://www.x.org/wiki/"
   483.7 -COOKOPTS="!gz" # too long
   483.8  
   483.9  TARBALL="font-daewoo-misc-$VERSION.tar.bz2"
  483.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  483.11  
  483.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  483.13 +COOKOPTS="!gz" # too long
  483.14  PKG_RULE="std"
  483.15  
  483.16 -# Rules to configure and make the package.
  483.17 -compile_rules()
  483.18 -{
  483.19 -	./configure \
  483.20 -		--sysconfdir=/etc \
  483.21 -		--localstatedir=/var \
  483.22 -		$CONFIGURE_ARGS &&
  483.23 +compile_rules() {
  483.24 +	./configure $CONFIGURE_ARGS &&
  483.25  	make &&
  483.26  	make install
  483.27  }
  483.28  
  483.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  483.30 -genpkg_rules()
  483.31 -{
  483.32 +genpkg_rules() {
  483.33  	copy @std
  483.34  	TAGS="font"
  483.35  }
   484.1 --- a/xorg-font-dec-misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   484.2 +++ b/xorg-font-dec-misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   484.3 @@ -7,28 +7,21 @@
   484.4  MAINTAINER="al.bobylev@gmail.com"
   484.5  LICENSE="MIT"
   484.6  WEB_SITE="https://www.x.org/wiki/"
   484.7 -COOKOPTS="!gz" # too long
   484.8  
   484.9  TARBALL="font-dec-misc-$VERSION.tar.bz2"
  484.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  484.11  
  484.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  484.13 +COOKOPTS="!gz" # too long
  484.14  PKG_RULE="std"
  484.15  
  484.16 -# Rules to configure and make the package.
  484.17 -compile_rules()
  484.18 -{
  484.19 -	./configure \
  484.20 -		--sysconfdir=/etc \
  484.21 -		--localstatedir=/var \
  484.22 -		$CONFIGURE_ARGS &&
  484.23 +compile_rules() {
  484.24 +	./configure $CONFIGURE_ARGS &&
  484.25  	make &&
  484.26  	make install
  484.27  }
  484.28  
  484.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  484.30 -genpkg_rules()
  484.31 -{
  484.32 +genpkg_rules() {
  484.33  	copy @std
  484.34  	TAGS="font"
  484.35  }
   485.1 --- a/xorg-font-ibm-type1/receipt	Tue Mar 27 12:50:45 2018 +0200
   485.2 +++ b/xorg-font-ibm-type1/receipt	Fri Mar 30 19:31:50 2018 +0300
   485.3 @@ -15,10 +15,7 @@
   485.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir"
   485.5  
   485.6  compile_rules() {
   485.7 -	./configure \
   485.8 -		--sysconfdir=/etc \
   485.9 -		--localstatedir=/var \
  485.10 -		$CONFIGURE_ARGS &&
  485.11 +	./configure $CONFIGURE_ARGS &&
  485.12  	make &&
  485.13  	make install
  485.14  }
   486.1 --- a/xorg-font-isas-misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   486.2 +++ b/xorg-font-isas-misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   486.3 @@ -7,28 +7,21 @@
   486.4  MAINTAINER="al.bobylev@gmail.com"
   486.5  LICENSE="MIT"
   486.6  WEB_SITE="https://www.x.org/wiki/"
   486.7 -COOKOPTS="!gz" # too long
   486.8  
   486.9  TARBALL="font-isas-misc-$VERSION.tar.bz2"
  486.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  486.11  
  486.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  486.13 +COOKOPTS="!gz" # too long
  486.14  PKG_RULE="std"
  486.15  
  486.16 -# Rules to configure and make the package.
  486.17 -compile_rules()
  486.18 -{
  486.19 -	./configure \
  486.20 -		--sysconfdir=/etc \
  486.21 -		--localstatedir=/var \
  486.22 -		$CONFIGURE_ARGS &&
  486.23 +compile_rules() {
  486.24 +	./configure $CONFIGURE_ARGS &&
  486.25  	make &&
  486.26  	make install
  486.27  }
  486.28  
  486.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  486.30 -genpkg_rules()
  486.31 -{
  486.32 +genpkg_rules() {
  486.33  	copy @std
  486.34  	TAGS="font"
  486.35  }
   487.1 --- a/xorg-font-jis-misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   487.2 +++ b/xorg-font-jis-misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   487.3 @@ -7,28 +7,21 @@
   487.4  MAINTAINER="al.bobylev@gmail.com"
   487.5  LICENSE="other"
   487.6  WEB_SITE="https://www.x.org/wiki/"
   487.7 -COOKOPTS="!gz" # too long
   487.8  
   487.9  TARBALL="font-jis-misc-$VERSION.tar.bz2"
  487.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  487.11  
  487.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  487.13 +COOKOPTS="!gz" # too long
  487.14  PKG_RULE="std"
  487.15  
  487.16 -# Rules to configure and make the package.
  487.17 -compile_rules()
  487.18 -{
  487.19 -	./configure \
  487.20 -		--sysconfdir=/etc \
  487.21 -		--localstatedir=/var \
  487.22 -		$CONFIGURE_ARGS &&
  487.23 +compile_rules() {
  487.24 +	./configure $CONFIGURE_ARGS &&
  487.25  	make &&
  487.26  	make install
  487.27  }
  487.28  
  487.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  487.30 -genpkg_rules()
  487.31 -{
  487.32 +genpkg_rules() {
  487.33  	copy @std
  487.34  	TAGS="font"
  487.35  }
   488.1 --- a/xorg-font-micro-misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   488.2 +++ b/xorg-font-micro-misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   488.3 @@ -14,20 +14,13 @@
   488.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
   488.5  PKG_RULE="std"
   488.6  
   488.7 -# Rules to configure and make the package.
   488.8 -compile_rules()
   488.9 -{
  488.10 -	./configure \
  488.11 -		--sysconfdir=/etc \
  488.12 -		--localstatedir=/var \
  488.13 -		$CONFIGURE_ARGS &&
  488.14 +compile_rules() {
  488.15 +	./configure $CONFIGURE_ARGS &&
  488.16  	make &&
  488.17  	make install
  488.18  }
  488.19  
  488.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  488.21 -genpkg_rules()
  488.22 -{
  488.23 +genpkg_rules() {
  488.24  	copy @std
  488.25  	TAGS="font"
  488.26  }
   489.1 --- a/xorg-font-misc-cyrillic/receipt	Tue Mar 27 12:50:45 2018 +0200
   489.2 +++ b/xorg-font-misc-cyrillic/receipt	Fri Mar 30 19:31:50 2018 +0300
   489.3 @@ -7,28 +7,21 @@
   489.4  MAINTAINER="al.bobylev@gmail.com"
   489.5  LICENSE="other"
   489.6  WEB_SITE="https://www.x.org/wiki/"
   489.7 -COOKOPTS="!gz" # too long
   489.8  
   489.9  TARBALL="font-misc-cyrillic-$VERSION.tar.bz2"
  489.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  489.11  
  489.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  489.13 +COOKOPTS="!gz" # too long
  489.14  PKG_RULE="std"
  489.15  
  489.16 -# Rules to configure and make the package.
  489.17 -compile_rules()
  489.18 -{
  489.19 -	./configure \
  489.20 -		--sysconfdir=/etc \
  489.21 -		--localstatedir=/var \
  489.22 -		$CONFIGURE_ARGS &&
  489.23 +compile_rules() {
  489.24 +	./configure $CONFIGURE_ARGS &&
  489.25  	make &&
  489.26  	make install
  489.27  }
  489.28  
  489.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  489.30 -genpkg_rules()
  489.31 -{
  489.32 +genpkg_rules() {
  489.33  	copy @std
  489.34  	TAGS="font"
  489.35  }
   490.1 --- a/xorg-font-misc-ethiopic/receipt	Tue Mar 27 12:50:45 2018 +0200
   490.2 +++ b/xorg-font-misc-ethiopic/receipt	Fri Mar 30 19:31:50 2018 +0300
   490.3 @@ -15,10 +15,7 @@
   490.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir"
   490.5  
   490.6  compile_rules() {
   490.7 -	./configure \
   490.8 -		--sysconfdir=/etc \
   490.9 -		--localstatedir=/var \
  490.10 -		$CONFIGURE_ARGS &&
  490.11 +	./configure $CONFIGURE_ARGS &&
  490.12  	make &&
  490.13  	make install
  490.14  }
   491.1 --- a/xorg-font-misc-meltho/receipt	Tue Mar 27 12:50:45 2018 +0200
   491.2 +++ b/xorg-font-misc-meltho/receipt	Fri Mar 30 19:31:50 2018 +0300
   491.3 @@ -14,20 +14,13 @@
   491.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir"
   491.5  PKG_RULE="std"
   491.6  
   491.7 -# Rules to configure and make the package.
   491.8 -compile_rules()
   491.9 -{
  491.10 -	./configure \
  491.11 -		--sysconfdir=/etc \
  491.12 -		--localstatedir=/var \
  491.13 -		$CONFIGURE_ARGS &&
  491.14 +compile_rules() {
  491.15 +	./configure $CONFIGURE_ARGS &&
  491.16  	make &&
  491.17  	make install
  491.18  }
  491.19  
  491.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  491.21 -genpkg_rules()
  491.22 -{
  491.23 +genpkg_rules() {
  491.24  	copy @std
  491.25  	TAGS="font"
  491.26  }
   492.1 --- a/xorg-font-misc-misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   492.2 +++ b/xorg-font-misc-misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   492.3 @@ -15,21 +15,15 @@
   492.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
   492.5  PKG_RULE="std"
   492.6  
   492.7 -# Rules to configure and make the package.
   492.8 -compile_rules()
   492.9 -{
  492.10 +compile_rules() {
  492.11  	./configure \
  492.12 -		--sysconfdir=/etc \
  492.13 -		--localstatedir=/var \
  492.14  		--disable-all-encodings \
  492.15  		$CONFIGURE_ARGS &&
  492.16  	make &&
  492.17  	make install
  492.18  }
  492.19  
  492.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  492.21 -genpkg_rules()
  492.22 -{
  492.23 +genpkg_rules() {
  492.24  	copy @std
  492.25  	TAGS="font"
  492.26  }
   493.1 --- a/xorg-font-mutt-misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   493.2 +++ b/xorg-font-mutt-misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   493.3 @@ -7,28 +7,21 @@
   493.4  MAINTAINER="al.bobylev@gmail.com"
   493.5  LICENSE="MIT"
   493.6  WEB_SITE="https://www.x.org/wiki/"
   493.7 -COOKOPTS="!gz" # too long
   493.8  
   493.9  TARBALL="font-mutt-misc-$VERSION.tar.bz2"
  493.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  493.11  
  493.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  493.13 +COOKOPTS="!gz" # too long
  493.14  PKG_RULE="std"
  493.15  
  493.16 -# Rules to configure and make the package.
  493.17 -compile_rules()
  493.18 -{
  493.19 -	./configure \
  493.20 -		--sysconfdir=/etc \
  493.21 -		--localstatedir=/var \
  493.22 -		$CONFIGURE_ARGS &&
  493.23 +compile_rules() {
  493.24 +	./configure $CONFIGURE_ARGS &&
  493.25  	make &&
  493.26  	make install
  493.27  }
  493.28  
  493.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  493.30 -genpkg_rules()
  493.31 -{
  493.32 +genpkg_rules() {
  493.33  	copy @std
  493.34  	TAGS="font"
  493.35  }
   494.1 --- a/xorg-font-schumacher-misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   494.2 +++ b/xorg-font-schumacher-misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   494.3 @@ -7,29 +7,23 @@
   494.4  MAINTAINER="al.bobylev@gmail.com"
   494.5  LICENSE="MIT"
   494.6  WEB_SITE="https://www.x.org/wiki/"
   494.7 -COOKOPTS="!gz" # too long
   494.8  
   494.9  TARBALL="font-schumacher-misc-$VERSION.tar.bz2"
  494.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  494.11  
  494.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  494.13 +COOKOPTS="!gz" # too long
  494.14  PKG_RULE="std"
  494.15  
  494.16 -# Rules to configure and make the package.
  494.17 -compile_rules()
  494.18 -{
  494.19 +compile_rules() {
  494.20  	./configure \
  494.21 -		--sysconfdir=/etc \
  494.22 -		--localstatedir=/var \
  494.23  		--disable-all-encodings \
  494.24  		$CONFIGURE_ARGS &&
  494.25  	make &&
  494.26  	make install
  494.27  }
  494.28  
  494.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  494.30 -genpkg_rules()
  494.31 -{
  494.32 +genpkg_rules() {
  494.33  	copy @std
  494.34  	TAGS="font"
  494.35  }
   495.1 --- a/xorg-font-screen-cyrillic/receipt	Tue Mar 27 12:50:45 2018 +0200
   495.2 +++ b/xorg-font-screen-cyrillic/receipt	Fri Mar 30 19:31:50 2018 +0300
   495.3 @@ -7,28 +7,21 @@
   495.4  MAINTAINER="al.bobylev@gmail.com"
   495.5  LICENSE="other"
   495.6  WEB_SITE="https://www.x.org/wiki/"
   495.7 -COOKOPTS="!gz" # too long
   495.8  
   495.9  TARBALL="font-screen-cyrillic-$VERSION.tar.bz2"
  495.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  495.11  
  495.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  495.13 +COOKOPTS="!gz" # too long
  495.14  PKG_RULE="std"
  495.15  
  495.16 -# Rules to configure and make the package.
  495.17 -compile_rules()
  495.18 -{
  495.19 -	./configure \
  495.20 -		--sysconfdir=/etc \
  495.21 -		--localstatedir=/var \
  495.22 -		$CONFIGURE_ARGS &&
  495.23 +compile_rules() {
  495.24 +	./configure $CONFIGURE_ARGS &&
  495.25  	make &&
  495.26  	make install
  495.27  }
  495.28  
  495.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  495.30 -genpkg_rules()
  495.31 -{
  495.32 +genpkg_rules() {
  495.33  	copy @std
  495.34  	TAGS="font"
  495.35  }
   496.1 --- a/xorg-font-sony-misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   496.2 +++ b/xorg-font-sony-misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   496.3 @@ -7,28 +7,21 @@
   496.4  MAINTAINER="al.bobylev@gmail.com"
   496.5  LICENSE="MIT"
   496.6  WEB_SITE="https://www.x.org/wiki/"
   496.7 -COOKOPTS="!gz" # too long
   496.8  
   496.9  TARBALL="font-sony-misc-$VERSION.tar.bz2"
  496.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  496.11  
  496.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  496.13 +COOKOPTS="!gz" # too long
  496.14  PKG_RULE="std"
  496.15  
  496.16 -# Rules to configure and make the package.
  496.17 -compile_rules()
  496.18 -{
  496.19 -	./configure \
  496.20 -		--sysconfdir=/etc \
  496.21 -		--localstatedir=/var \
  496.22 -		$CONFIGURE_ARGS &&
  496.23 +compile_rules() {
  496.24 +	./configure $CONFIGURE_ARGS &&
  496.25  	make &&
  496.26  	make install
  496.27  }
  496.28  
  496.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  496.30 -genpkg_rules()
  496.31 -{
  496.32 +genpkg_rules() {
  496.33  	copy @std
  496.34  	TAGS="font"
  496.35  }
   497.1 --- a/xorg-font-sun-misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   497.2 +++ b/xorg-font-sun-misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   497.3 @@ -7,28 +7,21 @@
   497.4  MAINTAINER="al.bobylev@gmail.com"
   497.5  LICENSE="MIT"
   497.6  WEB_SITE="https://www.x.org/wiki/"
   497.7 -COOKOPTS="!gz" # too long
   497.8  
   497.9  TARBALL="font-sun-misc-$VERSION.tar.bz2"
  497.10  WGET_URL="$XORG_MIRROR/font/$TARBALL"
  497.11  
  497.12  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
  497.13 +COOKOPTS="!gz" # too long
  497.14  PKG_RULE="std"
  497.15  
  497.16 -# Rules to configure and make the package.
  497.17 -compile_rules()
  497.18 -{
  497.19 -	./configure \
  497.20 -		--sysconfdir=/etc \
  497.21 -		--localstatedir=/var \
  497.22 -		$CONFIGURE_ARGS &&
  497.23 +compile_rules() {
  497.24 +	./configure $CONFIGURE_ARGS &&
  497.25  	make &&
  497.26  	make install
  497.27  }
  497.28  
  497.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
  497.30 -genpkg_rules()
  497.31 -{
  497.32 +genpkg_rules() {
  497.33  	copy @std
  497.34  	TAGS="font"
  497.35  }
   498.1 --- a/xorg-font-util/receipt	Tue Mar 27 12:50:45 2018 +0200
   498.2 +++ b/xorg-font-util/receipt	Fri Mar 30 19:31:50 2018 +0300
   498.3 @@ -16,10 +16,7 @@
   498.4  SPLIT="xorg-font-util-dev"
   498.5  
   498.6  compile_rules() {
   498.7 -	./configure \
   498.8 -		--sysconfdir=/etc \
   498.9 -		--localstatedir=/var \
  498.10 -		$CONFIGURE_ARGS &&
  498.11 +	./configure $CONFIGURE_ARGS &&
  498.12  	make &&
  498.13  	make install
  498.14  }
   499.1 --- a/xorg-font-winitzki-cyrillic/receipt	Tue Mar 27 12:50:45 2018 +0200
   499.2 +++ b/xorg-font-winitzki-cyrillic/receipt	Fri Mar 30 19:31:50 2018 +0300
   499.3 @@ -14,20 +14,13 @@
   499.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
   499.5  PKG_RULE="std"
   499.6  
   499.7 -# Rules to configure and make the package.
   499.8 -compile_rules()
   499.9 -{
  499.10 -	./configure \
  499.11 -		--sysconfdir=/etc \
  499.12 -		--localstatedir=/var \
  499.13 -		$CONFIGURE_ARGS &&
  499.14 +compile_rules() {
  499.15 +	./configure $CONFIGURE_ARGS &&
  499.16  	make &&
  499.17  	make install
  499.18  }
  499.19  
  499.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  499.21 -genpkg_rules()
  499.22 -{
  499.23 +genpkg_rules() {
  499.24  	copy @std
  499.25  	TAGS="font"
  499.26  }
   500.1 --- a/xorg-font-xfree86-type1/receipt	Tue Mar 27 12:50:45 2018 +0200
   500.2 +++ b/xorg-font-xfree86-type1/receipt	Fri Mar 30 19:31:50 2018 +0300
   500.3 @@ -15,10 +15,7 @@
   500.4  BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir"
   500.5  
   500.6  compile_rules() {
   500.7 -	./configure \
   500.8 -		--sysconfdir=/etc \
   500.9 -		--localstatedir=/var \
  500.10 -		$CONFIGURE_ARGS &&
  500.11 +	./configure $CONFIGURE_ARGS &&
  500.12  	make &&
  500.13  	make install
  500.14  }
   501.1 --- a/xorg-fontcacheproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   501.2 +++ b/xorg-fontcacheproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   501.3 @@ -14,11 +14,7 @@
   501.4  BUILD_DEPENDS="xorg-util-macros"
   501.5  
   501.6  compile_rules() {
   501.7 -	fix ld
   501.8 -	./configure \
   501.9 -		--sysconfdir=/etc \
  501.10 -		--localstatedir=/var \
  501.11 -		$CONFIGURE_ARGS &&
  501.12 +	./configure $CONFIGURE_ARGS &&
  501.13  	fix libtool &&
  501.14  	make &&
  501.15  	make install
   502.1 --- a/xorg-fontsproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   502.2 +++ b/xorg-fontsproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   502.3 @@ -15,10 +15,7 @@
   502.4  BUILD_DEPENDS="xorg-util-macros"
   502.5  
   502.6  compile_rules() {
   502.7 -	./configure \
   502.8 -		--sysconfdir=/etc \
   502.9 -		--localstatedir=/var \
  502.10 -		$CONFIGURE_ARGS &&
  502.11 +	./configure $CONFIGURE_ARGS &&
  502.12  	make &&
  502.13  	make install
  502.14  }
   503.1 --- a/xorg-fonttosfnt/receipt	Tue Mar 27 12:50:45 2018 +0200
   503.2 +++ b/xorg-fonttosfnt/receipt	Fri Mar 30 19:31:50 2018 +0300
   503.3 @@ -14,20 +14,13 @@
   503.4  BUILD_DEPENDS="xorg-xproto freetype-dev xorg-libfontenc-dev"
   503.5  PKG_RULE="std"
   503.6  
   503.7 -# Rules to configure and make the package.
   503.8 -compile_rules()
   503.9 -{
  503.10 -	./configure \
  503.11 -		--sysconfdir=/etc \
  503.12 -		--localstatedir=/var \
  503.13 -		$CONFIGURE_ARGS &&
  503.14 +compile_rules() {
  503.15 +	./configure $CONFIGURE_ARGS &&
  503.16  	make &&
  503.17  	make install
  503.18  }
  503.19  
  503.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  503.21 -genpkg_rules()
  503.22 -{
  503.23 +genpkg_rules() {
  503.24  	copy @std
  503.25  	DEPENDS="freetype xorg-libfontenc"
  503.26  	TAGS="utility xorg fonts"
   504.1 --- a/xorg-fslsfonts/receipt	Tue Mar 27 12:50:45 2018 +0200
   504.2 +++ b/xorg-fslsfonts/receipt	Fri Mar 30 19:31:50 2018 +0300
   504.3 @@ -14,20 +14,13 @@
   504.4  BUILD_DEPENDS="xorg-util-macros xorg-xproto xorg-libFS-dev"
   504.5  PKG_RULE="std"
   504.6  
   504.7 -# Rules to configure and make the package.
   504.8 -compile_rules()
   504.9 -{
  504.10 -	./configure \
  504.11 -		--sysconfdir=/etc \
  504.12 -		--localstatedir=/var \
  504.13 -		$CONFIGURE_ARGS &&
  504.14 +compile_rules() {
  504.15 +	./configure $CONFIGURE_ARGS &&
  504.16  	make &&
  504.17  	make install
  504.18  }
  504.19  
  504.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  504.21 -genpkg_rules()
  504.22 -{
  504.23 +genpkg_rules() {
  504.24  	copy @std
  504.25  	DEPENDS="xorg-libFS"
  504.26  }
   505.1 --- a/xorg-fstobdf/receipt	Tue Mar 27 12:50:45 2018 +0200
   505.2 +++ b/xorg-fstobdf/receipt	Fri Mar 30 19:31:50 2018 +0300
   505.3 @@ -14,20 +14,13 @@
   505.4  BUILD_DEPENDS="xorg-util-macros xorg-xproto xorg-libX11-dev xorg-libFS-dev"
   505.5  PKG_RULE="std"
   505.6  
   505.7 -# Rules to configure and make the package.
   505.8 -compile_rules()
   505.9 -{
  505.10 -	./configure \
  505.11 -		--sysconfdir=/etc \
  505.12 -		--localstatedir=/var \
  505.13 -		$CONFIGURE_ARGS &&
  505.14 +compile_rules() {
  505.15 +	./configure $CONFIGURE_ARGS &&
  505.16  	make &&
  505.17  	make install
  505.18  }
  505.19  
  505.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  505.21 -genpkg_rules()
  505.22 -{
  505.23 +genpkg_rules() {
  505.24  	copy @std
  505.25  	DEPENDS="xorg-libFS xorg-libX11"
  505.26  }
   506.1 --- a/xorg-gccmakedep/receipt	Tue Mar 27 12:50:45 2018 +0200
   506.2 +++ b/xorg-gccmakedep/receipt	Fri Mar 30 19:31:50 2018 +0300
   506.3 @@ -14,19 +14,12 @@
   506.4  BUILD_DEPENDS="xorg-util-macros"
   506.5  PKG_RULE="std"
   506.6  
   506.7 -# Rules to configure and make the package.
   506.8 -compile_rules()
   506.9 -{
  506.10 -	./configure \
  506.11 -		--sysconfdir=/etc \
  506.12 -		--localstatedir=/var \
  506.13 -		$CONFIGURE_ARGS &&
  506.14 +compile_rules() {
  506.15 +	./configure $CONFIGURE_ARGS &&
  506.16  	make &&
  506.17  	make install
  506.18  }
  506.19  
  506.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  506.21 -genpkg_rules()
  506.22 -{
  506.23 +genpkg_rules() {
  506.24  	copy @std
  506.25  }
   507.1 --- a/xorg-glproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   507.2 +++ b/xorg-glproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   507.3 @@ -15,10 +15,7 @@
   507.4  BUILD_DEPENDS="xorg-util-macros"
   507.5  
   507.6  compile_rules() {
   507.7 -	./configure \
   507.8 -		--sysconfdir=/etc \
   507.9 -		--localstatedir=/var \
  507.10 -		$CONFIGURE_ARGS &&
  507.11 +	./configure $CONFIGURE_ARGS &&
  507.12  	make &&
  507.13  	make install
  507.14  }
   508.1 --- a/xorg-iceauth/receipt	Tue Mar 27 12:50:45 2018 +0200
   508.2 +++ b/xorg-iceauth/receipt	Fri Mar 30 19:31:50 2018 +0300
   508.3 @@ -15,11 +15,7 @@
   508.4  BUILD_DEPENDS="xorg-libICE-dev"
   508.5  
   508.6  compile_rules() {
   508.7 -	fix ld
   508.8 -	./configure \
   508.9 -		--sysconfdir=/etc \
  508.10 -		--localstatedir=/var \
  508.11 -		$CONFIGURE_ARGS &&
  508.12 +	./configure $CONFIGURE_ARGS &&
  508.13  	fix libtool &&
  508.14  	make &&
  508.15  	make install
   509.1 --- a/xorg-imake/receipt	Tue Mar 27 12:50:45 2018 +0200
   509.2 +++ b/xorg-imake/receipt	Fri Mar 30 19:31:50 2018 +0300
   509.3 @@ -14,20 +14,13 @@
   509.4  BUILD_DEPENDS="xorg-util-macros perl xorg-xproto"
   509.5  PKG_RULE="std"
   509.6  
   509.7 -# Rules to configure and make the package.
   509.8 -compile_rules()
   509.9 -{
  509.10 -	./configure \
  509.11 -		--sysconfdir=/etc \
  509.12 -		--localstatedir=/var \
  509.13 -		$CONFIGURE_ARGS &&
  509.14 +compile_rules() {
  509.15 +	./configure $CONFIGURE_ARGS &&
  509.16  	make &&
  509.17  	make install
  509.18  }
  509.19  
  509.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  509.21 -genpkg_rules()
  509.22 -{
  509.23 +genpkg_rules() {
  509.24  	copy @std
  509.25  	DEPENDS="xorg-cf-files"
  509.26  }
   510.1 --- a/xorg-inputproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   510.2 +++ b/xorg-inputproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   510.3 @@ -15,10 +15,7 @@
   510.4  BUILD_DEPENDS="xorg-util-macros"
   510.5  
   510.6  compile_rules() {
   510.7 -	./configure \
   510.8 -		--sysconfdir=/etc \
   510.9 -		--localstatedir=/var \
  510.10 -		$CONFIGURE_ARGS &&
  510.11 +	./configure $CONFIGURE_ARGS &&
  510.12  	make &&
  510.13  	make install
  510.14  }
   511.1 --- a/xorg-kbproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   511.2 +++ b/xorg-kbproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   511.3 @@ -15,10 +15,7 @@
   511.4  BUILD_DEPENDS="xorg-util-macros"
   511.5  
   511.6  compile_rules() {
   511.7 -	./configure \
   511.8 -		--sysconfdir=/etc \
   511.9 -		--localstatedir=/var \
  511.10 -		$CONFIGURE_ARGS &&
  511.11 +	./configure $CONFIGURE_ARGS &&
  511.12  	make &&
  511.13  	make install
  511.14  }
   512.1 --- a/xorg-libFS/receipt	Tue Mar 27 12:50:45 2018 +0200
   512.2 +++ b/xorg-libFS/receipt	Fri Mar 30 19:31:50 2018 +0300
   512.3 @@ -16,10 +16,7 @@
   512.4  SPLIT="xorg-libFS-dev"
   512.5  
   512.6  compile_rules() {
   512.7 -	./configure \
   512.8 -		--sysconfdir=/etc \
   512.9 -		--localstatedir=/var \
  512.10 -		$CONFIGURE_ARGS &&
  512.11 +	./configure $CONFIGURE_ARGS &&
  512.12  	make &&
  512.13  	make install
  512.14  }
   513.1 --- a/xorg-libICE/receipt	Tue Mar 27 12:50:45 2018 +0200
   513.2 +++ b/xorg-libICE/receipt	Fri Mar 30 19:31:50 2018 +0300
   513.3 @@ -18,11 +18,7 @@
   513.4  compile_rules() {
   513.5  	touch /root/missing /missing
   513.6  
   513.7 -	fix ld
   513.8 -	./configure \
   513.9 -		--sysconfdir=/etc \
  513.10 -		--localstatedir=/var \
  513.11 -		$CONFIGURE_ARGS &&
  513.12 +	./configure $CONFIGURE_ARGS &&
  513.13  	fix libtool &&
  513.14  	make &&
  513.15  	make install
   514.1 --- a/xorg-libSM/receipt	Tue Mar 27 12:50:45 2018 +0200
   514.2 +++ b/xorg-libSM/receipt	Fri Mar 30 19:31:50 2018 +0300
   514.3 @@ -16,11 +16,7 @@
   514.4  SPLIT="xorg-libSM-dev"
   514.5  
   514.6  compile_rules() {
   514.7 -	fix ld
   514.8 -	./configure \
   514.9 -		--sysconfdir=/etc \
  514.10 -		--localstatedir=/var \
  514.11 -		$CONFIGURE_ARGS &&
  514.12 +	./configure $CONFIGURE_ARGS &&
  514.13  	fix libtool &&
  514.14  	make &&
  514.15  	make install
   515.1 --- a/xorg-libX11/receipt	Tue Mar 27 12:50:45 2018 +0200
   515.2 +++ b/xorg-libX11/receipt	Fri Mar 30 19:31:50 2018 +0300
   515.3 @@ -17,11 +17,7 @@
   515.4  SPLIT="xorg-libX11-dev"
   515.5  
   515.6  compile_rules() {
   515.7 -	fix ld
   515.8 -	./configure \
   515.9 -		--sysconfdir=/etc \
  515.10 -		--localstatedir=/var \
  515.11 -		$CONFIGURE_ARGS &&
  515.12 +	./configure $CONFIGURE_ARGS &&
  515.13  	fix libtool &&
  515.14  	make &&
  515.15  	make install
   516.1 --- a/xorg-libXScrnSaver/receipt	Tue Mar 27 12:50:45 2018 +0200
   516.2 +++ b/xorg-libXScrnSaver/receipt	Fri Mar 30 19:31:50 2018 +0300
   516.3 @@ -16,11 +16,7 @@
   516.4  SPLIT="xorg-libXScrnSaver-dev"
   516.5  
   516.6  compile_rules() {
   516.7 -	fix ld
   516.8 -	./configure \
   516.9 -		--sysconfdir=/etc \
  516.10 -		--localstatedir=/var \
  516.11 -		$CONFIGURE_ARGS &&
  516.12 +	./configure $CONFIGURE_ARGS &&
  516.13  	fix libtool &&
  516.14  	make &&
  516.15  	make install
   517.1 --- a/xorg-libXau/receipt	Tue Mar 27 12:50:45 2018 +0200
   517.2 +++ b/xorg-libXau/receipt	Fri Mar 30 19:31:50 2018 +0300
   517.3 @@ -16,11 +16,7 @@
   517.4  SPLIT="xorg-libXau-dev"
   517.5  
   517.6  compile_rules() {
   517.7 -	fix ld
   517.8 -	./configure \
   517.9 -		--sysconfdir=/etc \
  517.10 -		--localstatedir=/var \
  517.11 -		$CONFIGURE_ARGS &&
  517.12 +	./configure $CONFIGURE_ARGS &&
  517.13  	fix libtool &&
  517.14  	make &&
  517.15  	make install
   518.1 --- a/xorg-libXaw/receipt	Tue Mar 27 12:50:45 2018 +0200
   518.2 +++ b/xorg-libXaw/receipt	Fri Mar 30 19:31:50 2018 +0300
   518.3 @@ -16,10 +16,7 @@
   518.4  SPLIT="xorg-libXaw-dev"
   518.5  
   518.6  compile_rules() {
   518.7 -	fix ld
   518.8  	./configure \
   518.9 -		--sysconfdir=/etc \
  518.10 -		--localstatedir=/var \
  518.11  		--disable-xaw6 \
  518.12  		$CONFIGURE_ARGS &&
  518.13  	fix libtool &&
   519.1 --- a/xorg-libXaw3d/receipt	Tue Mar 27 12:50:45 2018 +0200
   519.2 +++ b/xorg-libXaw3d/receipt	Fri Mar 30 19:31:50 2018 +0300
   519.3 @@ -15,11 +15,7 @@
   519.4  SPLIT="xorg-libXaw3d-dev"
   519.5  
   519.6  compile_rules() {
   519.7 -	fix ld
   519.8 -	./configure \
   519.9 -		--sysconfdir=/etc \
  519.10 -		--localstatedir=/var \
  519.11 -		$CONFIGURE_ARGS &&
  519.12 +	./configure $CONFIGURE_ARGS &&
  519.13  	fix libtool &&
  519.14  	make &&
  519.15  	make install
   520.1 --- a/xorg-libXcomposite/receipt	Tue Mar 27 12:50:45 2018 +0200
   520.2 +++ b/xorg-libXcomposite/receipt	Fri Mar 30 19:31:50 2018 +0300
   520.3 @@ -16,11 +16,7 @@
   520.4  SPLIT="xorg-libXcomposite-dev"
   520.5  
   520.6  compile_rules() {
   520.7 -	fix ld
   520.8 -	./configure \
   520.9 -		--sysconfdir=/etc \
  520.10 -		--localstatedir=/var \
  520.11 -		$CONFIGURE_ARGS &&
  520.12 +	./configure $CONFIGURE_ARGS &&
  520.13  	fix libtool &&
  520.14  	make &&
  520.15  	make install
   521.1 --- a/xorg-libXcursor/receipt	Tue Mar 27 12:50:45 2018 +0200
   521.2 +++ b/xorg-libXcursor/receipt	Fri Mar 30 19:31:50 2018 +0300
   521.3 @@ -16,11 +16,7 @@
   521.4  SPLIT="xorg-libXcursor-dev"
   521.5  
   521.6  compile_rules() {
   521.7 -	fix ld
   521.8 -	./configure \
   521.9 -		--sysconfdir=/etc \
  521.10 -		--localstatedir=/var \
  521.11 -		$CONFIGURE_ARGS &&
  521.12 +	./configure $CONFIGURE_ARGS &&
  521.13  	fix libtool &&
  521.14  	make &&
  521.15  	make install
   522.1 --- a/xorg-libXdamage/receipt	Tue Mar 27 12:50:45 2018 +0200
   522.2 +++ b/xorg-libXdamage/receipt	Fri Mar 30 19:31:50 2018 +0300
   522.3 @@ -16,11 +16,7 @@
   522.4  SPLIT="xorg-libXdamage-dev"
   522.5  
   522.6  compile_rules() {
   522.7 -	fix ld
   522.8 -	./configure \
   522.9 -		--sysconfdir=/etc \
  522.10 -		--localstatedir=/var \
  522.11 -		$CONFIGURE_ARGS &&
  522.12 +	./configure $CONFIGURE_ARGS &&
  522.13  	fix libtool &&
  522.14  	make &&
  522.15  	make install
   523.1 --- a/xorg-libXdmcp/receipt	Tue Mar 27 12:50:45 2018 +0200
   523.2 +++ b/xorg-libXdmcp/receipt	Fri Mar 30 19:31:50 2018 +0300
   523.3 @@ -16,11 +16,7 @@
   523.4  SPLIT="xorg-libXdmcp-dev"
   523.5  
   523.6  compile_rules() {
   523.7 -	fix ld
   523.8 -	./configure \
   523.9 -		--sysconfdir=/etc \
  523.10 -		--localstatedir=/var \
  523.11 -		$CONFIGURE_ARGS &&
  523.12 +	./configure $CONFIGURE_ARGS &&
  523.13  	fix libtool &&
  523.14  	make &&
  523.15  	make install
   524.1 --- a/xorg-libXext/receipt	Tue Mar 27 12:50:45 2018 +0200
   524.2 +++ b/xorg-libXext/receipt	Fri Mar 30 19:31:50 2018 +0300
   524.3 @@ -16,11 +16,7 @@
   524.4  SPLIT="xorg-libXext-dev"
   524.5  
   524.6  compile_rules() {
   524.7 -	fix ld
   524.8 -	./configure \
   524.9 -		--sysconfdir=/etc \
  524.10 -		--localstatedir=/var \
  524.11 -		$CONFIGURE_ARGS &&
  524.12 +	./configure $CONFIGURE_ARGS &&
  524.13  	fix libtool &&
  524.14  	make &&
  524.15  	make install
   525.1 --- a/xorg-libXfixes/receipt	Tue Mar 27 12:50:45 2018 +0200
   525.2 +++ b/xorg-libXfixes/receipt	Fri Mar 30 19:31:50 2018 +0300
   525.3 @@ -16,11 +16,7 @@
   525.4  SPLIT="xorg-libXfixes-dev"
   525.5  
   525.6  compile_rules() {
   525.7 -	fix ld
   525.8 -	./configure \
   525.9 -		--sysconfdir=/etc \
  525.10 -		--localstatedir=/var \
  525.11 -		$CONFIGURE_ARGS &&
  525.12 +	./configure $CONFIGURE_ARGS &&
  525.13  	fix libtool &&
  525.14  	make &&
  525.15  	make install
   526.1 --- a/xorg-libXfont/receipt	Tue Mar 27 12:50:45 2018 +0200
   526.2 +++ b/xorg-libXfont/receipt	Fri Mar 30 19:31:50 2018 +0300
   526.3 @@ -16,20 +16,13 @@
   526.4  SPLIT="xorg-libXfont-dev"
   526.5  PKG_RULE="std-dev"
   526.6  
   526.7 -# Rules to configure and make the package.
   526.8 -compile_rules()
   526.9 -{
  526.10 -	./configure \
  526.11 -		--sysconfdir=/etc \
  526.12 -		--localstatedir=/var \
  526.13 -		$CONFIGURE_ARGS &&
  526.14 +compile_rules() {
  526.15 +	./configure $CONFIGURE_ARGS &&
  526.16  	make &&
  526.17  	make install
  526.18  }
  526.19  
  526.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  526.21 -genpkg_rules()
  526.22 -{
  526.23 +genpkg_rules() {
  526.24  	case $PACKAGE in
  526.25  		*-libXfont)
  526.26  			copy @std
   527.1 --- a/xorg-libXfont2/receipt	Tue Mar 27 12:50:45 2018 +0200
   527.2 +++ b/xorg-libXfont2/receipt	Fri Mar 30 19:31:50 2018 +0300
   527.3 @@ -17,11 +17,7 @@
   527.4  SPLIT="xorg-libXfont2-dev"
   527.5  
   527.6  compile_rules() {
   527.7 -	fix ld
   527.8 -	./configure \
   527.9 -		--sysconfdir=/etc \
  527.10 -		--localstatedir=/var \
  527.11 -		$CONFIGURE_ARGS &&
  527.12 +	./configure $CONFIGURE_ARGS &&
  527.13  	fix libtool &&
  527.14  	make &&
  527.15  	make install
   528.1 --- a/xorg-libXfontcache/receipt	Tue Mar 27 12:50:45 2018 +0200
   528.2 +++ b/xorg-libXfontcache/receipt	Fri Mar 30 19:31:50 2018 +0300
   528.3 @@ -16,11 +16,7 @@
   528.4  SPLIT="xorg-libXfontcache-dev"
   528.5  
   528.6  compile_rules() {
   528.7 -	fix ld
   528.8 -	./configure \
   528.9 -		--sysconfdir=/etc \
  528.10 -		--localstatedir=/var \
  528.11 -		$CONFIGURE_ARGS &&
  528.12 +	./configure $CONFIGURE_ARGS &&
  528.13  	fix libtool &&
  528.14  	make &&
  528.15  	make install
   529.1 --- a/xorg-libXft/receipt	Tue Mar 27 12:50:45 2018 +0200
   529.2 +++ b/xorg-libXft/receipt	Fri Mar 30 19:31:50 2018 +0300
   529.3 @@ -16,11 +16,7 @@
   529.4  SPLIT="xorg-libXft-dev"
   529.5  
   529.6  compile_rules() {
   529.7 -	fix ld
   529.8 -	./configure \
   529.9 -		--sysconfdir=/etc \
  529.10 -		--localstatedir=/var \
  529.11 -		$CONFIGURE_ARGS &&
  529.12 +	./configure $CONFIGURE_ARGS &&
  529.13  	fix libtool &&
  529.14  	make &&
  529.15  	make install
   530.1 --- a/xorg-libXi/receipt	Tue Mar 27 12:50:45 2018 +0200
   530.2 +++ b/xorg-libXi/receipt	Fri Mar 30 19:31:50 2018 +0300
   530.3 @@ -16,11 +16,7 @@
   530.4  SPLIT="xorg-libXi-dev"
   530.5  
   530.6  compile_rules() {
   530.7 -	fix ld
   530.8 -	./configure \
   530.9 -		--sysconfdir=/etc \
  530.10 -		--localstatedir=/var \
  530.11 -		$CONFIGURE_ARGS &&
  530.12 +	./configure $CONFIGURE_ARGS &&
  530.13  	fix libtool &&
  530.14  	make &&
  530.15  	make install
   531.1 --- a/xorg-libXinerama/receipt	Tue Mar 27 12:50:45 2018 +0200
   531.2 +++ b/xorg-libXinerama/receipt	Fri Mar 30 19:31:50 2018 +0300
   531.3 @@ -16,11 +16,7 @@
   531.4  SPLIT="xorg-libXinerama-dev"
   531.5  
   531.6  compile_rules() {
   531.7 -	fix ld
   531.8 -	./configure \
   531.9 -		--sysconfdir=/etc \
  531.10 -		--localstatedir=/var \
  531.11 -		$CONFIGURE_ARGS &&
  531.12 +	./configure $CONFIGURE_ARGS &&
  531.13  	fix libtool &&
  531.14  	make &&
  531.15  	make install
   532.1 --- a/xorg-libXmu/receipt	Tue Mar 27 12:50:45 2018 +0200
   532.2 +++ b/xorg-libXmu/receipt	Fri Mar 30 19:31:50 2018 +0300
   532.3 @@ -16,11 +16,7 @@
   532.4  SPLIT="xorg-libXmu-dev"
   532.5  
   532.6  compile_rules() {
   532.7 -	fix ld
   532.8 -	./configure \
   532.9 -		--sysconfdir=/etc \
  532.10 -		--localstatedir=/var \
  532.11 -		$CONFIGURE_ARGS &&
  532.12 +	./configure $CONFIGURE_ARGS &&
  532.13  	fix libtool &&
  532.14  	make &&
  532.15  	make install
   533.1 --- a/xorg-libXp/receipt	Tue Mar 27 12:50:45 2018 +0200
   533.2 +++ b/xorg-libXp/receipt	Fri Mar 30 19:31:50 2018 +0300
   533.3 @@ -16,20 +16,13 @@
   533.4  SPLIT="xorg-libXp-dev"
   533.5  PKG_RULE="std-dev"
   533.6  
   533.7 -# Rules to configure and make the package.
   533.8 -compile_rules()
   533.9 -{
  533.10 -	./configure \
  533.11 -		--sysconfdir=/etc \
  533.12 -		--localstatedir=/var \
  533.13 -		$CONFIGURE_ARGS &&
  533.14 +compile_rules() {
  533.15 +	./configure $CONFIGURE_ARGS &&
  533.16  	make &&
  533.17  	make install
  533.18  }
  533.19  
  533.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  533.21 -genpkg_rules()
  533.22 -{
  533.23 +genpkg_rules() {
  533.24  	case $PACKAGE in
  533.25  		*-libXp)
  533.26  			copy @std
   534.1 --- a/xorg-libXpm/receipt	Tue Mar 27 12:50:45 2018 +0200
   534.2 +++ b/xorg-libXpm/receipt	Fri Mar 30 19:31:50 2018 +0300
   534.3 @@ -27,11 +27,7 @@
   534.4  			done ;;
   534.5  	esac
   534.6  
   534.7 -	fix ld
   534.8 -	./configure \
   534.9 -		--sysconfdir=/etc \
  534.10 -		--localstatedir=/var \
  534.11 -		$CONFIGURE_ARGS &&
  534.12 +	./configure $CONFIGURE_ARGS &&
  534.13  	fix libtool &&
  534.14  	make &&
  534.15  	make install
   535.1 --- a/xorg-libXrandr/receipt	Tue Mar 27 12:50:45 2018 +0200
   535.2 +++ b/xorg-libXrandr/receipt	Fri Mar 30 19:31:50 2018 +0300
   535.3 @@ -16,11 +16,7 @@
   535.4  SPLIT="xorg-libXrandr-dev"
   535.5  
   535.6  compile_rules() {
   535.7 -	fix ld
   535.8 -	./configure \
   535.9 -		--sysconfdir=/etc \
  535.10 -		--localstatedir=/var \
  535.11 -		$CONFIGURE_ARGS &&
  535.12 +	./configure $CONFIGURE_ARGS &&
  535.13  	fix libtool &&
  535.14  	make &&
  535.15  	make install
   536.1 --- a/xorg-libXrender/receipt	Tue Mar 27 12:50:45 2018 +0200
   536.2 +++ b/xorg-libXrender/receipt	Fri Mar 30 19:31:50 2018 +0300
   536.3 @@ -16,11 +16,7 @@
   536.4  SPLIT="xorg-libXrender-dev"
   536.5  
   536.6  compile_rules() {
   536.7 -	fix ld
   536.8 -	./configure \
   536.9 -		--sysconfdir=/etc \
  536.10 -		--localstatedir=/var \
  536.11 -		$CONFIGURE_ARGS &&
  536.12 +	./configure $CONFIGURE_ARGS &&
  536.13  	fix libtool &&
  536.14  	make &&
  536.15  	make install
   537.1 --- a/xorg-libXres/receipt	Tue Mar 27 12:50:45 2018 +0200
   537.2 +++ b/xorg-libXres/receipt	Fri Mar 30 19:31:50 2018 +0300
   537.3 @@ -17,13 +17,10 @@
   537.4  SPLIT="xorg-libXres-dev"
   537.5  
   537.6  compile_rules() {
   537.7 -	fix ld
   537.8 -	./configure \
   537.9 -		--sysconfdir=/etc \
  537.10 -		--localstatedir=/var \
  537.11 -		$CONFIGURE_ARGS &&
  537.12 +	./configure $CONFIGURE_ARGS &&
  537.13  	fix libtool &&
  537.14 -	make && make install
  537.15 +	make &&
  537.16 +	make install
  537.17  }
  537.18  
  537.19  genpkg_rules() {
   538.1 --- a/xorg-libXt/receipt	Tue Mar 27 12:50:45 2018 +0200
   538.2 +++ b/xorg-libXt/receipt	Fri Mar 30 19:31:50 2018 +0300
   538.3 @@ -16,15 +16,11 @@
   538.4  SPLIT="xorg-libXt-dev"
   538.5  
   538.6  compile_rules() {
   538.7 -	# Handle cross compilation.
   538.8  	case "$ARCH" in
   538.9  		arm) unset CFLAGS ;;
  538.10  	esac
  538.11  
  538.12 -	fix ld
  538.13  	./configure \
  538.14 -		--sysconfdir=/etc \
  538.15 -		--localstatedir=/var \
  538.16  		--with-appdefaultdir=/etc/X11/app-defaults \
  538.17  		$CONFIGURE_ARGS &&
  538.18  	fix libtool &&
   539.1 --- a/xorg-libXtst/receipt	Tue Mar 27 12:50:45 2018 +0200
   539.2 +++ b/xorg-libXtst/receipt	Fri Mar 30 19:31:50 2018 +0300
   539.3 @@ -16,11 +16,7 @@
   539.4  SPLIT="xorg-libXtst-dev"
   539.5  
   539.6  compile_rules() {
   539.7 -	fix ld
   539.8 -	./configure \
   539.9 -		--sysconfdir=/etc \
  539.10 -		--localstatedir=/var \
  539.11 -		$CONFIGURE_ARGS
  539.12 +	./configure $CONFIGURE_ARGS
  539.13  	fix libtool &&
  539.14  	make &&
  539.15  	make install
   540.1 --- a/xorg-libXv/receipt	Tue Mar 27 12:50:45 2018 +0200
   540.2 +++ b/xorg-libXv/receipt	Fri Mar 30 19:31:50 2018 +0300
   540.3 @@ -16,11 +16,7 @@
   540.4  SPLIT="xorg-libXv-dev"
   540.5  
   540.6  compile_rules() {
   540.7 -	fix ld
   540.8 -	./configure \
   540.9 -		--sysconfdir=/etc \
  540.10 -		--localstatedir=/var \
  540.11 -		$CONFIGURE_ARGS &&
  540.12 +	./configure $CONFIGURE_ARGS &&
  540.13  	fix libtool &&
  540.14  	make &&
  540.15  	make install
   541.1 --- a/xorg-libXvMC/receipt	Tue Mar 27 12:50:45 2018 +0200
   541.2 +++ b/xorg-libXvMC/receipt	Fri Mar 30 19:31:50 2018 +0300
   541.3 @@ -16,11 +16,7 @@
   541.4  SPLIT="xorg-libXvMC-dev"
   541.5  
   541.6  compile_rules() {
   541.7 -	fix ld
   541.8 -	./configure \
   541.9 -		--sysconfdir=/etc \
  541.10 -		--localstatedir=/var \
  541.11 -		$CONFIGURE_ARGS &&
  541.12 +	./configure $CONFIGURE_ARGS &&
  541.13  	fix libtool &&
  541.14  	make &&
  541.15  	make install
   542.1 --- a/xorg-libXxf86dga/receipt	Tue Mar 27 12:50:45 2018 +0200
   542.2 +++ b/xorg-libXxf86dga/receipt	Fri Mar 30 19:31:50 2018 +0300
   542.3 @@ -17,11 +17,7 @@
   542.4  SPLIT="xorg-libXxf86dga-dev"
   542.5  
   542.6  compile_rules() {
   542.7 -	fix ld
   542.8 -	./configure \
   542.9 -		--sysconfdir=/etc \
  542.10 -		--localstatedir=/var \
  542.11 -		$CONFIGURE_ARGS &&
  542.12 +	./configure $CONFIGURE_ARGS &&
  542.13  	fix libtool &&
  542.14  	make &&
  542.15  	make install
   543.1 --- a/xorg-libXxf86misc/receipt	Tue Mar 27 12:50:45 2018 +0200
   543.2 +++ b/xorg-libXxf86misc/receipt	Fri Mar 30 19:31:50 2018 +0300
   543.3 @@ -16,11 +16,7 @@
   543.4  SPLIT="xorg-libXxf86misc-dev"
   543.5  
   543.6  compile_rules() {
   543.7 -	fix ld
   543.8 -	./configure \
   543.9 -		--sysconfdir=/etc \
  543.10 -		--localstatedir=/var \
  543.11 -		$CONFIGURE_ARGS &&
  543.12 +	./configure $CONFIGURE_ARGS &&
  543.13  	fix libtool &&
  543.14  	make &&
  543.15  	make install
   544.1 --- a/xorg-libXxf86vm/receipt	Tue Mar 27 12:50:45 2018 +0200
   544.2 +++ b/xorg-libXxf86vm/receipt	Fri Mar 30 19:31:50 2018 +0300
   544.3 @@ -16,11 +16,7 @@
   544.4  SPLIT="xorg-libXxf86vm-dev"
   544.5  
   544.6  compile_rules() {
   544.7 -	fix ld
   544.8 -	./configure \
   544.9 -		--sysconfdir=/etc \
  544.10 -		--localstatedir=/var \
  544.11 -		$CONFIGURE_ARGS &&
  544.12 +	./configure $CONFIGURE_ARGS &&
  544.13  	fix libtool &&
  544.14  	make &&
  544.15  	make install
   545.1 --- a/xorg-libdmx/receipt	Tue Mar 27 12:50:45 2018 +0200
   545.2 +++ b/xorg-libdmx/receipt	Fri Mar 30 19:31:50 2018 +0300
   545.3 @@ -16,14 +16,12 @@
   545.4  SPLIT="xorg-libdmx-dev"
   545.5  
   545.6  compile_rules() {
   545.7 -	fix ld
   545.8  	./configure \
   545.9 -		--sysconfdir=/etc \
  545.10 -		--localstatedir=/var \
  545.11  		--disable-static \
  545.12  		$CONFIGURE_ARGS &&
  545.13  	fix libtool &&
  545.14 -	make && make install
  545.15 +	make &&
  545.16 +	make install
  545.17  }
  545.18  
  545.19  genpkg_rules() {
   546.1 --- a/xorg-libfontenc/receipt	Tue Mar 27 12:50:45 2018 +0200
   546.2 +++ b/xorg-libfontenc/receipt	Fri Mar 30 19:31:50 2018 +0300
   546.3 @@ -16,11 +16,7 @@
   546.4  SPLIT="xorg-libfontenc-dev"
   546.5  
   546.6  compile_rules() {
   546.7 -	fix ld
   546.8 -	./configure \
   546.9 -		--sysconfdir=/etc \
  546.10 -		--localstatedir=/var \
  546.11 -		$CONFIGURE_ARGS &&
  546.12 +	./configure $CONFIGURE_ARGS &&
  546.13  	fix libtool &&
  546.14  	make &&
  546.15  	make install
   547.1 --- a/xorg-liblbxutil/receipt	Tue Mar 27 12:50:45 2018 +0200
   547.2 +++ b/xorg-liblbxutil/receipt	Fri Mar 30 19:31:50 2018 +0300
   547.3 @@ -15,20 +15,13 @@
   547.4  SPLIT="xorg-liblbxutil-dev"
   547.5  PKG_RULE="std-dev"
   547.6  
   547.7 -# Rules to configure and make the package.
   547.8 -compile_rules()
   547.9 -{
  547.10 -	./configure \
  547.11 -		--sysconfdir=/etc \
  547.12 -		--localstatedir=/var \
  547.13 -		$CONFIGURE_ARGS &&
  547.14 +compile_rules() {
  547.15 +	./configure $CONFIGURE_ARGS &&
  547.16  	make &&
  547.17  	make install
  547.18  }
  547.19  
  547.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  547.21 -genpkg_rules()
  547.22 -{
  547.23 +genpkg_rules() {
  547.24  	case $PACKAGE in
  547.25  		*-liblbxutil)
  547.26  			copy @std
   548.1 --- a/xorg-libpciaccess/receipt	Tue Mar 27 12:50:45 2018 +0200
   548.2 +++ b/xorg-libpciaccess/receipt	Fri Mar 30 19:31:50 2018 +0300
   548.3 @@ -16,10 +16,7 @@
   548.4  SPLIT="xorg-libpciaccess-dev"
   548.5  
   548.6  compile_rules() {
   548.7 -	./configure \
   548.8 -		--sysconfdir=/etc \
   548.9 -		--localstatedir=/var \
  548.10 -		$CONFIGURE_ARGS &&
  548.11 +	./configure $CONFIGURE_ARGS &&
  548.12  	make &&
  548.13  	make install
  548.14  }
   549.1 --- a/xorg-libxcb/receipt	Tue Mar 27 12:50:45 2018 +0200
   549.2 +++ b/xorg-libxcb/receipt	Fri Mar 30 19:31:50 2018 +0300
   549.3 @@ -34,7 +34,6 @@
   549.4  	# our platform already supply all the necessary pthread stubs.
   549.5  	sed -i "s|pthread-stubs||" $src/configure.ac
   549.6  
   549.7 -	fix ld
   549.8  	autoreconf -fi &&
   549.9  	./configure \
  549.10  		--enable-xinput \
   550.1 --- a/xorg-libxkbfile/receipt	Tue Mar 27 12:50:45 2018 +0200
   550.2 +++ b/xorg-libxkbfile/receipt	Fri Mar 30 19:31:50 2018 +0300
   550.3 @@ -16,11 +16,7 @@
   550.4  SPLIT="xorg-libxkbfile-dev"
   550.5  
   550.6  compile_rules() {
   550.7 -	fix ld
   550.8 -	./configure \
   550.9 -		--sysconfdir=/etc \
  550.10 -		--localstatedir=/var \
  550.11 -		$CONFIGURE_ARGS &&
  550.12 +	./configure $CONFIGURE_ARGS &&
  550.13  	fix libtool &&
  550.14  	make &&
  550.15  	make install
   551.1 --- a/xorg-libxshmfence/receipt	Tue Mar 27 12:50:45 2018 +0200
   551.2 +++ b/xorg-libxshmfence/receipt	Fri Mar 30 19:31:50 2018 +0300
   551.3 @@ -16,10 +16,7 @@
   551.4  SPLIT="xorg-libxshmfence-dev"
   551.5  
   551.6  compile_rules() {
   551.7 -	./configure \
   551.8 -		--sysconfdir=/etc \
   551.9 -		--localstatedir=/var \
  551.10 -		$CONFIGURE_ARGS &&
  551.11 +	./configure $CONFIGURE_ARGS &&
  551.12  	make &&
  551.13  	make install
  551.14  }
   552.1 --- a/xorg-luit/receipt	Tue Mar 27 12:50:45 2018 +0200
   552.2 +++ b/xorg-luit/receipt	Fri Mar 30 19:31:50 2018 +0300
   552.3 @@ -22,11 +22,7 @@
   552.4  	sed -i -e "s@#ifdef HAVE_CONFIG_H@$line1\n$line2\n$line3\n$line4\n\n&@" sys.c
   552.5  	unset line1 line2 line3 line4
   552.6  
   552.7 -	fix ld
   552.8 -	./configure \
   552.9 -		--sysconfdir=/etc \
  552.10 -		--localstatedir=/var \
  552.11 -		$CONFIGURE_ARGS &&
  552.12 +	./configure $CONFIGURE_ARGS &&
  552.13  	fix libtool &&
  552.14  	make &&
  552.15  	make install
   553.1 --- a/xorg-makedepend/receipt	Tue Mar 27 12:50:45 2018 +0200
   553.2 +++ b/xorg-makedepend/receipt	Fri Mar 30 19:31:50 2018 +0300
   553.3 @@ -14,20 +14,13 @@
   553.4  BUILD_DEPENDS="xorg-xproto"
   553.5  PKG_RULE="std"
   553.6  
   553.7 -# Rules to configure and make the package.
   553.8 -compile_rules()
   553.9 -{
  553.10 -	./configure \
  553.11 -		--sysconfdir=/etc \
  553.12 -		--localstatedir=/var \
  553.13 -		$CONFIGURE_ARGS &&
  553.14 +compile_rules() {
  553.15 +	./configure $CONFIGURE_ARGS &&
  553.16  	make &&
  553.17  	make install
  553.18  }
  553.19  
  553.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  553.21 -genpkg_rules()
  553.22 -{
  553.23 +genpkg_rules() {
  553.24  	copy @std
  553.25  	DEPENDS="xorg-xproto"
  553.26  }
   554.1 --- a/xorg-mkfontdir/receipt	Tue Mar 27 12:50:45 2018 +0200
   554.2 +++ b/xorg-mkfontdir/receipt	Fri Mar 30 19:31:50 2018 +0300
   554.3 @@ -15,11 +15,7 @@
   554.4  BUILD_DEPENDS="xorg-util-macros"
   554.5  
   554.6  compile_rules() {
   554.7 -	fix ld
   554.8 -	./configure \
   554.9 -		--sysconfdir=/etc \
  554.10 -		--localstatedir=/var \
  554.11 -		$CONFIGURE_ARGS &&
  554.12 +	./configure $CONFIGURE_ARGS &&
  554.13  	fix libtool &&
  554.14  	make &&
  554.15  	make install
   555.1 --- a/xorg-mkfontscale/receipt	Tue Mar 27 12:50:45 2018 +0200
   555.2 +++ b/xorg-mkfontscale/receipt	Fri Mar 30 19:31:50 2018 +0300
   555.3 @@ -15,11 +15,7 @@
   555.4  BUILD_DEPENDS="xorg-util-macros xorg-libfontenc-dev freetype-dev xorg-xproto"
   555.5  
   555.6  compile_rules() {
   555.7 -	fix ld
   555.8 -	./configure \
   555.9 -		--sysconfdir=/etc \
  555.10 -		--localstatedir=/var \
  555.11 -		$CONFIGURE_ARGS &&
  555.12 +	./configure $CONFIGURE_ARGS &&
  555.13  	fix libtool &&
  555.14  	make &&
  555.15  	make install
   556.1 --- a/xorg-oclock/receipt	Tue Mar 27 12:50:45 2018 +0200
   556.2 +++ b/xorg-oclock/receipt	Fri Mar 30 19:31:50 2018 +0300
   556.3 @@ -15,20 +15,13 @@
   556.4  xorg-libXext-dev xorg-libXt-dev xorg-libxkbfile-dev"
   556.5  PKG_RULE="std"
   556.6  
   556.7 -# Rules to configure and make the package.
   556.8 -compile_rules()
   556.9 -{
  556.10 -	./configure \
  556.11 -		--sysconfdir=/etc \
  556.12 -		--localstatedir=/var \
  556.13 -		$CONFIGURE_ARGS &&
  556.14 +compile_rules() {
  556.15 +	./configure $CONFIGURE_ARGS &&
  556.16  	make &&
  556.17  	make install
  556.18  }
  556.19  
  556.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  556.21 -genpkg_rules()
  556.22 -{
  556.23 +genpkg_rules() {
  556.24  	copy @std
  556.25  	DEPENDS="xorg-libX11 xorg-libXext xorg-libXmu xorg-libXt xorg-libxkbfile"
  556.26  	CONFIG_FILES="/etc/X11/app-defaults/Clock-color"
   557.1 --- a/xorg-pixman/receipt	Tue Mar 27 12:50:45 2018 +0200
   557.2 +++ b/xorg-pixman/receipt	Fri Mar 30 19:31:50 2018 +0300
   557.3 @@ -16,10 +16,7 @@
   557.4  PKG_RULE="std-dev"
   557.5  
   557.6  compile_rules() {
   557.7 -	./configure \
   557.8 -		--sysconfdir=/etc \
   557.9 -		--localstatedir=/var \
  557.10 -		$CONFIGURE_ARGS &&
  557.11 +	./configure $CONFIGURE_ARGS &&
  557.12  	make &&
  557.13  	make install
  557.14  }
   558.1 --- a/xorg-presentproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   558.2 +++ b/xorg-presentproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   558.3 @@ -15,10 +15,7 @@
   558.4  BUILD_DEPENDS="xorg-util-macros"
   558.5  
   558.6  compile_rules() {
   558.7 -	./configure \
   558.8 -		--sysconfdir=/etc \
   558.9 -		--localstatedir=/var \
  558.10 -		$CONFIGURE_ARGS &&
  558.11 +	./configure $CONFIGURE_ARGS &&
  558.12  	make &&
  558.13  	make install
  558.14  }
   559.1 --- a/xorg-printproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   559.2 +++ b/xorg-printproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   559.3 @@ -14,20 +14,13 @@
   559.4  BUILD_DEPENDS="xorg-util-macros"
   559.5  PKG_RULE="dev"
   559.6  
   559.7 -# Rules to configure and make the package.
   559.8 -compile_rules()
   559.9 -{
  559.10 -	./configure \
  559.11 -		--sysconfdir=/etc \
  559.12 -		--localstatedir=/var \
  559.13 -		$CONFIGURE_ARGS &&
  559.14 +compile_rules() {
  559.15 +	./configure $CONFIGURE_ARGS &&
  559.16  	make &&
  559.17  	make install
  559.18  }
  559.19  
  559.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  559.21 -genpkg_rules()
  559.22 -{
  559.23 +genpkg_rules() {
  559.24  	copy @dev
  559.25  	DEPENDS="xorg-fontsproto xorg-libX11-dev xorg-libXau-dev"
  559.26  }
   560.1 --- a/xorg-randrproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   560.2 +++ b/xorg-randrproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   560.3 @@ -15,10 +15,7 @@
   560.4  BUILD_DEPENDS="xorg-util-macros"
   560.5  
   560.6  compile_rules() {
   560.7 -	./configure \
   560.8 -		--sysconfdir=/etc \
   560.9 -		--localstatedir=/var \
  560.10 -		$CONFIGURE_ARGS &&
  560.11 +	./configure $CONFIGURE_ARGS &&
  560.12  	make &&
  560.13  	make install
  560.14  }
   561.1 --- a/xorg-recordproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   561.2 +++ b/xorg-recordproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   561.3 @@ -15,10 +15,7 @@
   561.4  BUILD_DEPENDS="xorg-util-macros"
   561.5  
   561.6  compile_rules() {
   561.7 -	./configure \
   561.8 -		--sysconfdir=/etc \
   561.9 -		--localstatedir=/var \
  561.10 -		$CONFIGURE_ARGS &&
  561.11 +	./configure $CONFIGURE_ARGS &&
  561.12  	make &&
  561.13  	make install
  561.14  }
   562.1 --- a/xorg-renderproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   562.2 +++ b/xorg-renderproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   562.3 @@ -15,10 +15,7 @@
   562.4  BUILD_DEPENDS="xorg-util-macros"
   562.5  
   562.6  compile_rules() {
   562.7 -	./configure \
   562.8 -		--sysconfdir=/etc \
   562.9 -		--localstatedir=/var \
  562.10 -		$CONFIGURE_ARGS &&
  562.11 +	./configure $CONFIGURE_ARGS &&
  562.12  	make &&
  562.13  	make install
  562.14  }
   563.1 --- a/xorg-resourceproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   563.2 +++ b/xorg-resourceproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   563.3 @@ -15,10 +15,7 @@
   563.4  BUILD_DEPENDS="xorg-util-macros"
   563.5  
   563.6  compile_rules() {
   563.7 -	./configure \
   563.8 -		--sysconfdir=/etc \
   563.9 -		--localstatedir=/var \
  563.10 -		$CONFIGURE_ARGS &&
  563.11 +	./configure $CONFIGURE_ARGS &&
  563.12  	make &&
  563.13  	make install
  563.14  }
   564.1 --- a/xorg-rgb/receipt	Tue Mar 27 12:50:45 2018 +0200
   564.2 +++ b/xorg-rgb/receipt	Fri Mar 30 19:31:50 2018 +0300
   564.3 @@ -14,19 +14,12 @@
   564.4  BUILD_DEPENDS="xorg-xproto"
   564.5  PKG_RULE="std"
   564.6  
   564.7 -# Rules to configure and make the package.
   564.8 -compile_rules()
   564.9 -{
  564.10 -	./configure \
  564.11 -		--sysconfdir=/etc \
  564.12 -		--localstatedir=/var \
  564.13 -		$CONFIGURE_ARGS &&
  564.14 +compile_rules() {
  564.15 +	./configure $CONFIGURE_ARGS &&
  564.16  	make &&
  564.17  	make install
  564.18  }
  564.19  
  564.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  564.21 -genpkg_rules()
  564.22 -{
  564.23 +genpkg_rules() {
  564.24  	copy @std
  564.25  }
   565.1 --- a/xorg-scrnsaverproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   565.2 +++ b/xorg-scrnsaverproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   565.3 @@ -15,10 +15,7 @@
   565.4  BUILD_DEPENDS="xorg-util-macros"
   565.5  
   565.6  compile_rules() {
   565.7 -	./configure \
   565.8 -		--sysconfdir=/etc \
   565.9 -		--localstatedir=/var \
  565.10 -		$CONFIGURE_ARGS &&
  565.11 +	./configure $CONFIGURE_ARGS &&
  565.12  	make &&
  565.13  	make install
  565.14  }
   566.1 --- a/xorg-server-light/receipt	Tue Mar 27 12:50:45 2018 +0200
   566.2 +++ b/xorg-server-light/receipt	Fri Mar 30 19:31:50 2018 +0300
   566.3 @@ -25,9 +25,7 @@
   566.4  xorg-compositeproto xorg-recordproto xorg-resourceproto xorg-presentproto \
   566.5  xorg-libxkbfile-dev xorg-libXfont2-dev xorg-libXau-dev xorg-libpciaccess-dev"
   566.6  
   566.7 -# Rules to configure and make the package.
   566.8 -compile_rules()
   566.9 -{
  566.10 +compile_rules() {
  566.11  	# Handle cross compilation. ARM use build host: perl flex
  566.12  	case "$ARCH" in
  566.13  		arm)
  566.14 @@ -35,14 +33,12 @@
  566.15  			ARCH_ARGS="--enable-malloc0returnsnull"
  566.16  			OS_NAME="SliTaz ARM"
  566.17  			VENDOR="http://arm.slitaz.org" ;;
  566.18 -		i?86)
  566.19 +		*)
  566.20  			OS_NAME="SliTaz GNU/Linux"
  566.21  			VENDOR="http://www.slitaz.org" ;;
  566.22  	esac
  566.23  
  566.24  	./configure \
  566.25 -		--sysconfdir=/etc \
  566.26 -		--localstatedir=/var \
  566.27  		--disable-docs \
  566.28  		--disable-devel-docs \
  566.29  		--disable-screensaver \
  566.30 @@ -69,8 +65,10 @@
  566.31  		--with-fontrootdir=/usr/share/fonts/X11 \
  566.32  		--with-xkb-output=/var/lib/xkb \
  566.33  		--with-serverconfig-path=/etc/X11 \
  566.34 -		$CONFIGURE_ARGS $ARCH_ARGS &&
  566.35 -	make && make install
  566.36 +		$ARCH_ARGS \
  566.37 +		$CONFIGURE_ARGS &&
  566.38 +	make &&
  566.39 +	make install
  566.40  }
  566.41  
  566.42  # Be sure it as cross compile
  566.43 @@ -78,9 +76,7 @@
  566.44  	readelf -h $install/usr/bin/Xorg
  566.45  }
  566.46  
  566.47 -# Rules to gen a SliTaz package suitable for Tazpkg.
  566.48 -genpkg_rules()
  566.49 -{
  566.50 +genpkg_rules() {
  566.51  	copy @std
  566.52  #	DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
  566.53  #	xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt xorg-pixman \
   567.1 --- a/xorg-server/receipt	Tue Mar 27 12:50:45 2018 +0200
   567.2 +++ b/xorg-server/receipt	Fri Mar 30 19:31:50 2018 +0300
   567.3 @@ -32,10 +32,7 @@
   567.4  COOKOPTS="skip-log-errors"
   567.5  
   567.6  compile_rules() {
   567.7 -	fix ld
   567.8  	./configure \
   567.9 -		--sysconfdir=/etc \
  567.10 -		--localstatedir=/var \
  567.11  		--disable-static \
  567.12  		--enable-glamor \
  567.13  		--enable-install-setuid \
  567.14 @@ -59,7 +56,8 @@
  567.15  		--with-builder-addr="devel@slitaz.org" \
  567.16  		$CONFIGURE_ARGS &&
  567.17  	fix libtool &&
  567.18 -	make && make DESTDIR=$install install &&
  567.19 +	make &&
  567.20 +	make DESTDIR=$install install &&
  567.21  
  567.22  	mkdir -pv $install/etc/X11/xorg.conf.d
  567.23  }
   568.1 --- a/xorg-sessreg/receipt	Tue Mar 27 12:50:45 2018 +0200
   568.2 +++ b/xorg-sessreg/receipt	Fri Mar 30 19:31:50 2018 +0300
   568.3 @@ -17,10 +17,7 @@
   568.4  compile_rules() {
   568.5  	sed -e 's/\$(CPP) \$(DEFS)/$(CPP) -P $(DEFS)/' -i man/Makefile.in
   568.6  
   568.7 -	./configure \
   568.8 -		--sysconfdir=/etc \
   568.9 -		--localstatedir=/var \
  568.10 -		$CONFIGURE_ARGS &&
  568.11 +	./configure $CONFIGURE_ARGS &&
  568.12  	make &&
  568.13  	make install
  568.14  }
   569.1 --- a/xorg-setxkbmap/receipt	Tue Mar 27 12:50:45 2018 +0200
   569.2 +++ b/xorg-setxkbmap/receipt	Fri Mar 30 19:31:50 2018 +0300
   569.3 @@ -15,11 +15,7 @@
   569.4  BUILD_DEPENDS="xorg-util-macros xorg-libxkbfile-dev xorg-libX11-dev"
   569.5  
   569.6  compile_rules() {
   569.7 -	fix ld
   569.8 -	./configure \
   569.9 -		--sysconfdir=/etc \
  569.10 -		--localstatedir=/var \
  569.11 -		$CONFIGURE_ARGS &&
  569.12 +	./configure $CONFIGURE_ARGS &&
  569.13  	fix libtool &&
  569.14  	make &&
  569.15  	make install
   570.1 --- a/xorg-showfont/receipt	Tue Mar 27 12:50:45 2018 +0200
   570.2 +++ b/xorg-showfont/receipt	Fri Mar 30 19:31:50 2018 +0300
   570.3 @@ -14,20 +14,13 @@
   570.4  BUILD_DEPENDS="xorg-util-macros xorg-libFS-dev"
   570.5  PKG_RULE="std"
   570.6  
   570.7 -# Rules to configure and make the package.
   570.8 -compile_rules()
   570.9 -{
  570.10 -	./configure \
  570.11 -		--sysconfdir=/etc \
  570.12 -		--localstatedir=/var \
  570.13 -		$CONFIGURE_ARGS &&
  570.14 +compile_rules() {
  570.15 +	./configure $CONFIGURE_ARGS &&
  570.16  	make &&
  570.17  	make install
  570.18  }
  570.19  
  570.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  570.21 -genpkg_rules()
  570.22 -{
  570.23 +genpkg_rules() {
  570.24  	copy @std
  570.25  	DEPENDS="xorg-libFS"
  570.26  }
   571.1 --- a/xorg-smproxy/receipt	Tue Mar 27 12:50:45 2018 +0200
   571.2 +++ b/xorg-smproxy/receipt	Fri Mar 30 19:31:50 2018 +0300
   571.3 @@ -16,11 +16,7 @@
   571.4  xorg-libXmu-dev"
   571.5  
   571.6  compile_rules() {
   571.7 -	fix ld
   571.8 -	./configure \
   571.9 -		--sysconfdir=/etc \
  571.10 -		--localstatedir=/var \
  571.11 -		$CONFIGURE_ARGS &&
  571.12 +	./configure $CONFIGURE_ARGS &&
  571.13  	fix libtool &&
  571.14  	make &&
  571.15  	make install
   572.1 --- a/xorg-twm/receipt	Tue Mar 27 12:50:45 2018 +0200
   572.2 +++ b/xorg-twm/receipt	Fri Mar 30 19:31:50 2018 +0300
   572.3 @@ -15,22 +15,15 @@
   572.4  xorg-libXt-dev xorg-libXmu-dev"
   572.5  PKG_RULE="std"
   572.6  
   572.7 -# Rules to configure and make the package.
   572.8 -compile_rules()
   572.9 -{
  572.10 +compile_rules() {
  572.11  	sed -i '/^rcdir =/s,^\(rcdir = \).*,\1/etc/X11/app-defaults,' src/Makefile.in
  572.12  
  572.13 -	./configure \
  572.14 -		--sysconfdir=/etc \
  572.15 -		--localstatedir=/var \
  572.16 -		$CONFIGURE_ARGS &&
  572.17 +	./configure $CONFIGURE_ARGS &&
  572.18  	make &&
  572.19  	make install
  572.20  }
  572.21  
  572.22 -# Rules to gen a SliTaz package suitable for Tazpkg.
  572.23 -genpkg_rules()
  572.24 -{
  572.25 +genpkg_rules() {
  572.26  	copy @std
  572.27  	DEPENDS="xorg-libICE xorg-libSM xorg-libX11 xorg-libXext xorg-libXmu \
  572.28  	xorg-libXt"
   573.1 --- a/xorg-util-macros/receipt	Tue Mar 27 12:50:45 2018 +0200
   573.2 +++ b/xorg-util-macros/receipt	Fri Mar 30 19:31:50 2018 +0300
   573.3 @@ -13,10 +13,7 @@
   573.4  WGET_URL="$XORG_MIRROR/util/$TARBALL"
   573.5  
   573.6  compile_rules() {
   573.7 -	./configure \
   573.8 -		--sysconfdir=/etc \
   573.9 -		--localstatedir=/var \
  573.10 -		$CONFIGURE_ARGS &&
  573.11 +	./configure $CONFIGURE_ARGS &&
  573.12  	make &&
  573.13  	make install
  573.14  }
   574.1 --- a/xorg-videoproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   574.2 +++ b/xorg-videoproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   574.3 @@ -15,10 +15,7 @@
   574.4  BUILD_DEPENDS="xorg-util-macros"
   574.5  
   574.6  compile_rules() {
   574.7 -	./configure \
   574.8 -		--sysconfdir=/etc \
   574.9 -		--localstatedir=/var \
  574.10 -		$CONFIGURE_ARGS &&
  574.11 +	./configure $CONFIGURE_ARGS &&
  574.12  	make &&
  574.13  	make install
  574.14  }
   575.1 --- a/xorg-x11perf/receipt	Tue Mar 27 12:50:45 2018 +0200
   575.2 +++ b/xorg-x11perf/receipt	Fri Mar 30 19:31:50 2018 +0300
   575.3 @@ -16,11 +16,7 @@
   575.4  xorg-libXrender-dev xorg-libXft-dev"
   575.5  
   575.6  compile_rules() {
   575.7 -	fix ld
   575.8 -	./configure \
   575.9 -		--sysconfdir=/etc \
  575.10 -		--localstatedir=/var \
  575.11 -		$CONFIGURE_ARGS &&
  575.12 +	./configure $CONFIGURE_ARGS &&
  575.13  	fix libtool &&
  575.14  	make &&
  575.15  	make install
   576.1 --- a/xorg-xauth/receipt	Tue Mar 27 12:50:45 2018 +0200
   576.2 +++ b/xorg-xauth/receipt	Fri Mar 30 19:31:50 2018 +0300
   576.3 @@ -16,11 +16,7 @@
   576.4  BUILD_DEPENDS="xorg-libXmu-dev"
   576.5  
   576.6  compile_rules() {
   576.7 -	fix ld
   576.8 -	./configure \
   576.9 -		--sysconfdir=/etc \
  576.10 -		--localstatedir=/var \
  576.11 -		$CONFIGURE_ARGS &&
  576.12 +	./configure $CONFIGURE_ARGS &&
  576.13  	fix libtool &&
  576.14  	make &&
  576.15  	make install
   577.1 --- a/xorg-xbacklight/receipt	Tue Mar 27 12:50:45 2018 +0200
   577.2 +++ b/xorg-xbacklight/receipt	Fri Mar 30 19:31:50 2018 +0300
   577.3 @@ -16,11 +16,7 @@
   577.4  xorg-libXrandr-dev"
   577.5  
   577.6  compile_rules() {
   577.7 -	fix ld
   577.8 -	./configure \
   577.9 -		--sysconfdir=/etc \
  577.10 -		--localstatedir=/var \
  577.11 -		$CONFIGURE_ARGS &&
  577.12 +	./configure $CONFIGURE_ARGS &&
  577.13  	fix libtool &&
  577.14  	make &&
  577.15  	make install
   578.1 --- a/xorg-xbitmaps/receipt	Tue Mar 27 12:50:45 2018 +0200
   578.2 +++ b/xorg-xbitmaps/receipt	Fri Mar 30 19:31:50 2018 +0300
   578.3 @@ -15,10 +15,7 @@
   578.4  BUILD_DEPENDS="xorg-util-macros"
   578.5  
   578.6  compile_rules() {
   578.7 -	./configure \
   578.8 -		--sysconfdir=/etc \
   578.9 -		--localstatedir=/var \
  578.10 -		$CONFIGURE_ARGS &&
  578.11 +	./configure $CONFIGURE_ARGS &&
  578.12  	make &&
  578.13  	make install
  578.14  }
   579.1 --- a/xorg-xcalc/receipt	Tue Mar 27 12:50:45 2018 +0200
   579.2 +++ b/xorg-xcalc/receipt	Fri Mar 30 19:31:50 2018 +0300
   579.3 @@ -15,20 +15,13 @@
   579.4  xorg-xproto"
   579.5  PKG_RULE="std"
   579.6  
   579.7 -# Rules to configure and make the package.
   579.8 -compile_rules()
   579.9 -{
  579.10 -	./configure \
  579.11 -		--sysconfdir=/etc \
  579.12 -		--localstatedir=/var \
  579.13 -		$CONFIGURE_ARGS &&
  579.14 +compile_rules() {
  579.15 +	./configure $CONFIGURE_ARGS &&
  579.16  	make &&
  579.17  	make install
  579.18  }
  579.19  
  579.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  579.21 -genpkg_rules()
  579.22 -{
  579.23 +genpkg_rules() {
  579.24  	copy @std
  579.25  	DEPENDS="xorg-libX11 xorg-libXaw xorg-libXt"
  579.26  	CONFIG_FILES="/etc/X11/app-defaults/XCalc /etc/X11/app-defaults/XCalc-color"
   580.1 --- a/xorg-xcb-proto/receipt	Tue Mar 27 12:50:45 2018 +0200
   580.2 +++ b/xorg-xcb-proto/receipt	Fri Mar 30 19:31:50 2018 +0300
   580.3 @@ -12,14 +12,11 @@
   580.4  TARBALL="xcb-proto-$VERSION.tar.bz2"
   580.5  WGET_URL="$XORG_MIRROR/xcb/$TARBALL"
   580.6  
   580.7 +BUILD_DEPENDS_arm=" "
   580.8  BUILD_DEPENDS="patch python-dev libxml2-tools"
   580.9 -BUILD_DEPENDS_arm=" "
  580.10  
  580.11  compile_rules() {
  580.12 -	./configure \
  580.13 -		--sysconfdir=/etc \
  580.14 -		--localstatedir=/var \
  580.15 -		$CONFIGURE_ARGS &&
  580.16 +	./configure $CONFIGURE_ARGS &&
  580.17  	make &&
  580.18  	make install
  580.19  }
   581.1 --- a/xorg-xcb-util-cursor/receipt	Tue Mar 27 12:50:45 2018 +0200
   581.2 +++ b/xorg-xcb-util-cursor/receipt	Fri Mar 30 19:31:50 2018 +0300
   581.3 @@ -17,11 +17,7 @@
   581.4  SPLIT="xorg-xcb-util-cursor-dev"
   581.5  
   581.6  compile_rules() {
   581.7 -	fix ld
   581.8 -	./configure \
   581.9 -		--sysconfdir=/etc \
  581.10 -		--localstatedir=/var \
  581.11 -		$CONFIGURE_ARGS &&
  581.12 +	./configure $CONFIGURE_ARGS &&
  581.13  	fix libtool &&
  581.14  	make &&
  581.15  	make install
   582.1 --- a/xorg-xcb-util-image/receipt	Tue Mar 27 12:50:45 2018 +0200
   582.2 +++ b/xorg-xcb-util-image/receipt	Fri Mar 30 19:31:50 2018 +0300
   582.3 @@ -17,11 +17,7 @@
   582.4  SPLIT="xorg-xcb-util-image-dev"
   582.5  
   582.6  compile_rules() {
   582.7 -	fix ld
   582.8 -	./configure \
   582.9 -		--sysconfdir=/etc \
  582.10 -		--localstatedir=/var \
  582.11 -		$CONFIGURE_ARGS &&
  582.12 +	./configure $CONFIGURE_ARGS &&
  582.13  	fix libtool &&
  582.14  	make &&
  582.15  	make install
   583.1 --- a/xorg-xcb-util-keysyms/receipt	Tue Mar 27 12:50:45 2018 +0200
   583.2 +++ b/xorg-xcb-util-keysyms/receipt	Fri Mar 30 19:31:50 2018 +0300
   583.3 @@ -16,11 +16,7 @@
   583.4  SPLIT="xorg-xcb-util-keysyms-dev"
   583.5  
   583.6  compile_rules() {
   583.7 -	fix ld
   583.8 -	./configure \
   583.9 -		--sysconfdir=/etc \
  583.10 -		--localstatedir=/var \
  583.11 -		$CONFIGURE_ARGS &&
  583.12 +	./configure $CONFIGURE_ARGS &&
  583.13  	fix libtool &&
  583.14  	make &&
  583.15  	make install
   584.1 --- a/xorg-xcb-util-renderutil/receipt	Tue Mar 27 12:50:45 2018 +0200
   584.2 +++ b/xorg-xcb-util-renderutil/receipt	Fri Mar 30 19:31:50 2018 +0300
   584.3 @@ -16,11 +16,7 @@
   584.4  SPLIT="xorg-xcb-util-renderutil-dev"
   584.5  
   584.6  compile_rules() {
   584.7 -	fix ld
   584.8 -	./configure \
   584.9 -		--sysconfdir=/etc \
  584.10 -		--localstatedir=/var \
  584.11 -		$CONFIGURE_ARGS &&
  584.12 +	./configure $CONFIGURE_ARGS &&
  584.13  	fix libtool &&
  584.14  	make &&
  584.15  	make install
   585.1 --- a/xorg-xcb-util-wm/receipt	Tue Mar 27 12:50:45 2018 +0200
   585.2 +++ b/xorg-xcb-util-wm/receipt	Fri Mar 30 19:31:50 2018 +0300
   585.3 @@ -17,11 +17,7 @@
   585.4  SPLIT="xorg-xcb-util-wm-dev"
   585.5  
   585.6  compile_rules() {
   585.7 -	fix ld
   585.8 -	./configure \
   585.9 -		--sysconfdir=/etc \
  585.10 -		--localstatedir=/var \
  585.11 -		$CONFIGURE_ARGS &&
  585.12 +	./configure $CONFIGURE_ARGS &&
  585.13  	fix libtool &&
  585.14  	make &&
  585.15  	make install
   586.1 --- a/xorg-xcb-util/receipt	Tue Mar 27 12:50:45 2018 +0200
   586.2 +++ b/xorg-xcb-util/receipt	Fri Mar 30 19:31:50 2018 +0300
   586.3 @@ -12,15 +12,12 @@
   586.4  TARBALL="xcb-util-$VERSION.tar.bz2"
   586.5  WGET_URL="$XORG_MIRROR/xcb/$TARBALL"
   586.6  
   586.7 +BUILD_DEPENDS_arm="xorg-libxcb-dev xorg-libXdmcp-dev"
   586.8  BUILD_DEPENDS="xorg-libxcb-dev gperf"
   586.9 -BUILD_DEPENDS_arm="xorg-libxcb-dev xorg-libXdmcp-dev"
  586.10  SPLIT="xorg-xcb-util-dev"
  586.11  
  586.12  compile_rules() {
  586.13 -	./configure \
  586.14 -		--sysconfdir=/etc \
  586.15 -		--localstatedir=/var \
  586.16 -		$CONFIGURE_ARGS &&
  586.17 +	./configure $CONFIGURE_ARGS &&
  586.18  	make &&
  586.19  	make install
  586.20  }
   587.1 --- a/xorg-xclipboard/receipt	Tue Mar 27 12:50:45 2018 +0200
   587.2 +++ b/xorg-xclipboard/receipt	Fri Mar 30 19:31:50 2018 +0300
   587.3 @@ -15,20 +15,13 @@
   587.4  xorg-libX11-dev xorg-xproto"
   587.5  PKG_RULE="std"
   587.6  
   587.7 -# Rules to configure and make the package.
   587.8 -compile_rules()
   587.9 -{
  587.10 -	./configure \
  587.11 -		--sysconfdir=/etc \
  587.12 -		--localstatedir=/var \
  587.13 -		$CONFIGURE_ARGS &&
  587.14 +compile_rules() {
  587.15 +	./configure $CONFIGURE_ARGS &&
  587.16  	make &&
  587.17  	make install
  587.18  }
  587.19  
  587.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  587.21 -genpkg_rules()
  587.22 -{
  587.23 +genpkg_rules() {
  587.24  	copy @std
  587.25  	DEPENDS="xorg-libX11 xorg-libXaw xorg-libXmu xorg-libXt"
  587.26  	CONFIG_FILES="/etc/X11/app-defaults/XClipboard"
   588.1 --- a/xorg-xclock/receipt	Tue Mar 27 12:50:45 2018 +0200
   588.2 +++ b/xorg-xclock/receipt	Fri Mar 30 19:31:50 2018 +0300
   588.3 @@ -15,20 +15,13 @@
   588.4  xorg-libX11-dev xorg-libXrender-dev xorg-libXft-dev xorg-libxkbfile-dev"
   588.5  PKG_RULE="std"
   588.6  
   588.7 -# Rules to configure and make the package.
   588.8 -compile_rules()
   588.9 -{
  588.10 -	./configure \
  588.11 -		--sysconfdir=/etc \
  588.12 -		--localstatedir=/var \
  588.13 -		$CONFIGURE_ARGS &&
  588.14 +compile_rules() {
  588.15 +	./configure $CONFIGURE_ARGS &&
  588.16  	make &&
  588.17  	make install
  588.18  }
  588.19  
  588.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  588.21 -genpkg_rules()
  588.22 -{
  588.23 +genpkg_rules() {
  588.24  	copy @std
  588.25  	DEPENDS="xorg-libX11 xorg-libXaw xorg-libXft xorg-libXmu xorg-libXrender \
  588.26  	xorg-libXt xorg-libxkbfile"
   589.1 --- a/xorg-xcmiscproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   589.2 +++ b/xorg-xcmiscproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   589.3 @@ -15,10 +15,7 @@
   589.4  BUILD_DEPENDS="xorg-util-macros"
   589.5  
   589.6  compile_rules() {
   589.7 -	./configure \
   589.8 -		--sysconfdir=/etc \
   589.9 -		--localstatedir=/var \
  589.10 -		$CONFIGURE_ARGS &&
  589.11 +	./configure $CONFIGURE_ARGS &&
  589.12  	make &&
  589.13  	make install
  589.14  }
   590.1 --- a/xorg-xcmsdb/receipt	Tue Mar 27 12:50:45 2018 +0200
   590.2 +++ b/xorg-xcmsdb/receipt	Fri Mar 30 19:31:50 2018 +0300
   590.3 @@ -15,11 +15,7 @@
   590.4  BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev"
   590.5  
   590.6  compile_rules() {
   590.7 -	fix ld
   590.8 -	./configure \
   590.9 -		--sysconfdir=/etc \
  590.10 -		--localstatedir=/var \
  590.11 -		$CONFIGURE_ARGS &&
  590.12 +	./configure $CONFIGURE_ARGS &&
  590.13  	fix libtool &&
  590.14  	make &&
  590.15  	make install
   591.1 --- a/xorg-xcompmgr/receipt	Tue Mar 27 12:50:45 2018 +0200
   591.2 +++ b/xorg-xcompmgr/receipt	Fri Mar 30 19:31:50 2018 +0300
   591.3 @@ -18,23 +18,16 @@
   591.4  xorg-libXdamage-dev xorg-libXrender-dev xorg-libXext-dev"
   591.5  PKG_RULE="std"
   591.6  
   591.7 -# Rules to configure and make the package.
   591.8 -compile_rules()
   591.9 -{
  591.10 -	./configure \
  591.11 -		--sysconfdir=/etc \
  591.12 -		--localstatedir=/var \
  591.13 -		$CONFIGURE_ARGS &&
  591.14 +compile_rules() {
  591.15 +	./configure $CONFIGURE_ARGS &&
  591.16  	make &&
  591.17 -	make install &&
  591.18 +	make install || return 1
  591.19  
  591.20 -	mkdir -p $install/etc/xdg &&
  591.21 -	cp -r $stuff/autostart $install/etc/xdg
  591.22 +	install -Dm644 $stuff/autostart/xcompmgr.desktop \
  591.23 +		$install/etc/xdg/autostart/xcompmgr.desktop
  591.24  }
  591.25  
  591.26 -# Rules to gen a SliTaz package suitable for Tazpkg.
  591.27 -genpkg_rules()
  591.28 -{
  591.29 +genpkg_rules() {
  591.30  	copy @std
  591.31  	DEPENDS="xorg-libX11 xorg-libXcomposite xorg-libXdamage xorg-libXext \
  591.32  	xorg-libXfixes xorg-libXrender"
   592.1 --- a/xorg-xcursor-themes/receipt	Tue Mar 27 12:50:45 2018 +0200
   592.2 +++ b/xorg-xcursor-themes/receipt	Fri Mar 30 19:31:50 2018 +0300
   592.3 @@ -15,10 +15,7 @@
   592.4  BUILD_DEPENDS="xorg-util-macros xorg-xcursorgen xorg-libXcursor-dev"
   592.5  
   592.6  compile_rules() {
   592.7 -	./configure \
   592.8 -		--sysconfdir=/etc \
   592.9 -		--localstatedir=/var \
  592.10 -		$CONFIGURE_ARGS &&
  592.11 +	./configure $CONFIGURE_ARGS &&
  592.12  	make &&
  592.13  	make install
  592.14  }
   593.1 --- a/xorg-xcursorgen/receipt	Tue Mar 27 12:50:45 2018 +0200
   593.2 +++ b/xorg-xcursorgen/receipt	Fri Mar 30 19:31:50 2018 +0300
   593.3 @@ -16,11 +16,7 @@
   593.4  libpng16-dev"
   593.5  
   593.6  compile_rules() {
   593.7 -	fix ld
   593.8 -	./configure \
   593.9 -		--sysconfdir=/etc \
  593.10 -		--localstatedir=/var \
  593.11 -		$CONFIGURE_ARGS &&
  593.12 +	./configure $CONFIGURE_ARGS &&
  593.13  	fix libtool &&
  593.14  	make &&
  593.15  	make install
   594.1 --- a/xorg-xdpyinfo/receipt	Tue Mar 27 12:50:45 2018 +0200
   594.2 +++ b/xorg-xdpyinfo/receipt	Fri Mar 30 19:31:50 2018 +0300
   594.3 @@ -18,11 +18,7 @@
   594.4  xorg-libXinerama-dev xorg-libdmx-dev xorg-libXxf86misc-dev"
   594.5  
   594.6  compile_rules() {
   594.7 -	fix ld
   594.8 -	./configure \
   594.9 -		--sysconfdir=/etc \
  594.10 -		--localstatedir=/var \
  594.11 -		$CONFIGURE_ARGS &&
  594.12 +	./configure $CONFIGURE_ARGS &&
  594.13  	fix libtool &&
  594.14  	make &&
  594.15  	make install
   595.1 --- a/xorg-xdriinfo/receipt	Tue Mar 27 12:50:45 2018 +0200
   595.2 +++ b/xorg-xdriinfo/receipt	Fri Mar 30 19:31:50 2018 +0300
   595.3 @@ -15,11 +15,7 @@
   595.4  BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-glproto mesa-dev"
   595.5  
   595.6  compile_rules() {
   595.7 -	fix ld
   595.8 -	./configure \
   595.9 -		--sysconfdir=/etc \
  595.10 -		--localstatedir=/var \
  595.11 -		$CONFIGURE_ARGS &&
  595.12 +	./configure $CONFIGURE_ARGS &&
  595.13  	fix libtool &&
  595.14  	make &&
  595.15  	make install
   596.1 --- a/xorg-xedit/receipt	Tue Mar 27 12:50:45 2018 +0200
   596.2 +++ b/xorg-xedit/receipt	Fri Mar 30 19:31:50 2018 +0300
   596.3 @@ -15,20 +15,13 @@
   596.4  xorg-libX11-dev"
   596.5  PKG_RULE="std"
   596.6  
   596.7 -# Rules to configure and make the package.
   596.8 -compile_rules()
   596.9 -{
  596.10 -	./configure \
  596.11 -		--sysconfdir=/etc \
  596.12 -		--localstatedir=/var \
  596.13 -		$CONFIGURE_ARGS &&
  596.14 +compile_rules() {
  596.15 +	./configure $CONFIGURE_ARGS &&
  596.16  	make &&
  596.17  	make install
  596.18  }
  596.19  
  596.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  596.21 -genpkg_rules()
  596.22 -{
  596.23 +genpkg_rules() {
  596.24  	copy @std
  596.25  	DEPENDS="xorg-libX11 xorg-libXaw xorg-libXmu xorg-libXt"
  596.26  	CONFIG_FILES="/etc/X11/app-defaults/Xedit /etc/X11/app-defaults/Xedit-color"
   597.1 --- a/xorg-xev/receipt	Tue Mar 27 12:50:45 2018 +0200
   597.2 +++ b/xorg-xev/receipt	Fri Mar 30 19:31:50 2018 +0300
   597.3 @@ -15,11 +15,7 @@
   597.4  BUILD_DEPENDS="xorg-libX11-dev xorg-libXrandr-dev"
   597.5  
   597.6  compile_rules() {
   597.7 -	fix ld
   597.8 -	./configure \
   597.9 -		--sysconfdir=/etc \
  597.10 -		--localstatedir=/var \
  597.11 -		$CONFIGURE_ARGS &&
  597.12 +	./configure $CONFIGURE_ARGS &&
  597.13  	fix libtool &&
  597.14  	make &&
  597.15  	make install
   598.1 --- a/xorg-xextproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   598.2 +++ b/xorg-xextproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   598.3 @@ -15,10 +15,7 @@
   598.4  BUILD_DEPENDS="xorg-util-macros coreutils-file-special" # for mkdir
   598.5  
   598.6  compile_rules() {
   598.7 -	./configure \
   598.8 -		--sysconfdir=/etc \
   598.9 -		--localstatedir=/var \
  598.10 -		$CONFIGURE_ARGS &&
  598.11 +	./configure $CONFIGURE_ARGS &&
  598.12  	make &&
  598.13  	make install
  598.14  }
   599.1 --- a/xorg-xeyes/receipt	Tue Mar 27 12:50:45 2018 +0200
   599.2 +++ b/xorg-xeyes/receipt	Fri Mar 30 19:31:50 2018 +0300
   599.3 @@ -15,20 +15,13 @@
   599.4  xorg-libXext-dev xorg-libXmu-dev xorg-libXrender-dev"
   599.5  PKG_RULE="std"
   599.6  
   599.7 -# Rules to configure and make the package.
   599.8 -compile_rules()
   599.9 -{
  599.10 -	./configure \
  599.11 -		--sysconfdir=/etc \
  599.12 -		--localstatedir=/var \
  599.13 -		$CONFIGURE_ARGS &&
  599.14 +compile_rules() {
  599.15 +	./configure $CONFIGURE_ARGS &&
  599.16  	make &&
  599.17  	make install
  599.18  }
  599.19  
  599.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  599.21 -genpkg_rules()
  599.22 -{
  599.23 +genpkg_rules() {
  599.24  	copy @std
  599.25  	DEPENDS="xorg-libX11 xorg-libXext xorg-libXmu xorg-libXrender xorg-libXt"
  599.26  }
   600.1 --- a/xorg-xf86-input-acecad/receipt	Tue Mar 27 12:50:45 2018 +0200
   600.2 +++ b/xorg-xf86-input-acecad/receipt	Fri Mar 30 19:31:50 2018 +0300
   600.3 @@ -15,20 +15,13 @@
   600.4  SPLIT="xorg-xf86-input-acecad-dev"
   600.5  PKG_RULE="std-dev"
   600.6  
   600.7 -# Rules to configure and make the package.
   600.8 -compile_rules()
   600.9 -{
  600.10 -	./configure \
  600.11 -		--sysconfdir=/etc \
  600.12 -		--localstatedir=/var \
  600.13 -		$CONFIGURE_ARGS &&
  600.14 +compile_rules() {
  600.15 +	./configure $CONFIGURE_ARGS &&
  600.16  	make &&
  600.17  	make install
  600.18  }
  600.19  
  600.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  600.21 -genpkg_rules()
  600.22 -{
  600.23 +genpkg_rules() {
  600.24  	case $PACKAGE in
  600.25  		*-acecad)
  600.26  			copy @std
   601.1 --- a/xorg-xf86-input-elographics/receipt	Tue Mar 27 12:50:45 2018 +0200
   601.2 +++ b/xorg-xf86-input-elographics/receipt	Fri Mar 30 19:31:50 2018 +0300
   601.3 @@ -15,20 +15,13 @@
   601.4  SPLIT="xorg-xf86-input-elographics-dev"
   601.5  PKG_RULE="std-dev"
   601.6  
   601.7 -# Rules to configure and make the package.
   601.8 -compile_rules()
   601.9 -{
  601.10 -	./configure \
  601.11 -		--sysconfdir=/etc \
  601.12 -		--localstatedir=/var \
  601.13 -		$CONFIGURE_ARGS &&
  601.14 +compile_rules() {
  601.15 +	./configure $CONFIGURE_ARGS &&
  601.16  	make &&
  601.17  	make install
  601.18  }
  601.19  
  601.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  601.21 -genpkg_rules()
  601.22 -{
  601.23 +genpkg_rules() {
  601.24  	case $PACKAGE in
  601.25  		*-elographics)
  601.26  			copy @std
   602.1 --- a/xorg-xf86-input-evdev/receipt	Tue Mar 27 12:50:45 2018 +0200
   602.2 +++ b/xorg-xf86-input-evdev/receipt	Fri Mar 30 19:31:50 2018 +0300
   602.3 @@ -19,11 +19,7 @@
   602.4  SPLIT="xorg-xf86-input-evdev-dev"
   602.5  
   602.6  compile_rules() {
   602.7 -	fix ld
   602.8 -	./configure \
   602.9 -		--sysconfdir=/etc \
  602.10 -		--localstatedir=/var \
  602.11 -		$CONFIGURE_ARGS &&
  602.12 +	./configure $CONFIGURE_ARGS &&
  602.13  	fix libtool &&
  602.14  	make &&
  602.15  	make install
   603.1 --- a/xorg-xf86-input-fpit/receipt	Tue Mar 27 12:50:45 2018 +0200
   603.2 +++ b/xorg-xf86-input-fpit/receipt	Fri Mar 30 19:31:50 2018 +0300
   603.3 @@ -15,20 +15,13 @@
   603.4  SPLIT="xorg-xf86-input-fpit-dev"
   603.5  PKG_RULE="std-dev"
   603.6  
   603.7 -# Rules to configure and make the package.
   603.8 -compile_rules()
   603.9 -{
  603.10 -	./configure \
  603.11 -		--sysconfdir=/etc \
  603.12 -		--localstatedir=/var \
  603.13 -		$CONFIGURE_ARGS &&
  603.14 +compile_rules() {
  603.15 +	./configure $CONFIGURE_ARGS &&
  603.16  	make &&
  603.17  	make install
  603.18  }
  603.19  
  603.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  603.21 -genpkg_rules()
  603.22 -{
  603.23 +genpkg_rules() {
  603.24  	case $PACKAGE in
  603.25  		*-fpit)
  603.26  			copy @std
   604.1 --- a/xorg-xf86-input-hyperpen/receipt	Tue Mar 27 12:50:45 2018 +0200
   604.2 +++ b/xorg-xf86-input-hyperpen/receipt	Fri Mar 30 19:31:50 2018 +0300
   604.3 @@ -15,20 +15,13 @@
   604.4  SPLIT="xorg-xf86-input-hyperpen-dev"
   604.5  PKG_RULE="std-dev"
   604.6  
   604.7 -# Rules to configure and make the package.
   604.8 -compile_rules()
   604.9 -{
  604.10 -	./configure \
  604.11 -		--sysconfdir=/etc \
  604.12 -		--localstatedir=/var \
  604.13 -		$CONFIGURE_ARGS &&
  604.14 +compile_rules() {
  604.15 +	./configure $CONFIGURE_ARGS &&
  604.16  	make &&
  604.17  	make install
  604.18  }
  604.19  
  604.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  604.21 -genpkg_rules()
  604.22 -{
  604.23 +genpkg_rules() {
  604.24  	case $PACKAGE in
  604.25  		*-hyperpen)
  604.26  			copy @std
   605.1 --- a/xorg-xf86-input-joystick/receipt	Tue Mar 27 12:50:45 2018 +0200
   605.2 +++ b/xorg-xf86-input-joystick/receipt	Fri Mar 30 19:31:50 2018 +0300
   605.3 @@ -16,20 +16,13 @@
   605.4  SPLIT="xorg-xf86-input-joystick-dev"
   605.5  PKG_RULE="std-dev"
   605.6  
   605.7 -# Rules to configure and make the package.
   605.8 -compile_rules()
   605.9 -{
  605.10 -	./configure \
  605.11 -		--sysconfdir=/etc \
  605.12 -		--localstatedir=/var \
  605.13 -		$CONFIGURE_ARGS &&
  605.14 +compile_rules() {
  605.15 +	./configure $CONFIGURE_ARGS &&
  605.16  	make &&
  605.17  	make install
  605.18  }
  605.19  
  605.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  605.21 -genpkg_rules()
  605.22 -{
  605.23 +genpkg_rules() {
  605.24  	case $PACKAGE in
  605.25  		*-joystick)
  605.26  			copy @std
   606.1 --- a/xorg-xf86-input-keyboard/receipt	Tue Mar 27 12:50:45 2018 +0200
   606.2 +++ b/xorg-xf86-input-keyboard/receipt	Fri Mar 30 19:31:50 2018 +0300
   606.3 @@ -15,20 +15,13 @@
   606.4  SPLIT="xorg-xf86-input-keyboard-dev"
   606.5  PKG_RULE="std-dev"
   606.6  
   606.7 -# Rules to configure and make the package.
   606.8 -compile_rules()
   606.9 -{
  606.10 -	./configure \
  606.11 -		--sysconfdir=/etc \
  606.12 -		--localstatedir=/var \
  606.13 -		$CONFIGURE_ARGS &&
  606.14 +compile_rules() {
  606.15 +	./configure $CONFIGURE_ARGS &&
  606.16  	make &&
  606.17  	make install
  606.18  }
  606.19  
  606.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  606.21 -genpkg_rules()
  606.22 -{
  606.23 +genpkg_rules() {
  606.24  	case $PACKAGE in
  606.25  		*-keyboard)
  606.26  			copy @std
   607.1 --- a/xorg-xf86-input-libinput/receipt	Tue Mar 27 12:50:45 2018 +0200
   607.2 +++ b/xorg-xf86-input-libinput/receipt	Fri Mar 30 19:31:50 2018 +0300
   607.3 @@ -16,10 +16,7 @@
   607.4  PKG_RULE="std-dev"
   607.5  
   607.6  compile_rules() {
   607.7 -	./configure \
   607.8 -		--sysconfdir=/etc \
   607.9 -		--localstatedir=/var \
  607.10 -		$CONFIGURE_ARGS &&
  607.11 +	./configure $CONFIGURE_ARGS &&
  607.12  	make &&
  607.13  	make install
  607.14  }
   608.1 --- a/xorg-xf86-input-mouse/receipt	Tue Mar 27 12:50:45 2018 +0200
   608.2 +++ b/xorg-xf86-input-mouse/receipt	Fri Mar 30 19:31:50 2018 +0300
   608.3 @@ -15,20 +15,13 @@
   608.4  SPLIT="xorg-xf86-input-mouse-dev"
   608.5  PKG_RULE="std-dev"
   608.6  
   608.7 -# Rules to configure and make the package.
   608.8 -compile_rules()
   608.9 -{
  608.10 -	./configure \
  608.11 -		--sysconfdir=/etc \
  608.12 -		--localstatedir=/var \
  608.13 -		$CONFIGURE_ARGS &&
  608.14 +compile_rules() {
  608.15 +	./configure $CONFIGURE_ARGS &&
  608.16  	make &&
  608.17  	make install
  608.18  }
  608.19  
  608.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  608.21 -genpkg_rules()
  608.22 -{
  608.23 +genpkg_rules() {
  608.24  	case $PACKAGE in
  608.25  		*-mouse)
  608.26  			copy @std
   609.1 --- a/xorg-xf86-input-mutouch/receipt	Tue Mar 27 12:50:45 2018 +0200
   609.2 +++ b/xorg-xf86-input-mutouch/receipt	Fri Mar 30 19:31:50 2018 +0300
   609.3 @@ -15,20 +15,13 @@
   609.4  SPLIT="xorg-xf86-input-mutouch-dev"
   609.5  PKG_RULE="std-dev"
   609.6  
   609.7 -# Rules to configure and make the package.
   609.8 -compile_rules()
   609.9 -{
  609.10 -	./configure \
  609.11 -		--sysconfdir=/etc \
  609.12 -		--localstatedir=/var \
  609.13 -		$CONFIGURE_ARGS &&
  609.14 +compile_rules() {
  609.15 +	./configure $CONFIGURE_ARGS &&
  609.16  	make &&
  609.17  	make install
  609.18  }
  609.19  
  609.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  609.21 -genpkg_rules()
  609.22 -{
  609.23 +genpkg_rules() {
  609.24  	case $PACKAGE in
  609.25  		*-mutouch)
  609.26  			copy @std
   610.1 --- a/xorg-xf86-input-penmount/receipt	Tue Mar 27 12:50:45 2018 +0200
   610.2 +++ b/xorg-xf86-input-penmount/receipt	Fri Mar 30 19:31:50 2018 +0300
   610.3 @@ -15,20 +15,13 @@
   610.4  SPLIT="xorg-xf86-input-penmount-dev"
   610.5  PKG_RULE="std-dev"
   610.6  
   610.7 -# Rules to configure and make the package.
   610.8 -compile_rules()
   610.9 -{
  610.10 -	./configure \
  610.11 -		--sysconfdir=/etc \
  610.12 -		--localstatedir=/var \
  610.13 -		$CONFIGURE_ARGS &&
  610.14 +compile_rules() {
  610.15 +	./configure $CONFIGURE_ARGS &&
  610.16  	make &&
  610.17  	make install
  610.18  }
  610.19  
  610.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  610.21 -genpkg_rules()
  610.22 -{
  610.23 +genpkg_rules() {
  610.24  	case $PACKAGE in
  610.25  		*-penmount)
  610.26  			copy @std
   611.1 --- a/xorg-xf86-input-synaptics/receipt	Tue Mar 27 12:50:45 2018 +0200
   611.2 +++ b/xorg-xf86-input-synaptics/receipt	Fri Mar 30 19:31:50 2018 +0300
   611.3 @@ -17,11 +17,7 @@
   611.4  PKG_RULE="std-dev"
   611.5  
   611.6  compile_rules() {
   611.7 -	fix ld
   611.8 -	./configure \
   611.9 -		--sysconfdir=/etc \
  611.10 -		--localstatedir=/var \
  611.11 -		$CONFIGURE_ARGS &&
  611.12 +	./configure $CONFIGURE_ARGS &&
  611.13  	fix libtool &&
  611.14  	make &&
  611.15  	make install
   612.1 --- a/xorg-xf86-input-vmmouse/receipt	Tue Mar 27 12:50:45 2018 +0200
   612.2 +++ b/xorg-xf86-input-vmmouse/receipt	Fri Mar 30 19:31:50 2018 +0300
   612.3 @@ -15,20 +15,13 @@
   612.4  SPLIT="xorg-xf86-input-vmmouse-dev"
   612.5  PKG_RULE="std-dev"
   612.6  
   612.7 -# Rules to configure and make the package.
   612.8 -compile_rules()
   612.9 -{
  612.10 -	./configure \
  612.11 -		--sysconfdir=/etc \
  612.12 -		--localstatedir=/var \
  612.13 -		$CONFIGURE_ARGS &&
  612.14 +compile_rules() {
  612.15 +	./configure $CONFIGURE_ARGS &&
  612.16  	make &&
  612.17  	make install
  612.18  }
  612.19  
  612.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  612.21 -genpkg_rules()
  612.22 -{
  612.23 +genpkg_rules() {
  612.24  	case $PACKAGE in
  612.25  		*-vmmouse)
  612.26  			copy @std
   613.1 --- a/xorg-xf86-input-void/receipt	Tue Mar 27 12:50:45 2018 +0200
   613.2 +++ b/xorg-xf86-input-void/receipt	Fri Mar 30 19:31:50 2018 +0300
   613.3 @@ -15,20 +15,13 @@
   613.4  SPLIT="xorg-xf86-input-void-dev"
   613.5  PKG_RULE="std-dev"
   613.6  
   613.7 -# Rules to configure and make the package.
   613.8 -compile_rules()
   613.9 -{
  613.10 -	./configure \
  613.11 -		--sysconfdir=/etc \
  613.12 -		--localstatedir=/var \
  613.13 -		$CONFIGURE_ARGS &&
  613.14 +compile_rules() {
  613.15 +	./configure $CONFIGURE_ARGS &&
  613.16  	make &&
  613.17  	make install
  613.18  }
  613.19  
  613.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  613.21 -genpkg_rules()
  613.22 -{
  613.23 +genpkg_rules() {
  613.24  	case $PACKAGE in
  613.25  		*-void)
  613.26  			copy @std
   614.1 --- a/xorg-xf86-input-wacom/receipt	Tue Mar 27 12:50:45 2018 +0200
   614.2 +++ b/xorg-xf86-input-wacom/receipt	Fri Mar 30 19:31:50 2018 +0300
   614.3 @@ -17,21 +17,16 @@
   614.4  SPLIT="xorg-xf86-input-wacom-dev"
   614.5  PKG_RULE="std-dev"
   614.6  
   614.7 -# Rules to configure and make the package.
   614.8 -compile_rules()
   614.9 -{
  614.10 +compile_rules() {
  614.11  	./configure \
  614.12 -		--sysconfdir=/etc \
  614.13 -		--localstatedir=/var \
  614.14  		--with-systemd-unit-dir=no \
  614.15  		$CONFIGURE_ARGS &&
  614.16 +	fix libtool &&
  614.17  	make &&
  614.18  	make install
  614.19  }
  614.20  
  614.21 -# Rules to gen a SliTaz package suitable for Tazpkg.
  614.22 -genpkg_rules()
  614.23 -{
  614.24 +genpkg_rules() {
  614.25  	case $PACKAGE in
  614.26  		*-wacom)
  614.27  			copy @std
   615.1 --- a/xorg-xf86-video-amdgpu/receipt	Tue Mar 27 12:50:45 2018 +0200
   615.2 +++ b/xorg-xf86-video-amdgpu/receipt	Fri Mar 30 19:31:50 2018 +0300
   615.3 @@ -7,7 +7,6 @@
   615.4  MAINTAINER="al.bobylev@gmail.com"
   615.5  LICENSE="MIT"
   615.6  WEB_SITE="https://www.x.org/wiki/"
   615.7 -TAGS="xorg display"
   615.8  
   615.9  TARBALL="xf86-video-amdgpu-$VERSION.tar.bz2"
  615.10  WGET_URL="$XORG_MIRROR/driver/$TARBALL"
  615.11 @@ -17,10 +16,7 @@
  615.12  PKG_RULE="std-dev"
  615.13  
  615.14  compile_rules() {
  615.15 -	./configure \
  615.16 -		--sysconfdir=/etc \
  615.17 -		--localstatedir=/var \
  615.18 -		$CONFIGURE_ARGS &&
  615.19 +	./configure $CONFIGURE_ARGS &&
  615.20  	make &&
  615.21  	make install
  615.22  }
  615.23 @@ -37,4 +33,5 @@
  615.24  			mesa-dev"
  615.25  			;;
  615.26  	esac
  615.27 +	TAGS="xorg display"
  615.28  }
   616.1 --- a/xorg-xf86-video-ast/receipt	Tue Mar 27 12:50:45 2018 +0200
   616.2 +++ b/xorg-xf86-video-ast/receipt	Fri Mar 30 19:31:50 2018 +0300
   616.3 @@ -15,20 +15,13 @@
   616.4  SPLIT="xorg-xf86-video-ast-dev"
   616.5  PKG_RULE="std-dev"
   616.6  
   616.7 -# Rules to configure and make the package.
   616.8 -compile_rules()
   616.9 -{
  616.10 -	./configure \
  616.11 -		--sysconfdir=/etc \
  616.12 -		--localstatedir=/var \
  616.13 -		$CONFIGURE_ARGS &&
  616.14 +compile_rules() {
  616.15 +	./configure $CONFIGURE_ARGS &&
  616.16  	make &&
  616.17  	make install
  616.18  }
  616.19  
  616.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  616.21 -genpkg_rules()
  616.22 -{
  616.23 +genpkg_rules() {
  616.24  	case $PACKAGE in
  616.25  		*-ast)
  616.26  			copy @std
   617.1 --- a/xorg-xf86-video-ati/receipt	Tue Mar 27 12:50:45 2018 +0200
   617.2 +++ b/xorg-xf86-video-ati/receipt	Fri Mar 30 19:31:50 2018 +0300
   617.3 @@ -16,20 +16,13 @@
   617.4  SPLIT="xorg-xf86-video-ati-dev"
   617.5  PKG_RULE="std-dev"
   617.6  
   617.7 -# Rules to configure and make the package.
   617.8 -compile_rules()
   617.9 -{
  617.10 -	./configure \
  617.11 -		--sysconfdir=/etc \
  617.12 -		--localstatedir=/var \
  617.13 -		$CONFIGURE_ARGS &&
  617.14 +compile_rules() {
  617.15 +	./configure $CONFIGURE_ARGS &&
  617.16  	make &&
  617.17  	make install
  617.18  }
  617.19  
  617.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  617.21 -genpkg_rules()
  617.22 -{
  617.23 +genpkg_rules() {
  617.24  	case $PACKAGE in
  617.25  		*-ati)
  617.26  			copy @std
   618.1 --- a/xorg-xf86-video-chips/receipt	Tue Mar 27 12:50:45 2018 +0200
   618.2 +++ b/xorg-xf86-video-chips/receipt	Fri Mar 30 19:31:50 2018 +0300
   618.3 @@ -15,20 +15,13 @@
   618.4  SPLIT="xorg-xf86-video-chips-dev"
   618.5  PKG_RULE="std-dev"
   618.6  
   618.7 -# Rules to configure and make the package.
   618.8 -compile_rules()
   618.9 -{
  618.10 -	./configure \
  618.11 -		--sysconfdir=/etc \
  618.12 -		--localstatedir=/var \
  618.13 -		$CONFIGURE_ARGS &&
  618.14 +compile_rules() {
  618.15 +	./configure $CONFIGURE_ARGS &&
  618.16  	make &&
  618.17  	make install
  618.18  }
  618.19  
  618.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  618.21 -genpkg_rules()
  618.22 -{
  618.23 +genpkg_rules() {
  618.24  	case $PACKAGE in
  618.25  		*-chips)
  618.26  			copy @std
   619.1 --- a/xorg-xf86-video-cirrus/receipt	Tue Mar 27 12:50:45 2018 +0200
   619.2 +++ b/xorg-xf86-video-cirrus/receipt	Fri Mar 30 19:31:50 2018 +0300
   619.3 @@ -15,20 +15,13 @@
   619.4  SPLIT="xorg-xf86-video-cirrus-dev"
   619.5  PKG_RULE="std-dev"
   619.6  
   619.7 -# Rules to configure and make the package.
   619.8 -compile_rules()
   619.9 -{
  619.10 -	./configure \
  619.11 -		--sysconfdir=/etc \
  619.12 -		--localstatedir=/var \
  619.13 -		$CONFIGURE_ARGS &&
  619.14 +compile_rules() {
  619.15 +	./configure $CONFIGURE_ARGS &&
  619.16  	make &&
  619.17  	make install
  619.18  }
  619.19  
  619.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  619.21 -genpkg_rules()
  619.22 -{
  619.23 +genpkg_rules() {
  619.24  	case $PACKAGE in
  619.25  		*-cirrus)
  619.26  			copy @std
   620.1 --- a/xorg-xf86-video-fbdev/receipt	Tue Mar 27 12:50:45 2018 +0200
   620.2 +++ b/xorg-xf86-video-fbdev/receipt	Fri Mar 30 19:31:50 2018 +0300
   620.3 @@ -19,11 +19,7 @@
   620.4  PKG_RULE="std-dev"
   620.5  
   620.6  compile_rules() {
   620.7 -	fix ld
   620.8 -	./configure \
   620.9 -		--sysconfdir=/etc \
  620.10 -		--localstatedir=/var \
  620.11 -		$CONFIGURE_ARGS &&
  620.12 +	./configure $CONFIGURE_ARGS &&
  620.13  	fix libtool &&
  620.14  	make &&
  620.15  	make install
   621.1 --- a/xorg-xf86-video-fbturbo/receipt	Tue Mar 27 12:50:45 2018 +0200
   621.2 +++ b/xorg-xf86-video-fbturbo/receipt	Fri Mar 30 19:31:50 2018 +0300
   621.3 @@ -17,25 +17,18 @@
   621.4  # actually because I stripped down Xorg build since it mesa are not
   621.5  # ported yet.
   621.6  
   621.7 -BUILD_DEPENDS="xorg-server-dev"
   621.8 +BUILD_DEPENDS="xorg-server-dev automake"
   621.9  SPLIT="xorg-xf86-video-fbturbo-dev"
  621.10  PKG_RULE="std-dev"
  621.11  
  621.12 -# Rules to configure and make the package.
  621.13 -compile_rules()
  621.14 -{
  621.15 +compile_rules() {
  621.16  	autoreconf -vi
  621.17 -	./configure \
  621.18 -		--sysconfdir=/etc \
  621.19 -		--localstatedir=/var \
  621.20 -		$CONFIGURE_ARGS &&
  621.21 +	./configure $CONFIGURE_ARGS &&
  621.22  	make &&
  621.23  	make install
  621.24  }
  621.25  
  621.26 -# Rules to gen a SliTaz package suitable for Tazpkg.
  621.27 -genpkg_rules()
  621.28 -{
  621.29 +genpkg_rules() {
  621.30  	case $PACKAGE in
  621.31  		*-fbturbo)
  621.32  			copy @std
   622.1 --- a/xorg-xf86-video-geode/receipt	Tue Mar 27 12:50:45 2018 +0200
   622.2 +++ b/xorg-xf86-video-geode/receipt	Fri Mar 30 19:31:50 2018 +0300
   622.3 @@ -15,20 +15,13 @@
   622.4  SPLIT="xorg-xf86-video-geode-dev"
   622.5  PKG_RULE="std-dev"
   622.6  
   622.7 -# Rules to configure and make the package.
   622.8 -compile_rules()
   622.9 -{
  622.10 -	./configure \
  622.11 -		--sysconfdir=/etc \
  622.12 -		--localstatedir=/var \
  622.13 -		$CONFIGURE_ARGS &&
  622.14 +compile_rules() {
  622.15 +	./configure $CONFIGURE_ARGS &&
  622.16  	make &&
  622.17  	make install
  622.18  }
  622.19  
  622.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  622.21 -genpkg_rules()
  622.22 -{
  622.23 +genpkg_rules() {
  622.24  	case $PACKAGE in
  622.25  		*-geode)
  622.26  			copy @std
   623.1 --- a/xorg-xf86-video-glint/receipt	Tue Mar 27 12:50:45 2018 +0200
   623.2 +++ b/xorg-xf86-video-glint/receipt	Fri Mar 30 19:31:50 2018 +0300
   623.3 @@ -16,20 +16,13 @@
   623.4  SPLIT="xorg-xf86-video-glint-dev"
   623.5  PKG_RULE="std-dev"
   623.6  
   623.7 -# Rules to configure and make the package.
   623.8 -compile_rules()
   623.9 -{
  623.10 -	./configure \
  623.11 -		--sysconfdir=/etc \
  623.12 -		--localstatedir=/var \
  623.13 -		$CONFIGURE_ARGS &&
  623.14 +compile_rules() {
  623.15 +	./configure $CONFIGURE_ARGS &&
  623.16  	make &&
  623.17  	make install
  623.18  }
  623.19  
  623.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  623.21 -genpkg_rules()
  623.22 -{
  623.23 +genpkg_rules() {
  623.24  	case $PACKAGE in
  623.25  		*-glint)
  623.26  			copy @std
   624.1 --- a/xorg-xf86-video-i740/receipt	Tue Mar 27 12:50:45 2018 +0200
   624.2 +++ b/xorg-xf86-video-i740/receipt	Fri Mar 30 19:31:50 2018 +0300
   624.3 @@ -15,20 +15,13 @@
   624.4  SPLIT="xorg-xf86-video-i740-dev"
   624.5  PKG_RULE="std-dev"
   624.6  
   624.7 -# Rules to configure and make the package.
   624.8 -compile_rules()
   624.9 -{
  624.10 -	./configure \
  624.11 -		--sysconfdir=/etc \
  624.12 -		--localstatedir=/var \
  624.13 -		$CONFIGURE_ARGS &&
  624.14 +compile_rules() {
  624.15 +	./configure $CONFIGURE_ARGS &&
  624.16  	make &&
  624.17  	make install
  624.18  }
  624.19  
  624.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  624.21 -genpkg_rules()
  624.22 -{
  624.23 +genpkg_rules() {
  624.24  	case $PACKAGE in
  624.25  		*-i740)
  624.26  			copy @std
   625.1 --- a/xorg-xf86-video-intel/receipt	Tue Mar 27 12:50:45 2018 +0200
   625.2 +++ b/xorg-xf86-video-intel/receipt	Fri Mar 30 19:31:50 2018 +0300
   625.3 @@ -20,12 +20,8 @@
   625.4  SPLIT="xorg-xf86-video-intel-dev"
   625.5  PKG_RULE="std-dev"
   625.6  
   625.7 -# Rules to configure and make the package.
   625.8 -compile_rules()
   625.9 -{
  625.10 +compile_rules() {
  625.11  	./configure \
  625.12 -		--sysconfdir=/etc \
  625.13 -		--localstatedir=/var \
  625.14  		--enable-kms-only \
  625.15  		--enable-uxa \
  625.16  		$CONFIGURE_ARGS &&
  625.17 @@ -33,9 +29,7 @@
  625.18  	make install
  625.19  }
  625.20  
  625.21 -# Rules to gen a SliTaz package suitable for Tazpkg.
  625.22 -genpkg_rules()
  625.23 -{
  625.24 +genpkg_rules() {
  625.25  	case $PACKAGE in
  625.26  		*-intel)
  625.27  			copy @std
   626.1 --- a/xorg-xf86-video-mach64/receipt	Tue Mar 27 12:50:45 2018 +0200
   626.2 +++ b/xorg-xf86-video-mach64/receipt	Fri Mar 30 19:31:50 2018 +0300
   626.3 @@ -15,20 +15,13 @@
   626.4  SPLIT="xorg-xf86-video-mach64-dev"
   626.5  PKG_RULE="std-dev"
   626.6  
   626.7 -# Rules to configure and make the package.
   626.8 -compile_rules()
   626.9 -{
  626.10 -	./configure \
  626.11 -		--sysconfdir=/etc \
  626.12 -		--localstatedir=/var \
  626.13 -		$CONFIGURE_ARGS &&
  626.14 +compile_rules() {
  626.15 +	./configure $CONFIGURE_ARGS &&
  626.16  	make &&
  626.17  	make install
  626.18  }
  626.19  
  626.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  626.21 -genpkg_rules()
  626.22 -{
  626.23 +genpkg_rules() {
  626.24  	case $PACKAGE in
  626.25  		*-mach64)
  626.26  			copy @std
   627.1 --- a/xorg-xf86-video-neomagic/receipt	Tue Mar 27 12:50:45 2018 +0200
   627.2 +++ b/xorg-xf86-video-neomagic/receipt	Fri Mar 30 19:31:50 2018 +0300
   627.3 @@ -16,20 +16,13 @@
   627.4  SPLIT="xorg-xf86-video-neomagic-dev"
   627.5  PKG_RULE="std-dev"
   627.6  
   627.7 -# Rules to configure and make the package.
   627.8 -compile_rules()
   627.9 -{
  627.10 -	./configure \
  627.11 -		--sysconfdir=/etc \
  627.12 -		--localstatedir=/var \
  627.13 -		$CONFIGURE_ARGS &&
  627.14 +compile_rules() {
  627.15 +	./configure $CONFIGURE_ARGS &&
  627.16  	make &&
  627.17  	make install
  627.18  }
  627.19  
  627.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  627.21 -genpkg_rules()
  627.22 -{
  627.23 +genpkg_rules() {
  627.24  	case $PACKAGE in
  627.25  		*-neomagic)
  627.26  			copy @std
   628.1 --- a/xorg-xf86-video-nouveau/receipt	Tue Mar 27 12:50:45 2018 +0200
   628.2 +++ b/xorg-xf86-video-nouveau/receipt	Fri Mar 30 19:31:50 2018 +0300
   628.3 @@ -16,20 +16,13 @@
   628.4  SPLIT="xorg-xf86-video-nouveau-dev"
   628.5  PKG_RULE="std-dev"
   628.6  
   628.7 -# Rules to configure and make the package.
   628.8 -compile_rules()
   628.9 -{
  628.10 -	./configure \
  628.11 -		--sysconfdir=/etc \
  628.12 -		--localstatedir=/var \
  628.13 -		$CONFIGURE_ARGS &&
  628.14 +compile_rules() {
  628.15 +	./configure $CONFIGURE_ARGS &&
  628.16  	make &&
  628.17  	make install
  628.18  }
  628.19  
  628.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  628.21 -genpkg_rules()
  628.22 -{
  628.23 +genpkg_rules() {
  628.24  	case $PACKAGE in
  628.25  		*-nouveau)
  628.26  			copy @std
   629.1 --- a/xorg-xf86-video-nv/receipt	Tue Mar 27 12:50:45 2018 +0200
   629.2 +++ b/xorg-xf86-video-nv/receipt	Fri Mar 30 19:31:50 2018 +0300
   629.3 @@ -15,20 +15,13 @@
   629.4  SPLIT="xorg-xf86-video-nv-dev"
   629.5  PKG_RULE="std-dev"
   629.6  
   629.7 -# Rules to configure and make the package.
   629.8 -compile_rules()
   629.9 -{
  629.10 -	./configure \
  629.11 -		--sysconfdir=/etc \
  629.12 -		--localstatedir=/var \
  629.13 -		$CONFIGURE_ARGS &&
  629.14 +compile_rules() {
  629.15 +	./configure $CONFIGURE_ARGS &&
  629.16  	make &&
  629.17  	make install
  629.18  }
  629.19  
  629.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  629.21 -genpkg_rules()
  629.22 -{
  629.23 +genpkg_rules() {
  629.24  	case $PACKAGE in
  629.25  		*-nv)
  629.26  			copy @std
   630.1 --- a/xorg-xf86-video-omap/receipt	Tue Mar 27 12:50:45 2018 +0200
   630.2 +++ b/xorg-xf86-video-omap/receipt	Fri Mar 30 19:31:50 2018 +0300
   630.3 @@ -16,10 +16,7 @@
   630.4  PKG_RULE="std-dev"
   630.5  
   630.6  compile_rules() {
   630.7 -	./configure \
   630.8 -		--sysconfdir=/etc \
   630.9 -		--localstatedir=/var \
  630.10 -		$CONFIGURE_ARGS &&
  630.11 +	./configure $CONFIGURE_ARGS &&
  630.12  	make &&
  630.13  	make install
  630.14  }
   631.1 --- a/xorg-xf86-video-openchrome/receipt	Tue Mar 27 12:50:45 2018 +0200
   631.2 +++ b/xorg-xf86-video-openchrome/receipt	Fri Mar 30 19:31:50 2018 +0300
   631.3 @@ -16,20 +16,13 @@
   631.4  SPLIT="xorg-xf86-video-openchrome-dev"
   631.5  PKG_RULE="std-dev"
   631.6  
   631.7 -# Rules to configure and make the package.
   631.8 -compile_rules()
   631.9 -{
  631.10 -	./configure \
  631.11 -		--sysconfdir=/etc \
  631.12 -		--localstatedir=/var \
  631.13 -		$CONFIGURE_ARGS &&
  631.14 +compile_rules() {
  631.15 +	./configure $CONFIGURE_ARGS &&
  631.16  	make &&
  631.17  	make install
  631.18  }
  631.19  
  631.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  631.21 -genpkg_rules()
  631.22 -{
  631.23 +genpkg_rules() {
  631.24  	case $PACKAGE in
  631.25  		*-openchrome)
  631.26  			copy @std
   632.1 --- a/xorg-xf86-video-qxl/receipt	Tue Mar 27 12:50:45 2018 +0200
   632.2 +++ b/xorg-xf86-video-qxl/receipt	Fri Mar 30 19:31:50 2018 +0300
   632.3 @@ -16,20 +16,13 @@
   632.4  SPLIT="xorg-xf86-video-qxl-dev"
   632.5  PKG_RULE="std-dev"
   632.6  
   632.7 -# Rules to configure and make the package.
   632.8 -compile_rules()
   632.9 -{
  632.10 -	./configure \
  632.11 -		--sysconfdir=/etc \
  632.12 -		--localstatedir=/var \
  632.13 -		$CONFIGURE_ARGS &&
  632.14 +compile_rules() {
  632.15 +	./configure $CONFIGURE_ARGS &&
  632.16  	make &&
  632.17  	make install
  632.18  }
  632.19  
  632.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  632.21 -genpkg_rules()
  632.22 -{
  632.23 +genpkg_rules() {
  632.24  	case $PACKAGE in
  632.25  		*-qxl)
  632.26  			copy @std
   633.1 --- a/xorg-xf86-video-r128/receipt	Tue Mar 27 12:50:45 2018 +0200
   633.2 +++ b/xorg-xf86-video-r128/receipt	Fri Mar 30 19:31:50 2018 +0300
   633.3 @@ -15,20 +15,13 @@
   633.4  SPLIT="xorg-xf86-video-r128-dev"
   633.5  PKG_RULE="std-dev"
   633.6  
   633.7 -# Rules to configure and make the package.
   633.8 -compile_rules()
   633.9 -{
  633.10 -	./configure \
  633.11 -		--sysconfdir=/etc \
  633.12 -		--localstatedir=/var \
  633.13 -		$CONFIGURE_ARGS &&
  633.14 +compile_rules() {
  633.15 +	./configure $CONFIGURE_ARGS &&
  633.16  	make &&
  633.17  	make install
  633.18  }
  633.19  
  633.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  633.21 -genpkg_rules()
  633.22 -{
  633.23 +genpkg_rules() {
  633.24  	case $PACKAGE in
  633.25  		*-r128)
  633.26  			copy @std
   634.1 --- a/xorg-xf86-video-rendition/receipt	Tue Mar 27 12:50:45 2018 +0200
   634.2 +++ b/xorg-xf86-video-rendition/receipt	Fri Mar 30 19:31:50 2018 +0300
   634.3 @@ -15,20 +15,13 @@
   634.4  SPLIT="xorg-xf86-video-rendition-dev"
   634.5  PKG_RULE="std-dev"
   634.6  
   634.7 -# Rules to configure and make the package.
   634.8 -compile_rules()
   634.9 -{
  634.10 -	./configure \
  634.11 -		--sysconfdir=/etc \
  634.12 -		--localstatedir=/var \
  634.13 -		$CONFIGURE_ARGS &&
  634.14 +compile_rules() {
  634.15 +	./configure $CONFIGURE_ARGS &&
  634.16  	make &&
  634.17  	make install
  634.18  }
  634.19  
  634.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  634.21 -genpkg_rules()
  634.22 -{
  634.23 +genpkg_rules() {
  634.24  	case $PACKAGE in
  634.25  		*-rendition)
  634.26  			copy @std
   635.1 --- a/xorg-xf86-video-s3virge/receipt	Tue Mar 27 12:50:45 2018 +0200
   635.2 +++ b/xorg-xf86-video-s3virge/receipt	Fri Mar 30 19:31:50 2018 +0300
   635.3 @@ -15,20 +15,13 @@
   635.4  SPLIT="xorg-xf86-video-s3virge-dev"
   635.5  PKG_RULE="std-dev"
   635.6  
   635.7 -# Rules to configure and make the package.
   635.8 -compile_rules()
   635.9 -{
  635.10 -	./configure \
  635.11 -		--sysconfdir=/etc \
  635.12 -		--localstatedir=/var \
  635.13 -		$CONFIGURE_ARGS &&
  635.14 +compile_rules() {
  635.15 +	./configure $CONFIGURE_ARGS &&
  635.16  	make &&
  635.17  	make install
  635.18  }
  635.19  
  635.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  635.21 -genpkg_rules()
  635.22 -{
  635.23 +genpkg_rules() {
  635.24  	case $PACKAGE in
  635.25  		*-s3virge)
  635.26  			copy @std
   636.1 --- a/xorg-xf86-video-savage/receipt	Tue Mar 27 12:50:45 2018 +0200
   636.2 +++ b/xorg-xf86-video-savage/receipt	Fri Mar 30 19:31:50 2018 +0300
   636.3 @@ -15,20 +15,13 @@
   636.4  SPLIT="xorg-xf86-video-savage-dev"
   636.5  PKG_RULE="std-dev"
   636.6  
   636.7 -# Rules to configure and make the package.
   636.8 -compile_rules()
   636.9 -{
  636.10 -	./configure \
  636.11 -		--sysconfdir=/etc \
  636.12 -		--localstatedir=/var \
  636.13 -		$CONFIGURE_ARGS &&
  636.14 +compile_rules() {
  636.15 +	./configure $CONFIGURE_ARGS &&
  636.16  	make &&
  636.17  	make install
  636.18  }
  636.19  
  636.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  636.21 -genpkg_rules()
  636.22 -{
  636.23 +genpkg_rules() {
  636.24  	case $PACKAGE in
  636.25  		*-savage)
  636.26  			copy @std
   637.1 --- a/xorg-xf86-video-siliconmotion/receipt	Tue Mar 27 12:50:45 2018 +0200
   637.2 +++ b/xorg-xf86-video-siliconmotion/receipt	Fri Mar 30 19:31:50 2018 +0300
   637.3 @@ -15,20 +15,13 @@
   637.4  SPLIT="xorg-xf86-video-siliconmotion-dev"
   637.5  PKG_RULE="std-dev"
   637.6  
   637.7 -# Rules to configure and make the package.
   637.8 -compile_rules()
   637.9 -{
  637.10 -	./configure \
  637.11 -		--sysconfdir=/etc \
  637.12 -		--localstatedir=/var \
  637.13 -		$CONFIGURE_ARGS &&
  637.14 +compile_rules() {
  637.15 +	./configure $CONFIGURE_ARGS &&
  637.16  	make &&
  637.17  	make install
  637.18  }
  637.19  
  637.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  637.21 -genpkg_rules()
  637.22 -{
  637.23 +genpkg_rules() {
  637.24  	case $PACKAGE in
  637.25  		*-siliconmotion)
  637.26  			copy @std
   638.1 --- a/xorg-xf86-video-sis/receipt	Tue Mar 27 12:50:45 2018 +0200
   638.2 +++ b/xorg-xf86-video-sis/receipt	Fri Mar 30 19:31:50 2018 +0300
   638.3 @@ -16,20 +16,13 @@
   638.4  SPLIT="xorg-xf86-video-sis-dev"
   638.5  PKG_RULE="std-dev"
   638.6  
   638.7 -# Rules to configure and make the package.
   638.8 -compile_rules()
   638.9 -{
  638.10 -	./configure \
  638.11 -		--sysconfdir=/etc \
  638.12 -		--localstatedir=/var \
  638.13 -		$CONFIGURE_ARGS &&
  638.14 +compile_rules() {
  638.15 +	./configure $CONFIGURE_ARGS &&
  638.16  	make &&
  638.17  	make install
  638.18  }
  638.19  
  638.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  638.21 -genpkg_rules()
  638.22 -{
  638.23 +genpkg_rules() {
  638.24  	case $PACKAGE in
  638.25  		*-sis)
  638.26  			copy @std
   639.1 --- a/xorg-xf86-video-sisusb/receipt	Tue Mar 27 12:50:45 2018 +0200
   639.2 +++ b/xorg-xf86-video-sisusb/receipt	Fri Mar 30 19:31:50 2018 +0300
   639.3 @@ -16,20 +16,13 @@
   639.4  SPLIT="xorg-xf86-video-sisusb-dev"
   639.5  PKG_RULE="std-dev"
   639.6  
   639.7 -# Rules to configure and make the package.
   639.8 -compile_rules()
   639.9 -{
  639.10 -	./configure \
  639.11 -		--sysconfdir=/etc \
  639.12 -		--localstatedir=/var \
  639.13 -		$CONFIGURE_ARGS &&
  639.14 +compile_rules() {
  639.15 +	./configure $CONFIGURE_ARGS &&
  639.16  	make &&
  639.17  	make install
  639.18  }
  639.19  
  639.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  639.21 -genpkg_rules()
  639.22 -{
  639.23 +genpkg_rules() {
  639.24  	case $PACKAGE in
  639.25  		*-sisusb)
  639.26  			copy @std
   640.1 --- a/xorg-xf86-video-suncg14/receipt	Tue Mar 27 12:50:45 2018 +0200
   640.2 +++ b/xorg-xf86-video-suncg14/receipt	Fri Mar 30 19:31:50 2018 +0300
   640.3 @@ -15,20 +15,13 @@
   640.4  SPLIT="xorg-xf86-video-suncg14-dev"
   640.5  PKG_RULE="std-dev"
   640.6  
   640.7 -# Rules to configure and make the package.
   640.8 -compile_rules()
   640.9 -{
  640.10 -	./configure \
  640.11 -		--sysconfdir=/etc \
  640.12 -		--localstatedir=/var \
  640.13 -		$CONFIGURE_ARGS &&
  640.14 +compile_rules() {
  640.15 +	./configure $CONFIGURE_ARGS &&
  640.16  	make &&
  640.17  	make install
  640.18  }
  640.19  
  640.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  640.21 -genpkg_rules()
  640.22 -{
  640.23 +genpkg_rules() {
  640.24  	case $PACKAGE in
  640.25  		*-suncg14)
  640.26  			copy @std
   641.1 --- a/xorg-xf86-video-suncg3/receipt	Tue Mar 27 12:50:45 2018 +0200
   641.2 +++ b/xorg-xf86-video-suncg3/receipt	Fri Mar 30 19:31:50 2018 +0300
   641.3 @@ -15,20 +15,13 @@
   641.4  SPLIT="xorg-xf86-video-suncg3-dev"
   641.5  PKG_RULE="std-dev"
   641.6  
   641.7 -# Rules to configure and make the package.
   641.8 -compile_rules()
   641.9 -{
  641.10 -	./configure \
  641.11 -		--sysconfdir=/etc \
  641.12 -		--localstatedir=/var \
  641.13 -		$CONFIGURE_ARGS &&
  641.14 +compile_rules() {
  641.15 +	./configure $CONFIGURE_ARGS &&
  641.16  	make &&
  641.17  	make install
  641.18  }
  641.19  
  641.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  641.21 -genpkg_rules()
  641.22 -{
  641.23 +genpkg_rules() {
  641.24  	case $PACKAGE in
  641.25  		*-suncg3)
  641.26  			copy @std
   642.1 --- a/xorg-xf86-video-suncg6/receipt	Tue Mar 27 12:50:45 2018 +0200
   642.2 +++ b/xorg-xf86-video-suncg6/receipt	Fri Mar 30 19:31:50 2018 +0300
   642.3 @@ -16,20 +16,13 @@
   642.4  SPLIT="xorg-xf86-video-suncg6-dev"
   642.5  PKG_RULE="std-dev"
   642.6  
   642.7 -# Rules to configure and make the package.
   642.8 -compile_rules()
   642.9 -{
  642.10 -	./configure \
  642.11 -		--sysconfdir=/etc \
  642.12 -		--localstatedir=/var \
  642.13 -		$CONFIGURE_ARGS &&
  642.14 +compile_rules() {
  642.15 +	./configure $CONFIGURE_ARGS &&
  642.16  	make &&
  642.17  	make install
  642.18  }
  642.19  
  642.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  642.21 -genpkg_rules()
  642.22 -{
  642.23 +genpkg_rules() {
  642.24  	case $PACKAGE in
  642.25  		*-suncg6)
  642.26  			copy @std
   643.1 --- a/xorg-xf86-video-sunffb/receipt	Tue Mar 27 12:50:45 2018 +0200
   643.2 +++ b/xorg-xf86-video-sunffb/receipt	Fri Mar 30 19:31:50 2018 +0300
   643.3 @@ -15,20 +15,13 @@
   643.4  SPLIT="xorg-xf86-video-sunffb-dev"
   643.5  PKG_RULE="std-dev"
   643.6  
   643.7 -# Rules to configure and make the package.
   643.8 -compile_rules()
   643.9 -{
  643.10 -	./configure \
  643.11 -		--sysconfdir=/etc \
  643.12 -		--localstatedir=/var \
  643.13 -		$CONFIGURE_ARGS &&
  643.14 +compile_rules() {
  643.15 +	./configure $CONFIGURE_ARGS &&
  643.16  	make &&
  643.17  	make install
  643.18  }
  643.19  
  643.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  643.21 -genpkg_rules()
  643.22 -{
  643.23 +genpkg_rules() {
  643.24  	case $PACKAGE in
  643.25  		*-sunffb)
  643.26  			copy @std
   644.1 --- a/xorg-xf86-video-sunleo/receipt	Tue Mar 27 12:50:45 2018 +0200
   644.2 +++ b/xorg-xf86-video-sunleo/receipt	Fri Mar 30 19:31:50 2018 +0300
   644.3 @@ -15,20 +15,13 @@
   644.4  SPLIT="xorg-xf86-video-sunleo-dev"
   644.5  PKG_RULE="std-dev"
   644.6  
   644.7 -# Rules to configure and make the package.
   644.8 -compile_rules()
   644.9 -{
  644.10 -	./configure \
  644.11 -		--sysconfdir=/etc \
  644.12 -		--localstatedir=/var \
  644.13 -		$CONFIGURE_ARGS &&
  644.14 +compile_rules() {
  644.15 +	./configure $CONFIGURE_ARGS &&
  644.16  	make &&
  644.17  	make install
  644.18  }
  644.19  
  644.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  644.21 -genpkg_rules()
  644.22 -{
  644.23 +genpkg_rules() {
  644.24  	case $PACKAGE in
  644.25  		*-sunleo)
  644.26  			copy @std
   645.1 --- a/xorg-xf86-video-suntcx/receipt	Tue Mar 27 12:50:45 2018 +0200
   645.2 +++ b/xorg-xf86-video-suntcx/receipt	Fri Mar 30 19:31:50 2018 +0300
   645.3 @@ -15,20 +15,13 @@
   645.4  SPLIT="xorg-xf86-video-suntcx-dev"
   645.5  PKG_RULE="std-dev"
   645.6  
   645.7 -# Rules to configure and make the package.
   645.8 -compile_rules()
   645.9 -{
  645.10 -	./configure \
  645.11 -		--sysconfdir=/etc \
  645.12 -		--localstatedir=/var \
  645.13 -		$CONFIGURE_ARGS &&
  645.14 +compile_rules() {
  645.15 +	./configure $CONFIGURE_ARGS &&
  645.16  	make &&
  645.17  	make install
  645.18  }
  645.19  
  645.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  645.21 -genpkg_rules()
  645.22 -{
  645.23 +genpkg_rules() {
  645.24  	case $PACKAGE in
  645.25  		*-suntcx)
  645.26  			copy @std
   646.1 --- a/xorg-xf86-video-tdfx/receipt	Tue Mar 27 12:50:45 2018 +0200
   646.2 +++ b/xorg-xf86-video-tdfx/receipt	Fri Mar 30 19:31:50 2018 +0300
   646.3 @@ -15,20 +15,13 @@
   646.4  SPLIT="xorg-xf86-video-tdfx-dev"
   646.5  PKG_RULE="std-dev"
   646.6  
   646.7 -# Rules to configure and make the package.
   646.8 -compile_rules()
   646.9 -{
  646.10 -	./configure \
  646.11 -		--sysconfdir=/etc \
  646.12 -		--localstatedir=/var \
  646.13 -		$CONFIGURE_ARGS &&
  646.14 +compile_rules() {
  646.15 +	./configure $CONFIGURE_ARGS &&
  646.16  	make &&
  646.17  	make install
  646.18  }
  646.19  
  646.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  646.21 -genpkg_rules()
  646.22 -{
  646.23 +genpkg_rules() {
  646.24  	case $PACKAGE in
  646.25  		*-tdfx)
  646.26  			copy @std
   647.1 --- a/xorg-xf86-video-trident/receipt	Tue Mar 27 12:50:45 2018 +0200
   647.2 +++ b/xorg-xf86-video-trident/receipt	Fri Mar 30 19:31:50 2018 +0300
   647.3 @@ -15,20 +15,13 @@
   647.4  SPLIT="xorg-xf86-video-trident-dev"
   647.5  PKG_RULE="std-dev"
   647.6  
   647.7 -# Rules to configure and make the package.
   647.8 -compile_rules()
   647.9 -{
  647.10 -	./configure \
  647.11 -		--sysconfdir=/etc \
  647.12 -		--localstatedir=/var \
  647.13 -		$CONFIGURE_ARGS &&
  647.14 +compile_rules() {
  647.15 +	./configure $CONFIGURE_ARGS &&
  647.16  	make &&
  647.17  	make install
  647.18  }
  647.19  
  647.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  647.21 -genpkg_rules()
  647.22 -{
  647.23 +genpkg_rules() {
  647.24  	case $PACKAGE in
  647.25  		*-trident)
  647.26  			copy @std
   648.1 --- a/xorg-xf86-video-vesa/receipt	Tue Mar 27 12:50:45 2018 +0200
   648.2 +++ b/xorg-xf86-video-vesa/receipt	Fri Mar 30 19:31:50 2018 +0300
   648.3 @@ -16,11 +16,7 @@
   648.4  PKG_RULE="std-dev"
   648.5  
   648.6  compile_rules() {
   648.7 -	fix ld
   648.8 -	./configure \
   648.9 -		--sysconfdir=/etc \
  648.10 -		--localstatedir=/var \
  648.11 -		$CONFIGURE_ARGS &&
  648.12 +	./configure $CONFIGURE_ARGS &&
  648.13  	fix libtool &&
  648.14  	make &&
  648.15  	make install
   649.1 --- a/xorg-xf86-video-vmware/receipt	Tue Mar 27 12:50:45 2018 +0200
   649.2 +++ b/xorg-xf86-video-vmware/receipt	Fri Mar 30 19:31:50 2018 +0300
   649.3 @@ -18,10 +18,7 @@
   649.4  PKG_RULE="std-dev"
   649.5  
   649.6  compile_rules() {
   649.7 -	./configure \
   649.8 -		--sysconfdir=/etc \
   649.9 -		--localstatedir=/var \
  649.10 -		$CONFIGURE_ARGS &&
  649.11 +	./configure $CONFIGURE_ARGS &&
  649.12  	make &&
  649.13  	make install
  649.14  }
   650.1 --- a/xorg-xf86bigfontproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   650.2 +++ b/xorg-xf86bigfontproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   650.3 @@ -15,10 +15,7 @@
   650.4  BUILD_DEPENDS="xorg-util-macros"
   650.5  
   650.6  compile_rules() {
   650.7 -	./configure \
   650.8 -		--sysconfdir=/etc \
   650.9 -		--localstatedir=/var \
  650.10 -		$CONFIGURE_ARGS &&
  650.11 +	./configure $CONFIGURE_ARGS &&
  650.12  	make &&
  650.13  	make install
  650.14  }
   651.1 --- a/xorg-xf86dgaproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   651.2 +++ b/xorg-xf86dgaproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   651.3 @@ -15,10 +15,7 @@
   651.4  BUILD_DEPENDS="xorg-util-macros"
   651.5  
   651.6  compile_rules() {
   651.7 -	./configure \
   651.8 -		--sysconfdir=/etc \
   651.9 -		--localstatedir=/var \
  651.10 -		$CONFIGURE_ARGS &&
  651.11 +	./configure $CONFIGURE_ARGS &&
  651.12  	make &&
  651.13  	make install
  651.14  }
   652.1 --- a/xorg-xf86driproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   652.2 +++ b/xorg-xf86driproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   652.3 @@ -15,10 +15,7 @@
   652.4  BUILD_DEPENDS="xorg-util-macros"
   652.5  
   652.6  compile_rules() {
   652.7 -	./configure \
   652.8 -		--sysconfdir=/etc \
   652.9 -		--localstatedir=/var \
  652.10 -		$CONFIGURE_ARGS &&
  652.11 +	./configure $CONFIGURE_ARGS &&
  652.12  	make &&
  652.13  	make install
  652.14  }
   653.1 --- a/xorg-xf86miscproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   653.2 +++ b/xorg-xf86miscproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   653.3 @@ -14,10 +14,7 @@
   653.4  BUILD_DEPENDS="xorg-util-macros"
   653.5  
   653.6  compile_rules() {
   653.7 -	./configure \
   653.8 -		--sysconfdir=/etc \
   653.9 -		--localstatedir=/var \
  653.10 -		$CONFIGURE_ARGS &&
  653.11 +	./configure $CONFIGURE_ARGS &&
  653.12  	make &&
  653.13  	make install
  653.14  }
   654.1 --- a/xorg-xf86rushproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   654.2 +++ b/xorg-xf86rushproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   654.3 @@ -14,19 +14,12 @@
   654.4  BUILD_DEPENDS="xorg-util-macros"
   654.5  PKG_RULE="dev"
   654.6  
   654.7 -# Rules to configure and make the package.
   654.8 -compile_rules()
   654.9 -{
  654.10 -	./configure \
  654.11 -		--sysconfdir=/etc \
  654.12 -		--localstatedir=/var \
  654.13 -		$CONFIGURE_ARGS &&
  654.14 +compile_rules() {
  654.15 +	./configure $CONFIGURE_ARGS &&
  654.16  	make &&
  654.17  	make install
  654.18  }
  654.19  
  654.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  654.21 -genpkg_rules()
  654.22 -{
  654.23 +genpkg_rules() {
  654.24  	copy @dev
  654.25  }
   655.1 --- a/xorg-xf86vidmodeproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   655.2 +++ b/xorg-xf86vidmodeproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   655.3 @@ -15,10 +15,7 @@
   655.4  BUILD_DEPENDS="xorg-util-macros"
   655.5  
   655.6  compile_rules() {
   655.7 -	./configure \
   655.8 -		--sysconfdir=/etc \
   655.9 -		--localstatedir=/var \
  655.10 -		$CONFIGURE_ARGS &&
  655.11 +	./configure $CONFIGURE_ARGS &&
  655.12  	make &&
  655.13  	make install
  655.14  }
   656.1 --- a/xorg-xfd/receipt	Tue Mar 27 12:50:45 2018 +0200
   656.2 +++ b/xorg-xfd/receipt	Fri Mar 30 19:31:50 2018 +0300
   656.3 @@ -15,20 +15,13 @@
   656.4  xorg-libXrender-dev xorg-libXmu-dev xorg-xproto gettext"
   656.5  PKG_RULE="std"
   656.6  
   656.7 -# Rules to configure and make the package.
   656.8 -compile_rules()
   656.9 -{
  656.10 -	./configure \
  656.11 -		--sysconfdir=/etc \
  656.12 -		--localstatedir=/var \
  656.13 -		$CONFIGURE_ARGS &&
  656.14 +compile_rules() {
  656.15 +	./configure $CONFIGURE_ARGS &&
  656.16  	make &&
  656.17  	make install
  656.18  }
  656.19  
  656.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  656.21 -genpkg_rules()
  656.22 -{
  656.23 +genpkg_rules() {
  656.24  	copy @std
  656.25  	DEPENDS="fontconfig freetype xorg-libX11 xorg-libXaw xorg-libXft \
  656.26  	xorg-libXmu xorg-libXrender xorg-libXt"
   657.1 --- a/xorg-xfontsel/receipt	Tue Mar 27 12:50:45 2018 +0200
   657.2 +++ b/xorg-xfontsel/receipt	Fri Mar 30 19:31:50 2018 +0300
   657.3 @@ -14,20 +14,13 @@
   657.4  BUILD_DEPENDS="xorg-libXaw-dev"
   657.5  PKG_RULE="std"
   657.6  
   657.7 -# Rules to configure and make the package.ls sr	
   657.8 -compile_rules()
   657.9 -{
  657.10 -	./configure \
  657.11 -		--sysconfdir=/etc \
  657.12 -		--localstatedir=/var \
  657.13 -		$CONFIGURE_ARGS &&
  657.14 +compile_rules() {
  657.15 +	./configure $CONFIGURE_ARGS &&
  657.16  	make &&
  657.17  	make install
  657.18  }
  657.19  
  657.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  657.21 -genpkg_rules()
  657.22 -{
  657.23 +genpkg_rules() {
  657.24  	copy @std
  657.25  	DEPENDS="xorg-libX11 xorg-libXaw xorg-libXmu xorg-libXt"
  657.26  	CONFIG_FILES="/etc/X11/app-defaults/XFontSel"
   658.1 --- a/xorg-xfs/receipt	Tue Mar 27 12:50:45 2018 +0200
   658.2 +++ b/xorg-xfs/receipt	Fri Mar 30 19:31:50 2018 +0300
   658.3 @@ -15,22 +15,15 @@
   658.4  xorg-libXfont-dev xorg-xtrans"
   658.5  PKG_RULE="std"
   658.6  
   658.7 -# Rules to configure and make the package.
   658.8 -compile_rules()
   658.9 -{
  658.10 +compile_rules() {
  658.11  	touch /root/missing /missing
  658.12  
  658.13 -	./configure \
  658.14 -		--sysconfdir=/etc \
  658.15 -		--localstatedir=/var \
  658.16 -		$CONFIGURE_ARGS &&
  658.17 +	./configure $CONFIGURE_ARGS &&
  658.18  	make &&
  658.19  	make install
  658.20  }
  658.21  
  658.22 -# Rules to gen a SliTaz package suitable for Tazpkg.
  658.23 -genpkg_rules()
  658.24 -{
  658.25 +genpkg_rules() {
  658.26  	copy @std
  658.27  	DEPENDS="xorg-libXfont"
  658.28  	CONFIG_FILES="/etc/X11/fs/config"
   659.1 --- a/xorg-xfsinfo/receipt	Tue Mar 27 12:50:45 2018 +0200
   659.2 +++ b/xorg-xfsinfo/receipt	Fri Mar 30 19:31:50 2018 +0300
   659.3 @@ -14,22 +14,15 @@
   659.4  BUILD_DEPENDS="xorg-util-macros xorg-xproto xorg-libFS-dev"
   659.5  PKG_RULE="std"
   659.6  
   659.7 -# Rules to configure and make the package.
   659.8 -compile_rules()
   659.9 -{
  659.10 +compile_rules() {
  659.11  	touch /root/missing
  659.12  
  659.13 -	./configure \
  659.14 -		--sysconfdir=/etc \
  659.15 -		--localstatedir=/var \
  659.16 -		$CONFIGURE_ARGS &&
  659.17 +	./configure $CONFIGURE_ARGS &&
  659.18  	make &&
  659.19  	make install
  659.20  }
  659.21  
  659.22 -# Rules to gen a SliTaz package suitable for Tazpkg.
  659.23 -genpkg_rules()
  659.24 -{
  659.25 +genpkg_rules() {
  659.26  	copy @std
  659.27  	DEPENDS="xorg-libFS"
  659.28  }
   660.1 --- a/xorg-xgamma/receipt	Tue Mar 27 12:50:45 2018 +0200
   660.2 +++ b/xorg-xgamma/receipt	Fri Mar 30 19:31:50 2018 +0300
   660.3 @@ -15,11 +15,7 @@
   660.4  BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXxf86vm-dev xorg-xproto"
   660.5  
   660.6  compile_rules() {
   660.7 -	fix ld
   660.8 -	./configure \
   660.9 -		--sysconfdir=/etc \
  660.10 -		--localstatedir=/var \
  660.11 -		$CONFIGURE_ARGS &&
  660.12 +	./configure $CONFIGURE_ARGS &&
  660.13  	fix libtool &&
  660.14  	make &&
  660.15  	make install
   661.1 --- a/xorg-xhost/receipt	Tue Mar 27 12:50:45 2018 +0200
   661.2 +++ b/xorg-xhost/receipt	Fri Mar 30 19:31:50 2018 +0300
   661.3 @@ -15,11 +15,7 @@
   661.4  BUILD_DEPENDS="xorg-util-macros xorg-xproto xorg-libX11-dev xorg-libXmu-dev"
   661.5  
   661.6  compile_rules() {
   661.7 -	fix ld
   661.8 -	./configure \
   661.9 -		--sysconfdir=/etc \
  661.10 -		--localstatedir=/var \
  661.11 -		$CONFIGURE_ARGS &&
  661.12 +	./configure $CONFIGURE_ARGS &&
  661.13  	fix libtool &&
  661.14  	make &&
  661.15  	make install
   662.1 --- a/xorg-xineramaproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   662.2 +++ b/xorg-xineramaproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   662.3 @@ -15,10 +15,7 @@
   662.4  BUILD_DEPENDS="xorg-util-macros"
   662.5  
   662.6  compile_rules() {
   662.7 -	./configure \
   662.8 -		--sysconfdir=/etc \
   662.9 -		--localstatedir=/var \
  662.10 -		$CONFIGURE_ARGS &&
  662.11 +	./configure $CONFIGURE_ARGS &&
  662.12  	make &&
  662.13  	make install
  662.14  }
   663.1 --- a/xorg-xinit/receipt	Tue Mar 27 12:50:45 2018 +0200
   663.2 +++ b/xorg-xinit/receipt	Fri Mar 30 19:31:50 2018 +0300
   663.3 @@ -14,15 +14,11 @@
   663.4  BUILD_DEPENDS="xorg-libXmu-dev"
   663.5  PKG_RULE="std"
   663.6  
   663.7 -# Rules to configure and make the package.
   663.8 -compile_rules()
   663.9 -{
  663.10 +compile_rules() {
  663.11  	sed -e '/$serverargs $vtarg/ s/serverargs/: #&/' \
  663.12  		-i startx.cpp
  663.13  
  663.14  	./configure \
  663.15 -		--sysconfdir=/etc \
  663.16 -		--localstatedir=/var \
  663.17  		--with-xinitdir=/etc/X11/xinit \
  663.18  		$CONFIGURE_ARGS &&
  663.19  	make &&
  663.20 @@ -31,10 +27,8 @@
  663.21  	cp $stuff/xserverrc $install/etc/X11/xinit/xserverrc
  663.22  }
  663.23  
  663.24 -# Rules to gen a SliTaz package suitable for Tazpkg.
  663.25 -genpkg_rules()
  663.26 -{
  663.27 +genpkg_rules() {
  663.28  	copy @std
  663.29 +	DEPENDS="xorg-libX11   openssl xorg-xauth"
  663.30  	TAGS="utility xorg"
  663.31 -	DEPENDS="xorg-libX11   openssl xorg-xauth"
  663.32  }
   664.1 --- a/xorg-xinput/receipt	Tue Mar 27 12:50:45 2018 +0200
   664.2 +++ b/xorg-xinput/receipt	Fri Mar 30 19:31:50 2018 +0300
   664.3 @@ -16,11 +16,7 @@
   664.4  xorg-libXi-dev xorg-inputproto xorg-libXrandr-dev xorg-libXinerama-dev"
   664.5  
   664.6  compile_rules() {
   664.7 -	fix ld
   664.8 -	./configure \
   664.9 -		--sysconfdir=/etc \
  664.10 -		--localstatedir=/var \
  664.11 -		$CONFIGURE_ARGS &&
  664.12 +	./configure $CONFIGURE_ARGS &&
  664.13  	fix libtool &&
  664.14  	make &&
  664.15  	make install
   665.1 --- a/xorg-xkbcomp/receipt	Tue Mar 27 12:50:45 2018 +0200
   665.2 +++ b/xorg-xkbcomp/receipt	Fri Mar 30 19:31:50 2018 +0300
   665.3 @@ -16,11 +16,7 @@
   665.4  SPLIT="xorg-xkbcomp-dev"
   665.5  
   665.6  compile_rules() {
   665.7 -	fix ld
   665.8 -	./configure \
   665.9 -		--sysconfdir=/etc \
  665.10 -		--localstatedir=/var \
  665.11 -		$CONFIGURE_ARGS &&
  665.12 +	./configure $CONFIGURE_ARGS &&
  665.13  	fix libtool &&
  665.14  	make &&
  665.15  	make install
   666.1 --- a/xorg-xkbevd/receipt	Tue Mar 27 12:50:45 2018 +0200
   666.2 +++ b/xorg-xkbevd/receipt	Fri Mar 30 19:31:50 2018 +0300
   666.3 @@ -15,11 +15,7 @@
   666.4  BUILD_DEPENDS="xorg-util-macros xorg-libxkbfile-dev xorg-libX11-dev"
   666.5  
   666.6  compile_rules() {
   666.7 -	fix ld
   666.8 -	./configure \
   666.9 -		--sysconfdir=/etc \
  666.10 -		--localstatedir=/var \
  666.11 -		$CONFIGURE_ARGS &&
  666.12 +	./configure $CONFIGURE_ARGS &&
  666.13  	fix libtool &&
  666.14  	make &&
  666.15  	make install
   667.1 --- a/xorg-xkbprint/receipt	Tue Mar 27 12:50:45 2018 +0200
   667.2 +++ b/xorg-xkbprint/receipt	Fri Mar 30 19:31:50 2018 +0300
   667.3 @@ -14,20 +14,13 @@
   667.4  BUILD_DEPENDS="xorg-util-macros xorg-libxkbfile-dev xorg-libX11-dev xorg-xproto"
   667.5  PKG_RULE="std"
   667.6  
   667.7 -# Rules to configure and make the package.
   667.8 -compile_rules()
   667.9 -{
  667.10 -	./configure \
  667.11 -		--sysconfdir=/etc \
  667.12 -		--localstatedir=/var \
  667.13 -		$CONFIGURE_ARGS &&
  667.14 +compile_rules() {
  667.15 +	./configure $CONFIGURE_ARGS &&
  667.16  	make &&
  667.17  	make install
  667.18  }
  667.19  
  667.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  667.21 -genpkg_rules()
  667.22 -{
  667.23 +genpkg_rules() {
  667.24  	copy @std
  667.25  	DEPENDS="xorg-libX11 xorg-libxkbfile"
  667.26  }
   668.1 --- a/xorg-xkbutils/receipt	Tue Mar 27 12:50:45 2018 +0200
   668.2 +++ b/xorg-xkbutils/receipt	Fri Mar 30 19:31:50 2018 +0300
   668.3 @@ -16,11 +16,7 @@
   668.4  xorg-libX11-dev xorg-inputproto"
   668.5  
   668.6  compile_rules() {
   668.7 -	fix ld
   668.8 -	./configure \
   668.9 -		--sysconfdir=/etc \
  668.10 -		--localstatedir=/var \
  668.11 -		$CONFIGURE_ARGS &&
  668.12 +	./configure $CONFIGURE_ARGS &&
  668.13  	fix libtool &&
  668.14  	make &&
  668.15  	make install
   669.1 --- a/xorg-xkeyboard-config/receipt	Tue Mar 27 12:50:45 2018 +0200
   669.2 +++ b/xorg-xkeyboard-config/receipt	Fri Mar 30 19:31:50 2018 +0300
   669.3 @@ -18,8 +18,6 @@
   669.4  
   669.5  compile_rules() {
   669.6  	./configure \
   669.7 -		--sysconfdir=/etc \
   669.8 -		--localstatedir=/var \
   669.9  		--with-xkb-base=/usr/share/X11/xkb \
  669.10  		--with-xkb-rules-symlink=xorg \
  669.11  		$CONFIGURE_ARGS &&
   670.1 --- a/xorg-xkill/receipt	Tue Mar 27 12:50:45 2018 +0200
   670.2 +++ b/xorg-xkill/receipt	Fri Mar 30 19:31:50 2018 +0300
   670.3 @@ -15,11 +15,7 @@
   670.4  BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXmu-dev xorg-xproto"
   670.5  
   670.6  compile_rules() {
   670.7 -	fix ld
   670.8 -	./configure \
   670.9 -		--sysconfdir=/etc \
  670.10 -		--localstatedir=/var \
  670.11 -		$CONFIGURE_ARGS &&
  670.12 +	./configure $CONFIGURE_ARGS &&
  670.13  	fix libtool &&
  670.14  	make &&
  670.15  	make install
   671.1 --- a/xorg-xload/receipt	Tue Mar 27 12:50:45 2018 +0200
   671.2 +++ b/xorg-xload/receipt	Fri Mar 30 19:31:50 2018 +0300
   671.3 @@ -14,22 +14,15 @@
   671.4  BUILD_DEPENDS="xorg-libXaw-dev gettext"
   671.5  PKG_RULE="std"
   671.6  
   671.7 -# Rules to configure and make the package.
   671.8 -compile_rules()
   671.9 -{
  671.10 +compile_rules() {
  671.11  	touch /root/missing /missing
  671.12  
  671.13 -	./configure \
  671.14 -		--sysconfdir=/etc \
  671.15 -		--localstatedir=/var \
  671.16 -		$CONFIGURE_ARGS &&
  671.17 +	./configure $CONFIGURE_ARGS &&
  671.18  	make &&
  671.19  	make install
  671.20  }
  671.21  
  671.22 -# Rules to gen a SliTaz package suitable for Tazpkg.
  671.23 -genpkg_rules()
  671.24 -{
  671.25 +genpkg_rules() {
  671.26  	copy @std
  671.27  	DEPENDS="xorg-libX11 xorg-libXaw xorg-libXmu xorg-libXt"
  671.28  	CONFIG_FILES="/etc/X11/app-defaults/XLoad"
   672.1 --- a/xorg-xlsatoms/receipt	Tue Mar 27 12:50:45 2018 +0200
   672.2 +++ b/xorg-xlsatoms/receipt	Fri Mar 30 19:31:50 2018 +0300
   672.3 @@ -15,11 +15,7 @@
   672.4  BUILD_DEPENDS="xorg-util-macros xorg-libxcb-dev"
   672.5  
   672.6  compile_rules() {
   672.7 -	fix ld
   672.8 -	./configure \
   672.9 -		--sysconfdir=/etc \
  672.10 -		--localstatedir=/var \
  672.11 -		$CONFIGURE_ARGS &&
  672.12 +	./configure $CONFIGURE_ARGS &&
  672.13  	fix libtool &&
  672.14  	make &&
  672.15  	make install
   673.1 --- a/xorg-xlsclients/receipt	Tue Mar 27 12:50:45 2018 +0200
   673.2 +++ b/xorg-xlsclients/receipt	Fri Mar 30 19:31:50 2018 +0300
   673.3 @@ -17,11 +17,7 @@
   673.4  compile_rules() {
   673.5  	touch /root/missing /missing
   673.6  
   673.7 -	fix ld
   673.8 -	./configure \
   673.9 -		--sysconfdir=/etc \
  673.10 -		--localstatedir=/var \
  673.11 -		$CONFIGURE_ARGS &&
  673.12 +	./configure $CONFIGURE_ARGS &&
  673.13  	fix libtool &&
  673.14  	make &&
  673.15  	make install
   674.1 --- a/xorg-xlsfonts/receipt	Tue Mar 27 12:50:45 2018 +0200
   674.2 +++ b/xorg-xlsfonts/receipt	Fri Mar 30 19:31:50 2018 +0300
   674.3 @@ -14,20 +14,13 @@
   674.4  BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xproto"
   674.5  PKG_RULE="std"
   674.6  
   674.7 -# Rules to configure and make the package.
   674.8 -compile_rules()
   674.9 -{
  674.10 -	./configure \
  674.11 -		--sysconfdir=/etc \
  674.12 -		--localstatedir=/var \
  674.13 -		$CONFIGURE_ARGS &&
  674.14 +compile_rules() {
  674.15 +	./configure $CONFIGURE_ARGS &&
  674.16  	make &&
  674.17  	make install
  674.18  }
  674.19  
  674.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  674.21 -genpkg_rules()
  674.22 -{
  674.23 +genpkg_rules() {
  674.24  	copy @std
  674.25  	DEPENDS="xorg-libX11"
  674.26  }
   675.1 --- a/xorg-xmag/receipt	Tue Mar 27 12:50:45 2018 +0200
   675.2 +++ b/xorg-xmag/receipt	Fri Mar 30 19:31:50 2018 +0300
   675.3 @@ -15,20 +15,13 @@
   675.4  xorg-libX11-dev"
   675.5  PKG_RULE="std"
   675.6  
   675.7 -# Rules to configure and make the package.
   675.8 -compile_rules()
   675.9 -{
  675.10 -	./configure \
  675.11 -		--sysconfdir=/etc \
  675.12 -		--localstatedir=/var \
  675.13 -		$CONFIGURE_ARGS &&
  675.14 +compile_rules() {
  675.15 +	./configure $CONFIGURE_ARGS &&
  675.16  	make &&
  675.17  	make install
  675.18  }
  675.19  
  675.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  675.21 -genpkg_rules()
  675.22 -{
  675.23 +genpkg_rules() {
  675.24  	copy @std
  675.25  	DEPENDS="xorg-libX11 xorg-libXaw xorg-libXmu xorg-libXt"
  675.26  	CONFIG_FILES="/etc/X11/app-defaults/Xmag"
   676.1 --- a/xorg-xmessage/receipt	Tue Mar 27 12:50:45 2018 +0200
   676.2 +++ b/xorg-xmessage/receipt	Fri Mar 30 19:31:50 2018 +0300
   676.3 @@ -15,11 +15,7 @@
   676.4  BUILD_DEPENDS="xorg-util-macros xorg-libXaw-dev"
   676.5  
   676.6  compile_rules() {
   676.7 -	fix ld
   676.8 -	./configure \
   676.9 -		--sysconfdir=/etc \
  676.10 -		--localstatedir=/var \
  676.11 -		$CONFIGURE_ARGS &&
  676.12 +	./configure $CONFIGURE_ARGS &&
  676.13  	fix libtool &&
  676.14  	make &&
  676.15  	make install
   677.1 --- a/xorg-xmodmap/receipt	Tue Mar 27 12:50:45 2018 +0200
   677.2 +++ b/xorg-xmodmap/receipt	Fri Mar 30 19:31:50 2018 +0300
   677.3 @@ -15,11 +15,7 @@
   677.4  BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xproto"
   677.5  
   677.6  compile_rules() {
   677.7 -	fix ld
   677.8 -	./configure \
   677.9 -		--sysconfdir=/etc \
  677.10 -		--localstatedir=/var \
  677.11 -		$CONFIGURE_ARGS &&
  677.12 +	./configure $CONFIGURE_ARGS &&
  677.13  	fix libtool &&
  677.14  	make &&
  677.15  	make install
   678.1 --- a/xorg-xpr/receipt	Tue Mar 27 12:50:45 2018 +0200
   678.2 +++ b/xorg-xpr/receipt	Fri Mar 30 19:31:50 2018 +0300
   678.3 @@ -15,11 +15,7 @@
   678.4  BUILD_DEPENDS="xorg-util-macros xorg-libXmu-dev xorg-libX11-dev xorg-xproto"
   678.5  
   678.6  compile_rules() {
   678.7 -	fix ld
   678.8 -	./configure \
   678.9 -		--sysconfdir=/etc \
  678.10 -		--localstatedir=/var \
  678.11 -		$CONFIGURE_ARGS &&
  678.12 +	./configure $CONFIGURE_ARGS &&
  678.13  	fix libtool &&
  678.14  	make &&
  678.15  	make install
   679.1 --- a/xorg-xprop/receipt	Tue Mar 27 12:50:45 2018 +0200
   679.2 +++ b/xorg-xprop/receipt	Fri Mar 30 19:31:50 2018 +0300
   679.3 @@ -15,11 +15,7 @@
   679.4  BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xproto"
   679.5  
   679.6  compile_rules() {
   679.7 -	fix ld
   679.8 -	./configure \
   679.9 -		--sysconfdir=/etc \
  679.10 -		--localstatedir=/var \
  679.11 -		$CONFIGURE_ARGS &&
  679.12 +	./configure $CONFIGURE_ARGS &&
  679.13  	fix libtool &&
  679.14  	make &&
  679.15  	make install
   680.1 --- a/xorg-xproto/receipt	Tue Mar 27 12:50:45 2018 +0200
   680.2 +++ b/xorg-xproto/receipt	Fri Mar 30 19:31:50 2018 +0300
   680.3 @@ -15,10 +15,7 @@
   680.4  BUILD_DEPENDS="xorg-util-macros"
   680.5  
   680.6  compile_rules() {
   680.7 -	./configure \
   680.8 -		--sysconfdir=/etc \
   680.9 -		--localstatedir=/var \
  680.10 -		$CONFIGURE_ARGS &&
  680.11 +	./configure $CONFIGURE_ARGS &&
  680.12  	make &&
  680.13  	make MKDIRPROG="mkdir -p" install
  680.14  }
   681.1 --- a/xorg-xrandr/receipt	Tue Mar 27 12:50:45 2018 +0200
   681.2 +++ b/xorg-xrandr/receipt	Fri Mar 30 19:31:50 2018 +0300
   681.3 @@ -16,11 +16,7 @@
   681.4  xorg-libX11-dev xorg-xproto"
   681.5  
   681.6  compile_rules() {
   681.7 -	fix ld
   681.8 -	./configure \
   681.9 -		--sysconfdir=/etc \
  681.10 -		--localstatedir=/var \
  681.11 -		$CONFIGURE_ARGS &&
  681.12 +	./configure $CONFIGURE_ARGS &&
  681.13  	fix libtool &&
  681.14  	make &&
  681.15  	make install
   682.1 --- a/xorg-xrdb/receipt	Tue Mar 27 12:50:45 2018 +0200
   682.2 +++ b/xorg-xrdb/receipt	Fri Mar 30 19:31:50 2018 +0300
   682.3 @@ -17,11 +17,7 @@
   682.4  compile_rules() {
   682.5  	touch /root/missing /missing
   682.6  
   682.7 -	fix ld
   682.8 -	./configure \
   682.9 -		--sysconfdir=/etc \
  682.10 -		--localstatedir=/var \
  682.11 -		$CONFIGURE_ARGS &&
  682.12 +	./configure $CONFIGURE_ARGS &&
  682.13  	fix libtool &&
  682.14  	make &&
  682.15  	make install
   683.1 --- a/xorg-xrefresh/receipt	Tue Mar 27 12:50:45 2018 +0200
   683.2 +++ b/xorg-xrefresh/receipt	Fri Mar 30 19:31:50 2018 +0300
   683.3 @@ -15,11 +15,7 @@
   683.4  BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xproto"
   683.5  
   683.6  compile_rules() {
   683.7 -	fix ld
   683.8 -	./configure \
   683.9 -		--sysconfdir=/etc \
  683.10 -		--localstatedir=/var \
  683.11 -		$CONFIGURE_ARGS &&
  683.12 +	./configure $CONFIGURE_ARGS &&
  683.13  	fix libtool &&
  683.14  	make &&
  683.15  	make install
   684.1 --- a/xorg-xset/receipt	Tue Mar 27 12:50:45 2018 +0200
   684.2 +++ b/xorg-xset/receipt	Fri Mar 30 19:31:50 2018 +0300
   684.3 @@ -18,11 +18,7 @@
   684.4  compile_rules() {
   684.5  	touch /root/missing /missing
   684.6  
   684.7 -	fix ld
   684.8 -	./configure \
   684.9 -		--sysconfdir=/etc \
  684.10 -		--localstatedir=/var \
  684.11 -		$CONFIGURE_ARGS &&
  684.12 +	./configure $CONFIGURE_ARGS &&
  684.13  	fix libtool &&
  684.14  	make &&
  684.15  	make install || return 1
   685.1 --- a/xorg-xsetmode/receipt	Tue Mar 27 12:50:45 2018 +0200
   685.2 +++ b/xorg-xsetmode/receipt	Fri Mar 30 19:31:50 2018 +0300
   685.3 @@ -14,20 +14,13 @@
   685.4  BUILD_DEPENDS="xorg-libXi-dev xorg-libX11-dev"
   685.5  PKG_RULE="std"
   685.6  
   685.7 -# Rules to configure and make the package.
   685.8 -compile_rules()
   685.9 -{
  685.10 -	./configure \
  685.11 -		--sysconfdir=/etc \
  685.12 -		--localstatedir=/var \
  685.13 -		$CONFIGURE_ARGS &&
  685.14 +compile_rules() {
  685.15 +	./configure $CONFIGURE_ARGS &&
  685.16  	make &&
  685.17  	make install
  685.18  }
  685.19  
  685.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  685.21 -genpkg_rules()
  685.22 -{
  685.23 +genpkg_rules() {
  685.24  	copy @std
  685.25  	DEPENDS="xorg-libX11 xorg-libXi"
  685.26  }
   686.1 --- a/xorg-xsetpointer/receipt	Tue Mar 27 12:50:45 2018 +0200
   686.2 +++ b/xorg-xsetpointer/receipt	Fri Mar 30 19:31:50 2018 +0300
   686.3 @@ -14,20 +14,13 @@
   686.4  BUILD_DEPENDS="xorg-libXi-dev xorg-libX11-dev xorg-inputproto"
   686.5  PKG_RULE="std"
   686.6  
   686.7 -# Rules to configure and make the package.
   686.8 -compile_rules()
   686.9 -{
  686.10 -	./configure \
  686.11 -		--sysconfdir=/etc \
  686.12 -		--localstatedir=/var \
  686.13 -		$CONFIGURE_ARGS &&
  686.14 +compile_rules() {
  686.15 +	./configure $CONFIGURE_ARGS &&
  686.16  	make &&
  686.17  	make install
  686.18  }
  686.19  
  686.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  686.21 -genpkg_rules()
  686.22 -{
  686.23 +genpkg_rules() {
  686.24  	copy @std
  686.25  	DEPENDS="xorg-libX11 xorg-libXi"
  686.26  }
   687.1 --- a/xorg-xsetroot/receipt	Tue Mar 27 12:50:45 2018 +0200
   687.2 +++ b/xorg-xsetroot/receipt	Fri Mar 30 19:31:50 2018 +0300
   687.3 @@ -16,11 +16,7 @@
   687.4  xorg-xbitmaps xorg-libXcursor-dev xorg-xproto"
   687.5  
   687.6  compile_rules() {
   687.7 -	fix ld
   687.8 -	./configure \
   687.9 -		--sysconfdir=/etc \
  687.10 -		--localstatedir=/var \
  687.11 -		$CONFIGURE_ARGS &&
  687.12 +	./configure $CONFIGURE_ARGS &&
  687.13  	fix libtool &&
  687.14  	make &&
  687.15  	make install
   688.1 --- a/xorg-xsm/receipt	Tue Mar 27 12:50:45 2018 +0200
   688.2 +++ b/xorg-xsm/receipt	Fri Mar 30 19:31:50 2018 +0300
   688.3 @@ -15,19 +15,12 @@
   688.4  xorg-libSM-dev xorg-libXaw-dev"
   688.5  PKG_RULE="std"
   688.6  
   688.7 -# Rules to configure and make the package.
   688.8 -compile_rules()
   688.9 -{
  688.10 -	./configure \
  688.11 -		--sysconfdir=/etc \
  688.12 -		--localstatedir=/var \
  688.13 -		$CONFIGURE_ARGS &&
  688.14 +compile_rules() {
  688.15 +	./configure $CONFIGURE_ARGS &&
  688.16  	make && make install
  688.17  }
  688.18  
  688.19 -# Rules to gen a SliTaz package suitable for Tazpkg.
  688.20 -genpkg_rules()
  688.21 -{
  688.22 +genpkg_rules() {
  688.23  	copy @std
  688.24  	DEPENDS="xorg-libICE xorg-libSM xorg-libX11 xorg-libXaw xorg-libXt"
  688.25  	CONFIG_FILES="/etc/X11/app-defaults/XSm /etc/X11/xsm/system.xsm"
   689.1 --- a/xorg-xtrans/receipt	Tue Mar 27 12:50:45 2018 +0200
   689.2 +++ b/xorg-xtrans/receipt	Fri Mar 30 19:31:50 2018 +0300
   689.3 @@ -15,10 +15,7 @@
   689.4  BUILD_DEPENDS="xorg-util-macros"
   689.5  
   689.6  compile_rules() {
   689.7 -	./configure \
   689.8 -		--sysconfdir=/etc \
   689.9 -		--localstatedir=/var \
  689.10 -		$CONFIGURE_ARGS &&
  689.11 +	./configure $CONFIGURE_ARGS &&
  689.12  	make &&
  689.13  	make install
  689.14  }
   690.1 --- a/xorg-xvidtune/receipt	Tue Mar 27 12:50:45 2018 +0200
   690.2 +++ b/xorg-xvidtune/receipt	Fri Mar 30 19:31:50 2018 +0300
   690.3 @@ -15,20 +15,13 @@
   690.4  xorg-libXaw-dev xorg-libXmu-dev xorg-libX11-dev"
   690.5  PKG_RULE="std"
   690.6  
   690.7 -# Rules to configure and make the package.
   690.8 -compile_rules()
   690.9 -{
  690.10 -	./configure \
  690.11 -		--sysconfdir=/etc \
  690.12 -		--localstatedir=/var \
  690.13 -		$CONFIGURE_ARGS &&
  690.14 +compile_rules() {
  690.15 +	./configure $CONFIGURE_ARGS &&
  690.16  	make &&
  690.17  	make install
  690.18  }
  690.19  
  690.20 -# Rules to gen a SliTaz package suitable for Tazpkg.
  690.21 -genpkg_rules()
  690.22 -{
  690.23 +genpkg_rules() {
  690.24  	copy @std
  690.25  	DEPENDS="xorg-libX11 xorg-libXaw xorg-libXmu xorg-libXt xorg-libXxf86vm"
  690.26  	CONFIG_FILES="/etc/X11/app-defaults/Xvidtune"
   691.1 --- a/xorg-xvinfo/receipt	Tue Mar 27 12:50:45 2018 +0200
   691.2 +++ b/xorg-xvinfo/receipt	Fri Mar 30 19:31:50 2018 +0300
   691.3 @@ -15,11 +15,7 @@
   691.4  BUILD_DEPENDS="xorg-util-macros xorg-libXv-dev xorg-libX11-dev xorg-xproto"
   691.5  
   691.6  compile_rules() {
   691.7 -	fix ld
   691.8 -	./configure \
   691.9 -		--sysconfdir=/etc \
  691.10 -		--localstatedir=/var \
  691.11 -		$CONFIGURE_ARGS &&
  691.12 +	./configure $CONFIGURE_ARGS &&
  691.13  	fix libtool &&
  691.14  	make &&
  691.15  	make install
   692.1 --- a/xorg-xwd/receipt	Tue Mar 27 12:50:45 2018 +0200
   692.2 +++ b/xorg-xwd/receipt	Fri Mar 30 19:31:50 2018 +0300
   692.3 @@ -15,11 +15,7 @@
   692.4  BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xproto xorg-libxkbfile-dev"
   692.5  
   692.6  compile_rules() {
   692.7 -	fix ld
   692.8 -	./configure \
   692.9 -		--sysconfdir=/etc \
  692.10 -		--localstatedir=/var \
  692.11 -		$CONFIGURE_ARGS &&
  692.12 +	./configure $CONFIGURE_ARGS &&
  692.13  	fix libtool &&
  692.14  	make &&
  692.15  	make install
   693.1 --- a/xorg-xwininfo/receipt	Tue Mar 27 12:50:45 2018 +0200
   693.2 +++ b/xorg-xwininfo/receipt	Fri Mar 30 19:31:50 2018 +0300
   693.3 @@ -15,11 +15,7 @@
   693.4  BUILD_DEPENDS="xorg-util-macros xorg-libxcb-dev xorg-libX11-dev"
   693.5  
   693.6  compile_rules() {
   693.7 -	fix ld
   693.8 -	./configure \
   693.9 -		--sysconfdir=/etc \
  693.10 -		--localstatedir=/var \
  693.11 -		$CONFIGURE_ARGS &&
  693.12 +	./configure $CONFIGURE_ARGS &&
  693.13  	fix libtool &&
  693.14  	make &&
  693.15  	make install
   694.1 --- a/xorg-xwud/receipt	Tue Mar 27 12:50:45 2018 +0200
   694.2 +++ b/xorg-xwud/receipt	Fri Mar 30 19:31:50 2018 +0300
   694.3 @@ -15,11 +15,7 @@
   694.4  BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xproto"
   694.5  
   694.6  compile_rules() {
   694.7 -	fix ld
   694.8 -	./configure \
   694.9 -		--sysconfdir=/etc \
  694.10 -		--localstatedir=/var \
  694.11 -		$CONFIGURE_ARGS &&
  694.12 +	./configure $CONFIGURE_ARGS &&
  694.13  	fix libtool &&
  694.14  	make &&
  694.15  	make install
   695.1 --- a/xrdp/receipt	Tue Mar 27 12:50:45 2018 +0200
   695.2 +++ b/xrdp/receipt	Fri Mar 30 19:31:50 2018 +0300
   695.3 @@ -1,41 +1,37 @@
   695.4 -# SliTaz package receipt.
   695.5 +# SliTaz package receipt v2.
   695.6  
   695.7  PACKAGE="xrdp"
   695.8  VERSION="0.6.1"
   695.9  CATEGORY="network"
  695.10 -SHORT_DESC="An open source remote desktop protocol(rdp) server."
  695.11 +SHORT_DESC="An open source remote desktop protocol(rdp) server"
  695.12  MAINTAINER="pascal.bellard@slitaz.org"
  695.13  LICENSE="GPL2"
  695.14 +WEB_SITE="http://www.xrdp.org/"
  695.15 +
  695.16  TARBALL="$PACKAGE-v$VERSION.tar.gz"
  695.17 -WEB_SITE="http://www.xrdp.org/"
  695.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
  695.19  
  695.20 -DEPENDS="openssl zlib xorg-libX11 xorg-libXfixes xorg-libxcb xorg-libXau \
  695.21 -xorg-libXdmcp pam tightvnc"
  695.22  BUILD_DEPENDS="autoconf automake libtool openssl-dev pam-dev xorg-dev"
  695.23  
  695.24 -# Rules to configure and make the package.
  695.25 -compile_rules()
  695.26 -{
  695.27 +compile_rules() {
  695.28  	./bootstrap &&
  695.29 -	./configure --prefix=/usr \
  695.30 -		--sysconfdir=/etc \
  695.31 -		--mandir=/usr/share/man \
  695.32 -		--localstatedir=/var \
  695.33 -		$CONFIGURE_ARGS &&
  695.34 +	./configure $CONFIGURE_ARGS &&
  695.35  	make &&
  695.36 -	make DESTDIR=$DESTDIR install
  695.37 +	make DESTDIR=$DESTDIR install || return 1
  695.38 +
  695.39 +	mkdir -p $install/etc/init.d/
  695.40 +	mv $install/etc/xrdp/xrdp.sh $install/etc/init.d/xrdp
  695.41 +	sed \
  695.42 +		-e 's|/usr/local|/usr|;s|xrdp\.sh|xrdp|' \
  695.43 +		-e 's|--noheading -C||' \
  695.44 +		-e 's,grep -q -i,grep /usr/sbin | &,' \
  695.45 +		-i $install/etc/init.d/xrdp
  695.46 +
  695.47 +	sed -i 's|gnome|lxde-session &|' $install/etc/xrdp/startwm.sh
  695.48  }
  695.49  
  695.50 -# Rules to gen a SliTaz package suitable for Tazpkg.
  695.51 -genpkg_rules()
  695.52 -{
  695.53 -	mkdir -p $fs/etc/init.d
  695.54 -	cp -a $install/* $fs/
  695.55 -	mv $fs/etc/xrdp/xrdp.sh $fs/etc/init.d/xrdp
  695.56 -	sed -i	-e 's|/usr/local|/usr|;s|xrdp\.sh|xrdp|' \
  695.57 -		-e 's|--noheading -C||' \
  695.58 -		-e 's,grep -q -i,grep /usr/sbin | &,' \
  695.59 -		$fs/etc/init.d/xrdp
  695.60 -	sed -i 's|gnome|lxde-session &|' $fs/etc/xrdp/startwm.sh
  695.61 +genpkg_rules() {
  695.62 +	copy @std
  695.63 +	DEPENDS="openssl zlib xorg-libX11 xorg-libXfixes xorg-libxcb xorg-libXau \
  695.64 +	xorg-libXdmcp pam tightvnc"
  695.65  }
   696.1 --- a/xterm/receipt	Tue Mar 27 12:50:45 2018 +0200
   696.2 +++ b/xterm/receipt	Fri Mar 30 19:31:50 2018 +0300
   696.3 @@ -19,10 +19,6 @@
   696.4  compile_rules() {
   696.5  	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
   696.6  	./configure \
   696.7 -		--prefix=/usr \
   696.8 -		--sysconfdir=/etc \
   696.9 -		--mandir=/usr/share/man \
  696.10 -		--localstatedir=/var \
  696.11  		--with-icon-symlink \
  696.12  		--disable-desktop \
  696.13  		--with-x \
  696.14 @@ -43,7 +39,7 @@
  696.15  		--disable-rectangles \
  696.16  		$CONFIGURE_ARGS &&
  696.17  	make &&
  696.18 -	make DESTDIR=$DESTDIR install
  696.19 +	make DESTDIR=$DESTDIR install || return 1
  696.20  
  696.21  	cat >> $install/usr/share/X11/app-defaults/XTerm <<EOT
  696.22  !
   697.1 --- a/yaws/receipt	Tue Mar 27 12:50:45 2018 +0200
   697.2 +++ b/yaws/receipt	Fri Mar 30 19:31:50 2018 +0300
   697.3 @@ -1,4 +1,4 @@
   697.4 -# SliTaz package receipt.
   697.5 +# SliTaz package receipt v2.
   697.6  
   697.7  PACKAGE="yaws"
   697.8  VERSION="1.91"
   697.9 @@ -6,35 +6,22 @@
  697.10  SHORT_DESC="http webserver written in erlang"
  697.11  MAINTAINER="allan316@gmail.com"
  697.12  LICENSE="BSD"
  697.13 +WEB_SITE="http://yaws.hyber.org"
  697.14 +
  697.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
  697.16 -WEB_SITE="http://yaws.hyber.org"
  697.17  WGET_URL="$WEB_SITE/download/$TARBALL"
  697.18 -TAGS="webserver"
  697.19  
  697.20 -DEPENDS="erlang pam"
  697.21  BUILD_DEPENDS="erlang pam-dev"
  697.22  
  697.23 -# Rules to configure and make the package.
  697.24 -compile_rules()
  697.25 -{
  697.26 +compile_rules() {
  697.27  	cd $src/yaws
  697.28 -	./configure \
  697.29 -		--prefix=/usr \
  697.30 -		--localstatedir=/var \
  697.31 -		--sysconfdir=/etc \
  697.32 -		--infodir=/usr/share/info \
  697.33 -		--mandir=/usr/share/man \
  697.34 -		$CONFIGURE_ARGS &&
  697.35 -	make && make DESTDIR=$DESTDIR install 2>&1 | grep -v yaws.pdf
  697.36 +	./configure $CONFIGURE_ARGS &&
  697.37 +	make &&
  697.38 +	make DESTDIR=$DESTDIR install
  697.39  }
  697.40  
  697.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
  697.42 -genpkg_rules()
  697.43 -{
  697.44 -	mkdir -p $fs/usr 
  697.45 -	cp -a $install/usr/bin $fs/usr
  697.46 -	cp -a $install/usr/lib $fs/usr
  697.47 -	cp -a $install/etc $fs
  697.48 -	cp -a $install/var $fs
  697.49 +genpkg_rules() {
  697.50 +	copy @std
  697.51 +	DEPENDS="erlang pam"
  697.52 +	TAGS="webserver"
  697.53  }
  697.54 -
   698.1 --- a/zenity-gtk2/receipt	Tue Mar 27 12:50:45 2018 +0200
   698.2 +++ b/zenity-gtk2/receipt	Fri Mar 30 19:31:50 2018 +0300
   698.3 @@ -11,7 +11,7 @@
   698.4  TARBALL="zenity-$VERSION.tar.bz2"
   698.5  WGET_URL="$GNOME_MIRROR/zenity/${VERSION%.*}/$TARBALL"
   698.6  
   698.7 -BUILD_DEPENDS="gnome-doc-utils-dev intltool gtk+-dev" # + libnotify-dev -> crash on build. FIXME
   698.8 +BUILD_DEPENDS="gnome-doc-utils intltool gtk+-dev" # + libnotify-dev -> crash on build. FIXME
   698.9  
  698.10  compile_rules() {
  698.11  	./configure \
   699.1 --- a/zoneminder/receipt	Tue Mar 27 12:50:45 2018 +0200
   699.2 +++ b/zoneminder/receipt	Fri Mar 30 19:31:50 2018 +0300
   699.3 @@ -1,48 +1,44 @@
   699.4 -# SliTaz package receipt.
   699.5 +# SliTaz package receipt v2.
   699.6  
   699.7  PACKAGE="zoneminder"
   699.8  VERSION="1.25.0"
   699.9 -SOURCE="ZoneMinder"
  699.10  CATEGORY="misc"
  699.11 -SHORT_DESC="Linux video camera security and surveillance solution."
  699.12 +SHORT_DESC="Linux video camera security and surveillance solution"
  699.13  MAINTAINER="pascal.bellard@slitaz.org"
  699.14  LICENSE="GPL2"
  699.15  WEB_SITE="http://www.zoneminder.com/"
  699.16 -TARBALL="$SOURCE-$VERSION.tar.gz"
  699.17 +
  699.18 +TARBALL="ZoneMinder-$VERSION.tar.gz"
  699.19  WGET_URL="http://www2.zoneminder.com/downloads/$TARBALL"
  699.20  
  699.21 -DEPENDS="mysql jpeg bzlib zlib ffmpeg x264 perl perl-dbi-dbd \
  699.22 -perl-dbd-mysql perl-time-hires perl-getopt-long perl-date-manip \
  699.23 -perl-libwww-perl perl-archive-zip"
  699.24  BUILD_DEPENDS="mysql-dev jpeg-dev ffmpeg-dev gnutls-dev libav-dev \
  699.25  linux-api-headers $DEPENDS"
  699.26  
  699.27 -# Rules to configure and make the package.
  699.28 -compile_rules()
  699.29 -{
  699.30 -	cd $src
  699.31 +compile_rules() {
  699.32  	sed -i 's/.*fcntl.h.*/#include <limits.h>\n&/' src/zm_event.cpp \
  699.33  		src/zm_local_camera.cpp
  699.34  	CXXFLAGS=-D__STDC_CONSTANT_MACROS \
  699.35 -	./configure --prefix=/usr --infodir=/usr/share/info \
  699.36 -		--mandir=/usr/share/man \
  699.37 -		--sysconfdir=/etc \
  699.38 +	./configure \
  699.39  		--with-libarch=lib \
  699.40 -		--with-mysql=/usr --with-ffmpeg=/usr \
  699.41 -		--with-webuser=www --with-webgroup=www \
  699.42 +		--with-mysql=/usr \
  699.43 +		--with-ffmpeg=/usr \
  699.44 +		--with-webuser=www \
  699.45 +		--with-webgroup=www \
  699.46  		--with-webdir=/usr/share/zoneminder/www \
  699.47  		--with-cgidir=/usr/share/zoneminder/cgi-bin \
  699.48  		--enable-mmap=no \
  699.49  		$CONFIGURE_ARGS &&
  699.50  	make &&
  699.51 -	make -j 1 DESTDIR=$DESTDIR install
  699.52 +	make -j 1 DESTDIR=$DESTDIR install || return 1
  699.53 +
  699.54 +	install -Dm644 $stuff/etc/logrotate.d/zoneminder $install/etc/logrotate.d/zoneminder
  699.55 +	install -Dm644 $stuff/etc/mysql.d/zoneminder     $install/etc/mysql.d/zoneminder
  699.56 +	install -Dm644 $src/db/zm_create.sql             $install/usr/share/zoneminder/zm_create.sql
  699.57  }
  699.58  
  699.59 -# Rules to gen a SliTaz package suitable for Tazpkg.
  699.60 -genpkg_rules()
  699.61 -{
  699.62 -	cp -a $install/* $stuff/* $fs
  699.63 -	cp $src/db/zm_create.sql $fs/usr/share/zoneminder
  699.64 -	chown -R root.root $fs/usr/share/zoneminder/zm_create.sql \
  699.65 -		$fs/usr/lib/perl* $fs/etc/*.d/zoneminder
  699.66 +genpkg_rules() {
  699.67 +	copy @std
  699.68 +	DEPENDS="mysql jpeg bzlib zlib ffmpeg x264 perl perl-dbi-dbd \
  699.69 +	perl-dbd-mysql perl-time-hires perl-getopt-long perl-date-manip \
  699.70 +	perl-libwww-perl perl-archive-zip"
  699.71  }