Mon Nov 24 00:52:09 2014 UTC ()
Allow empty lines, blank space, and "#"-delimited comments in list of packages to build.


(asau)
diff -r1.8 -r1.9 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/scan
cvs diff -r1.8 -r1.9 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/scan (expand / switch to unified diff)

--- pkgsrc/pkgtools/pbulk/files/pbulk/scripts/scan 2012/11/23 12:13:35 1.8
+++ pkgsrc/pkgtools/pbulk/files/pbulk/scripts/scan 2014/11/24 00:52:09 1.9
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#!@SH@ 1#!@SH@
2# $NetBSD: scan,v 1.8 2012/11/23 12:13:35 joerg Exp $ 2# $NetBSD: scan,v 1.9 2014/11/24 00:52:09 asau Exp $
3# 3#
4# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. 4# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
5# All rights reserved. 5# All rights reserved.
6# 6#
7# This code was developed as part of Google's Summer of Code 2007 program. 7# This code was developed as part of Google's Summer of Code 2007 program.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 12#
13# 1. Redistributions of source code must retain the above copyright 13# 1. Redistributions of source code must retain the above copyright
14# notice, this list of conditions and the following disclaimer. 14# notice, this list of conditions and the following disclaimer.
15# 2. Redistributions in binary form must reproduce the above copyright 15# 2. Redistributions in binary form must reproduce the above copyright
@@ -69,27 +69,27 @@ if [ -z "${limited_list}" ]; then @@ -69,27 +69,27 @@ if [ -z "${limited_list}" ]; then
69 exit 1 69 exit 1
70 ;; 70 ;;
71 [yY][eE][sS]) 71 [yY][eE][sS])
72 ${presolve} -p -v ${loc}/pscan > ${loc}/presolve 2> /dev/null 72 ${presolve} -p -v ${loc}/pscan > ${loc}/presolve 2> /dev/null
73 ;; 73 ;;
74 *) 74 *)
75 echo "Unsupported value for ignore_missing_dependencies." 75 echo "Unsupported value for ignore_missing_dependencies."
76 ;; 76 ;;
77 esac 77 esac
78 fi 78 fi
79else 79else
80 initial=1 80 initial=1
81 mkdir -p ${loc} 81 mkdir -p ${loc}
82 grep -v '^#' "${limited_list}" > ${loc}/missing 82 sed -e 's/\#.*$//' -e 's/[ ]*$//' -e '/^$/d' "${limited_list}" > ${loc}/missing
83 83
84 while [ -s ${loc}/missing ]; do 84 while [ -s ${loc}/missing ]; do
85 sort -u ${loc}/missing > ${loc}/missing.s 85 sort -u ${loc}/missing > ${loc}/missing.s
86 echo "Scanning..." 86 echo "Scanning..."
87 case "${master_mode}" in 87 case "${master_mode}" in
88 [nN][oO]) 88 [nN][oO])
89 ${pscan} -v -l -M ${make} ${pkgsrc} ${loc}/pscan < ${loc}/missing.s 89 ${pscan} -v -l -M ${make} ${pkgsrc} ${loc}/pscan < ${loc}/missing.s
90 ;; 90 ;;
91 [yY][eE][sS]) 91 [yY][eE][sS])
92 ${pscan} -v -l -I ${pscan_start_script} -m ${master_port_scan} -M ${make} ${pkgsrc} ${loc}/pscan < ${loc}/missing.s 92 ${pscan} -v -l -I ${pscan_start_script} -m ${master_port_scan} -M ${make} ${pkgsrc} ${loc}/pscan < ${loc}/missing.s
93 ;; 93 ;;
94 *) 94 *)
95 echo "master_mode must be either yes or no." 95 echo "master_mode must be either yes or no."