# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1545002187 -7200
# Node ID f77e48e58ac05b595ee6ebed7ab623fd6e3c4c19
# Parent  77272271e283122c09470635f323790c5e059bd7
cook, modules/precheck: provide CATEGORY="nopack"; modules/pack: improve variables handling; modules/postcheck: display badge "old" both with any other badges
:
CATEGORY="nopack" is useful in the case, for example, when receipt called "libappindicator" but we want to produce only two sub-packages: "libappindicator-gtk2" and "libappindicator-gtk3" and don't want to pack "libappindicator".

diff -r 77272271e283 -r f77e48e58ac0 cook
--- a/cook	Tue Dec 11 23:15:30 2018 +0200
+++ b/cook	Mon Dec 17 01:16:27 2018 +0200
@@ -361,6 +361,7 @@
 		version=$(awk -F$'\t' -vpkg="$i" '{
 			if ($1 == pkg) {print $2; exit}
 		}' "$PKGS/packages-$ARCH.info")
+		[ -n "$version" ] || continue
 		fs=$(du -sh $WOK/$pkg/taz/$i-$VERSION$EXTRAVERSION | awk '{print $1}')
 		arch=$(awk -F$'\t' -vi="$i" '{if ($1 == i) print $2}' $pkgdir/.arch)
 		pkgname="$i-$version-$arch.tazpkg"
diff -r 77272271e283 -r f77e48e58ac0 lighttpd/index.cgi
--- a/lighttpd/index.cgi	Tue Dec 11 23:15:30 2018 +0200
+++ b/lighttpd/index.cgi	Mon Dec 17 01:16:27 2018 +0200
@@ -2502,7 +2502,7 @@
 					;;
 				man)
 					#export TEXTDOMAIN='man2html'
-					echo "<div id='content2'>"
+					echo "<div id='content2' class='manpage'>"
 
 					html=$(./man2html.bin "$tmp" | sed -e '1,/<header>/d' -e '/<footer>/,$d' \
 					-e 's|<a href="file:///[^>]*>\([^<]*\)</a>|\1|g' \
diff -r 77272271e283 -r f77e48e58ac0 modules/pack
--- a/modules/pack	Tue Dec 11 23:15:30 2018 +0200
+++ b/modules/pack	Mon Dec 17 01:16:27 2018 +0200
@@ -458,7 +458,7 @@
 
 find_vars() {
 	# You can define variables in the root of the receipt describing
-	# the dependencies (tags, config files, etc.) for each sub-package.
+	# the dependencies (or tags, config files, etc.) for each sub-package.
 	# Example:
 	#   PACKAGE="cool"
 	#   SPLIT="$PACKAGE-extra libcool $PACKAGE-dev"
@@ -470,14 +470,15 @@
 
 	local out
 	local var=$1
-	local pkg=$(echo -n $2       | tr -c 'a-zA-Z0-9' '_')
+	local pkg=$(echo -n $2             | tr -c 'a-zA-Z0-9' '_')
 	local end=$(echo -n ${2#$basepkg-} | tr -c 'a-zA-Z0-9' '_')
 	if [ "$2" == "$basepkg" ]; then
-		eval out="\$${var}_$pkg"
-		[ -n "$out" ] || eval out="\$${var}_std"
+		eval out="\$${var}_$pkg"                  # DEPENDS_cool
+		[ -n "$out" ] || eval out="\$${var}_std"  # DEPENDS_std
+		[ -n "$out" ] || eval out="\$$var"        # DEPENDS
 	else
-		eval out="\$${var}_$pkg"
-		[ -n "$out" ] || eval out="\$${var}_$end"
+		eval out="\$${var}_$pkg"                  # DEPENDS_cool_extra
+		[ -n "$out" ] || eval out="\$${var}_$end" # DEPENDS_extra
 	fi
 	echo "$out"
 }
@@ -522,33 +523,51 @@
 	# Execute genpkg_rules()
 	#
 
+	require_copy='yes'
+	[ "${COOKOPTS/empty-pkg/}" != "$COOKOPTS" ] && require_copy='no'
+
 	if grep -q ^genpkg_rules $receipt; then
 		_ 'Executing: %s' 'genpkg_rules'
-		set -e; cd $pkgdir; mkdir -p $fs
-		genpkg_rules || (newline; _ 'ERROR: genpkg_rules failed'; newline) >> \
-			$LOGS/$pkg.log
+		set -e
+		cd $pkgdir; mkdir -p $fs
+		genpkg_rules || (newline; _ 'ERROR: genpkg_rules failed'; newline) >> $LOGS/$pkg.log
+		require_copy='no'
 	else
-		cd $pkgdir
-		mkdir -p $fs
+		cd $pkgdir; mkdir -p $fs
 		if [ "$CATEGORY" == 'meta' -a "$thispkg" == "$basepkg" ]; then
 			_ 'No packages rules: meta package'
-		else
-			# Auto-packing
-			for i in DEPENDS SUGGESTED PROVIDE CONFIG_FILES TAGS CAT COPY; do
-				eval $i="\$(find_vars $i $thispkg)"
-			done
+			require_copy='no'
+		fi
+	fi
 
-			[ -n "$COPY" ] ||
-			case "$thispkg" in
-				$basepkg)    COPY='@std @rm';;
-				*-dev)       COPY='@dev @rm';;
-				lib$basepkg) COPY='*.so*';;
-			esac
-			[ -n "$COPY" ] || die "ERROR: COPY_$thispkg rules undefined"
+	# Auto-packing
+
+	for i in DEPENDS SUGGESTED PROVIDE CONFIG_FILES TAGS CATEGORY CAT COPY; do
+		eval $i="\$(find_vars $i $thispkg)"
+	done
+
+	[ -n "$CAT" ] && CATEGORY=$(echo "$CAT" | cut -d'|' -f1)
+
+	if [ "$CATEGORY" != 'meta' -a "$CATEGORY" != 'nopack' ]; then
+		[ -n "$COPY" ] ||
+		case "$thispkg" in
+			$basepkg)    COPY='@std @rm';;
+			*-dev)       COPY='@dev @rm';;
+			lib$basepkg) COPY='*.so*';;
+		esac
+		if [ -n "$COPY" ]; then
 			copy $COPY
