# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1573838922 -3600
# Node ID ba1e68274f761b7bb0ba593530569c4072c838d1
# Parent  6a937d641b10d613e05c02aa40489ffe190a7af4
remove x11vnc-extra

diff -r 6a937d641b10 -r ba1e68274f76 iptables-template/receipt
--- a/iptables-template/receipt	Fri Nov 15 17:18:01 2019 +0100
+++ b/iptables-template/receipt	Fri Nov 15 18:28:42 2019 +0100
@@ -7,7 +7,9 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://gist.github.com/jirutka/3742890"
-EXTRA_SOURCE_FILES="rules-both.iptables rules-ipv4.iptables rules-ipv6.ip6tables"
+TARBALL="rules-both.iptables"
+WGET_URL="$WEB_SITE/raw/c025b0b8c58af49aa9644982c459314c9adba157/$TARBALL"
+EXTRA_SOURCE_FILES="rules-ipv4.iptables rules-ipv6.ip6tables"
 
 BUILD_DEPENDS="wget"
 
@@ -15,13 +17,13 @@
 compile_rules()
 {
 	mkdir -p $install/usr/share/iptables
+	cp rules-both.iptables $install/usr/share/iptables
 	while read dir file ; do
 		[ -s "$SOURCES_REPOSITORY/$file" ] ||
 			wget --no-check-certificate -P $SOURCES_REPOSITORY \
 				$WEB_SITE/raw/$dir/$file
 		cp $SOURCES_REPOSITORY/$file $install/usr/share/iptables/
 	done <<EOT
-c025b0b8c58af49aa9644982c459314c9adba157 rules-both.iptables
 622104b0e46e0e7134a69bb7ce24850943b8d2a7 rules-ipv4.iptables
 3b92a873bf750a6df32331657c641078adc5906e rules-ipv6.ip6tables
 EOT
diff -r 6a937d641b10 -r ba1e68274f76 noto-mono/receipt
--- a/noto-mono/receipt	Fri Nov 15 17:18:01 2019 +0100
+++ b/noto-mono/receipt	Fri Nov 15 18:28:42 2019 +0100
@@ -8,6 +8,9 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="OFL"
 WEB_SITE="http://www.google.com/get/noto/"
+font=Regular
+TARBALL="NotoMono-$font-$VERSION.ttf"
+WGET_URL="https://github.com/googlei18n/noto-fonts/raw/$COMMIT/hinted/NotoMono-$font.ttf"
 TAGS="font"
 
 # Rules to configure and make the package.
@@ -22,19 +25,9 @@
 	# This commit "5329592" introduced "NotoMono-*" font version "1.00":
 	# https://github.com/googlei18n/noto-fonts/commit/5329592b9d0fee9fc8e462b328884a011811ff2c
 
-	mkdir -p $src
-	for font in Regular; do
-		 get_file="NotoMono-$font.ttf"
-		save_file="NotoMono-$font-$VERSION.ttf"
-		url="https://github.com/googlei18n/noto-fonts/raw/$COMMIT/hinted/$get_file"
-		[ -e "$SRC/$save_file" ] || wget -T 30 -O "$SRC/$save_file" $url
-		[ -e "$SRC/$save_file" ] || exit 1
-		cp "$SRC/$save_file" "$src/$get_file"
-	done
-
 	f=$install/usr/share/fonts/truetype/noto
 	mkdir -p $f
-	cp -a $src/*.ttf $f
+	cp -a $src/*.ttf $f/NotoMono-Regular.ttf
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 6a937d641b10 -r ba1e68274f76 noto-sans/receipt
--- a/noto-sans/receipt	Fri Nov 15 17:18:01 2019 +0100
+++ b/noto-sans/receipt	Fri Nov 15 18:28:42 2019 +0100
@@ -8,6 +8,10 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="OFL"
 WEB_SITE="http://www.google.com/get/noto/"
+font=Regular
+TARBALL="NotoSans-$font-$VERSION.ttf"
+EXTRA_SOURCE_FILES="NotoSans-Bold-$VERSION.ttf NotoSans-Italic-$VERSION.ttf NotoSans-BoldItalic-$VERSION.ttf"
+WGET_URL="https://github.com/googlei18n/noto-fonts/raw/$COMMIT/hinted/NotoSans-$font.ttf"
 TAGS="font"
 
 SIBLINGS="noto-serif"
@@ -27,8 +31,8 @@
 	# This commit "ad153f5" bumped version of "NotoSans-*" fonts to "1.06":
 	# https://github.com/googlei18n/noto-fonts/commit/ad153f5a14c838afb16c83f0a02784c7605f1e21
 
-	mkdir -p $src
-	for font in Regular Bold Italic BoldItalic; do
+	mv $TARBALL NotoSans-Regular.ttf
+	for font in Bold Italic BoldItalic; do
 		 get_file="NotoSans-$font.ttf"
 		save_file="NotoSans-$font-$VERSION.ttf"
 		url="https://github.com/googlei18n/noto-fonts/raw/$COMMIT/hinted/$get_file"
diff -r 6a937d641b10 -r ba1e68274f76 noto-serif/receipt
--- a/noto-serif/receipt	Fri Nov 15 17:18:01 2019 +0100
+++ b/noto-serif/receipt	Fri Nov 15 18:28:42 2019 +0100
@@ -8,6 +8,10 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="OFL"
 WEB_SITE="http://www.google.com/get/noto/"
+font=Regular
+TARBALL="NotoSerif-$font-$VERSION.ttf"
+EXTRA_SOURCE_FILES="NotoSerif-Bold-$VERSION.ttf NotoSerif-Italic-$VERSION.ttf NotoSerif-BoldItalic-$VERSION.ttf"
+WGET_URL="https://github.com/googlei18n/noto-fonts/raw/$COMMIT/hinted/NotoSerif-$font.ttf"
 TAGS="font"
 
 SIBLINGS="noto-serif"
@@ -28,10 +32,10 @@
 	# (NotoSerif-Italic was bumped to 1.07):
 	# https://github.com/googlei18n/noto-fonts/commit/0af3d5fd0830eaeb1825044b2f4c04125eacf08f
 
-	mkdir -p $src
-	for variant in Regular Bold Italic BoldItalic; do
-		 get_file="NotoSerif-$variant.ttf"
-		save_file="NotoSerif-$variant-$VERSION.ttf"
+	mv $TARBALL NotoSerif-Regular.ttf
+	for font in Bold Italic BoldItalic; do
+		 get_file="NotoSerif-$font.ttf"
+		save_file="NotoSerif-$font-$VERSION.ttf"
 		url="https://github.com/googlei18n/noto-fonts/raw/$COMMIT/hinted/$get_file"
 		[ -e "$SRC/$save_file" ] || wget -T 30 -O "$SRC/$save_file" $url
 		[ -e "$SRC/$save_file" ] || exit 1
diff -r 6a937d641b10 -r ba1e68274f76 qt4-examples/receipt
--- a/qt4-examples/receipt	Fri Nov 15 17:18:01 2019 +0100
+++ b/qt4-examples/receipt	Fri Nov 15 18:28:42 2019 +0100
@@ -7,6 +7,7 @@
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL3 LGPL2.1"
 WEB_SITE="http://qt-project.org/"
+WANTED="qt4"
 TAGS="qt"
 
 DEPENDS="libQtCore libQtGui"
@@ -15,19 +16,19 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	mkdir -p $install/usr/bin $install/usr/share/applications
+	mkdir -p $DESTDIR/usr/bin $DESTDIR/usr/share/applications
 
 	for i in desktop/screenshot dialogs/findfiles widgets/charactermap;
 	do
-                ii=$(basename $i) && cd $WOK/qt4/source/qt4-$VERSION/examples/$i
+                ii=$(basename $i) && cd $WANTED/examples/$i
 		rm -rf Makefile moc* *.o
 		qmake	$ii.pro
 		sed 's|-O2|'"$CFLAGS"'|' -i Makefile
 		make $MAKEFLAGS &&
 		install $ii $DESTDIR/usr/bin
 		install $ii.desktop $DESTDIR/usr/share/applications
-		find $install -name $ii.desktop \
-		-exec echo 'Categories=Utility;'>>$install/usr/share/applications/$ii.desktop \; \
+		find $DESTDIR -name $ii.desktop \
+		-exec echo 'Categories=Utility;'>>$DESTDIR/usr/share/applications/$ii.desktop \; \
 		-exec sed 's|/opt/|/|g' -i {} \;
 	done
 }
diff -r 6a937d641b10 -r ba1e68274f76 vmware-view-open-client/receipt
--- a/vmware-view-open-client/receipt	Fri Nov 15 17:18:01 2019 +0100
+++ b/vmware-view-open-client/receipt	Fri Nov 15 18:28:42 2019 +0100
@@ -9,6 +9,7 @@
 LICENSE="LGPL2.1"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="https://github.com/dontsueme/vmware-view-open-client"
+WGET_URL="http://mirror.slitaz.org/sources/packages/${TARBALL:0:1}/$TARBALL"
 
 DEPENDS="gtk+ libssl libxml2 curl libboost-signals icu bzlib"
 BUILD_DEPENDS="gtk+-dev openssl-dev libxml2-dev curl-dev libboost-dev \
diff -r 6a937d641b10 -r ba1e68274f76 x11vnc-extra/receipt
--- a/x11vnc-extra/receipt	Fri Nov 15 17:18:01 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="x11vnc-extra"
-VERSION="0.9.16"
-CATEGORY="network"
-SHORT_DESC="java VNC viewer"
-MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="http://www.karlrunge.com/x11vnc/"
-WANTED="x11vnc"
-TAGS="vnc"
-HOST_ARCH="i486 arm"
-
-DEPENDS="x11vnc"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/share/x11vnc $fs/usr/share
-}
-
-# Post install/remove commands for Tazpkg.
-post_install()
-{
-	sed -i 's/X11VNC_OPTIONS="/X11VNC_OPTIONS="-ssl -http /' "$1/etc/daemons.conf"
-}