Update to 3.1.0 and take over as maintainer from ports@. The only non

vendor-induced change is that this port now installs igawk and awklib
(this accounts for the removal of patch-a{a,b}).  As far as I can
tell, there was never a reason not to do this (other than that
patch-sec1 hardcoded the wrong path to mktemp, so igawk couldn't
work).

6 files changed, 87 insertions, 87 deletions

diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index beb1e53b9174..a91eabc413f8 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -5,17 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=	gawk
-PORTVERSION=	3.0.6
+PORTVERSION=	3.1.0
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gawk
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dd@FreeBSD.org
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--program-prefix=g \
-			--enable-bitops \
+CONFIGURE_ARGS=		--enable-bitops \
 			--enable-non-decimal-data
-MAN1= gawk.1
+MAN1= gawk.1 igawk.1
 
 .include <bsd.port.mk>
diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo
index 8d6e8049f52c..06b0f7cfa0fe 100644
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1 +1 @@
-MD5 (gawk-3.0.6.tar.gz) = b5ba21c033f5a9737455458d94954609
+MD5 (gawk-3.1.0.tar.gz) = 789d223fc7ee4ada694071e04124a3ae
diff --git a/lang/gawk/files/patch-aa b/lang/gawk/files/patch-aa
deleted file mode 100644
index 3e2196a08f97..000000000000
--- a/lang/gawk/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Wed Jun  9 10:36:30 1999
-+++ Makefile.in	Mon Oct 11 07:54:39 1999
-@@ -184,7 +184,6 @@
- 	then	$(LN_S) gawk awk; \
- 	fi; exit 0)
- 	cd doc && $(MAKE) install
--	cd awklib && $(MAKE) install
- 
- installdirs: mkinstalldirs
- 	$(srcdir)/mkinstalldirs $(bindir) $(datadir) \
diff --git a/lang/gawk/files/patch-ab b/lang/gawk/files/patch-ab
deleted file mode 100644
index f57cc21366c6..000000000000
--- a/lang/gawk/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Wed Apr 28 16:21:56 1999
-+++ doc/Makefile.in	Tue Oct 19 07:54:59 1999
-@@ -69,7 +69,7 @@
- 
- all: $(DOCS) info
- 
--install: $(mandir)/gawk$(manext) $(mandir)/igawk$(manext) $(infodir)/gawk.info
-+install: $(mandir)/gawk$(manext) $(infodir)/gawk.info
- 
- $(infodir)/gawk.info::
- 	-if test -f gawk.info; then d=.; \
diff --git a/lang/gawk/files/patch-sec1 b/lang/gawk/files/patch-sec1
index e1b57b976396..a26de999c473 100644
--- a/lang/gawk/files/patch-sec1
+++ b/lang/gawk/files/patch-sec1
@@ -1,7 +1,6 @@
-diff -ur gawk-3.0.6.orig/doc/gawk.texi gawk-3.0.6/doc/gawk.texi
---- doc/gawk.texi.orig	Tue Aug  8 02:57:43 2000
-+++ doc/gawk.texi	Sun May 27 04:30:53 2001
-@@ -16550,8 +16550,7 @@
+--- doc/gawk.texi~	Wed Jul 11 01:44:15 2001
++++ doc/gawk.texi	Wed Jul 11 01:47:18 2001
+@@ -20336,8 +20336,7 @@
  arranges to clean up any temporary files on program exit or upon an
  interrupt.
  
@@ -9,47 +8,46 @@ diff -ur gawk-3.0.6.orig/doc/gawk.texi gawk-3.0.6/doc/gawk.texi
 -@c 2e: or something as similar as possible.
 +@c 2e: For the temporary file handling, use mktemp with $@{TMPDIR:-/tmp@}.
  
- The next part loops through all the command line arguments.
- There are several cases of interest.
-@@ -16576,7 +16575,7 @@
- @itemx --file
- @itemx --file=
- @itemx -Wfile=
--The file name is saved to the temporary file @file{/tmp/ig.s.$$} with an
-+The file name is saved to a temporary file with an
+ The next part loops through all the command-line arguments.
+ There are several cases of interest:
+@@ -20358,13 +20357,13 @@
+ These are saved and passed on to @command{gawk}.
+ 
+ @item -f@r{,} --file@r{,} --file=@r{,} -Wfile=
+-The @value{FN} is saved to the temporary file @file{/tmp/ig.s.$$} with an
++The @value{FN} is saved to a temporary file with an
  @samp{@@include} statement.
