[Midnightbsd-cvs] mports: lang/gawk: Update to 3.1.5
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon May 12 23:42:22 EDT 2008
Log Message:
-----------
Update to 3.1.5
Modified Files:
--------------
mports/lang/gawk:
Makefile (r1.2 -> r1.3)
distinfo (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
mports/lang/gawk/files:
extra-patch-nowchar (r1.1 -> r1.2)
patch-Makefile (r1.1 -> r1.2)
Added Files:
-----------
mports/lang/gawk/files:
patch-dfa.c (r1.1)
patch-hard-locale.h (r1.1)
patch-io.c (r1.1)
Removed Files:
-------------
mports/lang/gawk/files:
patch-sec1
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/lang/gawk/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/gawk/pkg-plist -L lang/gawk/pkg-plist -u -r1.1 -r1.2
--- lang/gawk/pkg-plist
+++ lang/gawk/pkg-plist
@@ -22,12 +22,26 @@
share/awk/readable.awk
share/awk/rewind.awk
share/awk/round.awk
+share/awk/strtonum.awk
+share/awk/zerofile.awk
+%%NLS%%share/locale/ca/LC_MESSAGES/gawk.mo
+%%NLS%%share/locale/da/LC_MESSAGES/gawk.mo
%%NLS%%share/locale/de/LC_MESSAGES/gawk.mo
%%NLS%%share/locale/es/LC_MESSAGES/gawk.mo
%%NLS%%share/locale/fr/LC_MESSAGES/gawk.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/gawk.mo
%%NLS%%share/locale/he/LC_MESSAGES/gawk.mo
%%NLS%%share/locale/it/LC_MESSAGES/gawk.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gawk.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gawk.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gawk.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gawk.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/gawk.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/gawk.mo
%%NLS%%share/locale/sv/LC_MESSAGES/gawk.mo
%%NLS%%share/locale/tr/LC_MESSAGES/gawk.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/gawk.mo
@dirrm share/awk
@dirrm libexec/awk
+ at dirrmtry share/locale/rw/LC_MESSAGES
+ at dirrmtry share/locale/rw
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/gawk/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lang/gawk/Makefile -L lang/gawk/Makefile -u -r1.2 -r1.3
--- lang/gawk/Makefile
+++ lang/gawk/Makefile
@@ -6,8 +6,8 @@
# $MidnightBSD$
PORTNAME= gawk
-PORTVERSION= 3.1.1
-PORTREVISION= 1
+PORTVERSION= 3.1.5
+PORTREVISION= 0
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gawk
@@ -24,7 +24,8 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
-MAN1= gawk.1 igawk.1
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd6.0
+MAN1= gawk.1 igawk.1 pgawk.1
PLIST_SUB= VERSION=${PORTVERSION}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/lang/gawk/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/gawk/distinfo -L lang/gawk/distinfo -u -r1.1 -r1.2
--- lang/gawk/distinfo
+++ lang/gawk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gawk-3.1.1.tar.gz) = 47e3754195bf32c8b78ad632bab903cd
-SHA256 (gawk-3.1.1.tar.gz) = d6426dce790abe2abd2eabf90b8968ebe4e4150ca5e7f7ada05098c77a02035e
-SIZE (gawk-3.1.1.tar.gz) = 1875134
+MD5 (gawk-3.1.5.tar.gz) = 4760325489479cac17fe0114b8f62f30
+SHA256 (gawk-3.1.5.tar.gz) = 463dcb9d0ca398b1d4f5a332f6cd9cec56441265fca616f2ea1b44d459e9f0f8
+SIZE (gawk-3.1.5.tar.gz) = 2310919
--- /dev/null
+++ lang/gawk/files/patch-hard-locale.h
@@ -0,0 +1,22 @@
+
+$FreeBSD: ports/lang/gawk/files/patch-hard-locale.h,v 1.1 2007/03/23 10:15:18 krion Exp $
+
+--- hard-locale.h.orig
++++ hard-locale.h
+@@ -22,6 +22,8 @@
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+
++static ptr_t xmalloc PARAMS ((size_t n));
++
+ /* Return nonzero if the current CATEGORY locale is hard, i.e. if you
+ can't get away with assuming traditional C or POSIX behavior. */
+ static int
+@@ -40,7 +42,6 @@
+ if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+ hard = 0;
+ # else
+- static ptr_t xmalloc PARAMS ((size_t n));
+
+ char *locale = xmalloc (strlen (p) + 1);
+ strcpy (locale, p);
Index: patch-Makefile
===================================================================
RCS file: /home/cvs/mports/lang/gawk/files/patch-Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/gawk/files/patch-Makefile -L lang/gawk/files/patch-Makefile -u -r1.1 -r1.2
--- lang/gawk/files/patch-Makefile
+++ lang/gawk/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.in.orig Mon Apr 29 23:36:46 2002
-+++ Makefile.in Mon May 20 21:04:00 2002
-@@ -761,7 +761,7 @@
- cd $(DESTDIR)$(bindir); \
- $(LN) gawk $$fullname ; \
- $(LN) pgawk p$$fullname ; \
-- if [ ! -f awk ]; \
+--- Makefile.in.orig Sun Mar 4 10:18:08 2007
++++ Makefile.in Sun Mar 4 10:19:23 2007
+@@ -936,7 +936,7 @@
+ (cd $(DESTDIR)$(bindir); \
+ $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
+ $(LN) pgawk$(EXEEXT) pgawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
+- if [ ! -f awk$(EXEEXT) ]; \
+ if ! /usr/bin/which -s awk; \
- then $(LN_S) gawk awk; \
+ then $(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \
fi; exit 0)
--- /dev/null
+++ lang/gawk/files/patch-dfa.c
@@ -0,0 +1,13 @@
+
+$FreeBSD: ports/lang/gawk/files/patch-dfa.c,v 1.1 2007/03/23 10:15:18 krion Exp $
+
+--- dfa.c.orig
++++ dfa.c
+@@ -122,7 +122,6 @@
+ static void dfamust PARAMS ((struct dfa *dfa));
+
+ static ptr_t xcalloc PARAMS ((size_t n, size_t s));
+-static ptr_t xmalloc PARAMS ((size_t n));
+ static ptr_t xrealloc PARAMS ((ptr_t p, size_t n));
+ #ifdef DEBUG
+ static void prtok PARAMS ((token t));
--- /dev/null
+++ lang/gawk/files/patch-io.c
@@ -0,0 +1,29 @@
+
+$FreeBSD: ports/lang/gawk/files/patch-io.c,v 1.1 2007/09/03 20:18:36 krion Exp $
+
+--- io.c.orig
++++ io.c
+@@ -2480,9 +2480,12 @@
+ {
+ struct stat sbuf;
+ struct open_hook *oh;
++ int iop_malloced = FALSE;
+
+- if (iop == NULL)
++ if (iop == NULL) {
+ emalloc(iop, IOBUF *, sizeof(IOBUF), "iop_alloc");
++ iop_malloced = TRUE;
++ }
+ memset(iop, '\0', sizeof(IOBUF));
+ iop->flag = 0;
+ iop->fd = fd;
+@@ -2495,7 +2498,8 @@
+ }
+
+ if (iop->fd == INVALID_HANDLE) {
+- free(iop);
++ if (iop_malloced)
++ free(iop);
+ return NULL;
+ }
+ if (isatty(iop->fd))
Index: extra-patch-nowchar
===================================================================
RCS file: /home/cvs/mports/lang/gawk/files/extra-patch-nowchar,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/gawk/files/extra-patch-nowchar -L lang/gawk/files/extra-patch-nowchar -u -r1.1 -r1.2
--- lang/gawk/files/extra-patch-nowchar
+++ lang/gawk/files/extra-patch-nowchar
@@ -1,11 +1,11 @@
---- configure.orig Mon Apr 29 23:36:47 2002
-+++ configure Wed Sep 11 02:22:41 2002
-@@ -4789,7 +4789,7 @@
- for ac_hdr in fcntl.h limits.h locale.h libintl.h mcheck.h \
+--- configure.orig Sun Mar 4 10:17:16 2007
++++ configure Sun Mar 4 10:17:29 2007
+@@ -7725,7 +7725,7 @@
+ for ac_header in fcntl.h limits.h locale.h libintl.h mcheck.h \
netdb.h netinet/in.h signum.h stdarg.h string.h \
sys/param.h sys/socket.h sys/time.h unistd.h \
-- wchar.h wctype.h
-+
+- termios.h stropts.h wchar.h wctype.h
++ termios.h stropts.h
do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
--- lang/gawk/files/patch-sec1
+++ /dev/null
@@ -1,217 +0,0 @@
---- 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
-
-- at copying
-+ at 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
-- at end copying
-+ at 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 @*
-- at sp 2
-- at 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''.
-+
-+ at enumerate a
-+ at item
-+``A GNU Manual''
-+
-+ at 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.''
-+ at 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.
-
-- at insertcopying
-+This is Edition @value{EDITION} of @cite{@value{TITLE}: @value{SUBTITLE}},
-+for the @value{VERSION}. at 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.
-
-- at c 2e: For the temp file handling, go with Darrel's ig=${TMP:-/tmp}/igs.$$
-- at c 2e: or something as similar as possible.
-+ at 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:
-@@ -21440,13 +21457,13 @@
- These are saved and passed on to @command{gawk}.
-
- @item -f at r{,} --file at 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 @command{sed} utility is used to remove the leading option part of the
- argument (e.g., @samp{--file=}).
-
- @item --source at 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 at 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.$$}.
-+Otherwise, the first argument is echoed into a temporary file.
- In any case, after the arguments have been processed,
-- at 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
-- at 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
--that the temporary @value{FN}s will clash.
- The program is as follows:
-
- @cindex @code{igawk.sh} program
-@@ -21482,6 +21494,18 @@
- # Arnold Robbins, arnold@@gnu.org, Public Domain
- # July 1993
-
-+# Temporary file handling modifications for Owl by
-+# Jarno Huuskonen and Solar Designer, still Public Domain
-+# May 2001
-+
-+if [ ! -x /usr/bin/mktemp ]; then
-+ echo "$0 needs mktemp to create temporary files."
-+ exit 1
-+fi
-+
-+STEMPFILE=`/usr/bin/mktemp $@{TMPDIR:-/tmp@}/igawk.s.XXXXXX` || exit 1
-+ETEMPFILE=`/usr/bin/mktemp $@{TMPDIR:-/tmp@}/igawk.e.XXXXXX` || exit 1
-+
- @c endfile
- @end ignore
- @c file eg/prog/igawk.sh
-@@ -21491,7 +21515,7 @@
- shift
- else
- # cleanup on exit, hangup, interrupt, quit, termination
-- trap 'rm -f /tmp/ig.[se].$$' 0 1 2 3 15
-+ trap 'rm -f $STEMPFILE $ETEMPFILE' EXIT HUP INT QUIT TERM
- fi
-
- while [ $# -ne 0 ] # loop over arguments
-@@ -21508,26 +21532,26 @@
-
- -[vF]*) opts="$opts '$1'" ;;
-
-- -f) echo @@include "$2" >> /tmp/ig.s.$$
-+ -f) echo @@include "$2" >> $STEMPFILE
- shift;;
-
- -f*) f=`echo "$1" | sed 's/-f//'`
-- echo @@include "$f" >> /tmp/ig.s.$$ ;;
-+ echo @@include "$f" >> $STEMPFILE ;;
-
- -?file=*) # -Wfile or --file
- f=`echo "$1" | sed 's/-.file=//'`
-- echo @@include "$f" >> /tmp/ig.s.$$ ;;
-+ echo @@include "$f" >> $STEMPFILE ;;
-
- -?file) # get arg, $2
-- echo @@include "$2" >> /tmp/ig.s.$$
-+ echo @@include "$2" >> $STEMPFILE
- shift;;
-
- -?source=*) # -Wsource or --source
- t=`echo "$1" | sed 's/-.source=//'`
-- echo "$t" >> /tmp/ig.s.$$ ;;
-+ echo "$t" >> $STEMPFILE ;;
-
- -?source) # get arg, $2
-- echo "$2" >> /tmp/ig.s.$$
-+ echo "$2" >> $STEMPFILE
- shift;;
-
- -?version)
-@@ -21542,7 +21566,7 @@
- shift
- done
-
--if [ ! -s /tmp/ig.s.$$ ]
-+if [ ! -s $STEMPFILE ]
- then
- @group
- if [ -z "$1" ]
-@@ -21551,12 +21575,12 @@
- exit 1
- @end group
- else
-- echo "$1" > /tmp/ig.s.$$
-+ echo "$1" > $STEMPFILE
- shift
- fi
- fi
-
--# at this point, /tmp/ig.s.$$ has the program
-+# at this point, $STEMPFILE has the program
- @c endfile
- @end example
-
-@@ -21635,7 +21659,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.
- If the line does start with @samp{@@include}, the @value{FN} is in @code{$2}.
-@@ -21681,7 +21705,7 @@
- @}
- close(input[stackptr])
- @}
--@}' /tmp/ig.s.$$ > /tmp/ig.e.$$
-+@}' $STEMPFILE > $ETEMPFILE
- @c endfile
- @end example
-
-@@ -21707,7 +21731,7 @@
-
- @example
- @c file eg/prog/igawk.sh
--eval gawk -f /tmp/ig.e.$$ $opts -- "$@@"
-+eval gawk -f $ETEMPFILE $opts -- "$@@"
-
- exit $?
- @c endfile
More information about the Midnightbsd-cvs
mailing list