Attachment #22283 for bug #38712

View | Details | Raw Unified | Return to bug 38712
Collapse All | Expand All

Lines 5-20 Link Here

(-)lang/gawk/Makefile (-4 / +8 lines)
5	# $FreeBSD: ports/lang/gawk/Makefile,v 1.13 2001/07/11 09:02:17 dd Exp $	5	# $FreeBSD: ports/lang/gawk/Makefile,v 1.13 2001/07/11 09:02:17 dd Exp $
6		6
7	PORTNAME= gawk	7	PORTNAME= gawk
8	PORTVERSION= 3.1.0	8	PORTVERSION= 3.1.1
9	CATEGORIES= lang	9	CATEGORIES= lang
10	MASTER_SITES= ${MASTER_SITE_GNU}	10	MASTER_SITES= ${MASTER_SITE_GNU}
11	MASTER_SITE_SUBDIR= gawk	11	MASTER_SITE_SUBDIR= gawk
12		12
13	MAINTAINER= dd@FreeBSD.org	13	MAINTAINER= dd@FreeBSD.org
14		14
15	GNU_CONFIGURE= yes	15	BUILD_DEPENDS= ${LOCALBASE}/lib/libintl.a:${PORTSDIR}/devel/gettext
16	CONFIGURE_ARGS= --enable-bitops \	16
17	--enable-non-decimal-data	17	GNU_CONFIGURE= yes
		18	CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
		19	--with-libintl-prefix=${LOCALBASE}
18	MAN1= gawk.1 igawk.1	20	MAN1= gawk.1 igawk.1
		21
		22	PLIST_SUB= VERSION=${PORTVERSION}
19		23
20	.include <bsd.port.mk>	24	.include <bsd.port.mk>

Line 1 Link Here

(-)lang/gawk/distinfo (-1 / +1 lines)
1	MD5 (gawk-3.1.0.tar.gz) = 789d223fc7ee4ada694071e04124a3ae	1	MD5 (gawk-3.1.1.tar.gz) = 47e3754195bf32c8b78ad632bab903cd

Lines 1-9 Link Here

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




--- doc/gawk.texi.orig	Mon Apr 22 20:26:20 2002
+++ doc/gawk.texi	Mon May 20 23:07:14 2002
@@ -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
 interrupt.
 

 
 The next part loops through all the command-line arguments.
 There are several cases of interest:
@@ -21440,13 +21457,13 @@
 These are saved and passed on to @command{gawk}.
 
 @item -f@r{,} --file@r{,} --file=@r{,} -Wfile=

 
 @item --version@r{,} -Wversion
 @command{igawk} prints its version number, runs @samp{gawk --version}
@@ -21457,17 +21474,12 @@
 or @option{-Wsource} arguments are supplied, then the first nonoption 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.$$}.

 In any case, after the arguments have been processed,
-@file{/tmp/ig.s.$$} contains the complete text of the original @command{awk}
-program.
+the complete text of the original @command{awk} program
+is contained in a temporary file.
 
 @cindex @command{sed} utility
-@cindex stream editors
-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

 The program is as follows:
 
 @cindex @code{igawk.sh} program
@@ -21482,6 +21494,18 @@
 # Arnold Robbins, arnold@@gnu.org, Public Domain
 # July 1993
 

 @c endfile
 @end ignore
 @c file eg/prog/igawk.sh
@@ -21491,7 +21515,7 @@
     shift
 else
     # cleanup on exit, hangup, interrupt, quit, termination

 fi
 
 while [ $# -ne 0 ] # loop over arguments
@@ -21508,26 +21532,26 @@
 
     -[vF]*) opts="$opts '$1'" ;;
 

             shift;;
 
     -?version)
@@ -21542,7 +21566,7 @@
     shift
 done
 

 then
 @group
     if [ -z "$1" ]
@@ -21551,12 +21575,12 @@
          exit 1
 @end group
     else

 @c endfile
 @end example
 
