# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1646208296 -3600
# Node ID 2ba3c02cf43f8d083b99aeb95d81bd25dab1680b
# Parent  0a4466bbdeb0df46a1c22ba232f10797accba724
updated git (2.26.2 -> 2.35.1)

diff -r 0a4466bbdeb0 -r 2ba3c02cf43f git-lang/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/git-lang/receipt	Wed Mar 02 09:04:56 2022 +0100
@@ -0,0 +1,17 @@
+# SliTaz package receipt.
+
+PACKAGE="git-lang"
+VERSION="2.35.1"
+CATEGORY="localization"
+SHORT_DESC="Fast version control system - localised messages."
+MAINTAINER="maintainer@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="https://git-scm.com/"
+
+WANTED="git"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_folders	locale
+}
diff -r 0a4466bbdeb0 -r 2ba3c02cf43f git/description.txt
--- a/git/description.txt	Wed Mar 02 07:52:09 2022 +0100
+++ b/git/description.txt	Wed Mar 02 09:04:56 2022 +0100
@@ -1,2 +1,2 @@
-Git is a free & open source, distributed version control system designed to 
+Git is a free and open source, distributed version control system designed to 
 handle everything from small to very large projects with speed and efficiency.
diff -r 0a4466bbdeb0 -r 2ba3c02cf43f git/receipt
--- a/git/receipt	Wed Mar 02 07:52:09 2022 +0100
+++ b/git/receipt	Wed Mar 02 09:04:56 2022 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="git"
-VERSION="2.26.2"
+VERSION="2.35.1"
 CATEGORY="development"
 SHORT_DESC="Fast version control system."
 MAINTAINER="b1+slitaz@nagel.org"
@@ -11,6 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/software/scm/git/$TARBALL"
 
+SUGGESTED="git-lang"
 DEPENDS="cacerts curl expat openssl zlib"
 BUILD_DEPENDS="curl-dev expat-dev openssl-dev perl python-dev zlib-dev"
 
@@ -33,8 +34,8 @@
 		--libexecdir=/usr/lib	\
 		--without-tcltk		\
 		$CONFIGURE_ARGS &&
-	make -j 1 THREADED_DELTA_SEARCH=1 &&
-	make THREADED_DELTA_SEARCH=1 DESTDIR=$DESTDIR install
+	make THREADED_DELTA_SEARCH=1 &&
+	make install THREADED_DELTA_SEARCH=1 DESTDIR=$DESTDIR
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -43,7 +44,10 @@
 	mkdir -p $fs/etc/init.d
 
 	cp -a $stuff/git-daemon	$fs/etc/init.d
-	cp -a $install/usr	$fs/
+	cp -a $install/usr	$fs
+
+	# moved to package git-lang
+	rm -rf			$fs/usr/share/locale
 
 	strip -s $fs/usr/lib/git-core/* 2>/dev/null || true
 }
@@ -51,11 +55,12 @@
 # edit daemons.conf.
 post_install()
 {
-	if ! grep -q 'GIT_OPTIONS' "$1/etc/daemons.conf"; then
+	if ! grep -q 'GIT_OPTIONS' "$1/etc/daemons.conf"
+	  then
 		mkdir -p "$1/var/www/git"
-		echo '# Git daemon options.' >> "$1/etc/daemons.conf"
-		echo 'GIT_REPO="/var/www/git/"' >> "$1/etc/daemons.conf"
-		echo 'GIT_OPTIONS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"' >> "$1/etc/daemons.conf"
-		echo '' >> "$1/etc/daemons.conf"
+		echo '# Git daemon options.
+GIT_REPO="/var/www/git/"
+GIT_OPTIONS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"
+' >> "$1/etc/daemons.conf"
 	fi
 }
diff -r 0a4466bbdeb0 -r 2ba3c02cf43f git/stuff/git-daemon
--- a/git/stuff/git-daemon	Wed Mar 02 07:52:09 2022 +0100
+++ b/git/stuff/git-daemon	Wed Mar 02 09:04:56 2022 +0100
@@ -1,8 +1,8 @@
 #!/bin/sh
-# /etc/init.d/git-daemon: Start, stop and restart git-daemon daemon on SliTaz, at boot
-# time or with the command line.
+# /etc/init.d/git-daemon: Start, stop and restart git daemon on SliTaz,
+# at boot time or with the command line.
 #
-# To start daemon at boot time, just put the right name in the $RUN_DAEMONS
+# To start git daemon at boot time, just put git-daemon in the $RUN_DAEMONS
 # variable of /etc/rcS.conf and configure options with /etc/daemons.conf.
 #
 . /etc/init.d/rc.functions
@@ -15,40 +15,43 @@
 PIDFILE=/var/run/git-daemon.pid
 
 case "$1" in
-  start)
-    if active_pidfile $PIDFILE git-daemon ; then
-      _ '%s is already running.' $NAME
-      exit 1
-    fi
-    action 'Starting %s: %s...' "$DESC" $NAME
-    $DAEMON --pid-file=$PIDFILE $OPTIONS
-    status
-    ;;
-  stop)
-    if ! active_pidfile $PIDFILE git-daemon ; then
-      _ '%s is not running.' $NAME
-      exit 1
-    fi
-    action 'Stopping %s: %s...' "$DESC" $NAME
-    kill $(cat $PIDFILE)
-    status
-    ;;
-  restart)
-    if ! active_pidfile $PIDFILE git-daemon ; then
-      _ '%s is not running.' $NAME
-      exit 1
-    fi
-    action 'Restarting %s: %s...' "$DESC" $NAME
-    kill $(cat $PIDFILE)
-    sleep 2
-    $DAEMON $OPTIONS
-    status
-    ;;
-  *)
-    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
-    newline
-    exit 1
-    ;;
+	(start)
+		if active_pidfile $PIDFILE $NAME
+		  then
+			_ '%s is already running.' $NAME
+			exit 1
+		fi
+		action 'Starting %s: %s...' "$DESC" $NAME
+		$DAEMON --pid-file=$PIDFILE $OPTIONS
+		status
+	;;
+	(stop)
+		if ! active_pidfile $PIDFILE $NAME
+		  then
+			_ '%s is not running.' $NAME
+			exit 1
+		fi
+		action 'Stopping %s: %s...' "$DESC" $NAME
+		kill $(cat $PIDFILE)
+		status
+		;;
+	(restart)
+		if ! active_pidfile $PIDFILE $NAME
+		  then
+			_ '%s is not running.' $NAME
+			exit 1
+		fi
+		action 'Restarting %s: %s...' "$DESC" $NAME
+		kill $(cat $PIDFILE)
+		sleep 2
+		$DAEMON --pid-file=$PIDFILE $OPTIONS
+		status
+		;;
+	(*)
+		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
+		newline
+		exit 1
+		;;
 esac
 
 exit 0