From owner-freebsd-ports Mon Jul 16 10: 1:49 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 60C6437B412 for ; Mon, 16 Jul 2001 10:00:05 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f6GH05J21210; Mon, 16 Jul 2001 10:00:05 -0700 (PDT) (envelope-from gnats) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 26D6337B401 for ; Mon, 16 Jul 2001 09:59:07 -0700 (PDT) (envelope-from nobody@FreeBSD.org) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f6GGx7021072; Mon, 16 Jul 2001 09:59:07 -0700 (PDT) (envelope-from nobody) Message-Id: <200107161659.f6GGx7021072@freefall.freebsd.org> Date: Mon, 16 Jul 2001 09:59:07 -0700 (PDT) From: KATO Tsuguru To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/29018: Update port: japanses/gawk to 3.0.6 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 29018 >Category: ports >Synopsis: Update port: japanses/gawk to 3.0.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 16 10:00:05 PDT 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.3-RELEASE i386 >Organization: >Environment: >Description: - Update to version 3.0.6 New file: files/patch-sec1 >How-To-Repeat: >Fix: diff -urN /usr/ports/japanese/gawk/Makefile japanese/gawk/Makefile --- /usr/ports/japanese/gawk/Makefile Wed Mar 7 02:21:38 2001 +++ japanese/gawk/Makefile Mon Jul 16 20:52:11 2001 @@ -6,28 +6,29 @@ # PORTNAME= gawk -PORTVERSION= 3.0.4 -PORTREVISION= 1 +PORTVERSION= 3.0.6 CATEGORIES= japanese lang MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} +PATCH_SITES= http://www.hinadori.dyn.to/~wills/program/ +PATCHFILES= ${PORTNAME}mb115.diff.gz +PATCH_DIST_STRIP= -p1 + MAINTAINER= ports@FreeBSD.org GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-prefix=g - -PATCH_SITES= http://www.hinadori.dyn.to/~wills/program/ -PATCHFILES= ${PORTNAME}mb114.diff.gz -PATCH_DIST_STRIP= -p1 +CONFIGURE_ARGS= --enable-bitops --enable-non-decimal-data MAN1= gawk.1 igawk.1 +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} + post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/${PKGBASE} - ${INSTALL_DATA} ${WRKSRC}/OREADME.MB ${PREFIX}/share/doc/${PKGBASE} - ${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/${PKGBASE} + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/OREADME.MB ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.MB ${DOCSDIR} .endif .include diff -urN /usr/ports/japanese/gawk/distinfo japanese/gawk/distinfo --- /usr/ports/japanese/gawk/distinfo Wed Mar 7 02:21:38 2001 +++ japanese/gawk/distinfo Mon Jul 16 19:52:12 2001 @@ -1,2 +1,2 @@ -MD5 (gawk-3.0.4.tar.gz) = 58f904f256b3026c3fe27cf80e6291af -MD5 (gawkmb114.diff.gz) = e19594cc9b553f078224972bb8b4ff26 +MD5 (gawk-3.0.6.tar.gz) = b5ba21c033f5a9737455458d94954609 +MD5 (gawkmb115.diff.gz) = dfe41aeea74b824ab70ea68657db7c72 diff -urN /usr/ports/japanese/gawk/files/patch-ac japanese/gawk/files/patch-ac --- /usr/ports/japanese/gawk/files/patch-ac Tue Sep 7 11:35:46 1999 +++ japanese/gawk/files/patch-ac Mon Jul 16 20:48:48 2001 @@ -1,18 +1,18 @@ ---- Makefile.in.orig Sat Sep 4 06:27:22 1999 -+++ Makefile.in Sat Sep 4 06:31:43 1999 +--- Makefile.in.orig Mon Jul 16 20:42:58 2001 ++++ Makefile.in Mon Jul 16 20:48:25 2001 @@ -194,14 +194,8 @@ - mbc.o: Makefile + mbc.o: Makefile - install: gawk$(exec_suffix) info installdirs -- -rm -f $(bindir)/gawk$(exec_suffix) + install: gawk info installdirs +- -rm -f $(bindir)/gawk - fullname=gawk-$(REL).`./gawk '{print $$3}' $(srcdir)/patchlevel.h`+mb$(MBREL) ; \ -- $(INSTALL_PROGRAM) gawk$(exec_suffix) $(bindir)/$${fullname}$(exec_suffix) ; \ -- (cd $(bindir); $(LN) $${fullname}$(exec_suffix) gawk$(exec_suffix)) -- (cd $(bindir);\ -- if [ ! -f awk$(exec_suffix) ]; \ -- then $(LN_S) gawk$(exec_suffix) awk$(exec_suffix); \ +- $(INSTALL_PROGRAM) gawk $(bindir)/$$fullname ; \ +- (cd $(bindir); $(LN) $$fullname gawk) +- (cd $(bindir); \ +- if [ ! -f awk ]; \ +- then $(LN_S) gawk awk; \ - fi; exit 0) -+ $(INSTALL_PROGRAM) gawk$(exec_suffix) \ ++ $(INSTALL_PROGRAM) gawk \ + $(bindir)/$(binprefix)gawk$(exec_suffix) cd doc && $(MAKE) install cd awklib && $(MAKE) install diff -urN /usr/ports/japanese/gawk/files/patch-sec1 japanese/gawk/files/patch-sec1 --- /usr/ports/japanese/gawk/files/patch-sec1 Thu Jan 1 09:00:00 1970 +++ japanese/gawk/files/patch-sec1 Mon Jul 16 21:30:27 2001 @@ -0,0 +1,162 @@ +--- doc/gawk.texi.orig Tue Aug 8 07:57:43 2000 ++++ doc/gawk.texi Mon Jul 16 21:30:14 2001 +@@ -16550,8 +16550,7 @@ + arranges to clean up any temporary files on program exit or upon an + interrupt. + +-@c 2e: For the temp file handling, go with Darrel's ig=${TMP:-/tmp}/igs.$$ +-@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 + @samp{@@include} statement. + The @code{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= +-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. +-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} +-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 @@ + # 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 /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 ++ + if [ "$1" = debug ] + then + set -x + 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 +@@ -16643,28 +16649,28 @@ + + -[vF]*) opts="$opts '$1'" ;; + +- -f) echo @@include "$2" >> /tmp/ig.s.$$ ++ -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 +- 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) +@@ -16679,19 +16685,19 @@ + shift + done + +-if [ ! -s /tmp/ig.s.$$ ] ++if [ ! -s $STEMPFILE ] + then + if [ -z "$1" ] + then + echo igawk: no program! 1>&2 + exit 1 + 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 + @c @end group + @end example +@@ -16776,7 +16782,7 @@ + @end group + @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 + close(input[stackptr]) + @} +-@}' /tmp/ig.s.$$ > /tmp/ig.e.$$ ++@}' $STEMPFILE > $ETEMPFILE + @end group + @c endfile + @c @end group +@@ -16852,7 +16858,7 @@ + @example + @c @group + @c file eg/prog/igawk.sh +-eval gawk -f /tmp/ig.e.$$ $opts -- "$@@" ++eval gawk -f $ETEMPFILE $opts -- "$@@" + + exit $? + @c endfile diff -urN /usr/ports/japanese/gawk/pkg-plist japanese/gawk/pkg-plist --- /usr/ports/japanese/gawk/pkg-plist Wed Mar 7 02:21:38 2001 +++ japanese/gawk/pkg-plist Mon Jul 16 21:13:24 2001 @@ -19,6 +19,6 @@ share/awk/round.awk %%PORTDOCS%%share/doc/ja-gawk/OREADME.MB %%PORTDOCS%%share/doc/ja-gawk/README.MB -@dirrm share/awk %%PORTDOCS%%@dirrm share/doc/ja-gawk +@dirrm share/awk @dirrm libexec/awk >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message