@@ -21635,7 +21659,7 @@
 @c endfile
 @end example
 

 The main loop comes next.  Input lines are read in succession. Lines that
 do not start with @samp{@@include} are printed verbatim.
 If the line does start with @samp{@@include}, the @value{FN} is in @code{$2}.
@@ -21681,7 +21705,7 @@
         @}
         close(input[stackptr])
     @}

 @c endfile
 @end example
 
@@ -21707,7 +21731,7 @@
 
 @example
 @c file eg/prog/igawk.sh

Lines 1-13 Link Here

(-)lang/gawk/pkg-plist (-10 / +17 lines)
1	bin/gawk	1	bin/gawk
2	bin/pgawk	2	bin/gawk-%%VERSION%%
3	bin/gawk-3.1.0
4	bin/igawk	3	bin/igawk
		4	bin/pgawk
		5	bin/pgawk-%%VERSION%%
		6	@unexec install-info --delete %D/info/gawk.info %D/info/dir
5	info/gawk.info	7	info/gawk.info
		8	@exec install-info %D/info/gawk.info %D/info/dir
		9	@unexec install-info --delete %D/info/gawkinet.info %D/info/dir
6	info/gawkinet.info	10	info/gawkinet.info
7	libexec/awk/pwcat	11	@exec install-info %D/info/gawkinet.info %D/info/dir
8	libexec/awk/grcat	12	libexec/awk/grcat
9	share/awk/passwd.awk	13	libexec/awk/pwcat
10	share/awk/group.awk
11	share/awk/assert.awk	14	share/awk/assert.awk
12	share/awk/bits2str.awk	15	share/awk/bits2str.awk
13	share/awk/cliff_rand.awk	16	share/awk/cliff_rand.awk
Lines 15-32 Link Here
15	share/awk/ftrans.awk	18	share/awk/ftrans.awk
16	share/awk/getopt.awk	19	share/awk/getopt.awk
17	share/awk/gettime.awk	20	share/awk/gettime.awk
		21	share/awk/group.awk
18	share/awk/join.awk	22	share/awk/join.awk
19	share/awk/libintl.awk	23	share/awk/libintl.awk
20	share/awk/nextfile.awk	24	share/awk/nextfile.awk
21	share/awk/noassign.awk	25	share/awk/noassign.awk
22	share/awk/ord.awk	26	share/awk/ord.awk
		27	share/awk/passwd.awk
23	share/awk/readable.awk	28	share/awk/readable.awk
24	share/awk/rewind.awk	29	share/awk/rewind.awk
25	share/awk/round.awk	30	share/awk/round.awk
		31	share/locale/de/LC_MESSAGES/gawk.mo
		32	share/locale/es/LC_MESSAGES/gawk.mo
		33	share/locale/fr/LC_MESSAGES/gawk.mo
26	share/locale/he/LC_MESSAGES/gawk.mo	34	share/locale/he/LC_MESSAGES/gawk.mo
27	@exec install-info %D/info/gawk.info %D/info/dir	35	share/locale/it/LC_MESSAGES/gawk.mo
28	@unexec install-info --delete %D/info/gawk.info %D/info/dir	36	share/locale/sv/LC_MESSAGES/gawk.mo
29	@exec install-info %D/info/gawkinet.info %D/info/dir	37	share/locale/tr/LC_MESSAGES/gawk.mo
30	@unexec install-info --delete %D/info/gawkinet.info %D/info/dir
31	@dirrm libexec/awk
32	@dirrm share/awk	38	@dirrm share/awk
		39	@dirrm libexec/awk

Return to bug 38712

Lines 1-6 Link Here

