svn commit: r366528 - in head/japanese/jvim3: . files

[Hiroki Sato]

Author: hrs
Date: Fri Aug 29 16:31:26 2014
New Revision: 366528
URL: http://svnweb.freebsd.org/changeset/ports/366528
QAT: https://qat.redports.org/buildarchive/r366528/

Log:
  - Fix build.  A "grep" directory conflicted with "grep" target.
  - Move generation of a file to post-build.

Modified:
  head/japanese/jvim3/Makefile
  head/japanese/jvim3/files/patch-src-makjunix.mak

Modified: head/japanese/jvim3/Makefile
==============================================================================
--- head/japanese/jvim3/Makefile	Fri Aug 29 16:27:48 2014	(r366527)
+++ head/japanese/jvim3/Makefile	Fri Aug 29 16:31:26 2014	(r366528)
@@ -92,13 +92,12 @@ FEPLIBS+=	-lonew-wnn7 -ljd -lcrypt
 .endif
 
 post-build:
-	${CP} ${WRKSRC}/doc.j/tutor/tutor.j ${WRKSRC}/doc.j
+	${INSTALL_DATA} ${WRKSRC}/doc.j/tutor/tutor.j ${WRKSRC}/doc.j
+	${ECHO_CMD} "${JVIM3RC}" > ${WRKSRC}/jvim3rc.dist
 
 post-install:
 	${LN} -sf jvim3 ${STAGEDIR}${PREFIX}/bin/jvim
-	${INSTALL_PROGRAM} ${WRKSRC}/src/grep/grep \
-	    ${STAGEDIR}${PREFIX}/bin/jgrep
-	${ECHO_CMD} "${JVIM3RC}" > ${WRKSRC}/jvim3rc.dist
+	${INSTALL_PROGRAM} ${WRKSRC}/src/grep.bin ${STAGEDIR}${PREFIX}/bin/jgrep
 	${INSTALL_DATA} ${WRKSRC}/jvim3rc.dist ${STAGEDIR}${PREFIX}/etc/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc.j && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}

Modified: head/japanese/jvim3/files/patch-src-makjunix.mak
==============================================================================
--- head/japanese/jvim3/files/patch-src-makjunix.mak	Fri Aug 29 16:27:48 2014	(r366527)
+++ head/japanese/jvim3/files/patch-src-makjunix.mak	Fri Aug 29 16:31:26 2014	(r366528)
@@ -1,5 +1,5 @@
---- src/makjunix.mak.orig	2014-03-14 23:13:33.000000000 +0900
-+++ src/makjunix.mak	2014-03-14 23:20:30.000000000 +0900
+--- src/makjunix.mak.orig	2014-08-30 01:12:22.000000000 +0900
++++ src/makjunix.mak	2014-08-30 01:19:58.000000000 +0900
 @@ -72,19 +72,20 @@
  
  
@@ -59,7 +59,7 @@
  GOBJ = grep.o alloc.o charset.o kanji.o regexp.o regsub.o u2s.o s2u.o
  
 -all: $(TARGET) grep
-+all: $(PROG) grep
++all: $(PROG) grep.bin
  
 -$(TARGET): $(OBJ) version.c
 -	$(CC) $(CFLAGS) version.c
@@ -68,8 +68,10 @@
 +	$(CC) -c $(CFLAGS) version.c
 +	$(CC) -o $(PROG) $(OBJ) version.o $(LIBS) $(FEPLIBS)
  
- grep: $(GOBJ)
- 	$(CC) -o grep/grep $(GOBJ) $(LIBS) $(FEPLIBS)
+-grep: $(GOBJ)
+-	$(CC) -o grep/grep $(GOBJ) $(LIBS) $(FEPLIBS)
++grep.bin: $(GOBJ)
++	$(CC) -o grep.bin $(GOBJ) $(LIBS) $(FEPLIBS)
  
  debug: $(OBJ) version.c
 -	$(CC) $(CFLAGS) version.c