- The @code{sed} utility is used to remove the leading option part of the
+ The @command{sed} utility is used to remove the leading option part of the
  argument (e.g., @samp{--file=}).
-@@ -16584,7 +16583,7 @@
- @item --source
- @itemx --source=
- @itemx -Wsource=
+ 
+ @item --source@r{,} --source=@r{,} -Wsource=
 -The source text is echoed into @file{/tmp/ig.s.$$}.
 +The source text is echoed into a temporary file.
  
- @item --version
- @itemx -Wversion
-@@ -16596,16 +16595,11 @@
- or @samp{-Wsource}, were supplied, then the first non-option argument
- should be the @code{awk} program.  If there are no command line
- arguments left, @code{igawk} prints an error message and exits.
+ @item --version@r{,} -Wversion
+ @command{igawk} prints its version number, runs @samp{gawk --version}
+@@ -20375,17 +20374,12 @@
+ or @option{-Wsource} arguments are supplied, then the first non-option argument
+ should be the @command{awk} program.  If there are no command-line
+ arguments left, @command{igawk} prints an error message and exits.
 -Otherwise, the first argument is echoed into @file{/tmp/ig.s.$$}.
 +Otherwise, the first argument is echoed into a temporary file.
- 
  In any case, after the arguments have been processed,
--@file{/tmp/ig.s.$$} contains the complete text of the original @code{awk}
+-@file{/tmp/ig.s.$$} contains the complete text of the original @command{awk}
 -program.
--
--The @samp{$$} in @code{sh} represents the current process ID number.
--It is often used in shell programs to generate unique temporary file
--names.  This allows multiple users to run @code{igawk} without worrying
--that the temporary file names will clash.
 +the complete text of the original @code{awk} program
 +is contained in a temporary file.
  
- @cindex @code{sed} utility
- Here's the program:
-@@ -16620,13 +16614,25 @@
+ @cindex @command{sed} utility
+-@cindex stream editor
+-The @samp{$$} in @command{sh} represents the current process ID number.
+-It is often used in shell programs to generate unique temporary @value{FN}s.
+-This allows multiple users to run @command{igawk} without worrying
+-that the temporary @value{FN}s will clash.
+ The program is as follows:
+ 
+ @cindex @code{igawk.sh} program
+@@ -20400,6 +20394,18 @@
  # Arnold Robbins, arnold@@gnu.org, Public Domain
  # July 1993
  
@@ -57,17 +55,18 @@ diff -ur gawk-3.0.6.orig/doc/gawk.texi gawk-3.0.6/doc/gawk.texi
 +# Jarno Huuskonen and Solar Designer, still Public Domain
 +# May 2001
 +
-+if [ ! -x /bin/mktemp ]; then
++if [ ! -x /usr/bin/mktemp ]; then
 +    echo "$0 needs mktemp to create temporary files."
 +    exit 1
 +fi
 +
-+STEMPFILE=`/bin/mktemp $@{TMPDIR:-/tmp@}/igawk.s.XXXXXX` || exit 1
-+ETEMPFILE=`/bin/mktemp $@{TMPDIR:-/tmp@}/igawk.e.XXXXXX` || exit 1
++STEMPFILE=`/usr/bin/mktemp $@{TMPDIR:-/tmp@}/igawk.s.XXXXXX` || exit 1
++ETEMPFILE=`/usr/bin/mktemp $@{TMPDIR:-/tmp@}/igawk.e.XXXXXX` || exit 1
 +
- if [ "$1" = debug ]
- then
-     set -x
+ @c endfile
+ @end ignore
+ @c file eg/prog/igawk.sh
+@@ -20409,7 +20415,7 @@
      shift
  else
      # cleanup on exit, hangup, interrupt, quit, termination
@@ -76,7 +75,7 @@ diff -ur gawk-3.0.6.orig/doc/gawk.texi gawk-3.0.6/doc/gawk.texi
  fi
  
  while [ $# -ne 0 ] # loop over arguments
-@@ -16643,28 +16649,28 @@
+@@ -20426,26 +20432,26 @@
  
      -[vF]*) opts="$opts '$1'" ;;
  
@@ -84,44 +83,43 @@ diff -ur gawk-3.0.6.orig/doc/gawk.texi gawk-3.0.6/doc/gawk.texi
 +    -f)     echo @@include "$2" >> $STEMPFILE
              shift;;
  
- @group
      -f*)    f=`echo "$1" | sed 's/-f//'`
 -            echo @@include "$f" >> /tmp/ig.s.$$ ;;
 +            echo @@include "$f" >> $STEMPFILE ;;
