# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1545644163 -7200
# Node ID d635206a56495093e60cd3f8efd5c4236e65933b
# Parent  75632eca5b0759cb0bf37d0d3b248aa3b57f6cb7
Tiny edits

diff -r 75632eca5b07 -r d635206a5649 arping/receipt
--- a/arping/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/arping/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,6 +12,7 @@
 WGET_URL="http://www.habets.pp.se/synscan/files/$TARBALL"
 
 BUILD_DEPENDS="automake libpcap-dev libnet-dev libcap-dev"
+DEPENDS="libcap libnet libpcap"
 
 compile_rules() {
 	./bootstrap.sh &&
@@ -20,8 +21,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="libcap libnet libpcap"
-}
diff -r 75632eca5b07 -r d635206a5649 atk/receipt
--- a/atk/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/atk/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -15,6 +15,11 @@
 BUILD_DEPENDS="meson ninja glib-dev gobject-introspection-dev gettext-dev"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="glib"
+DEPENDS_dev="$PACKAGE glib-dev"
+
+TAGS_std="accessibility"
+
 compile_rules() {
 	mkdir build
 	cd    build
@@ -23,17 +28,3 @@
 	ninja &&
 	ninja install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		atk)
-			copy @std
-			DEPENDS="glib"
-			TAGS="accessibility"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="atk glib-dev"
-			;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 babl/receipt
--- a/babl/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/babl/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -20,10 +20,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		babl)  copy @std;;
-		*-dev) copy @dev;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 bastet/receipt
--- a/bastet/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/bastet/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -13,6 +13,9 @@
 WGET_URL="https://github.com/fph/bastet/archive/${COMMIT:-$VERSION}.tar.gz"
 
 BUILD_DEPENDS="ncurses-dev boost-dev boost-program-options"