(-)lang/gawk/files/patch-sec1 (-16 / +72 lines)
1	--- doc/gawk.texi~ Wed Jul 11 01:44:15 2001	1	--- doc/gawk.texi.orig Mon Apr 22 20:26:20 2002
2	+++ doc/gawk.texi Wed Jul 11 01:47:18 2001	2	+++ doc/gawk.texi Mon May 20 23:07:14 2002
3	@@ -20336,8 +20336,7 @@	3	@@ -97,7 +97,7 @@
		4	@finalout
		5	@end iftex
		6
		7	-@copying
		8	+@ifinfo
		9	Copyright @copyright{} 1989, 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
		10	@sp 2
		11
		12	@@ -122,7 +122,7 @@
		13	software. Copies published by the Free Software Foundation raise
		14	funds for GNU development.''
		15	@end enumerate
		16	-@end copying
		17	+@end ifinfo
		18
		19	@c Comment out the "smallbook" for technical review. Saves
		20	@c considerable paper. Remember to turn it back on before
		21	@@ -184,8 +184,24 @@
		22
		23	@c This one is correct for gawk 3.1.0 from the FSF
		24	ISBN 1-882114-28-0 @*
		25	-@sp 2
		26	-@insertcopying
		27	+
		28	+Permission is granted to copy, distribute and/or modify this document
		29	+under the terms of the GNU Free Documentation License, Version 1.1 or
		30	+any later version published by the Free Software Foundation; with the
		31	+Invariant Sections being ``GNU General Public License'', the Front-Cover
		32	+texts being (a) (see below), and with the Back-Cover Texts being (b)
		33	+(see below). A copy of the license is included in the section entitled
		34	+``GNU Free Documentation License''.
		35	+
		36	+@enumerate a
		37	+@item
		38	+``A GNU Manual''
		39	+
		40	+@item
		41	+``You have freedom to copy and modify this GNU Manual, like GNU
		42	+software. Copies published by the Free Software Foundation raise
		43	+funds for GNU development.''
		44	+@end enumerate
		45	@sp 2
		46	Cover art by Etienne Suvasa.
		47	@end titlepage
		48	@@ -228,7 +244,9 @@
		49	This file documents @command{awk}, a program that you can use to select
		50	particular records in a file and perform operations upon them.
		51
		52	-@insertcopying
		53	+This is Edition @value{EDITION} of @cite{@value{TITLE}: @value{SUBTITLE}},
		54	+for the @value{VERSION}.@value{PATCHLEVEL} (or later) version of the GNU
		55	+implementation of AWK.
		56
		57	@end ifnottex
		58
		59	@@ -21418,8 +21436,7 @@
