Update to 3.1.1.

PR:		38712
Submitted by:	KATO Tsuguru <tkato@prontomail.com>
This commit is contained in:
Dima Dorfman 2002-06-09 02:30:34 +00:00
parent 8ff4eda1d0
commit 76c38efeb9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=60940
5 changed files with 102 additions and 35 deletions

View file

@ -5,16 +5,20 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= gawk PORTNAME= gawk
PORTVERSION= 3.1.0 PORTVERSION= 3.1.1
CATEGORIES= lang CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gawk MASTER_SITE_SUBDIR= gawk
MAINTAINER= dd@FreeBSD.org MAINTAINER= dd@FreeBSD.org
GNU_CONFIGURE= yes BUILD_DEPENDS= ${LOCALBASE}/lib/libintl.a:${PORTSDIR}/devel/gettext
CONFIGURE_ARGS= --enable-bitops \
--enable-non-decimal-data GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
MAN1= gawk.1 igawk.1 MAN1= gawk.1 igawk.1
PLIST_SUB= VERSION=${PORTVERSION}
.include <bsd.port.mk> .include <bsd.port.mk>

View file

@ -1 +1 @@
MD5 (gawk-3.1.0.tar.gz) = 789d223fc7ee4ada694071e04124a3ae MD5 (gawk-3.1.1.tar.gz) = 47e3754195bf32c8b78ad632bab903cd

View file

