Date: Fri, 14 Mar 2014 14:38:50 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348240 - in head/japanese/jvim3: . files Message-ID: <201403141438.s2EEco89028803@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Fri Mar 14 14:38:50 2014 New Revision: 348240 URL: http://svnweb.freebsd.org/changeset/ports/348240 QAT: https://qat.redports.org/buildarchive/r348240/ Log: - Fix build. - Integrate FREEWNN and CANNA into one option. - STAGEDIR support. - Bump PORTREVISION due to the option change. Added: head/japanese/jvim3/files/patch-src-unix.h (contents, props changed) Modified: head/japanese/jvim3/Makefile head/japanese/jvim3/files/patch-src-makjunix.mak head/japanese/jvim3/pkg-plist (contents, props changed) Modified: head/japanese/jvim3/Makefile ============================================================================== --- head/japanese/jvim3/Makefile Fri Mar 14 14:26:44 2014 (r348239) +++ head/japanese/jvim3/Makefile Fri Mar 14 14:38:50 2014 (r348240) @@ -3,6 +3,7 @@ PORTNAME= jvim PORTVERSION= 3.0.j2.1b +PORTREVISION= 1 CATEGORIES= japanese editors MASTER_SITES= ftp://ftp.vim.org/pub/vim/unix/ \ http://hp.vector.co.jp/authors/VA003457/vim/vim3/2.1b/ @@ -11,8 +12,6 @@ DISTFILES= vim-3.0.tar.gz jvim.2.1b.tar. MAINTAINER= hrs@FreeBSD.org COMMENT= Japanized Vim-3.0 -BROKEN= Fails to install - EXTRA_PATCHES= ${WRKDIR}/${PORTNAME}.diff WRKSRC= ${WRKDIR}/vim BUILD_WRKSRC= ${WRKSRC}/src @@ -25,53 +24,48 @@ MAKE_ARGS= FEPOPT='${FEPOPT}' \ FEPOBJS="${FEPOBJS}" \ LIBS="${LIBS}" -MAN1= jvim3.1 - OPTIONS_DEFINE= X11 -OPTIONS_DEFAULT=X11 FREEWNN +OPTIONS_DEFAULT=X11 FREEWNN_CANNA OPTIONS_RADIO= FEP -OPTIONS_RADIO_FEP= CANNA DIRECT_CANNA WNN6 WNN7 FREEWNN +OPTIONS_RADIO_FEP= FREEWNN_CANNA DIRECT_CANNA WNN6 WNN7 FEP_DESC= Japanese FrontEnd Processor -CANNA_DESC= Canna support (via ONEW library) DIRECT_CANNA_DESC= Canna support (direct) -FREEWNN_DESC= FreeWnn support (via ONEW library) +FREEWNN_CANNA_DESC= Canna and FreeWnn support (via ONEW library) WNN6_DESC= Wnn6 support WNN7_DESC= Wnn7 support PORTDOCS= cygwin.txt differen.doc fepctrl.doc readme.doc \ termcap.dos uganda.jp vim-jp.htm vim32.ini tutor.j -# -DUSE_X11 is the cause of a problem treating Japanese CPPFLAGS+= -DBSD_UNIX -DUSE_LOCALE LIBS= -ltermlib -L${PREFIX}/lib -NO_STAGE= yes +X11_USE= XORG=x11 +X11_CPPFLAGS+= -DUSE_X11 -I${LOCALBASE}/include + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MX11} -USE_XORG= x11 -CPPFLAGS+= -DUSE_X11 -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -lX11 +LIBS+= -lX11 -L${LOCALBASE}/lib .endif .if ${PORT_OPTIONS:MDIRECT_CANNA} || \ - ${PORT_OPTIONS:MCANNA} || \ - ${PORT_OPTIONS:MFREEWNN} || \ + ${PORT_OPTIONS:MFREEWNN_CANNA} || \ ${PORT_OPTIONS:MWNN6} || \ ${PORT_OPTIONS:MWNN7} FEPOPT+= -DJP_DEF=\"EEE\" -DFEPCTRL .endif # Direct connection to Canna +DIRECT_CANNA_LIB_DEPENDS+= libcanna.so:${PORTSDIR}/japanese/canna-lib .if ${PORT_OPTIONS:MDIRECT_CANNA} -LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib FEPOPT+= -DCANNA FEPLIBS= -lcanna -L${LOCALBASE}/lib FEPOBJS= fepcanna.o JVIM3RC= "set fepctrl" .endif -.if ${PORT_OPTIONS:MFREEWNN} || \ +.if ${PORT_OPTIONS:MFREEWNN_CANNA} || \ ${PORT_OPTIONS:MWNN6} || \ ${PORT_OPTIONS:MWNN7} || \ ${PORT_OPTIONS:MCANNA} @@ -81,27 +75,22 @@ JVIM3RC= "set fepctrl onewredraw" .endif # Connection by using ONEW library -.if ${PORT_OPTIONS:MCANNA} -LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib -BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew-canna.a:${PORTSDIR}/japanese/onew -FEPLIBS+= -lonew-canna -lcanna -.endif - -.if ${PORT_OPTIONS:MFREEWNN} -LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib -BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew-freewnn.a:${PORTSDIR}/japanese/onew -FEPLIBS+= -lonew-freewnn -ljd -lcrypt +FREEWNN_CANNA_LIB_DEPENDS= libjd.so:${PORTSDIR}/japanese/FreeWnn-lib \ + libcanna.so:${PORTSDIR}/japanese/canna-lib +FREEWNN_CANNA_BUILD_DEPENDS= ${LOCALBASE}/lib/libonew-canna+freewnn.a:${PORTSDIR}/japanese/onew +.if ${PORT_OPTIONS:MFREEWNN_CANNA} +FEPLIBS+= -lonew-canna+freewnn -lcanna -ljd -lcrypt .endif +WNN6_LIB_DEPENDS= libjd.so:${PORTSDIR}/japanese/FreeWnn-lib +WNN6_BUILD_DEPENDS= ${LOCALBASE}/lib/libonew-wnn6.a:${PORTSDIR}/japanese/onew .if ${PORT_OPTIONS:MWNN6} -LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib -BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew-wnn6.a:${PORTSDIR}/japanese/onew FEPLIBS+= -lonew-wnn6 -ljd -lcrypt .endif +WNN7_LIB_DEPENDS= libjd.so:${PORTSDIR}/japanese/FreeWnn-lib +WNN7_BUILD_DEPENDS= ${LOCALBASE}/lib/libonew-wnn7.a:${PORTSDIR}/japanese/onew .if ${PORT_OPTIONS:MWNN7} -LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib -BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew-wnn7.a:${PORTSDIR}/japanese/onew FEPLIBS+= -lonew-wnn7 -ljd -lcrypt .endif @@ -109,16 +98,12 @@ post-build: ${CP} ${WRKSRC}/doc.j/tutor/tutor.j ${WRKSRC}/doc.j post-install: - ${LN} -sf ${PREFIX}/bin/jvim3 ${PREFIX}/bin/jvim - ${INSTALL_PROGRAM} ${WRKSRC}/src/grep/grep ${PREFIX}/bin/jgrep + ${LN} -sf jvim3 ${STAGEDIR}${PREFIX}/bin/jvim + ${INSTALL_PROGRAM} ${WRKSRC}/src/grep/grep \ + ${STAGEDIR}${PREFIX}/bin/jgrep ${ECHO_CMD} "${JVIM3RC}" > ${WRKSRC}/jvim3rc.dist - ${INSTALL_DATA} ${WRKSRC}/jvim3rc.dist ${PREFIX}/etc/ -.if !exists(${PREFIX}/etc/jvim3rc) - ${INSTALL_DATA} ${PREFIX}/etc/jvim3rc.dist ${PREFIX}/etc/jvim3rc -.endif -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/doc.j && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + ${INSTALL_DATA} ${WRKSRC}/jvim3rc.dist ${STAGEDIR}${PREFIX}/etc/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc.j && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/japanese/jvim3/files/patch-src-makjunix.mak ============================================================================== --- head/japanese/jvim3/files/patch-src-makjunix.mak Fri Mar 14 14:26:44 2014 (r348239) +++ head/japanese/jvim3/files/patch-src-makjunix.mak Fri Mar 14 14:38:50 2014 (r348240) @@ -1,6 +1,6 @@ ---- src/makjunix.mak.orig 2013-05-04 03:51:13.000000000 +0900 -+++ src/makjunix.mak 2013-05-04 03:52:09.000000000 +0900 -@@ -72,16 +72,17 @@ +--- src/makjunix.mak.orig 2014-03-14 23:13:33.000000000 +0900 ++++ src/makjunix.mak 2014-03-14 23:20:30.000000000 +0900 +@@ -72,19 +72,20 @@ ### Prefix for location of files @@ -8,7 +8,8 @@ +PREFIX?= /usr/local ### Location of binary - BINLOC = $(PREFIX)/bin +-BINLOC = $(PREFIX)/bin ++BINLOC = $(DESTDIR)$(PREFIX)/bin ### Name of target -TARGET = vim @@ -17,10 +18,14 @@ ### Location of man page -MANLOC = $(PREFIX)/man/man1 +MAN1PREFIX?= ${PREFIX} -+MANLOC = $(MAN1PREFIX)/man/man1 ++MANLOC = $(DESTDIR)$(MAN1PREFIX)/man/man1 ### Location of help file - HELPLOC = $(PREFIX)/lib +-HELPLOC = $(PREFIX)/lib ++HELPLOC = $(DESTDIR)$(PREFIX)/lib + + ### Program to run on installed binary + STRIP = strip @@ -100,7 +101,7 @@ MANFILE = ../doc/vim.1 Added: head/japanese/jvim3/files/patch-src-unix.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/jvim3/files/patch-src-unix.h Fri Mar 14 14:38:50 2014 (r348240) @@ -0,0 +1,11 @@ +--- src/unix.h.orig 2013-09-05 04:16:52.000000000 +0900 ++++ src/unix.h 2013-09-05 04:18:11.000000000 +0900 +@@ -104,7 +104,7 @@ + # define strrchr(ptr, c) rindex((ptr), (c)) + #endif + +-#if defined(BSD_UNIX) && !defined(__bsdi__) && !defined(linux) && !defined(__GNU__) ++#if defined(BSD_UNIX) && !defined(__FreeBSD__) && !defined(__bsdi__) && !defined(linux) && !defined(__GNU__) + # define memset(ptr, c, size) bsdmemset((ptr), (c), (size)) + char *bsdmemset __ARGS((char *, int, long)); + #endif Modified: head/japanese/jvim3/pkg-plist ============================================================================== --- head/japanese/jvim3/pkg-plist Fri Mar 14 14:26:44 2014 (r348239) +++ head/japanese/jvim3/pkg-plist Fri Mar 14 14:38:50 2014 (r348240) @@ -1,7 +1,9 @@ +@comment $FreeBSD$ bin/jvim bin/jvim3 bin/jgrep lib/jvim3.hlp +man/man1/jvim3.1.gz @unexec if cmp -s %D/etc/jvim3rc %D/etc/jvim3rc.dist; then rm -f %D/etc/jvim3rc; fi etc/jvim3rc.dist @exec if [ ! -f %D/etc/jvim3rc ]; then cp %D/etc/jvim3rc.dist %D/etc/jvim3rc; fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403141438.s2EEco89028803>