diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2014-08-29 16:31:26 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2014-08-29 16:31:26 +0000 |
| commit | 0dbd0e7c9cb2b0cf3327c76760ef93548c5f6ad0 (patch) | |
| tree | fa4f75830211bbf37e4b91d0f6b2326e24d494b7 /japanese/jvim3 | |
| parent | 5027b0d5aaa8d0cb0f09d5872651210b3755d898 (diff) | |
| download | ports-0dbd0e7c9cb2b0cf3327c76760ef93548c5f6ad0.tar.gz ports-0dbd0e7c9cb2b0cf3327c76760ef93548c5f6ad0.zip | |
- Fix build. A "grep" directory conflicted with "grep" target.
- Move generation of a file to post-build.
Notes
Notes:
svn path=/head/; revision=366528
Diffstat (limited to 'japanese/jvim3')
| -rw-r--r-- | japanese/jvim3/Makefile | 7 | ||||
| -rw-r--r-- | japanese/jvim3/files/patch-src-makjunix.mak | 12 |
2 files changed, 10 insertions, 9 deletions
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile index d29f5cc445a1..443248dcf511 100644 --- a/japanese/jvim3/Makefile +++ b/japanese/jvim3/Makefile @@ -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} diff --git a/japanese/jvim3/files/patch-src-makjunix.mak b/japanese/jvim3/files/patch-src-makjunix.mak index 04b60f200fda..690346cb361b 100644 --- a/japanese/jvim3/files/patch-src-makjunix.mak +++ b/japanese/jvim3/files/patch-src-makjunix.mak @@ -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 |