+		elif [ "$require_copy" == 'yes' ]; then
+			var=$(echo -n COPY_$thispkg | tr -c 'a-zA-Z0-9' '_')
+			die "ERROR: $var rules undefined"
 		fi
 	fi
 
+	if [ "$CATEGORY" == 'nopack' ]; then
+		echo "Skipping $thispkg"
+		return
+	fi
+
 
 	#
 	# Check CONFIG_FILES
diff -r 77272271e283 -r f77e48e58ac0 modules/postcheck
--- a/modules/postcheck	Tue Dec 11 23:15:30 2018 +0200
+++ b/modules/postcheck	Mon Dec 17 01:16:27 2018 +0200
@@ -133,7 +133,7 @@
 				add 'libtool'
 			fi
 		else
-			if grep -q '^fix.libtool$' $WOK/$1/.patch.done 2>/dev/null; then
+			if grep -q '^\s*fix libtool' $WOK/$1/receipt 2>/dev/null; then
 				add 'nolibtool'
 			fi
 		fi
@@ -269,9 +269,9 @@
 	if [ "$REPOLOGY" != '-' ]; then
 		action 'Querying Repology...'
 		repo_ver=$(repology_get ${REPOLOGY:-$PACKAGE})
-		if [ "$repo_ver" != '-' -a ! -s $fail ]; then
+		if [ "$repo_ver" != '-' ]; then
 			if echo " $repo_ver " | fgrep -q " $VERSION "; then
-				add 'win'
+				[ -s $fail ] || add 'win'
 			else
 				add 'old'
 			fi
diff -r 77272271e283 -r f77e48e58ac0 modules/precheck
--- a/modules/precheck	Tue Dec 11 23:15:30 2018 +0200
+++ b/modules/precheck	Mon Dec 17 01:16:27 2018 +0200
@@ -22,7 +22,7 @@
 
 	case "$var" in
 		CATEGORY)
-			valid="$(echo $PKGS_CATEGORIES)" # avoid newlines
+			valid="$(echo $PKGS_CATEGORIES nopack)" # avoid newlines
 			if ! echo " $valid " | grep -q " $value "; then
 				newline
 				_ 'QA: unknown category "%s"' "$value"