+DEPENDS="boost-program-options ncurses"
+
+TAGS="tetris"
 
 compile_rules() {
 	cp $stuff/*.png $src
@@ -20,9 +23,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="boost-program-options ncurses"
-	TAGS="tetris"
-}
diff -r 75632eca5b07 -r d635206a5649 caja/receipt
--- a/caja/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/caja/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -15,6 +15,13 @@
 pango-dev gtk3-dev libnotify-dev libexif-dev exempi-dev libsm-dev"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="atk cairo exempi gdk-pixbuf glib gtk3 libexif libnotify libxml2 \
+mate-desktop pango libice libsm libx11   shared-mime-info"
+DEPENDS_dev="$PACKAGE glib-dev gtk3-dev"
+
+SUGGESTED_std="gvfs-smb"
+TAGS_std="MATE file-manager"
+
 compile_rules() {
 	./configure \
 		--disable-packagekit \
@@ -25,21 +32,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		caja)
-			copy @std
-			DEPENDS="atk cairo exempi gdk-pixbuf glib gtk3 libexif \
-			libnotify libxml2 mate-desktop pango libice libsm \
-			libx11   shared-mime-info"
-			SUGGESTED="gvfs-smb"
-			TAGS="MATE file-manager"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="caja glib-dev gtk3-dev"
-			TAGS="MATE"
-			;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 catpoint/receipt
--- a/catpoint/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/catpoint/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -13,6 +13,7 @@
 WGET_URL="http://git.r-36.net/catpoint/snapshot/$TARBALL"
 
 BUILD_DEPENDS="ncurses-dev"
+DEPENDS="ncurses"
 
 compile_rules() {
 	sed -i 's|/usr/local|/usr|' config.mk
@@ -22,8 +23,3 @@
 
 	cook_pick_docs README.md showoff
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="ncurses"
-}
diff -r 75632eca5b07 -r d635206a5649 cgal/receipt
--- a/cgal/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/cgal/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -14,6 +14,8 @@
 BUILD_DEPENDS="cmake boost-dev gmp-dev mpfr-dev boost-thread"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="boost-thread boost-system gcc-lib-base"
+
 compile_rules() {
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
@@ -21,15 +23,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		cgal)
-			copy @std
-			DEPENDS="boost-thread boost-system gcc-lib-base"
-			;;
-		*-dev)
-			copy @dev
-		;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 ckermit/receipt
--- a/ckermit/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/ckermit/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,6 +12,7 @@
 WGET_URL="ftp://kermit.columbia.edu/kermit/archives/$TARBALL"
 
 BUILD_DEPENDS="ncurses-dev"
+DEPENDS="ncurses"
 
 compile_rules() {
 	make linux "LNKFLAGS=-lncurses" || return 1
@@ -19,8 +20,3 @@
 	install -Dm755 $src/wart   $install/usr/bin/wart
 	install -Dm755 $src/wermit $install/usr/bin/wermit
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="ncurses"
-}
diff -r 75632eca5b07 -r d635206a5649 dd_rhelp/receipt
--- a/dd_rhelp/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/dd_rhelp/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -13,11 +13,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.kalysto.org/pkg/$TARBALL"
 
+DEPENDS="bash dd_rescue"
+
 compile_rules() {
 	install -Dm755 $src/dd_rhelp $install/usr/bin/dd_rhelp
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="bash dd_rescue"
-}
diff -r 75632eca5b07 -r d635206a5649 dirmngr/receipt
--- a/dirmngr/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/dirmngr/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -15,14 +15,10 @@
 
 BUILD_DEPENDS="pth-dev libgpg-error-dev libgcrypt-dev libassuan-dev \
 libksba-dev openldap-dev"
+DEPENDS="libassuan libgcrypt libksba libldap pth zlib"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="libassuan libgcrypt libksba libldap pth zlib"
-}
diff -r 75632eca5b07 -r d635206a5649 flam3/receipt
--- a/flam3/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/flam3/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -15,6 +15,9 @@
 BUILD_DEPENDS="expat-dev libjpeg-turbo-dev libpng-dev libxml2-dev"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="libjpeg-turbo libpng libxml2 zlib"
+DEPENDS_dev="$PACKAGE libjpeg-turbo-dev libpng-dev libxml2-dev"
+
 compile_rules() {
 	./configure \
 		--disable-static \
@@ -24,16 +27,3 @@
 	make $MAKEFLAGS &&
 	make DESTDIR=$install -j1 install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		flam3)
-			copy @std
-			DEPENDS="libjpeg-turbo libpng libxml2 zlib"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="flam3 libjpeg-turbo-dev libpng-dev libxml2-dev"
-			;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 four-in-a-row/receipt
--- a/four-in-a-row/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/four-in-a-row/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -13,6 +13,7 @@
 
 BUILD_DEPENDS="vala glib-dev gtk3-dev librsvg-dev libcanberra-dev gettext-dev \
 itstool"
+DEPENDS="cairo gdk-pixbuf glib gtk3 libcanberra libcanberra-gtk3"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,8 +22,3 @@
 
 	fix symlinks
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk3 libcanberra libcanberra-gtk3"
-}
diff -r 75632eca5b07 -r d635206a5649 fox14/receipt
--- a/fox14/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/fox14/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -17,6 +17,11 @@
 libxml2-dev"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="libpng12 jpeg libtiff libxft bzlib mesa glu"
+DEPENDS_dev="$PACKAGE libx11-dev"
+
+SUGGESTED_std="adie calculator pathfinder shutterbug"
+
 compile_rules() {
 	sed -i 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/fxpngio.cpp
 	sed -i 's/(gzFile\*)/(gzFile)/' src/FXGZStream.cpp
@@ -29,17 +34,3 @@
 	make $MAKEFLAGS &&
 	make DESTDIR=$install install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		fox14)
-			copy @std
-			DEPENDS="libpng12 jpeg libtiff libxft bzlib mesa glu"
-			SUGGESTED="adie calculator pathfinder shutterbug"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="fox libx11-dev"
-			;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 frozen-bubble/receipt
--- a/frozen-bubble/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/frozen-bubble/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -15,6 +15,7 @@
 libsdl-gfx-dev libsdl-image-dev libsdl-net-dev freetype-dev libsdl-ttf-dev \
 libsdl-mixer-dev libsdl-pango-dev libsmpeg-dev pkg-config libsdl-perl mesa-dev \
 glibc-locale perl-dev"
+DEPENDS="perl-locale-gettext libsdl-mixer libsdl-pango libsdl-perl"
 
 compile_rules() {
 	make \
@@ -24,8 +25,3 @@
 		PREFIX=/usr &&
 	make DESTDIR=$install PREFIX=/usr install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="perl-locale-gettext libsdl-mixer libsdl-pango libsdl-perl"
-}
diff -r 75632eca5b07 -r d635206a5649 gadmin-antivirus/receipt
--- a/gadmin-antivirus/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/gadmin-antivirus/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,14 +12,10 @@
 WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev"
+DEPENDS="gtk2 clamav"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$install install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="gtk2 clamav"
-}
diff -r 75632eca5b07 -r d635206a5649 gadmin-httpd/receipt
--- a/gadmin-httpd/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/gadmin-httpd/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,14 +12,10 @@
 WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev"
+DEPENDS="gtk2 apache"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$install install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="gtk2 apache"
-}
diff -r 75632eca5b07 -r d635206a5649 gif2apng/receipt
--- a/gif2apng/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/gif2apng/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,6 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev"
+DEPENDS="zlib"
 
 compile_rules() {
 	make &&
@@ -19,8 +20,3 @@
 
 	cook_pick_docs readme.txt
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="zlib"
-}
diff -r 75632eca5b07 -r d635206a5649 gtklp/receipt
--- a/gtklp/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/gtklp/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,6 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="cups-dev gtk2-dev autoconf automake libtool gettext"
+DEPENDS="cups gtk2"
 
 compile_rules() {
 	sed -i 's/^gettextize .*/autopoint -f/' autogen.sh
@@ -25,8 +26,3 @@
 	make &&
 	make DESTDIR=$install install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="cups gtk2"
-}
diff -r 75632eca5b07 -r d635206a5649 hfsutils/receipt
--- a/hfsutils/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/hfsutils/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -21,7 +21,3 @@
 
 	cook_pick_docs doc/*.txt
 }
-
-genpkg_rules() {
-	copy @std
-}
diff -r 75632eca5b07 -r d635206a5649 isapnptools/receipt
--- a/isapnptools/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/isapnptools/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -22,10 +22,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		isapnptools) copy @std;;
-		*-dev)       copy @dev;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 iucode-tool/receipt
--- a/iucode-tool/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/iucode-tool/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -19,7 +19,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	copy @std
-}
diff -r 75632eca5b07 -r d635206a5649 jack/receipt
--- a/jack/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/jack/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -16,6 +16,15 @@
 db-dev libsndfile-dev libsamplerate-dev alsa-lib-dev readline-dev doxygen"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="alsa-lib flac libdb libogg libsamplerate libsndfile libvorbis \
+ncurses readline"
+DEPENDS_dev="$PACKAGE alsa-lib-dev db-dev libsamplerate-dev"
+
+PROVIDE_std="jack-audio-connection-kit"
+PROVIDE_dev="jack-audio-connection-kit-dev"
+
+TAGS_std="audio server"
+
 compile_rules() {
 	autoreconf -fi &&
 	sed -i 's|md5 -q|md5sum|' jackd/Makefile.in
@@ -36,20 +45,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		jack)
-			copy @std
-			DEPENDS="alsa-lib flac libdb libogg libsamplerate libsndfile \
-			libvorbis ncurses readline"
-			PROVIDE="jack-audio-connection-kit"
-			TAGS="audio server"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="jack alsa-lib-dev db-dev libsamplerate-dev"
-			PROVIDE="jack-audio-connection-kit-dev"
-			;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 jpegoptim/receipt
--- a/jpegoptim/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/jpegoptim/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,14 +12,10 @@
 WGET_URL="https://github.com/tjko/jpegoptim/archive/RELEASE.$VERSION.tar.gz"
 
 BUILD_DEPENDS="libjpeg-turbo-dev"
+DEPENDS="libjpeg-turbo"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="libjpeg-turbo"
-}
diff -r 75632eca5b07 -r d635206a5649 libgusb/receipt
--- a/libgusb/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/libgusb/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -16,6 +16,9 @@
 gtk-doc"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="glib libusb"
+DEPENDS_dev="$PACKAGE glib-dev libusb-dev"
+
 compile_rules() {
 	mkdir build
 	cd    build
@@ -24,16 +27,3 @@
 	ninja &&
 	ninja install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		libgusb)
-			copy @std
-			DEPENDS="glib libusb"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="libgusb glib-dev libusb-dev"
-			;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 libogg/receipt
--- a/libogg/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/libogg/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -20,10 +20,3 @@
 	make &&
 	make -j1 install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		libogg) copy @std;;
-		*-dev)  copy @dev;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 libsde-utils/receipt
--- a/libsde-utils/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/libsde-utils/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -15,6 +15,9 @@
 BUILD_DEPENDS="automake libtool glib-dev"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="glib"
+DEPENDS_dev="$PACKAGE glib-dev"
+
 compile_rules() {
 	./autogen.sh &&
 	./configure $CONFIGURE_ARGS &&
@@ -22,16 +25,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		libsde-utils)
-			copy @std
-			DEPENDS="glib"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="libsde-utils glib-dev"
-			;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 libsigsegv/receipt
--- a/libsigsegv/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/libsigsegv/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -23,10 +23,3 @@
 	make &&
 	make DESTDIR=$install install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		libsigsegv) copy @std;;
-		*-dev)      copy @dev;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 libunwind/receipt
--- a/libunwind/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/libunwind/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -14,22 +14,12 @@
 BUILD_DEPENDS="xz-dev"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="liblzma"
+DEPENDS_dev="$PACKAGE xz-dev"
+
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		libunwind)
-			copy @std
-			DEPENDS="liblzma"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="libunwind xz-dev"
-			;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 logfence/receipt
--- a/logfence/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/logfence/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,13 +12,9 @@
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="fuse2-dev"
+DEPENDS="fuse2"
 
 compile_rules() {
 	make &&
 	make DESTDIR=$install install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="fuse2"
-}
diff -r 75632eca5b07 -r d635206a5649 luufs/receipt
--- a/luufs/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/luufs/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,12 +12,8 @@
 WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="fuse2-dev zlib-dev"
+DEPENDS="fuse2 zlib"
 
 compile_rules() {
 	make install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="fuse2 zlib"
-}
diff -r 75632eca5b07 -r d635206a5649 micro_proxy/receipt
--- a/micro_proxy/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/micro_proxy/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -18,7 +18,3 @@
 	make &&
 	install -Dm755 $src/micro_proxy $install/usr/bin/micro_proxy
 }
-
-genpkg_rules() {
-	copy @std
-}
diff -r 75632eca5b07 -r d635206a5649 modsecurity-apache/receipt
--- a/modsecurity-apache/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/modsecurity-apache/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -13,6 +13,7 @@
 
 BUILD_DEPENDS="apache-dev apr-dev apr-util-dev pcre-dev libxml2-dev \
 util-linux-uuid-dev curl-dev"
+DEPENDS="apr apr-util libcurl libpcre libxml2 perl   apache"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -20,8 +21,3 @@
 	make &&
 	make DESTDIR=$install install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="apr apr-util libcurl libpcre libxml2 perl   apache"
-}
diff -r 75632eca5b07 -r d635206a5649 nms/receipt
--- a/nms/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/nms/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,13 +12,9 @@
 WGET_URL="git|git://github.com/bartobri/no-more-secrets"
 
 BUILD_DEPENDS="git bzip2 ncurses-dev"
+DEPENDS="ncurses"
 
 compile_rules() {
 	make &&
 	make prefix=/usr DESTDIR=$install install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="ncurses"
-}
diff -r 75632eca5b07 -r d635206a5649 notify-python/receipt
--- a/notify-python/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/notify-python/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -14,6 +14,10 @@
 BUILD_DEPENDS="gfortran python-dev libnotify-dev python-pygtk-dev"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="gdk-pixbuf glib libnotify python   python-pygtk"
+
+TAGS_std="python"
+
 compile_rules() {
 #	sed -i 's|, attach||; s| attach[^;]*||; /GtkWidget .attach/d' src/pynotify.c
 
@@ -30,16 +34,3 @@
 	make &&
 	make -j1 install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		notify-python)
-			copy @std
-			DEPENDS="gdk-pixbuf glib libnotify python   python-pygtk"
-			TAGS="python"
-			;;
-		*-dev)
-			copy @dev
-			;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 ntpclient/receipt
--- a/ntpclient/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/ntpclient/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -18,10 +18,6 @@
 	install -Dm755 $src/ntpclient $install/usr/bin/ntpclient
 }
 
-genpkg_rules() {
-	copy @std
-}
-
 post_install() {
 	[ -n "$1" -o -n "$quiet" ] && return
 	echo -en '\nDo you want to run ntpclient in automatic mode (y/N): '
diff -r 75632eca5b07 -r d635206a5649 openbox-themes-debian/receipt
--- a/openbox-themes-debian/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/openbox-themes-debian/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -11,6 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
+DEPENDS="openbox"
+
 compile_rules() {
 	mkdir -p $install/usr/share
 	cp -a debian/themes $install/usr/share
@@ -20,8 +22,3 @@
 	find $install -type f -exec chmod 644 '{}' \;
 	chown -R root:root $install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="openbox"
-}
diff -r 75632eca5b07 -r d635206a5649 othello/receipt
--- a/othello/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/othello/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -36,7 +36,3 @@
 
 	install -Dm644 $stuff/othello.desktop $install/usr/share/applications/othello.desktop
 }
-
-genpkg_rules() {
-	copy @std
-}
diff -r 75632eca5b07 -r d635206a5649 partclone/receipt
--- a/partclone/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/partclone/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -13,6 +13,9 @@
 
 BUILD_DEPENDS="automake libtool gettext util-linux-uuid-dev e2fsprogs-dev \
 ntfs-3g-dev util-linux-blkid-dev openssl-dev"
+DEPENDS="e2fsprogs ncurses ntfs-3g openssl util-linux-blkid util-linux-uuid"
+
+TAGS="backup"
 
 compile_rules() {
 	export RPM_ARCH=$ARCH
@@ -31,9 +34,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="e2fsprogs ncurses ntfs-3g openssl util-linux-blkid util-linux-uuid"
-	TAGS="backup"
-}
diff -r 75632eca5b07 -r d635206a5649 pciids/receipt
--- a/pciids/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/pciids/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -16,7 +16,3 @@
 	gzip -1 pci.ids
 	install -Dm644 pci.ids.gz $install/usr/share/hwdata/pci.ids.gz
 }
-
-genpkg_rules() {
-	copy @std
-}
diff -r 75632eca5b07 -r d635206a5649 pcmciautils/receipt
--- a/pcmciautils/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/pcmciautils/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -13,6 +13,7 @@
 WGET_URL="http://sourceware.mirrors.tds.net/pub/kernel.org/linux/utils/kernel/pcmcia/$TARBALL"
 
 BUILD_DEPENDS="sysfsutils-dev"
+DEPENDS="sysfsutils   eudev"
 
 compile_rules() {
 	sed -i 's|/lib/udev|/usr/lib/udev|g; s|/sbin|/usr/bin|g' Makefile
@@ -21,11 +22,6 @@
 	make DESTDIR=$install install
 }
 
-genpkg_rules() {
-	copy @std
-	DEPENDS="sysfsutils   eudev"
-}
-
 #post_install() {
 #	echo "root='$1:$root'"
 #	tazpkg reconfigure eudev --root="$1/" --quiet
diff -r 75632eca5b07 -r d635206a5649 pcsc-lite/receipt
--- a/pcsc-lite/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/pcsc-lite/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -14,6 +14,9 @@
 BUILD_DEPENDS="eudev-dev perl libtool"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="eudev"
+SUGGESTED_std="ccid"
+
 compile_rules() {
 	./configure \
 		--enable-libudev \
@@ -28,19 +31,6 @@
 	install -Dm644 $stuff/pcscd.conf $install/etc/daemons.conf.d/pcscd.conf
 }
 
-genpkg_rules() {
-	case $PACKAGE in
-		pcsc-lite)
-			copy @std
-			DEPENDS="eudev"
-			SUGGESTED="ccid"
-			;;
-		*-dev)
-			copy @dev
-			;;
-	esac
-}
-
 # Daemon options in: daemons.conf
 # TODO: use /etc/daemons.conf.d/
 post_install_pcsc_lite() {
diff -r 75632eca5b07 -r d635206a5649 raptor/receipt
--- a/raptor/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/raptor/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -14,6 +14,9 @@
 BUILD_DEPENDS="perl libxml2-dev libxslt-dev curl-dev yajl-dev"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="libcurl libxml2 libxslt yajl"
+DEPENDS_dev="$PACKAGE libxml2-dev libxslt-dev yajl-dev"
+
 compile_rules() {
 	./configure \
 		--disable-static \
@@ -22,16 +25,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		raptor)
-			copy @std
-			DEPENDS="libcurl libxml2 libxslt yajl"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="raptor libxml2-dev libxslt-dev yajl-dev"
-			;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 sakura/receipt
--- a/sakura/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/sakura/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,6 +12,9 @@
 WGET_URL="https://launchpad.net/sakura/trunk/$VERSION/+download/$TARBALL"
 
 BUILD_DEPENDS="cmake glib-dev gtk3-dev vte-dev gettext-dev"
+DEPENDS="glib gtk3 pango vte"
+
+TAGS="terminal"
 
 compile_rules() {
 	sed -i '/TryExec/d; s|Icon=.*|Icon=utilities-terminal|' sakura.desktop
@@ -25,9 +28,3 @@
 
 	rm -rf $install/usr/share/pixmaps
 }
-
-genpkg_rules() {
-	copy @std
-	TAGS="terminal"
-	DEPENDS="glib gtk3 pango vte"
-}
diff -r 75632eca5b07 -r d635206a5649 screentest/receipt
--- a/screentest/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/screentest/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,6 +12,9 @@
 WGET_URL="https://github.com/TobiX/screentest/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="gtk2-dev libglade-dev automake autoconf libtool"
+DEPENDS="gtk2 libglade"
+
+TAGS="test diagnostic screen"
 
 compile_rules() {
 	sed -i 's/prune , -name/prune -or -name/' autogen.sh
@@ -22,9 +25,3 @@
 	make &&
 	make DESTDIR=$install install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="gtk2 libglade"
-	TAGS="test diagnostic screen"
-}
diff -r 75632eca5b07 -r d635206a5649 slim-theme-mascot/receipt
--- a/slim-theme-mascot/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/slim-theme-mascot/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -10,6 +10,8 @@
 HOST_ARCH="any"
 
 BUILD_DEPENDS="rsvg-convert"
+DEPENDS="slim slitaz-configs-base"
+
 COOKOPTS="!pngquant"
 
 compile_rules() {
@@ -25,11 +27,6 @@
 	cp $stuff/slim.theme $theme
 }
 
-genpkg_rules() {
-	copy @std
-	DEPENDS="slim slitaz-configs-base"
-}
-
 post_install() {
 	chroot "$1/" slim-theme -smascot
 }
diff -r 75632eca5b07 -r d635206a5649 slitaz-icons-hydroxygen/receipt
--- a/slitaz-icons-hydroxygen/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/slitaz-icons-hydroxygen/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -17,7 +17,3 @@
 		-t $install/usr/share/icons/SliTaz-Hydroxygen \
 		-opmax
 }
-
-genpkg_rules() {
-	copy @std
-}
diff -r 75632eca5b07 -r d635206a5649 spandsp/receipt
--- a/spandsp/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/spandsp/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -14,21 +14,11 @@
 BUILD_DEPENDS="tiff-dev zlib-dev jpeg-dev"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="libtiff zlib jpeg"
+
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
 	make -j1 install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		spandsp)
-			copy @std
-			DEPENDS="libtiff zlib jpeg"
-			;;
-		*-dev)
-			copy @dev
-			;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 st/receipt
--- a/st/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/st/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dl.suckless.org/st/$TARBALL"
 
-BUILD_DEPENDS="fontconfig-dev freetype-dev xorgproto libx11-dev \
-libxft-dev"
+BUILD_DEPENDS="fontconfig-dev freetype-dev xorgproto libx11-dev libxft-dev"
+DEPENDS="fontconfig freetype libx11 libxft"
 
 compile_rules() {
 	# fix PREFIX
@@ -23,8 +23,3 @@
 	make CC=$HOST_SYSTEM-gcc &&
 	make install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="fontconfig freetype libx11 libxft"
-}
diff -r 75632eca5b07 -r d635206a5649 tcl2c-fork/receipt
--- a/tcl2c-fork/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/tcl2c-fork/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,6 +12,7 @@
 WGET_URL="http://web.tiscali.it/pas80/tcl2c.tar.gz"
 
 BUILD_DEPENDS="tcl-dev"
+DEPENDS="tcl"
 
 compile_rules() {
 	sed -i 's|8\.5|8.6|' Makefile
@@ -19,8 +20,3 @@
 	make &&
 	install -Dm755 tcl2c $install/usr/bin/tcl2cf
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="tcl"
-}
diff -r 75632eca5b07 -r d635206a5649 ucarp/receipt
--- a/ucarp/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/ucarp/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,6 +12,9 @@
 WGET_URL="http://download.pureftpd.org/pub/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libpcap-dev gfortran gettext-dev"
+DEPENDS="libpcap"
+
+TAGS="HA"
 
 compile_rules() {
 	sed -i 's/\$(SHELL) @install_sh@/@install_sh@/' po/Makefile.in*
@@ -21,9 +24,3 @@
 	make &&
 	make DESTDIR=$install install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="libpcap"
-	TAGS="High availability HA"
-}
diff -r 75632eca5b07 -r d635206a5649 udisks2/receipt
--- a/udisks2/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/udisks2/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -16,6 +16,9 @@
 libblockdev-dev polkit-dev libatasmart-dev acl-dev intltool"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="acl glib libatasmart libblockdev libgudev polkit util-linux-mount"
+DEPENDS_dev="$PACKAGE glib-dev"
+
 compile_rules() {
 	./configure \
 		--disable-static \
@@ -29,17 +32,3 @@
 	mkdir -p $install/etc/udev/rules.d/
 	cp $stuff/99-udisks2.rules $install/etc/udev/rules.d/
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		udisks2)
-			copy @std
-			DEPENDS="acl glib libatasmart libblockdev libgudev polkit \
-			util-linux-mount"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="udisks2 glib-dev"
-			;;
-	esac
-}
diff -r 75632eca5b07 -r d635206a5649 vice/receipt
--- a/vice/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/vice/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -16,6 +16,9 @@
 libjpeg-turbo-dev portaudio-dev mpg123-dev libice-dev gtk2-dev \
 vte-gtk2-dev gtkglext-dev mesa-dev libxxf86vm-dev libxrandr-dev \
 bdftopcf mkfontdir" # pulseaudio-dev
+DEPENDS="alsa-lib cairo flac gdk-pixbuf giflib glib gtk2 gtkglext \
+libjpeg-turbo libogg libpng libvorbis mesa mpg123 pango pciutils portaudio \
+readline vte-gtk2 libx11 libxrandr libxxf86vm zlib"
 
 compile_rules() {
 	rm -r src/lib/liblame src/lib/libx264 src/lib/libffmpeg
@@ -38,10 +41,3 @@
 		DESTDIR="$install" \
 		install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="alsa-lib cairo flac gdk-pixbuf giflib glib gtk2 gtkglext \
-	libjpeg-turbo libogg libpng libvorbis mesa mpg123 pango pciutils \
-	portaudio readline vte-gtk2 libx11 libxrandr libxxf86vm zlib"
-}
diff -r 75632eca5b07 -r d635206a5649 xosd/receipt
--- a/xosd/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/xosd/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -12,6 +12,7 @@
 WGET_URL="$SF_MIRROR/libxosd/$TARBALL"
 
 BUILD_DEPENDS="xorg-dev"
+DEPENDS="libx11"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -19,8 +20,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="libx11"
-}
diff -r 75632eca5b07 -r d635206a5649 xplanet/receipt
--- a/xplanet/receipt	Mon Dec 24 02:07:02 2018 +0200
+++ b/xplanet/receipt	Mon Dec 24 11:36:03 2018 +0200
@@ -14,6 +14,8 @@
 BUILD_DEPENDS="patch libx11-dev libice-dev libxext-dev \
 libxscrnsaver-dev freetype-dev pango-dev giflib-dev libjpeg-turbo-dev \
 libpng-dev tiff-dev"
+DEPENDS="perl jpeg libpng zlib libtiff libx11 freetype pango fontconfig \
+glib libxau libxdmcp expat giflib libxscrnsaver gcc-lib-base util-linux-uuid"
 
 compile_rules() {
 	./configure \
@@ -22,10 +24,3 @@
 	make -j1 &&
 	make install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="perl jpeg libpng zlib libtiff libx11 freetype pango fontconfig \
-glib libxau libxdmcp expat giflib libxscrnsaver gcc-lib-base \
- util-linux-uuid"
-}