# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1497073071 -10800
# Node ID 0abbdf485a8db073eefc22362fd384ae80061c3c
# Parent  0ff6bd67793874323b7ac20654b30a165a537d0e
Typo: glibc, ncurses; up jsmin, kmod, svkbd.

diff -r 0ff6bd677938 -r 0abbdf485a8d glibc/receipt
--- a/glibc/receipt	Fri Jun 09 22:24:52 2017 +0300
+++ b/glibc/receipt	Sat Jun 10 08:37:51 2017 +0300
@@ -221,7 +221,7 @@
 			CAT="base-system|name-server caching daemon"
 			;;
 		glibc-dev)
-			cp @dev
+			copy @std @dev
 			remove_already_packed
 			DEPENDS="glibc-base"
 			;;
diff -r 0ff6bd677938 -r 0abbdf485a8d jsmin/receipt
--- a/jsmin/receipt	Fri Jun 09 22:24:52 2017 +0300
+++ b/jsmin/receipt	Sat Jun 10 08:37:51 2017 +0300
@@ -1,29 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="jsmin"
-COMMIT="1bf6ce5f74a9f8752ac7f5d115b8d7ccb31cfe1b"
-VERSION="${COMMIT:0:10}"
+VERSION="1bf6ce5"
 CATEGORY="development"
 SHORT_DESC="JavaScript minification filter"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://github.com/douglascrockford/JSMin"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$WEB_SITE/archive/$COMMIT.tar.gz"
 HOST_ARCH="i486 arm"
 
-DEPENDS=""
-BUILD_DEPENDS=""
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	make jsmin
+
+	mkdir -p $install/usr/bin
+	cp -a $src/jsmin $install/usr/bin
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a $src/jsmin $fs/usr/bin
+	copy jsmin
 }
diff -r 0ff6bd677938 -r 0abbdf485a8d kmod/receipt
--- a/kmod/receipt	Fri Jun 09 22:24:52 2017 +0300
+++ b/kmod/receipt	Sat Jun 10 08:37:51 2017 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="kmod"
 VERSION="23"
 CATEGORY="base-system"
-SHORT_DESC="Linux kernel modules tools."
+SHORT_DESC="Linux kernel modules tools"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.kernel.org/pub/linux/utils/kernel/kmod/"
@@ -12,14 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE$TARBALL"
 
-DEPENDS="zlib liblzma"
-BUILD_DEPENDS="zlib-dev liblzma-dev tar"
-PROVIDE="modules-init-tools depmod"
-
-# Handle cross compilation. ARM use build host: tar
-case "$ARCH" in
-	arm) BUILD_DEPENDS="wget zlib-dev liblzma-dev" ;;
-esac
+BUILD_DEPENDS="zlib-dev xz-dev tar"
+BUILD_DEPENDS_arm="zlib-dev xz-dev"
+SPLIT="kmod-dev"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -45,6 +40,15 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin sbin
-	cook_copy_files *.so*
+	case $PACKAGE in
+		kmod)
+			copy @std
+			PROVIDE="modules-init-tools depmod"
+			DEPENDS="zlib liblzma"
+			;;
+		*-dev)
+			copy @dev
+			DEPENDS="kmod xz-dev pkg-config"
+			;;
+	esac
 }
diff -r 0ff6bd677938 -r 0abbdf485a8d ncurses/receipt
--- a/ncurses/receipt	Fri Jun 09 22:24:52 2017 +0300
+++ b/ncurses/receipt	Sat Jun 10 08:37:51 2017 +0300
@@ -75,7 +75,7 @@
 			;;
 		ncurses-libpanel)
 			copy libpanelw.so*
-			CATEGORY="libs|panel stack extension"
+			CAT="libs|panel stack extension"
 			DEPENDS="ncurses"
 			;;
 		ncurses-extra)