4	arranges to clean up any temporary files on program exit or upon an	60	arranges to clean up any temporary files on program exit or upon an
5	interrupt.	61	interrupt.
6		62
Lines 10-16 Link Here
10		66
11	The next part loops through all the command-line arguments.	67	The next part loops through all the command-line arguments.
12	There are several cases of interest:	68	There are several cases of interest:
13	@@ -20358,13 +20357,13 @@	69	@@ -21440,13 +21457,13 @@
14	These are saved and passed on to @command{gawk}.	70	These are saved and passed on to @command{gawk}.
15		71
16	@item -f@r{,} --file@r{,} --file=@r{,} -Wfile=	72	@item -f@r{,} --file@r{,} --file=@r{,} -Wfile=
Lines 26-33 Link Here
26		82
27	@item --version@r{,} -Wversion	83	@item --version@r{,} -Wversion
28	@command{igawk} prints its version number, runs @samp{gawk --version}	84	@command{igawk} prints its version number, runs @samp{gawk --version}
29	@@ -20375,17 +20374,12 @@	85	@@ -21457,17 +21474,12 @@
30	or @option{-Wsource} arguments are supplied, then the first non-option argument	86	or @option{-Wsource} arguments are supplied, then the first nonoption argument
31	should be the @command{awk} program. If there are no command-line	87	should be the @command{awk} program. If there are no command-line
32	arguments left, @command{igawk} prints an error message and exits.	88	arguments left, @command{igawk} prints an error message and exits.
33	-Otherwise, the first argument is echoed into @file{/tmp/ig.s.$$}.	89	-Otherwise, the first argument is echoed into @file{/tmp/ig.s.$$}.
Lines 35-45 Link Here
35	In any case, after the arguments have been processed,	91	In any case, after the arguments have been processed,
36	-@file{/tmp/ig.s.$$} contains the complete text of the original @command{awk}	92	-@file{/tmp/ig.s.$$} contains the complete text of the original @command{awk}
37	-program.	93	-program.
38	+the complete text of the original @code{awk} program	94	+the complete text of the original @command{awk} program
39	+is contained in a temporary file.	95	+is contained in a temporary file.
40		96
41	@cindex @command{sed} utility	97	@cindex @command{sed} utility
42	-@cindex stream editor	98	-@cindex stream editors
43	-The @samp{$$} in @command{sh} represents the current process ID number.	99	-The @samp{$$} in @command{sh} represents the current process ID number.
44	-It is often used in shell programs to generate unique temporary @value{FN}s.	100	-It is often used in shell programs to generate unique temporary @value{FN}s.
45	-This allows multiple users to run @command{igawk} without worrying	101	-This allows multiple users to run @command{igawk} without worrying
Lines 47-53 Link Here
47	The program is as follows:	103	The program is as follows:
48		104
49	@cindex @code{igawk.sh} program	105	@cindex @code{igawk.sh} program
50	@@ -20400,6 +20394,18 @@	106	@@ -21482,6 +21494,18 @@
51	# Arnold Robbins, arnold@@gnu.org, Public Domain	107	# Arnold Robbins, arnold@@gnu.org, Public Domain
52	# July 1993	108	# July 1993
53		109
Lines 66-72 Link Here
66	@c endfile	122	@c endfile
67	@end ignore	123	@end ignore
68	@c file eg/prog/igawk.sh	124	@c file eg/prog/igawk.sh
69	@@ -20409,7 +20415,7 @@	125	@@ -21491,7 +21515,7 @@
70	shift	126	shift
71	else	127	else
72	# cleanup on exit, hangup, interrupt, quit, termination	128	# cleanup on exit, hangup, interrupt, quit, termination
Lines 75-81 Link Here
75	fi	131	fi
76		132
77	while [ $# -ne 0 ] # loop over arguments	133	while [ $# -ne 0 ] # loop over arguments
78	@@ -20426,26 +20432,26 @@	134	@@ -21508,26 +21532,26 @@
79		135
80	-[vF]*) opts="$opts '$1'" ;;	136	-[vF]*) opts="$opts '$1'" ;;
81		137
Lines 108-114 Link Here
108	shift;;	164	shift;;
109		165
110	-?version)	166	-?version)
111	@@ -20460,7 +20466,7 @@	167	@@ -21542,7 +21566,7 @@
112	shift	168	shift
113	done	169	done
114		170
Lines 117-123 Link Here
117	then	173	then
118	@group	174	@group
119	if [ -z "$1" ]	175	if [ -z "$1" ]
120	@@ -20469,12 +20475,12 @@	176	@@ -21551,12 +21575,12 @@
121	exit 1	177	exit 1
122	@end group	178	@end group
123	else	179	else
Lines 132-138 Link Here
132	@c endfile	188	@c endfile
133	@end example	189	@end example
134		190
135	@@ -20553,7 +20559,7 @@	191	@@ -21635,7 +21659,7 @@
136	@c endfile	192	@c endfile
137	@end example	193	@end example
138		194
Lines 141-147 Link Here
141	The main loop comes next. Input lines are read in succession. Lines that	197	The main loop comes next. Input lines are read in succession. Lines that
142	do not start with @samp{@@include} are printed verbatim.	198	do not start with @samp{@@include} are printed verbatim.
143	If the line does start with @samp{@@include}, the @value{FN} is in @code{$2}.	199	If the line does start with @samp{@@include}, the @value{FN} is in @code{$2}.
144	@@ -20599,7 +20605,7 @@	200	@@ -21681,7 +21705,7 @@
145	@}	201	@}
146	close(input[stackptr])	202	close(input[stackptr])
147	@}	203	@}
Lines 150-156 Link Here
150	@c endfile	206	@c endfile
151	@end example	207	@end example
152		208
153	@@ -20625,7 +20631,7 @@	209	@@ -21707,7 +21731,7 @@
154		210
155	@example	211	@example
156	@c file eg/prog/igawk.sh	212	@c file eg/prog/igawk.sh