@ -1,9 +1,9 @@
--- Makefile.in~ Wed Aug 1 15:12:53 2001 --- Makefile.in.orig Mon Apr 29 23:36:46 2002
+++ Makefile.in Wed Aug 1 15:13:00 2001 +++ Makefile.in Mon May 20 21:04:00 2002
@@ -755,7 +755,7 @@ @@ -761,7 +761,7 @@
(fullname=gawk-`./gawk --version | sed 1q | awk '{print $$3}'` ; \
cd $(DESTDIR)$(bindir); \ cd $(DESTDIR)$(bindir); \
$(LN) gawk $$fullname ; \ $(LN) gawk $$fullname ; \
$(LN) pgawk p$$fullname ; \
- if [ ! -f awk ]; \ - if [ ! -f awk ]; \
+ if ! /usr/bin/which -s awk; \ + if ! /usr/bin/which -s awk; \
then $(LN_S) gawk awk; \ then $(LN_S) gawk awk; \

View file

@ -1,6 +1,62 @@
--- doc/gawk.texi~ Wed Jul 11 01:44:15 2001 --- doc/gawk.texi.orig Mon Apr 22 20:26:20 2002
+++ doc/gawk.texi Wed Jul 11 01:47:18 2001 +++ doc/gawk.texi Mon May 20 23:07:14 2002
@@ -20336,8 +20336,7 @@ @@ -97,7 +97,7 @@
@finalout
@end iftex
-@copying
+@ifinfo
Copyright @copyright{} 1989, 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
@sp 2
@@ -122,7 +122,7 @@
software. Copies published by the Free Software Foundation raise
funds for GNU development.''
@end enumerate
-@end copying
+@end ifinfo
@c Comment out the "smallbook" for technical review. Saves
@c considerable paper. Remember to turn it back on *before*
@@ -184,8 +184,24 @@
@c This one is correct for gawk 3.1.0 from the FSF
ISBN 1-882114-28-0 @*
-@sp 2
-@insertcopying
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being ``GNU General Public License'', the Front-Cover
+texts being (a) (see below), and with the Back-Cover Texts being (b)
+(see below). A copy of the license is included in the section entitled
+``GNU Free Documentation License''.
+
+@enumerate a
+@item
+``A GNU Manual''
+
+@item
+``You have freedom to copy and modify this GNU Manual, like GNU
+software. Copies published by the Free Software Foundation raise
+funds for GNU development.''
+@end enumerate
@sp 2
Cover art by Etienne Suvasa.
@end titlepage
@@ -228,7 +244,9 @@
This file documents @command{awk}, a program that you can use to select
particular records in a file and perform operations upon them.
-@insertcopying
+This is Edition @value{EDITION} of @cite{@value{TITLE}: @value{SUBTITLE}},
+for the @value{VERSION}.@value{PATCHLEVEL} (or later) version of the GNU
+implementation of AWK.
@end ifnottex
@@ -21418,8 +21436,7 @@
arranges to clean up any temporary files on program exit or upon an arranges to clean up any temporary files on program exit or upon an
interrupt. interrupt.
@ -10,7 +66,7 @@
The next part loops through all the command-line arguments. The next part loops through all the command-line arguments.
There are several cases of interest: There are several cases of interest:
@@ -20358,13 +20357,13 @@ @@ -21440,13 +21457,13 @@
These are saved and passed on to @command{gawk}. These are saved and passed on to @command{gawk}.
@item -f@r{,} --file@r{,} --file=@r{,} -Wfile= @item -f@r{,} --file@r{,} --file=@r{,} -Wfile=
@ -26,8 +82,8 @@
@item --version@r{,} -Wversion @item --version@r{,} -Wversion
@command{igawk} prints its version number, runs @samp{gawk --version} @command{igawk} prints its version number, runs @samp{gawk --version}
@@ -20375,17 +20374,12 @@ @@ -21457,17 +21474,12 @@
or @option{-Wsource} arguments are supplied, then the first non-option argument or @option{-Wsource} arguments are supplied, then the first nonoption argument
should be the @command{awk} program. If there are no command-line should be the @command{awk} program. If there are no command-line
arguments left, @command{igawk} prints an error message and exits. 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 @file{/tmp/ig.s.$$}.
@ -35,11 +91,11 @@
In any case, after the arguments have been processed, In any case, after the arguments have been processed,
-@file{/tmp/ig.s.$$} contains the complete text of the original @command{awk} -@file{/tmp/ig.s.$$} contains the complete text of the original @command{awk}
-program. -program.
+the complete text of the original @code{awk} program +the complete text of the original @command{awk} program
+is contained in a temporary file. +is contained in a temporary file.
@cindex @command{sed} utility @cindex @command{sed} utility
-@cindex stream editor -@cindex stream editors
-The @samp{$$} in @command{sh} represents the current process ID number. -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. -It is often used in shell programs to generate unique temporary @value{FN}s.
-This allows multiple users to run @command{igawk} without worrying -This allows multiple users to run @command{igawk} without worrying
@ -47,7 +103,7 @@
The program is as follows: The program is as follows:
@cindex @code{igawk.sh} program @cindex @code{igawk.sh} program
@@ -20400,6 +20394,18 @@ @@ -21482,6 +21494,18 @@
# Arnold Robbins, arnold@@gnu.org, Public Domain # Arnold Robbins, arnold@@gnu.org, Public Domain
# July 1993 # July 1993
@ -66,7 +122,7 @@
@c endfile @c endfile
@end ignore @end ignore
@c file eg/prog/igawk.sh @c file eg/prog/igawk.sh
@@ -20409,7 +20415,7 @@ @@ -21491,7 +21515,7 @@
shift shift
else else
# cleanup on exit, hangup, interrupt, quit, termination # cleanup on exit, hangup, interrupt, quit, termination
@ -75,7 +131,7 @@
fi fi
while [ $# -ne 0 ] # loop over arguments while [ $# -ne 0 ] # loop over arguments
@@ -20426,26 +20432,26 @@ @@ -21508,26 +21532,26 @@
-[vF]*) opts="$opts '$1'" ;; -[vF]*) opts="$opts '$1'" ;;
@ -108,7 +164,7 @@
shift;; shift;;
-?version) -?version)
@@ -20460,7 +20466,7 @@ @@ -21542,7 +21566,7 @@
shift shift
done done
@ -117,7 +173,7 @@
then then
@group @group
if [ -z "$1" ] if [ -z "$1" ]
@@ -20469,12 +20475,12 @@ @@ -21551,12 +21575,12 @@
exit 1 exit 1
@end group @end group
else else
@ -132,7 +188,7 @@
@c endfile @c endfile
@end example @end example
@@ -20553,7 +20559,7 @@ @@ -21635,7 +21659,7 @@
@c endfile @c endfile
@end example @end example
@ -141,7 +197,7 @@
The main loop comes next. Input lines are read in succession. Lines that The main loop comes next. Input lines are read in succession. Lines that
do not start with @samp{@@include} are printed verbatim. do not start with @samp{@@include} are printed verbatim.
If the line does start with @samp{@@include}, the @value{FN} is in @code{$2}. If the line does start with @samp{@@include}, the @value{FN} is in @code{$2}.
@@ -20599,7 +20605,7 @@ @@ -21681,7 +21705,7 @@
@} @}
close(input[stackptr]) close(input[stackptr])
@} @}
@ -150,7 +206,7 @@
@c endfile @c endfile
@end example @end example
@@ -20625,7 +20631,7 @@ @@ -21707,7 +21731,7 @@
@example @example
@c file eg/prog/igawk.sh @c file eg/prog/igawk.sh

