From 56693cf7fdeda28dabbf7de9e66272581f47a4c4 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Mon, 23 Jul 2001 03:55:20 +0000 Subject: Update to 2.4.2. PR: ports/29019 Submitted by: KATO Tsuguru --- japanese/grep/Makefile | 20 ++++++++++++-------- japanese/grep/distinfo | 4 ++-- japanese/grep/files/patch-ab | 29 ----------------------------- japanese/grep/files/patch-ac | 16 ---------------- japanese/grep/files/patch-ad | 11 ----------- japanese/grep/pkg-descr | 3 ++- japanese/grep/pkg-plist | 8 ++++++-- 7 files changed, 22 insertions(+), 69 deletions(-) delete mode 100644 japanese/grep/files/patch-ab delete mode 100644 japanese/grep/files/patch-ac delete mode 100644 japanese/grep/files/patch-ad (limited to 'japanese/grep') diff --git a/japanese/grep/Makefile b/japanese/grep/Makefile index 37e0fb6a2fd2..5cfdde22858b 100644 --- a/japanese/grep/Makefile +++ b/japanese/grep/Makefile @@ -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 diff --git a/japanese/grep/distinfo b/japanese/grep/distinfo index b589ba93fce6..9532790da6c1 100644 --- a/japanese/grep/distinfo +++ b/japanese/grep/distinfo @@ -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 --git a/japanese/grep/files/patch-ab b/japanese/grep/files/patch-ab deleted file mode 100644 index 3712ae594301..000000000000 --- a/japanese/grep/files/patch-ab +++ /dev/null @@ -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 --git a/japanese/grep/files/patch-ac b/japanese/grep/files/patch-ac deleted file mode 100644 index d1d06ec800d2..000000000000 --- a/japanese/grep/files/patch-ac +++ /dev/null @@ -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 --git a/japanese/grep/files/patch-ad b/japanese/grep/files/patch-ad deleted file mode 100644 index 126058791949..000000000000 --- a/japanese/grep/files/patch-ad +++ /dev/null @@ -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 --git a/japanese/grep/pkg-descr b/japanese/grep/pkg-descr index 00fcc85fc5bb..b7400305ec3f 100644 --- a/japanese/grep/pkg-descr +++ b/japanese/grep/pkg-descr @@ -6,4 +6,5 @@ Grep searches the named input files (or standard input if no files are 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 --git a/japanese/grep/pkg-plist b/japanese/grep/pkg-plist index 5c61343cf879..8af50fabfee2 100644 --- a/japanese/grep/pkg-plist +++ b/japanese/grep/pkg-plist @@ -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 -- cgit v1.2.3