Import of pkgsrc-2016Q3

mk/scripts/genreadme.awk

@@ -1,7 +1,7 @@
 #!/usr/bin/awk -f
-# $NetBSD: genreadme.awk,v 1.35 2013/05/09 23:37:27 riastradh Exp $
+# $NetBSD: genreadme.awk,v 1.37 2016/07/07 12:01:22 wiz Exp $
 #
-# Copyright (c) 2002, 2003, 2005, 2006 The NetBSD Foundation, Inc.
+# Copyright (c) 2002, 2003, 2005, 2006, 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
 # This code is derived from software contributed to The NetBSD Foundation
@@ -165,6 +165,15 @@ BEGIN {
 	next;
 }
 
+/^htmloptions / {
+	htmloptions = $3;
+	for (i = 4; i <= NF; i++){
+		htmloptions = htmloptions " " $i;
+	}
+	options[$2] = htmloptions;
+	next;
+}
+
 /^index / {
 #
 # read lines like:
@@ -395,6 +404,7 @@ END {
 				gsub(/%%VULNERABILITIES%%/, ""vul"");
 				gsub(/%%VULDATE%%/, ""vuldate"");
 				gsub(/%%RUN_DEPENDS%%/, ""rundeps"");
+				gsub(/%%OPTIONS%%/, ""options[toppkg]"");
 
 				line = $0;
 
@@ -458,7 +468,9 @@ END {
 			gsub(/^[ \t]*SUBDIR.*=[ \t]*/, "", category);
 			catdir = PKGSRCDIR"/"category;
 			readmenew = catdir"/"readme_name;
-			printf("Category = %s\n", category);
+			if (quiet != "yes") {
+				printf("Category = %s\n", category);
+			}
 			cat_make = catdir"/Makefile";
 			pkgs = "";
 			pkgs_file = TMPDIR "/pkgs_file";

mk/scripts/htmloptions.awk

@@ -0,0 +1,58 @@
+#!/usr/bin/awk -f
+# $NetBSD: htmloptions.awk,v 1.1 2015/10/03 13:17:57 bsiegert Exp $
+#
+# Copyright (c) 2015 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+BEGIN {
+	FS = "\t";
+}
+
+/^\t/ {
+	o++;
+	printf "<dt>%s</dt><dd>%s</dd>", $2, $3;
+}
+
+/^These options are/ {
+	finalize();
+	exit;
+}
+
+END {
+	finalize();
+}
+
+function finalize() {
+	if(o == 0) {
+		printf "<dt><em>(none)</em></dt>";
+	}
+}

mk/scripts/mkdatabase

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkdatabase,v 1.9 2005/11/18 11:07:27 rillig Exp $
+# $NetBSD: mkdatabase,v 1.10 2015/10/03 13:17:57 bsiegert Exp $
 #
 # Script for generating a database with complete dependency information
 # for a particular package
@@ -160,6 +160,11 @@ case ${DATABASE} in
 esac
 
 
+here=`pwd`
+tmp1=`dirname "$here"`
+pkgcat=`basename "$tmp1"`
+pkg=`basename "$here"`
+pkgpath=$pkgcat/$pkg
 if [ $append_flag = yes ]; then
     echo "$prompt Appending to database in ${DATABASE}"
     if [ ! -f "${DATABASE}" ]; then
@@ -167,11 +172,6 @@ if [ $append_flag = yes ]; then
     fi
     # make sure we haven't already been listed before
     # appending ourselves.
-    here=`pwd`
-    tmp1=`dirname "$here"`
-    pkgcat=`basename "$tmp1"`
-    pkg=`basename "$here"`
-    pkgpath=$pkgcat/$pkg
     case $debug_flag in
     yes)	echo "Looking for $pkgpath before appending";;
     esac
@@ -184,7 +184,9 @@ if [ $append_flag = yes ]; then
     fi
 else
     echo "$prompt Creating new database in ${DATABASE}"
-    ${BMAKE} print-summary-data > "${DATABASE}" || exit 1
+    o=`${BMAKE} show-options | ${AWK} -f ../../mk/scripts/htmloptions.awk`
+    echo "htmloptions ${pkgpath} $o" > ${DATABASE}
+    ${BMAKE} print-summary-data >> "${DATABASE}" || exit 1
 fi
 here=`pwd`
 echo "$prompt Depending in $here (pass #1)"

mk/scripts/mkreadme

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkreadme,v 1.27 2015/06/13 12:09:32 spz Exp $
+# $NetBSD: mkreadme,v 1.30 2016/08/19 12:17:26 wiz Exp $
 #
 # Script for README.html generation
 #
@@ -265,23 +265,16 @@ echo "Starting README.html generation: `date`"
 ######################################################################
 
 echo " "
-echo "Extracting tool variables:"
-echo " "
+echo "Extracting tool variables"
 if [ -d ${PKGSRCDIR}/pkgtools/prereq-readme ]; then
     cd ${PKGSRCDIR}/pkgtools/prereq-readme
     eval "`${BMAKE} show-tools`"
-    for v in AWK CMP ECHO EXPR FGREP FIND GREP GZIP_CMD SED SETENV SORT
-    do
-	eval "echo '---->'  ${v}=\"\${${v}}\""
-    done
 else
     echo "Error:   ${PKGSRCDIR}/pkgtools/prereq-readme does not seem to exist"
     exit 1
 fi
 
-echo " "
-echo "Extracting configuration variables:"
-echo " "
+echo "Extracting configuration variables"
 if [ -d ${PKGSRCDIR}/pkgtools/prereq-readme ]; then
     cd ${PKGSRCDIR}/pkgtools/prereq-readme
     for v in CDROM_PKG_URL_HOST CDROM_PKG_URL_DIR DISTDIR \
@@ -294,7 +287,6 @@ if [ -d ${PKGSRCDIR}/pkgtools/prereq-readme ]; then
 	    echo "Failed.  This is a fatal error"
 	    clean_and_exit
 	fi
-	echo "---->  ${v}=\"${val}\""
 	eval "${v}=\"${val}\""
     done
 else
@@ -381,6 +373,7 @@ if [ "x$restart" = "xno" ] ; then
 		    		echo "          but the directory does not exist.  Please fix this!" > /dev/stderr
 	    		else
 		    		cd ${PKGSRCDIR}/${c}/${pkgdir}
+				o=`${BMAKE} show-options | ${AWK} -f ${PKGSRCDIR}/mk/scripts/htmloptions.awk`
 		    		l=`${BMAKE} print-summary-data`
 		    		if [ $? != 0 ]; then
 			    		echo "WARNING (printdepends):  the package in ${c}/${pkgdir} had problem with" \
@@ -391,6 +384,7 @@ if [ "x$restart" = "xno" ] ; then
 			    		${BMAKE} print-summary-data  2>&1 > /dev/stderr
 		    		else
 			    		echo "$l" >> $DATABASEFILE
+					echo "htmloptions ${c}/${pkgdir} $o" >> $DATABASEFILE
 		    		fi
 	    		fi
 			if [ "x$quiet" = "xno" ]; then