View file

@ -1,13 +1,16 @@
bin/gawk bin/gawk
bin/pgawk bin/gawk-%%VERSION%%
bin/gawk-3.1.0
bin/igawk bin/igawk
bin/pgawk
bin/pgawk-%%VERSION%%
@unexec install-info --delete %D/info/gawk.info %D/info/dir
info/gawk.info info/gawk.info
@exec install-info %D/info/gawk.info %D/info/dir
@unexec install-info --delete %D/info/gawkinet.info %D/info/dir
info/gawkinet.info info/gawkinet.info
libexec/awk/pwcat @exec install-info %D/info/gawkinet.info %D/info/dir
libexec/awk/grcat libexec/awk/grcat
share/awk/passwd.awk libexec/awk/pwcat
share/awk/group.awk
share/awk/assert.awk share/awk/assert.awk
share/awk/bits2str.awk share/awk/bits2str.awk
share/awk/cliff_rand.awk share/awk/cliff_rand.awk
@ -15,18 +18,22 @@ share/awk/ctime.awk
share/awk/ftrans.awk share/awk/ftrans.awk
share/awk/getopt.awk share/awk/getopt.awk
share/awk/gettime.awk share/awk/gettime.awk
share/awk/group.awk
share/awk/join.awk share/awk/join.awk
share/awk/libintl.awk share/awk/libintl.awk
share/awk/nextfile.awk share/awk/nextfile.awk
share/awk/noassign.awk share/awk/noassign.awk
share/awk/ord.awk share/awk/ord.awk
share/awk/passwd.awk
share/awk/readable.awk share/awk/readable.awk
share/awk/rewind.awk share/awk/rewind.awk
share/awk/round.awk share/awk/round.awk
share/locale/de/LC_MESSAGES/gawk.mo
share/locale/es/LC_MESSAGES/gawk.mo
share/locale/fr/LC_MESSAGES/gawk.mo
share/locale/he/LC_MESSAGES/gawk.mo share/locale/he/LC_MESSAGES/gawk.mo
@exec install-info %D/info/gawk.info %D/info/dir share/locale/it/LC_MESSAGES/gawk.mo
@unexec install-info --delete %D/info/gawk.info %D/info/dir share/locale/sv/LC_MESSAGES/gawk.mo
@exec install-info %D/info/gawkinet.info %D/info/dir share/locale/tr/LC_MESSAGES/gawk.mo
@unexec install-info --delete %D/info/gawkinet.info %D/info/dir
@dirrm libexec/awk
@dirrm share/awk @dirrm share/awk
@dirrm libexec/awk