executable are prefixed with @@bindir@@

awk modules - with @@awkmoddir@@
version -> 0.18.1
pkg_src_summary: fix for packages having more than one file listed in
   DESCR_SRC

pkg_summary-utils/files/Makefile

@@ -46,6 +46,7 @@ PROJECTNAME=	pkg_summary-utils
 	    -e 's,@@sbindir@@,${SBINDIR},g' \
 	    -e 's,@@datadir@@,${DATADIR},g' \
 	    -e 's,@@version@@,${VERSION},g' \
+	    -e 's,@@awkmoddir@@,${AWKMODDIR},g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 .PHONY: clean-my

pkg_summary-utils/files/Makefile.version

@@ -1 +1 @@
-VERSION=	0.18.0
+VERSION=	0.18.1

pkg_summary-utils/files/pkg_grep_summary.in

@@ -90,7 +90,7 @@ else
 fi
 
 runawk -e '
-#use "pkg_grep_summary.awk"
+#use "@@awkmoddir@@/pkg_grep_summary.awk"
 
 BEGIN {
    grep_summary__field="'"$field"'"

pkg_summary-utils/files/pkg_micro_src_summary.in

@@ -100,7 +100,7 @@ list_pkgs (){
 
 runpipe \
     list_pkgs "$@" '|' \
-    pkg_src_fetch_var -f="$fields" > "$helper_out"
+    @@bindir@@/pkg_src_fetch_var -f="$fields" > "$helper_out"
 
 # `+' to micro_summary (fast!)
 awk -F'\t' -v fields="$fields" '
@@ -122,4 +122,4 @@ awk -F'\t' '
 /^[-]/ {
    print $NF
 }' "$helper_out" |
-pkg_src_summary -f "$fields"
+@@bindir@@/pkg_src_summary -f "$fields"

pkg_summary-utils/files/pkg_refresh_summary.in

@@ -117,7 +117,7 @@ export newest_fn
 
 runawk -e '
 #use "xgetline.awk"
-#use "pkg_grep_summary.awk"
+#use "@@awkmoddir@@/pkg_grep_summary.awk"
 
 BEGIN {
    newest_fn = ENVIRON ["newest_fn"]

pkg_summary-utils/files/pkg_src_summary.in

@@ -181,15 +181,18 @@ normal_pkgs_fn=$tmp_dir/normal_pkgs.txt
 
 ############################################################
 enrich_summary (){
-    awk -F= '
-    $1 == "DESCR_SRC" {
-	fn = $2
-	while (0 < ret = (getline < fn)){
-	    print "DESCRIPTION=" $0
-	}
-	if (ret < 0){
-	    printf "reading from `" fn "` failed\n" > "/dev/stderr"
-	    exit 1
+    awk '
+    $0 ~ /^DESCR_SRC=/ {
+	$0 = substr($0, 11)
+	for (i=1; i <= NF; ++i){
+	    while (0 < ret = (getline ln < $i)){
+		print "DESCRIPTION=" ln
+	    }
+	    if (ret < 0){
+		printf "reading from `" fn "` failed\n" > "/dev/stderr"
+		exit 1
+	    }
+	    close($i)
 	}
 	next
     }
@@ -268,7 +271,7 @@ cd_and_print_summary (){
 
     # CVS_CHECKSUM
     if test "$field_cvs_checksum"; then
-	cvs_checksum "$real_pkgpath" > "$tmpfn" || return 1
+	@@bindir@@/cvs_checksum "$real_pkgpath" > "$tmpfn" || return 1
 	read cksum < "$tmpfn" || return 1
 	printf "CVS_CHECKSUM=%s\n" "$cksum" >>"$summaryfn" || return 1
     fi
@@ -444,7 +447,7 @@ NF == 0 {
 
 if test "_$multi_var" = _2; then
     move_ASSIGNMENTS_to_PKGPATH (){
-	pkg_assignments2pkgpath "$@"
+	@@bindir@@/pkg_assignments2pkgpath "$@"
     }
 else
     move_ASSIGNMENTS_to_PKGPATH (){
@@ -453,11 +456,11 @@ else
 fi
 
 if test "$multi_var"; then
-    pkg_grep_summary VARIANTS7 'fvalue != ""' \
+    @@bindir@@/pkg_grep_summary VARIANTS7 'fvalue != ""' \
 	< $partial_summary_fn >$multi_pkgs_fn
 
     if test -s $multi_pkgs_fn; then
-	pkg_grep_summary VARIANTS7 'fvalue == ""' \
+	@@bindir@@/pkg_grep_summary VARIANTS7 'fvalue == ""' \
 	    < $partial_summary_fn >$normal_pkgs_fn
 	grep -v VARIANTS7 $normal_pkgs_fn > $partial_summary_fn || true
 
@@ -465,7 +468,7 @@ if test "$multi_var"; then
 
 	runpipe_re '0 0 [01] 0' \
 	    summary2all_variants < $multi_pkgs_fn '|' \
-	    pkg_src_summary $make_plist '|' \
+	    @@bindir@@/pkg_src_summary $make_plist '|' \
 	    grep -v VARIANTS7 '|' \
 	    move_ASSIGNMENTS_to_PKGPATH >> "$partial_summary_fn"
     fi
@@ -522,7 +525,7 @@ while test -n "${with_dep}${with_bdep}"; do
 
     if test -s "$extra_deps_fn"; then
 #	echo "inside! pkg_src_summary $make_plist < \"$extra_deps_fn\" >> \"$partial_summary_fn\"" 1>&2
-	pkg_src_summary $make_plist \
+	@@bindir@@/pkg_src_summary $make_plist \
 	    < "$extra_deps_fn" >> "$partial_summary_fn"
 	cat "$extra_deps_fn" >> "$processed_pkgs_fn"
     else

pkg_summary-utils/files/pkg_update_src_summary.in

@@ -106,7 +106,7 @@ allpkgs_fn=$tmp_dir/allpkgs
 if test "$pkgs_fn"; then
     awk '{sub(/#.*/, "")} NF > 0 {print $1}' $pkgs_fn > $allpkgs_fn
 else
-    pkg_list_all_pkgs > $allpkgs_fn
+    @@bindir@@/pkg_list_all_pkgs > $allpkgs_fn
 fi
 
 ############################################################
@@ -114,18 +114,18 @@ fi
 
 # src_summary from scratch
 if ! test -f $summary; then
-    eval pkg_src_summary $fields < $allpkgs_fn > $new_summary
+    eval @@bindir@@/pkg_src_summary $fields < $allpkgs_fn > $new_summary
     mv $new_summary $summary
     exit $?
 fi
 
 # micro summary
 micsum_fn=$tmp_dir/micsum
-pkg_micro_src_summary < $allpkgs_fn >$micsum_fn
+@@bindir@@/pkg_micro_src_summary < $allpkgs_fn >$micsum_fn
 
 # summary against microsummary
 cmp_fn=$tmp_dir/cmp
-pkg_cmp_summary -p $summary $micsum_fn > $cmp_fn
+@@bindir@@/pkg_cmp_summary -p $summary $micsum_fn > $cmp_fn
 
 # copying summary about unchanged packages
 eq_pkgs_fn=$tmp_dir/eqpkgs
@@ -134,7 +134,7 @@ awk '$1 ~ /^[=]/ {print $2 ":" $3}' $cmp_fn > $eq_pkgs_fn # pkgpath:pkgbase
 copy_eq_pkgs (){
 env eq_pkgs_fn="$eq_pkgs_fn" runawk -e '
 #use "xgetline.awk"
-#use "pkg_grep_summary.awk"
+#use "@@awkmoddir@@/pkg_grep_summary.awk"
 
 BEGIN {
    eq_pkgs_fn = ENVIRON ["eq_pkgs_fn"]
@@ -212,7 +212,7 @@ NF == 0 && interesting {
 pkgpath_fn=$tmp_dir/pkgpaths
 extract_pkgpath $micsum_fn > $pkgpath_fn
 
-eval pkg_src_summary $fields < $pkgpath_fn >> $new_summary
+eval @@bindir@@/pkg_src_summary $fields < $pkgpath_fn >> $new_summary
 
 # result
 mv $new_summary $summary

pkg_summary-utils/files/pkg_update_summary.in

@@ -43,7 +43,7 @@ while test $# -ne 0; do
 	    usage
 	    exit 0;;
 	-r|--refresh)
-	    refresh=pkg_refresh_summary;;
+	    refresh=@@bindir@@/pkg_refresh_summary;;
 	--)
 	    shift
 	    break;;