# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1644829742 -3600
# Node ID 92bbd9147f9b349aa3113b7460867ad774f834fb
# Parent  c644ecfbd345f4758c618b9a1199622088b4a857
updated cups packages (2.3.1 -> 2.4.1)

diff -r c644ecfbd345 -r 92bbd9147f9b cups-dev/receipt
--- a/cups-dev/receipt	Mon Feb 14 07:50:21 2022 +0100
+++ b/cups-dev/receipt	Mon Feb 14 10:09:02 2022 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt."
 
 PACKAGE="cups-dev"
-VERSION="2.3.1"
+VERSION="2.4.1"
 CATEGORY="development"
 SHORT_DESC="Common UNIX Printing System - development files."
 MAINTAINER="erjo@slitaz.org"
@@ -13,8 +13,6 @@
 
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-
-	cp -a $install/usr/include	$fs/usr
-	cp -a $install/usr/lib/*.*a	$fs/usr/lib
+	cook_copy_folders	include
+	cook_copy_files		*.*a
 }
diff -r c644ecfbd345 -r 92bbd9147f9b cups-doc/receipt
--- a/cups-doc/receipt	Mon Feb 14 07:50:21 2022 +0100
+++ b/cups-doc/receipt	Mon Feb 14 10:09:02 2022 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="cups-doc"
-VERSION="2.3.1"
+VERSION="2.4.1"
 CATEGORY="misc"
 SHORT_DESC="Documentation for cups."
 MAINTAINER="slaxemulator@gmail.com"
@@ -14,6 +14,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share
-	# We need the doc for CSS, images and help in the web interface.
+	# We need the documentation for CSS, images and help in the web interface.
 	cp -a $install/usr/share/doc	$fs/usr/share
 }
diff -r c644ecfbd345 -r 92bbd9147f9b cups-lang/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cups-lang/receipt	Mon Feb 14 10:09:02 2022 +0100
@@ -0,0 +1,17 @@
+# SliTaz package receipt.
+
+PACKAGE="cups-lang"
+VERSION="2.4.1"
+CATEGORY="localization"
+SHORT_DESC="Common UNIX Printing System - localised messages."
+MAINTAINER="maintainer@slitaz.org"
+LICENSE="GPL2 LGPL2"
+WEB_SITE="https://www.cups.org/"
+
+WANTED="cups"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_folders	locale
+}
diff -r c644ecfbd345 -r 92bbd9147f9b cups-pam/receipt
--- a/cups-pam/receipt	Mon Feb 14 07:50:21 2022 +0100
+++ b/cups-pam/receipt	Mon Feb 14 10:09:02 2022 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="cups-pam"
-VERSION="2.3.1"
+VERSION="2.4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Common UNIX Printing System with PAM support."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -10,9 +10,10 @@
 
 SOURCE="cups"
 TARBALL="$SOURCE-$VERSION-source.tar.gz"
-WGET_URL="https://github.com/apple/$SOURCE/releases/download/v$VERSION/$TARBALL"
+WGET_URL="https://github.com/OpenPrinting/$SOURCE/releases/download/v$VERSION/$TARBALL"
 
 PROVIDE="cups:pam"
+SUGGESTED="cups-lang"
 DEPENDS="cups-doc cups-filters dbus libcomerr libcups libkrb5 libssl 
 	libunistring pam"
 BUILD_DEPENDS="acl-dev dbus-dev gnutls-dev jpeg-dev libcomerr-dev 
@@ -51,10 +52,9 @@
 		--with-languages="$LOCALE_PACK"	\
 		$CONFIGURE_ARGS &&
 	make &&
-	make BUILDROOT=$DESTDIR install
+	make install BUILDROOT=$DESTDIR
 
-	cp -f $WOK/cups/stuff/cups.desktop \
-		$install/usr/share/applications/cups.desktop
+	cp -f $WOK/cups/stuff/cups.desktop	$install/usr/share/applications/cups.desktop
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -67,9 +67,9 @@
 	cp -a $install/etc/cups		$fs/etc
 	cp -a $install/etc/dbus*	$fs/etc
 	cp -a $install/usr/bin		$fs/usr
-	cp -a $install/usr/sbin		$fs/usr
 	cp -a $install/usr/lib/*.so*	$fs/usr/lib
 	cp -a $install/usr/lib/cups	$fs/usr/lib
+	cp -a $install/usr/sbin		$fs/usr
 	cp -a $install/usr/share/cups	$fs/usr/share
 	cp -a $install/usr/share/icons	$fs/usr/share
 	cp -a $install/var		$fs
@@ -81,7 +81,7 @@
 	# Remove files provided by libcups
 	rm -f				$fs/usr/lib/libcups.so*
 
-	# PAM conf
+	# PAM configuration
 	cp -a $stuff/etc		$fs
 
 	# Daemon script
@@ -89,7 +89,6 @@
 
 	# TazPanel link
 	cp -a $WOK/cups/stuff/var	$fs
-
 }
 
 post_install()
@@ -111,7 +110,7 @@
 
 pre_remove()
 {
-	# Stop CUPS daemon before remove.
+	# Stop CUPS daemon before removing.
 	[ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop
 	:
 }
diff -r c644ecfbd345 -r 92bbd9147f9b cups/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cups/description.txt	Mon Feb 14 10:09:02 2022 +0100
@@ -0,0 +1,14 @@
+OpenPrinting CUPS is the most current version of CUPS, a standards-based,
+open source printing system for Linux® and other Unix®-like operating
+systems.
+
+CUPS supports printing to:
+
+* AirPrint® and IPP Everywhere® printers,
+* Network and local (USB) printers with Printer Applications, and
+* Network and local (USB) printers with (legacy) PPD-based printer drivers.
+
+CUPS provides the System V ("lp") and Berkeley ("lpr") command-line
+interfaces, a configurable web interface, a C API, and common print filters,
+drivers, and backends for printing.
+The cups-filters project provides additional filters and drivers.
diff -r c644ecfbd345 -r 92bbd9147f9b cups/receipt
--- a/cups/receipt	Mon Feb 14 07:50:21 2022 +0100
+++ b/cups/receipt	Mon Feb 14 10:09:02 2022 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="cups"
-VERSION="2.3.1"
+VERSION="2.4.1"
 CATEGORY="system-tools"
 TAGS="printer printing"
 SHORT_DESC="Common UNIX Printing System."
@@ -10,8 +10,9 @@
 WEB_SITE="https://www.cups.org/"
 
 TARBALL="$PACKAGE-$VERSION-source.tar.gz"
-WGET_URL="https://github.com/apple/$PACKAGE/releases/download/v$VERSION/$TARBALL"
+WGET_URL="https://github.com/OpenPrinting/$PACKAGE/releases/download/v$VERSION/$TARBALL"
 
+SUGGESTED="cups-lang"
 DEPENDS="cups-doc cups-filters dbus libcomerr libcups libkrb5 libssl 
 	libunistring libusb-compat poppler-apps"
 BUILD_DEPENDS="acl-dev dbus-dev gnutls-dev jpeg-dev libgcrypt-dev 
@@ -55,7 +56,7 @@
 		--with-languages="$LOCALE_PACK" \
 		$CONFIGURE_ARGS &&
 	make &&
-	make BUILDROOT=$DESTDIR install
+	make install BUILDROOT=$DESTDIR
 
 	cp -f $stuff/cups.desktop \
 		$install/usr/share/applications/cups.desktop
@@ -71,9 +72,9 @@
 	cp -a $install/etc/cups		$fs/etc
 	cp -a $install/etc/dbus*	$fs/etc
 	cp -a $install/usr/bin		$fs/usr
-	cp -a $install/usr/sbin		$fs/usr
 	cp -a $install/usr/lib/*.so*	$fs/usr/lib
 	cp -a $install/usr/lib/cups	$fs/usr/lib
+	cp -a $install/usr/sbin		$fs/usr
 	cp -a $install/usr/share/cups	$fs/usr/share
 	cp -a $install/usr/share/icons	$fs/usr/share
 	cp -a $install/var		$fs
@@ -87,7 +88,7 @@
 
 	# Daemon script
 	cp -a $stuff/etc		$fs
-	sed -i 's|^#Group .*|Group lp|' $fs/etc/cups/cups-files.conf
+	sed -i 's|^#Group .*|Group lp|'	$fs/etc/cups/cups-files.conf
 
 	# TazPanel link
 	cp -a $stuff/var		$fs
@@ -112,11 +113,12 @@
 
 EOT
 	fi
+	echo "Add cupsd to RUN_DAEMONS in /etc/rcS.conf to start cupsd after SliTaz startup."
 }
 
 pre_remove()
 {
-	# Stop CUPS daemon before remove.
+	# Stop CUPS daemon before removing.
 	[ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop
 	:
 }
diff -r c644ecfbd345 -r 92bbd9147f9b libcups/receipt
--- a/libcups/receipt	Mon Feb 14 07:50:21 2022 +0100
+++ b/libcups/receipt	Mon Feb 14 10:09:02 2022 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libcups"
-VERSION="2.3.1"
+VERSION="2.4.1"
 CATEGORY="system-tools"
 TAGS="printer printing"
 SHORT_DESC="Common UNIX Printing System - libraries."