Date: Mon, 16 Jul 2001 10:00:17 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/29019: Update port: japanses/grep to 2.4.2 Message-ID: <200107161700.f6GH0Hu21240@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 29019
>Category: ports
>Synopsis: Update port: japanses/grep to 2.4.2
>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:10:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.3-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2.4.2
Remove file:
files/patch-ab files/patch-ac files/patch-ad
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/japanese/grep/Makefile japanese/grep/Makefile
--- /usr/ports/japanese/grep/Makefile Wed Feb 28 03:27:23 2001
+++ japanese/grep/Makefile Mon Jul 16 20:01:30 2001
@@ -6,27 +6,31 @@
#
PORTNAME= grep
-PORTVERSION= 2.0
-PORTREVISION= 1
+PORTVERSION= 2.4.2
CATEGORIES= japanese textproc
MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= grep
+MASTER_SITE_SUBDIR= ${PORTNAME}
-PATCH_SITES= ftp://ftp.hipecs.hokudai.ac.jp/pub/GNU/jp/
-PATCHFILES= ${DISTNAME}-mb1.04.diff.gz
+PATCH_SITES= http://www.hinadori.dyn.to/~wills/program/
+PATCHFILES= grep-2.4.2-mlb2.patch.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
GNU_CONFIGURE= yes
-MAKE_ARGS= binprefix=j
+CONFIGURE_ARGS= --program-prefix=j --disable-nls
MAN1= jgrep.1
+MLINKS= jgrep.1 jegrep.1 \
+ jgrep.1 jfgrep.1
+
+DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
post-install:
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/ja/grep
- ${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja/grep
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README.MB ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README.mlb ${DOCSDIR}
.endif
.include <bsd.port.mk>
diff -urN /usr/ports/japanese/grep/distinfo japanese/grep/distinfo
--- /usr/ports/japanese/grep/distinfo Sun Jan 30 06:36:37 2000
+++ japanese/grep/distinfo Mon Jul 16 19:52:59 2001
@@ -1,2 +1,2 @@
-MD5 (grep-2.0.tar.gz) = b676733ad3437ebd5dc3999f56c55950
-MD5 (grep-2.0-mb1.04.diff.gz) = c9f733852567a484db4fecec12f05fcd
+MD5 (grep-2.4.2.tar.gz) = 8ec9a2e875cd3aaa89896a8f39249f58
+MD5 (grep-2.4.2-mlb2.patch.gz) = 70fad6606fe32e903e9cacbecad5363e
diff -urN /usr/ports/japanese/grep/files/patch-ab japanese/grep/files/patch-ab
--- /usr/ports/japanese/grep/files/patch-ab Wed Feb 28 03:27:24 2001
+++ japanese/grep/files/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,29 +0,0 @@
---- Makefile.in.orig Mon Feb 12 03:51:57 2001
-+++ Makefile.in Mon Feb 12 03:59:55 2001
-@@ -53,10 +53,10 @@
- LIBS=@LIBS@
- ALLOCA=@ALLOCA@
-
--CFLAGS=-O
-+CFLAGS=@CFLAGS@
- LDFLAGS=$(CFLAGS)
-
--prefix=/usr/local
-+prefix=@prefix@
- exec_prefix=$(prefix)
-
- # Prefix for installed program, normally empty or `g'.
-@@ -97,10 +97,10 @@
- install: all
- $(INSTALL_PROGRAM) grep $(bindir)/$(binprefix)grep
- rm -f $(bindir)/$(binprefix)egrep
-- $(LN) $(bindir)/$(binprefix)grep $(bindir)/$(binprefix)egrep
-+ $(LN) -s $(binprefix)grep $(bindir)/$(binprefix)egrep
- rm -f $(bindir)/$(binprefix)fgrep
-- $(LN) $(bindir)/$(binprefix)grep $(bindir)/$(binprefix)fgrep
-- $(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/grep.$(manext)
-+ $(LN) -s $(binprefix)grep $(bindir)/$(binprefix)fgrep
-+ $(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/$(binprefix)grep.$(manext)
-
- check:
- AWK=$(AWK) sh $(srcdir)/tests/check.sh $(srcdir)/tests
diff -urN /usr/ports/japanese/grep/files/patch-ac japanese/grep/files/patch-ac
--- /usr/ports/japanese/grep/files/patch-ac Fri Dec 24 01:28:54 1999
+++ japanese/grep/files/patch-ac Thu Jan 1 09:00:00 1970
@@ -1,16 +0,0 @@
---- configure.orig Sat May 22 13:20:23 1993
-+++ configure Fri Dec 3 21:49:27 1999
-@@ -808,11 +808,13 @@
- s%@AWK@%$AWK%g
- s%@CC@%$CC%g
- s%@CPP@%$CPP%g
-+s%@CFLAGS@%$CFLAGS%g
- s%@INSTALL@%$INSTALL%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@ALLOCA@%$ALLOCA%g
- s%@LIBS@%$LIBS%g
-+s%@prefix@%$prefix%g
- s%@srcdir@%$srcdir%g
- s%@DEFS@%$DEFS%
- " $top_srcdir/${file}.in >> $file
diff -urN /usr/ports/japanese/grep/files/patch-ad japanese/grep/files/patch-ad
--- /usr/ports/japanese/grep/files/patch-ad Wed Feb 28 03:27:24 2001
+++ japanese/grep/files/patch-ad Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- grep.c.orig Mon Feb 12 03:52:11 2001
-+++ grep.c Mon Feb 12 03:57:30 2001
-@@ -832,7 +832,7 @@
- usage();
-
- if (!matcher)
-- matcher = prog;
-+ matcher = prog[0] == 'j' ? prog + 1 : prog;
-
- if (!setmatcher(matcher) && !setmatcher("default"))
- abort();
diff -urN /usr/ports/japanese/grep/pkg-descr japanese/grep/pkg-descr
--- /usr/ports/japanese/grep/pkg-descr Tue Apr 4 18:38:28 1995
+++ japanese/grep/pkg-descr Mon Jul 16 20:05:26 2001
@@ -6,4 +6,5 @@
named, or the file name - is given) for lines containing a match to
the given pattern. By default, grep prints the matching lines.
-Multi-byte patch by t^2(Takahiro Tanimoto, NBC02362@niftyserve.or.jp)
+Multi-byte code by Media Lab., Inc. (linux@mlb.co.jp)
+and t^2(Takahiro Tanimoto, NBC02362@niftyserve.or.jp).
diff -urN /usr/ports/japanese/grep/pkg-plist japanese/grep/pkg-plist
--- /usr/ports/japanese/grep/pkg-plist Wed Feb 28 03:27:23 2001
+++ japanese/grep/pkg-plist Mon Jul 16 20:34:35 2001
@@ -1,5 +1,9 @@
bin/jgrep
bin/jegrep
bin/jfgrep
-share/doc/ja/grep/README.MB
-@dirrm share/doc/ja/grep
+@unexec install-info --delete %D/info/grep.info %D/info/dir
+info/grep.info
+@exec install-info %D/info/grep.info %D/info/dir
+%%PORTDOCS%%share/doc/ja-grep/README.MB
+%%PORTDOCS%%share/doc/ja-grep/README.mlb
+%%PORTDOCS%%@dirrm share/doc/ja-grep
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107161700.f6GH0Hu21240>