diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2002-04-22 21:29:46 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2002-04-22 21:29:46 +0000 |
| commit | 7b1715fb10669c52ced8a1eb8e1ac4c6a9728926 (patch) | |
| tree | 7593ec15b774c3fedcf41b4a663b2f2584216e4a /japanese | |
| parent | fb76c325a9a63928ef0576548de61e0d82e1ead4 (diff) | |
| download | ports-7b1715fb10669c52ced8a1eb8e1ac4c6a9728926.tar.gz ports-7b1715fb10669c52ced8a1eb8e1ac4c6a9728926.zip | |
- Unbreak on CURRENT: malloc.h -> stdlib.h.
- Remove -lxpg4.
- Cosmetique.
Notes
Notes:
svn path=/head/; revision=58007
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/vje30/Makefile | 3 | ||||
| -rw-r--r-- | japanese/vje30/files/patch-Makefile | 8 | ||||
| -rw-r--r-- | japanese/vje30/files/patch-ximsub1.c | 22 |
3 files changed, 14 insertions, 19 deletions
diff --git a/japanese/vje30/Makefile b/japanese/vje30/Makefile index d0ae71866df6..ca95c9c3d734 100644 --- a/japanese/vje30/Makefile +++ b/japanese/vje30/Makefile @@ -84,9 +84,10 @@ post-extract: post-patch: @cd ${WRKSRC}/vje30/bin && ${RM} swingall.jar - @find ${WRKSRC} -name '*.orig' -delete + @${FIND} ${WRKSRC} -name '*.orig' -delete @${CP} ${FILESDIR}/vje.sh ${WRKSRC}/etc/rc.d/ @${PERL} -i -pe 's,/usr/X11R6,${X11BASE},g' ${BUILD_WRKSRC}/${MAKEFILE} + @${PERL} -i -pe 's,^(#include\s*)\<malloc\.h\>,$$1<stdlib.h>,' ${BUILD_WRKSRC}/*.c .if defined(NOPORTDOCS) @cd ${WRKSRC}/vje30 && ${RM} -rf doc README FAQ REQUEST .endif diff --git a/japanese/vje30/files/patch-Makefile b/japanese/vje30/files/patch-Makefile index 1729513bd20a..7668f67fb97c 100644 --- a/japanese/vje30/files/patch-Makefile +++ b/japanese/vje30/files/patch-Makefile @@ -1,5 +1,5 @@ --- delta/newFrontend/Makefile.FreeBSD.orig Tue Aug 1 03:00:00 2000 -+++ delta/newFrontend/Makefile.FreeBSD Thu Jan 11 21:22:45 2001 ++++ delta/newFrontend/Makefile.FreeBSD Tue Apr 23 06:20:41 2002 @@ -16,14 +16,14 @@ DEST = . HDRS = . -I/usr/X11R6/include @@ -7,8 +7,10 @@ -CFLAGS = -g -DBSD=1 -DUSE_XPM=0 -DPCUNIX=1 -Dunix -DUSER_DIC -DVJE -DSINGLE=0 -DDLL_SRCH=1 -DADELTA=1 -DDELTA=1 -DUCS -I$(HDRS) +CFLAGS += -DBSD=1 -DUSE_XPM=0 -DPCUNIX=1 -Dunix -DUSER_DIC -DVJE -DSINGLE=0 -DDLL_SRCH=1 -DADELTA=1 -DDELTA=1 -DUCS -I$(HDRS) - BSDLIBS = -lxpg4 - #BSDLIBS = +-BSDLIBS = -lxpg4 +-#BSDLIBS = ++#BSDLIBS = -lxpg4 ++BSDLIBS = #XPMLIB = -lXpm XPMLIB = LIBS = $(BSDLIBS) $(XPMLIB) -lXmu -L/usr/X11R6/lib -lXt -lX11 -lXext diff --git a/japanese/vje30/files/patch-ximsub1.c b/japanese/vje30/files/patch-ximsub1.c index 10a303ce1f7e..7a1678577684 100644 --- a/japanese/vje30/files/patch-ximsub1.c +++ b/japanese/vje30/files/patch-ximsub1.c @@ -1,28 +1,20 @@ --- delta/newFrontend/ximsub1.c.orig Tue Aug 1 03:00:00 2000 -+++ delta/newFrontend/ximsub1.c Thu Jan 11 21:24:21 2001 -@@ -259,10 +259,11 @@ - ++++ delta/newFrontend/ximsub1.c Tue Apr 23 06:24:39 2002 +@@ -260,7 +260,7 @@ if (&fxim_table[i].client == xim_client) { FreeRecvQueue(fxim_table[i].client.pending); -+ #if 1/*991109*/ - if (xim_client->v_data) { -+ /* if (xim_client->v_data) { */ ++ if (1) { /* (xim_client->v_data) { */ CloseVJE (xim_client); -- } -+ /* } */ + } #endif - fxim_table[i].client.used = False; - if (xim_client->preedit->FontName) { -@@ -295,9 +296,9 @@ +@@ -295,7 +295,7 @@ FreeRecvQueue(fxim_table[i].client.pending); #if 1/*991109*/ xim_client = &fxim_table[i].client; - if (xim_client->v_data) { -+ /* if (xim_client->v_data) { */ ++ if (1) { /* (xim_client->v_data) { */ CloseVJE (xim_client); -- } -+ /* } */ + } #endif - fxim_table[i].client.used = False; - |