The attached patch fixes building clusterit on systems with gawk
installed. When gawk is present, configure prefers it to
/usr/bin/n?awk, breaking the clustersed, dshbak and pdf scripts when
the package is installed on systems without gawk. Since the scripts
are nawk-compatible, it shouldn't be necessary to add gawk to
RUN_DEPENDS; instead, I've forced configure to try regular old awk
first.

Tested on i386/-current; reported by Dave Steinberg
<[EMAIL PROTECTED]>.

-- 

o--------------------------{ Will Maier }--------------------------o
| web:.......http://www.lfod.us/ | [EMAIL PROTECTED] |
*------------------[ BSD Unix: Live Free or Die ]------------------*
diff -x CVS -Naur ../clusterit/Makefile ./Makefile
--- ../clusterit/Makefile       Tue Jun 13 14:39:07 2006
+++ ./Makefile  Mon May  7 11:48:00 2007
@@ -3,6 +3,7 @@
 COMMENT=               "suite of clustering tools based on IBM's PSSP"
 
 DISTNAME=              clusterit-2.4
+PKGNAME=               ${DISTNAME}p1
 CATEGORIES=            sysutils
 
 HOMEPAGE=              http://www.garbled.net/clusterit.html
diff -x CVS -Naur ../clusterit/patches/patch-configure ./patches/patch-configure
--- ../clusterit/patches/patch-configure        Wed Dec 31 18:00:00 1969
+++ ./patches/patch-configure   Mon May  7 11:46:13 2007
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- configure.orig     Wed Feb  1 12:07:16 2006
++++ configure  Mon May  7 11:43:31 2007
+@@ -1528,7 +1528,7 @@ else
+   fi
+ fi
+ 
+-for ac_prog in gawk mawk nawk awk
++for ac_prog in awk nawk gawk mawk 
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with 
args.
+ set dummy $ac_prog; ac_word=$2
+@@ -1761,7 +1761,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMT
+ 
+ 
+ # Checks for programs.
+-for ac_prog in gawk /usr/xpg4/bin/awk awk
++for ac_prog in awk gawk /usr/xpg4/bin/awk
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with 
args.
+ set dummy $ac_prog; ac_word=$2

Reply via email to