# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1520911446 -7200
# Node ID 4c1ed6983d05b6526d917f943b675b6cc753985b
# Parent  2f03cb67a994759be2ce8f5eb6339019e8fa9790
Up c_icap, colord, compiz-core, gtksourceview3, libsdl-perl, p910nd, polkit

diff -r 2f03cb67a994 -r 4c1ed6983d05 c_icap/receipt
--- a/c_icap/receipt	Tue Mar 13 02:04:32 2018 +0200
+++ b/c_icap/receipt	Tue Mar 13 05:24:06 2018 +0200
@@ -14,29 +14,27 @@
 BUILD_DEPENDS="zlib-dev"
 SPLIT="c_icap-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
+	sed -i '/sysconfdir=/ s|^|#|' /etc/slitaz/cook.site # default sysconfdir=/etc
+
 	./configure \
 		--sysconfdir=/etc/c-icap \
 		--enable-large-files \
 		$CONFIGURE_ARGS &&
-	make && make install &&
+	make && make install || return 1
 
-	mkdir -p $install/etc/init.d/ $install/var/log/c-icap/ &&
-	install -m755 $stuff/c-icapd $install/etc/init.d &&
+	mkdir -p $install/etc/init.d/ $install/var/log/c-icap/
+	install -m755 $stuff/c-icapd $install/etc/init.d
 
 	# Fix config file
 	sed -i -e "s|YourServerName|localhost|;
 		s|/usr/var/log|/var/log/c-icap/|;
 		s|/usr/var/run/|/var/run/c-icap|;