- @end group
  
      -?file=*)    # -Wfile or --file
              f=`echo "$1" | sed 's/-.file=//'`
 -            echo @@include "$f" >> /tmp/ig.s.$$ ;;
 +            echo @@include "$f" >> $STEMPFILE ;;
  
-     -?file)    # get arg, $2
+     -?file)      # get arg, $2
 -            echo @@include "$2" >> /tmp/ig.s.$$
 +            echo @@include "$2" >> $STEMPFILE
              shift;;
  
-     -?source=*)    # -Wsource or --source
+     -?source=*)  # -Wsource or --source
              t=`echo "$1" | sed 's/-.source=//'`
 -            echo "$t" >> /tmp/ig.s.$$ ;;
 +            echo "$t" >> $STEMPFILE ;;
  
-     -?source)  # get arg, $2
+     -?source)    # get arg, $2
 -            echo "$2" >> /tmp/ig.s.$$
 +            echo "$2" >> $STEMPFILE
              shift;;
  
      -?version)
-@@ -16679,19 +16685,19 @@
+@@ -20460,7 +20466,7 @@
      shift
  done
  
 -if [ ! -s /tmp/ig.s.$$ ]
 +if [ ! -s $STEMPFILE ]
  then
+ @group
      if [ -z "$1" ]
-     then
-          echo igawk: no program! 1>&2
+@@ -20469,12 +20475,12 @@
           exit 1
+ @end group
      else
 -        echo "$1" > /tmp/ig.s.$$
 +        echo "$1" > $STEMPFILE
@@ -132,29 +130,29 @@ diff -ur gawk-3.0.6.orig/doc/gawk.texi gawk-3.0.6/doc/gawk.texi
 -# at this point, /tmp/ig.s.$$ has the program
 +# at this point, $STEMPFILE has the program
  @c endfile
- @c @end group
  @end example
-@@ -16776,7 +16782,7 @@
- @end group
+ 
+@@ -20553,7 +20559,7 @@
+ @c endfile
  @end example
  
 -The stack is initialized with @code{ARGV[1]}, which will be @file{/tmp/ig.s.$$}.
 +The stack is initialized with @code{ARGV[1]}, which will be @file{$STEMPFILE}.
  The main loop comes next.  Input lines are read in succession. Lines that
  do not start with @samp{@@include} are printed verbatim.
- 
-@@ -16825,7 +16831,7 @@
- @group
+ If the line does start with @samp{@@include}, the @value{FN} is in @code{$2}.
+@@ -20599,7 +20605,7 @@
+         @}
          close(input[stackptr])
      @}
 -@}' /tmp/ig.s.$$ > /tmp/ig.e.$$
 +@}' $STEMPFILE > $ETEMPFILE
- @end group
  @c endfile
- @c @end group
-@@ -16852,7 +16858,7 @@
+ @end example
+ 
+@@ -20625,7 +20631,7 @@
+ 
  @example
- @c @group
  @c file eg/prog/igawk.sh
 -eval gawk -f /tmp/ig.e.$$ $opts -- "$@@"
 +eval gawk -f $ETEMPFILE $opts -- "$@@"
diff --git a/lang/gawk/pkg-plist b/lang/gawk/pkg-plist
index 2d81def3fa75..f113de3b34de 100644
--- a/lang/gawk/pkg-plist
+++ b/lang/gawk/pkg-plist
@@ -1,8 +1,32 @@
-bin/awk
 bin/gawk
-bin/gawk-3.0.6
+bin/pgawk
+bin/gawk-3.1.0
+bin/igawk
 info/gawk.info
 @exec install-info %D/%F %D/info/dir
 @unexec install-info --delete %D/%F %D/info/dir
+info/gawkinet.info
+@exec install-info %D/%F %D/info/dir
+@unexec install-info --delete %D/%F %D/info/dir
+libexec/awk/pwcat
+libexec/awk/grcat
+share/awk/passwd.awk
+share/awk/group.awk
+share/awk/assert.awk
+share/awk/bits2str.awk
+share/awk/cliff_rand.awk
+share/awk/ctime.awk
+share/awk/ftrans.awk
+share/awk/getopt.awk
+share/awk/gettime.awk
+share/awk/join.awk
+share/awk/libintl.awk
+share/awk/nextfile.awk
+share/awk/noassign.awk
+share/awk/ord.awk
+share/awk/readable.awk
+share/awk/rewind.awk
+share/awk/round.awk
+share/locale/he/LC_MESSAGES/gawk.mo
 @dirrm libexec/awk
 @dirrm share/awk