diff -r 0ff6bd677938 -r 0abbdf485a8d svkbd-de/receipt
--- a/svkbd-de/receipt	Fri Jun 09 22:24:52 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="svkbd-de"
-GITHASH="a5b40479e354ce11a1b009492da65ea562070cba"
-VERSION="${GITHASH:0:7}"
-CATEGORY="x-window"
-SHORT_DESC="Simple virtual keyboard that suck less (DE Layout)."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="BSD"
-WEB_SITE="http://tools.suckless.org/svkbd"
-HOST_ARCH="i486 arm"
-
-WANTED="svkbd"
-DEPENDS="xorg-libX11 xorg-libXtst"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin/
-	cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin
-}
diff -r 0ff6bd677938 -r 0abbdf485a8d svkbd-de/stuff/svkbd-de.desktop
--- a/svkbd-de/stuff/svkbd-de.desktop	Fri Jun 09 22:24:52 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Svkbd Virtual Keyboard (DE)
-Icon=input-keyboard
-Exec=svkbd-de -d
-Categories=Utility;
diff -r 0ff6bd677938 -r 0abbdf485a8d svkbd-fr/receipt
--- a/svkbd-fr/receipt	Fri Jun 09 22:24:52 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="svkbd-fr"
-GITHASH="a5b40479e354ce11a1b009492da65ea562070cba"
-VERSION="${GITHASH:0:7}"
-CATEGORY="x-window"
-SHORT_DESC="Simple virtual keyboard that suck less (FR Layout)."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="BSD"
-WEB_SITE="http://tools.suckless.org/svkbd"
-HOST_ARCH="i486 arm"
-
-WANTED="svkbd"
-DEPENDS="xorg-libX11 xorg-libXtst"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin/
-	cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin
-}
diff -r 0ff6bd677938 -r 0abbdf485a8d svkbd-fr/stuff/svkbd-fr.desktop
--- a/svkbd-fr/stuff/svkbd-fr.desktop	Fri Jun 09 22:24:52 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Svkbd Virtual Keyboard (FR)
-Name[fr]=Clavier virtuel Svkbd (FR)
-Icon=input-keyboard
-Exec=svkbd-fr -d
-Categories=Utility;
diff -r 0ff6bd677938 -r 0abbdf485a8d svkbd-ru/receipt
--- a/svkbd-ru/receipt	Fri Jun 09 22:24:52 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="svkbd-ru"
-GITHASH="a5b40479e354ce11a1b009492da65ea562070cba"
-VERSION="${GITHASH:0:7}"
-CATEGORY="x-window"
-SHORT_DESC="Simple virtual keyboard that suck less (RU Layout)."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="BSD"
-WEB_SITE="http://tools.suckless.org/svkbd"
-HOST_ARCH="i486 arm"
-
-WANTED="svkbd"
-DEPENDS="xorg-libX11 xorg-libXtst"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin/
-	cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin
-}
diff -r 0ff6bd677938 -r 0abbdf485a8d svkbd-ru/stuff/svkbd-ru.desktop
--- a/svkbd-ru/stuff/svkbd-ru.desktop	Fri Jun 09 22:24:52 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Svkbd Virtual Keyboard (RU)
-Name[ru]=Виртуальная клавиатура Svkbd (RU)
-Icon=input-keyboard
-Exec=svkbd-ru -d
-Categories=Utility;
diff -r 0ff6bd677938 -r 0abbdf485a8d svkbd/receipt
--- a/svkbd/receipt	Fri Jun 09 22:24:52 2017 +0300
+++ b/svkbd/receipt	Sat Jun 10 08:37:51 2017 +0300
@@ -1,36 +1,42 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="svkbd"
-GITHASH="a5b40479e354ce11a1b009492da65ea562070cba"
+GITHASH="fc267005ced2251de9e05e62e8a2b42a2712236a"
 VERSION="${GITHASH:0:7}"
 CATEGORY="x-window"
-SHORT_DESC="Simple virtual keyboard that suck less (EN Layout)."
+SHORT_DESC="Simple virtual keyboard that suck less"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://tools.suckless.org/x/svkbd"
+HOST_ARCH="i486 arm"
+COOKOPTS="!menus"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://tools.suckless.org/svkbd"
 WGET_URL="http://git.suckless.org/svkbd/snapshot/svkbd-$GITHASH.tar.bz2"
-HOST_ARCH="i486 arm"
 
-DEPENDS="xorg-libX11 xorg-libXtst"
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXtst-dev"
+SPLIT="svkbd-de svkbd-fr svkbd-ru"
 
 # Rules to configure and make the package.
 compile_rules()
-{ 
-	cp -d ${stuff}/*.h .
-	for layout in de en ru fr
-	do
-		make svkbd-${layout} CC=${HOST_SYSTEM}-gcc || return 1
+{
+	cp -d $stuff/*.h .
+	for layout in de en ru fr; do
+		make svkbd-$layout CC=$HOST_SYSTEM-gcc || return 1
 	done
 	# We may need to sed config.def.h to set correct font for RU ???
 	#make svkbd-ru CC=${HOST_SYSTEM}-gcc
-	make install DESTDIR=${DESTDIR} PREFIX="/usr"
+	make install DESTDIR=$DESTDIR PREFIX="/usr"
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a ${install}/usr/bin/${PACKAGE}-en $fs/usr/bin
+	case $PACKAGE in
+		svkbd)    copy svkbd-en*;;
+		svkbd-de) copy svkbd-de*; CAT="x-window|DE Layout";;
+		svkbd-fr) copy svkbd-fr*; CAT="x-window|FR Layout";;
+		svkbd-ru) copy svkbd-ru*; CAT="x-window|RU Layout";;
+	esac
+	DEPENDS="xorg-libX11 xorg-libXtst"
 }
diff -r 0ff6bd677938 -r 0abbdf485a8d svkbd/stuff/applications/svkbd-de.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/svkbd/stuff/applications/svkbd-de.desktop	Sat Jun 10 08:37:51 2017 +0300
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Svkbd Virtual Keyboard (DE)
+Exec=svkbd-de -d
+Icon=input-keyboard
+Categories=Utility;
diff -r 0ff6bd677938 -r 0abbdf485a8d svkbd/stuff/applications/svkbd-en.desktop
--- a/svkbd/stuff/applications/svkbd-en.desktop	Fri Jun 09 22:24:52 2017 +0300
+++ b/svkbd/stuff/applications/svkbd-en.desktop	Sat Jun 10 08:37:51 2017 +0300
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
 Name=Svkbd Virtual Keyboard
+Exec=svkbd-en -d
 Icon=input-keyboard
-Exec=svkbd-en -d
 Categories=Utility;
diff -r 0ff6bd677938 -r 0abbdf485a8d svkbd/stuff/applications/svkbd-fr.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/svkbd/stuff/applications/svkbd-fr.desktop	Sat Jun 10 08:37:51 2017 +0300
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Svkbd Virtual Keyboard (FR)
+Name[fr]=Clavier virtuel Svkbd (FR)
+Exec=svkbd-fr -d
+Icon=input-keyboard
+Categories=Utility;
diff -r 0ff6bd677938 -r 0abbdf485a8d svkbd/stuff/applications/svkbd-ru.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/svkbd/stuff/applications/svkbd-ru.desktop	Sat Jun 10 08:37:51 2017 +0300
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Svkbd Virtual Keyboard (RU)
+Name[ru]=Виртуальная клавиатура Svkbd (RU)
+Exec=svkbd-ru -d
+Icon=input-keyboard
+Categories=Utility;