From e8a49fd3ff7992ab850509b069830a3732c41da9 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Thu, 11 Jan 2001 12:52:12 +0000 Subject: [PATCH] Applying the patch posted on unix-ml@vacs.co.jp mailing list by Hiroyuki Aizu , build `vje' executable from the source. This should finally fix the memory leakage problem that has been reported by many users. :) --- japanese/vje30/Makefile | 43 ++++++++++++++-------------- japanese/vje30/distinfo | 8 +++--- japanese/vje30/files/patch-Makefile | 19 ++++++++++++ japanese/vje30/files/patch-aa | 4 +-- japanese/vje30/files/patch-ximsub1.c | 28 ++++++++++++++++++ 5 files changed, 75 insertions(+), 27 deletions(-) create mode 100644 japanese/vje30/files/patch-Makefile create mode 100644 japanese/vje30/files/patch-ximsub1.c diff --git a/japanese/vje30/Makefile b/japanese/vje30/Makefile index c22076de92e6..b380cb4ad7f8 100644 --- a/japanese/vje30/Makefile +++ b/japanese/vje30/Makefile @@ -7,31 +7,39 @@ PORTNAME= vje PORTVERSION= 3.0 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= file:${MOUNT_PT}/freebsd/ \ - ftp://ftp.vacs.co.jp/pub/unix/vje30/Update/FreeBSD-${DISTOBJFORMAT}/bin/ -DISTNAME= ${PORTNAME}-delta-${PORTVERSION}-${DISTOBJFORMAT} -EXTRACT_SUFX= .tgz + file:${MOUNT_PT}/source/delta/ \ + ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= knu DISTFILES= ${MAINDIST} \ - ${UPDATEDIST} -DIST_SUBDIR= vje30-${DISTOBJFORMAT} + vje-delta-3.0-${DISTOBJFORMAT}-update.tgz \ + delta.tgz \ + vje-delta-3.0-source-update.tgz +DIST_SUBDIR= vje30 MAINTAINER= knu@FreeBSD.org #RUN_DEPENDS= ${LOCALBASE}/share/java/classes/jfc-1.1.1/swing.jar:${PORTSDIR}/java/jfc -NO_BUILD= yes RESTRICTED= "You must purchase a licensed copy from VACS Corporation." NO_CDROM= "You must purchase a licensed copy from VACS Corporation." NO_PACKAGE= "You must purchase a licensed copy from VACS Corporation." +# Specify this! +MOUNT_PT?= /cdrom + ONLY_FOR_ARCHS= i386 +USE_XLIB= yes + PLIST_SUB= BINSTUFF="${BINSTUFF}" WRKSRC= ${WRKDIR}/usr/local - -MOUNT_PT?= /cdrom +PATCH_WRKSRC= ${WRKDIR} +BUILD_WRKSRC= ${WRKDIR}/delta/newFrontend +MAKEFILE= Makefile.FreeBSD .include @@ -41,10 +49,7 @@ DISTOBJFORMAT= AOUT DISTOBJFORMAT= ELF .endif -MAINDIST= ${DISTNAME}${EXTRACT_SUFX} -.if !defined(WITHOUT_MINORUPDATE) - UPDATEDIST= update${EXTRACT_SUFX} -.endif +MAINDIST= ${PORTNAME}-delta-${PORTVERSION}-${DISTOBJFORMAT}.tgz BINSTUFF= vje \ vjed \ @@ -72,20 +77,18 @@ pre-fetch: ${ECHO} "*****************************************************************"; \ ${FALSE} \ ) -.if !defined(WITHOUT_MINORUPDATE) - @${ECHO} "If you don't want to apply the buggy minor update from the vendor, define \"WITHOUT_MINORUPDATE\"." -.endif post-extract: - @${RM} ${_DISTDIR}/${MAINDIST} + @${RM} ${_DISTDIR}/${MAINDIST} ${WRKDIR}/vje post-patch: @cd ${WRKSRC}/vje30/bin && ${RM} swingall.jar @find ${WRKSRC} -name '*.orig' -delete @${CP} ${FILESDIR}/vje.sh ${WRKSRC}/etc/rc.d/ -.if !defined(WITHOUT_MINORUPDATE) - @${MV} ${WRKDIR}/vje ${WRKSRC}/vje30/bin/ -.endif + @${PERL} -i -pe 's,/usr/X11R6,${X11BASE},g' ${BUILD_WRKSRC}/${MAKEFILE} + +post-build: + @${CP} ${BUILD_WRKSRC}/vje ${WRKSRC}/vje30/bin/ do-install: @cd ${WRKSRC} && tar cf - . | tar xf - -C ${PREFIX} @@ -95,11 +98,9 @@ do-install: @${CHMOD} a+x ${PREFIX}/etc/rc.d/vje.sh @${CHMOD} a+w ${PREFIX}/vje30/dic/vjed95m.dic @[ X${PREFIX} = X"/usr/local" ] || (${LN} -s ${PREFIX}/vje30 /usr/local/; ${LN} -s ${PREFIX}/etc/vje30 /usr/local/etc/) -.if !defined(WITHOUT_MINORUPDATE) @${CP} ${WRKDIR}/vjed.bin /tmp/ @${ECHO} '' | ${WRKDIR}/vjesetup @${RM} /tmp/vjed.bin -.endif @${CP} -Pp /etc/services /etc/services.bak @${GREP} -qw '^vjed' /etc/services || ${ECHO} "vjed 11493/tcp # VJE-Delta Server" >> /etc/services diff --git a/japanese/vje30/distinfo b/japanese/vje30/distinfo index d5529b4b188e..a9cfee94ec98 100644 --- a/japanese/vje30/distinfo +++ b/japanese/vje30/distinfo @@ -1,4 +1,4 @@ -MD5 (vje30-AOUT/vje-delta-3.0-AOUT.tgz) = 81634ed63ed22d2e3f450f0241ef74ff -MD5 (vje30-AOUT/update.tgz) = 02bd9279f4deae3995bbf30d6295bd86 -MD5 (vje30-ELF/vje-delta-3.0-ELF.tgz) = 04b59e749950032159d7357f7844fadb -MD5 (vje30-ELF/update.tgz) = d009e6bb5cd8dbefd3fbf2399ec137e9 +MD5 (vje30/vje-delta-3.0-ELF.tgz) = 04b59e749950032159d7357f7844fadb +MD5 (vje30/vje-delta-3.0-ELF-update.tgz) = d009e6bb5cd8dbefd3fbf2399ec137e9 +MD5 (vje30/delta.tgz) = c458a80287e3344fff295dd4d7338b8f +MD5 (vje30/vje-delta-3.0-source-update.tgz) = 67bde42cf0032a6bc0db1c4080b8c8cd diff --git a/japanese/vje30/files/patch-Makefile b/japanese/vje30/files/patch-Makefile new file mode 100644 index 000000000000..1729513bd20a --- /dev/null +++ b/japanese/vje30/files/patch-Makefile @@ -0,0 +1,19 @@ +--- delta/newFrontend/Makefile.FreeBSD.orig Tue Aug 1 03:00:00 2000 ++++ delta/newFrontend/Makefile.FreeBSD Thu Jan 11 21:22:45 2001 +@@ -16,14 +16,14 @@ + DEST = . + HDRS = . -I/usr/X11R6/include + +-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 = + #XPMLIB = -lXpm + XPMLIB = + LIBS = $(BSDLIBS) $(XPMLIB) -lXmu -L/usr/X11R6/lib -lXt -lX11 -lXext +-LINKER = cc ++LINKER = $(CC) + + MAKEFILE = Makefile + diff --git a/japanese/vje30/files/patch-aa b/japanese/vje30/files/patch-aa index ccb9e4b2a980..a605e7836148 100644 --- a/japanese/vje30/files/patch-aa +++ b/japanese/vje30/files/patch-aa @@ -1,5 +1,5 @@ ---- vje30/bin/vjeacc.orig Tue Dec 28 03:00:00 1999 -+++ vje30/bin/vjeacc Wed Jul 5 12:26:22 2000 +--- usr/local/vje30/bin/vjeacc.orig Tue Dec 28 03:00:00 1999 ++++ usr/local/vje30/bin/vjeacc Thu Jan 11 21:28:59 2001 @@ -23,10 +23,18 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$VJE_HOME/lib diff --git a/japanese/vje30/files/patch-ximsub1.c b/japanese/vje30/files/patch-ximsub1.c new file mode 100644 index 000000000000..10a303ce1f7e --- /dev/null +++ b/japanese/vje30/files/patch-ximsub1.c @@ -0,0 +1,28 @@ +--- 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 @@ + + 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) { */ + CloseVJE (xim_client); +- } ++ /* } */ + #endif + fxim_table[i].client.used = False; + if (xim_client->preedit->FontName) { +@@ -295,9 +296,9 @@ + 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) { */ + CloseVJE (xim_client); +- } ++ /* } */ + #endif + fxim_table[i].client.used = False; +