* Modified patches to support CFLAGS/PREFIX properly

PR:		15242
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
This commit is contained in:
Steve Price 1999-12-23 16:28:55 +00:00
parent 8e9582af85
commit db2e1b2d39
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=23890
5 changed files with 42 additions and 17 deletions

View File

@ -12,16 +12,21 @@ CATEGORIES= japanese textproc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= grep
PATCH_SITES= ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1994/jun/ \
ftp://ftp.hipecs.hokudai.ac.jp/pub/GNU/jp/
PATCHFILES= grep-2.0-mb1.04.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
GNU_CONFIGURE= yes
PATCH_STRIP= -p1
MAN1= grep.1
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/doc/ja-grep
${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja-grep
@${MKDIR} ${PREFIX}/share/doc/ja/grep
${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja/grep
.endif
.include <bsd.port.mk>

View File

@ -1 +1,2 @@
MD5 (grep-2.0.tar.gz) = b676733ad3437ebd5dc3999f56c55950
MD5 (grep-2.0-mb1.04.diff.gz) = 116f21ae22bcf4d02da577678a21664a

View File

@ -1,24 +1,27 @@
--- grep-2.0/Makefile.in.orig Tue Apr 4 02:25:58 1995
+++ grep-2.0/Makefile.in Tue Apr 4 02:27:57 1995
@@ -74,7 +74,7 @@
manext=1
--- Makefile.in.orig Fri Dec 3 21:46:09 1999
+++ Makefile.in Fri Dec 3 21:47:39 1999
@@ -53,10 +53,10 @@
LIBS=@LIBS@
ALLOCA=@ALLOCA@
# How to make a hard link.
-LN=ln
+LN=ln -s
-CFLAGS=-O
+CFLAGS=@CFLAGS@
LDFLAGS=$(CFLAGS)
#### End of system configuration section. ####
-prefix=/usr/local
+prefix=@prefix@
exec_prefix=$(prefix)
@@ -97,10 +97,10 @@
# Prefix for installed program, normally empty or `g'.
@@ -97,9 +97,9 @@
install: all
$(INSTALL_PROGRAM) grep $(bindir)/$(binprefix)grep
rm -f $(bindir)/$(binprefix)egrep
- $(LN) $(bindir)/$(binprefix)grep $(bindir)/$(binprefix)egrep
+ cd $(bindir); $(LN) $(binprefix)grep $(binprefix)egrep
+ $(LN) -s $(binprefix)grep $(bindir)/$(binprefix)egrep
rm -f $(bindir)/$(binprefix)fgrep
- $(LN) $(bindir)/$(binprefix)grep $(bindir)/$(binprefix)fgrep
+ cd $(bindir); $(LN) $(binprefix)grep $(binprefix)fgrep
+ $(LN) -s $(binprefix)grep $(bindir)/$(binprefix)fgrep
$(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/grep.$(manext)
check:
AWK=$(AWK) sh $(srcdir)/tests/check.sh $(srcdir)/tests

View File

@ -0,0 +1,16 @@
--- 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

View File

@ -1,5 +1,5 @@
bin/grep
bin/egrep
bin/fgrep
share/doc/ja-grep/README.MB
@dirrm share/doc/ja-grep
share/doc/ja/grep/README.MB
@dirrm share/doc/ja/grep