-		s|/usr/etc|/etc/c-icap|" $install/etc/c-icap/c-icap.conf &&
+		s|/usr/etc|/etc/c-icap|" $install/etc/c-icap/c-icap.conf
 	chmod -x $install/etc/c-icap/*
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		c_icap)
 			copy @std var/log/c-icap/
@@ -52,13 +50,13 @@
 
 	[ -n "$quiet" ] || cat <<EOF
 
-----
-To start $PACKAGE server you can run :
-
-    /etc/init.d/$PACKAGE start
-
-Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf
-----
+	.----------------------------------------------.
+	| To start c_icap server you can run:          |
+	|                                              |
+	|    /etc/init.d/c_icap start                  |
+	|                                              |
+	|Or add c_icap to RUN_DAEMONS in /etc/rcS.conf |
+	'----------------------------------------------'
 EOF
 }
 
diff -r 2f03cb67a994 -r 4c1ed6983d05 colord/receipt
--- a/colord/receipt	Tue Mar 13 02:04:32 2018 +0200
+++ b/colord/receipt	Tue Mar 13 05:24:06 2018 +0200
@@ -53,7 +53,14 @@
 }
 
 post_install_colord() {
-	chroot "$1/" /usr/sbin/addgroup -g 71 colord &&
-	chroot "$1/" /usr/sbin/adduser -g "Color Daemon Owner"  -h /var/lib/colord \
-		-u 71  -G colord  -s /bin/false  -D colord
+	if ! grep -q colord "$1/etc/group"; then
+		chroot "$1/" /usr/sbin/addgroup -g 71 colord
+		chroot "$1/" /usr/sbin/adduser -g "Color Daemon Owner"  -h /var/lib/colord \
+			-u 71  -G colord  -s /bin/false  -D colord
+	fi
 }
+
+post_remove_colord() {
+	chroot "$1/" deluser  colord
+	chroot "$1/" delgroup colord
+}
diff -r 2f03cb67a994 -r 4c1ed6983d05 compiz-core/receipt
--- a/compiz-core/receipt	Tue Mar 13 02:04:32 2018 +0200
+++ b/compiz-core/receipt	Tue Mar 13 05:24:06 2018 +0200
@@ -12,8 +12,9 @@
 WGET_URL="$WEB_SITE/compiz/releases/download/v$VERSION/compiz-$VERSION.tar.xz"
 
 BUILD_DEPENDS="xorg-dev intltool librsvg-dev libxslt-dev pango-dev libtool \
-startup-notification-dev mesa-dev file dbus-dev dbus-glib-dev cairo-dev \
-util-linux-uuid-dev expat-dev xorg-libxshmfence-dev libglu-mesa-dev "
+startup-notification-dev mesa17-dev file dbus-dev dbus-glib-dev cairo-dev \
+util-linux-uuid-dev expat-dev xorg-libxshmfence-dev libglu-mesa-dev \
+xorg-xcb-util-dev"
 SPLIT="compiz-core-dev"
 
 compile_rules() {
diff -r 2f03cb67a994 -r 4c1ed6983d05 fpc-src/receipt
--- a/fpc-src/receipt	Tue Mar 13 02:04:32 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="fpc-src"
-VERSION="2.6.4"
-CATEGORY="development"
-SHORT_DESC="Sources for the FreePascal compiler (requierd by the Lazarus IDE)."
-MAINTAINER="slaxemulator@gmail.com"
-LICENSE="GPL2 LGPL2.1"
-SOURCE="fpcbuild"
-TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.freepascal.org/"
-WGET_URL="ftp://ftp.freepascal.org/pub/fpc/dist/$VERSION/source/$TARBALL"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib/fpc
-	cp -a $src/fpcsrc $fs/usr/lib/fpc/src
-}
-
diff -r 2f03cb67a994 -r 4c1ed6983d05 gtksourceview3/receipt
--- a/gtksourceview3/receipt	Tue Mar 13 02:04:32 2018 +0200
+++ b/gtksourceview3/receipt	Tue Mar 13 05:24:06 2018 +0200
@@ -12,11 +12,15 @@
 TARBALL="gtksourceview-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gtksourceview/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev itstool gtk+3-dev libxml2-dev gettext gtk-doc vala"
+BUILD_DEPENDS="glib-dev itstool gtk+3-dev libxml2-dev gettext gtk-doc vala \
+gobject-introspection-dev"
 SPLIT="gtksourceview3-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	fix ld
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make && make install
 }
 
 genpkg_rules() {
diff -r 2f03cb67a994 -r 4c1ed6983d05 libsdl-perl/receipt
--- a/libsdl-perl/receipt	Tue Mar 13 02:04:32 2018 +0200
+++ b/libsdl-perl/receipt	Tue Mar 13 05:24:06 2018 +0200
@@ -1,34 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="libsdl-perl"
 VERSION="2.2.6"
 CATEGORY="x-window"
-SHORT_DESC="SDL perl support."
+SHORT_DESC="SDL perl support"
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="LGPL2"
-SOURCE="SDL_Perl"
-TARBALL="$SOURCE-v${VERSION}.tar.gz"
 WEB_SITE="http://sdl.perl.org"
+
+TARBALL="SDL_Perl-v$VERSION.tar.gz"
 WGET_URL="http://search.cpan.org/CPAN/authors/id/K/KT/KTHAKORE/$TARBALL"
 
-DEPENDS="xorg libglu-mesa mesa libsdl libsdl-gfx libsdl-image libsdl-mixer \
-libsdl-net libsmpeg libsdl-ttf"
-BUILD_DEPENDS="perl-yaml xorg-dev libglu-mesa libglu-mesa-dev mesa-dev \
-libsdl-dev libsdl-gfx-dev libsdl-image-dev libsdl-mixer-dev libsdl-net-dev \
-libsdl-ttf-dev perl-module-build perl-dev"
+BUILD_DEPENDS="perl-module-build perl-yaml libsdl-dev perl-dev mesa17-dev \
+libglu-mesa-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Build.PL destdir="$DESTDIR" &&
 	perl Build &&
 	perl Build install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/lib $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="libglu-mesa libsdl mesa17 perl"
 }
-
diff -r 2f03cb67a994 -r 4c1ed6983d05 p910nd/receipt
--- a/p910nd/receipt	Tue Mar 13 02:04:32 2018 +0200
+++ b/p910nd/receipt	Tue Mar 13 05:24:06 2018 +0200
@@ -1,30 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="p910nd"
 VERSION="0.95"
 CATEGORY="network"
-SHORT_DESC="Network to printer (/dev/lp* or /dev/usb/lp*) gateway."
+SHORT_DESC="Network to printer (/dev/lp* or /dev/usb/lp*) gateway"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://p910nd.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="printer"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	make CFLAGS=-DLOCKFILE_DIR=\\\"/var/lock\\\" &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$DESTDIR install || return 1
+
+	mkdir -p     $install/etc/init.d/
+	ln -s daemon $install/etc/init.d/p910nd
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr $fs/etc/init.d
-	cp -a $install/usr/sbin $fs/usr
-	sed '1,/%description/d;/%pre/,$d' $src/p910nd.spec > $WOK/$PACKAGE/description.txt
-	ln -s daemon $fs/etc/init.d/p910nd
+genpkg_rules() {
+	copy @std
+	TAGS="printer"
 }
-
diff -r 2f03cb67a994 -r 4c1ed6983d05 polkit/receipt
--- a/polkit/receipt	Tue Mar 13 02:04:32 2018 +0200
+++ b/polkit/receipt	Tue Mar 13 05:24:06 2018 +0200
@@ -75,9 +75,11 @@
 }
 
 post_install_polkit() {
-	chroot "$1/" /usr/sbin/addgroup -g 27 polkitd &&
-	chroot "$1/" /usr/sbin/adduser -g "PolicyKit Daemon Owner" \
-		-h /etc/polkit-1 -u 27 -G polkitd -s /bin/false -D polkitd
+	if ! grep -q polkitd "$1/etc/group"; then
+		chroot "$1/" /usr/sbin/addgroup -g 27 polkitd
+		chroot "$1/" /usr/sbin/adduser -g "PolicyKit Daemon Owner" \
+			-h /etc/polkit-1 -u 27 -G polkitd -s /bin/false -D polkitd
+	fi
 
 	mkdir -p "$1/var"
 
@@ -90,10 +92,17 @@
 	install -dm700 -o27 -g27 "$1/usr/share/polkit-1/rules.d"
 }
 
+post_remove_polkit() {
+	chroot "$1/" deluser  polkitd
+	chroot "$1/" delgroup polkitd
+}
+
 post_install_polkit_pam() {
-	chroot "$1/" /usr/sbin/addgroup -g 27 polkitd &&
-	chroot "$1/" /usr/sbin/adduser -g "PolicyKit Daemon Owner" \
-		-h /etc/polkit-1 -u 27 -G polkitd -s /bin/false -D polkitd
+	if ! grep -q polkitd "$1/etc/group"; then
+		chroot "$1/" /usr/sbin/addgroup -g 27 polkitd
+		chroot "$1/" /usr/sbin/adduser -g "PolicyKit Daemon Owner" \
+			-h /etc/polkit-1 -u 27 -G polkitd -s /bin/false -D polkitd
+	fi
 
 	mkdir -p "$1/var"
 
@@ -105,3 +114,8 @@
 
 	install -dm700 -o27 -g27 "$1/usr/share/polkit-1/rules.d"
 }
+
+post_remove_polkit_pam() {
+	chroot "$1/" deluser  polkitd
+	chroot "$1/" delgroup polkitd
+}