From 59d082981f01121beef07c563e1e7fd9c4c59ff9 Mon Sep 17 00:00:00 2001 From: Satoshi Asami Date: Fri, 25 Nov 1994 18:21:00 +0000 Subject: [PATCH] Update to make jserver work. Needed to "wnntouch" dictionary files here and there. --- japanese/FreeWnn-lib/Makefile | 9 +++++++-- japanese/FreeWnn-lib/files/patch-aa | 28 +++++++++++++++++----------- japanese/FreeWnn-server/Makefile | 9 +++++++-- japanese/Wnn6-lib/Makefile | 9 +++++++-- japanese/Wnn6/Makefile | 9 +++++++-- japanese/Wnn7-lib/Makefile | 9 +++++++-- 6 files changed, 52 insertions(+), 21 deletions(-) diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile index 4f516bf7800b..daa3f49248a5 100644 --- a/japanese/FreeWnn-lib/Makefile +++ b/japanese/FreeWnn-lib/Makefile @@ -8,8 +8,10 @@ DISTNAME= Wnn4.2 MASTER_SITES= ftp://utsun.s.u-tokyo.ac.jp/fj/ -PKG_CMD= pkg_create -N +IS_INTERACTIVE= yes WRKSRC= ${WRKDIR}/Xsi +PKG_ARGS?= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST \ + -r ${PKGDIR}/REQ -i ${PKGDIR}/INSTALL -p ${PREFIX} # These are necesary because this package uses a different Makefile for # building and installing etc. @@ -19,9 +21,12 @@ pre-build: build: configure pre-build depends ${BUILD_COOKIE} @${TOUCH} ${TOUCH_FLAGS} ${BUILD_COOKIE} +pre-install: + @PREFIX=${PREFIX} ${SCRIPTDIR}/pre-install # This package uses imake's "install.man" target to install man pages but # I can't define USE_IMAKE because it doesn't involve xmkmf -pre-install: @(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man) +pre-reinstall: pre-install + .include diff --git a/japanese/FreeWnn-lib/files/patch-aa b/japanese/FreeWnn-lib/files/patch-aa index e2163a1bc2cb..dda1f466c132 100644 --- a/japanese/FreeWnn-lib/files/patch-aa +++ b/japanese/FreeWnn-lib/files/patch-aa @@ -1,5 +1,20 @@ +--- ./Wnn/pubdic/Imakefile.org Mon Aug 22 19:21:30 1994 ++++ ./Wnn/pubdic/Imakefile Thu Nov 24 22:00:29 1994 +@@ -109,6 +109,12 @@ + WnnInstallDicMultiple($(DIC),$(JWNNPUBDICDIR)) + #endif + InstallMultiple($(FZKDATA),$(JWNNPUBDICDIR)) ++install:: ++ @for i in $(FZKDATA); \ ++ do \ ++ $(WNNTOUCH) $(DESTDIR)$(JWNNPUBDICDIR)/$$i ;\ ++ done ++ + InstallMultiple($(FZK_SRC),$(JWNNFZKSRCDIR)) + + depend:: --- ./config/Project.tmpl.org Mon Aug 29 01:40:17 1994 -+++ ./config/Project.tmpl Tue Nov 22 09:56:34 1994 ++++ ./config/Project.tmpl Thu Nov 24 21:53:26 1994 @@ -389,6 +389,7 @@ XCOMM ----------------------------------------------------------------------- XCOMM X Window System make variables; these need to be coordinated with rules @@ -18,7 +33,7 @@ INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */ #ifdef UseInstalled -@@ -1134,21 +1138,28 @@ +@@ -1134,17 +1138,20 @@ $(WNNTOUCH) $(DESTDIR)dest/$$i); fi \ @@\ done @@ -41,13 +56,4 @@ +#define BuildXwnmo NO #endif -+/* -+ * Jserver doesn't seem to work -+ * - Satoshi -+ */ #ifndef BuildJserver --#define BuildJserver YES -+#define BuildJserver NO - #endif - #ifndef BuildJlib - #define BuildJlib YES diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile index 4f516bf7800b..daa3f49248a5 100644 --- a/japanese/FreeWnn-server/Makefile +++ b/japanese/FreeWnn-server/Makefile @@ -8,8 +8,10 @@ DISTNAME= Wnn4.2 MASTER_SITES= ftp://utsun.s.u-tokyo.ac.jp/fj/ -PKG_CMD= pkg_create -N +IS_INTERACTIVE= yes WRKSRC= ${WRKDIR}/Xsi +PKG_ARGS?= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST \ + -r ${PKGDIR}/REQ -i ${PKGDIR}/INSTALL -p ${PREFIX} # These are necesary because this package uses a different Makefile for # building and installing etc. @@ -19,9 +21,12 @@ pre-build: build: configure pre-build depends ${BUILD_COOKIE} @${TOUCH} ${TOUCH_FLAGS} ${BUILD_COOKIE} +pre-install: + @PREFIX=${PREFIX} ${SCRIPTDIR}/pre-install # This package uses imake's "install.man" target to install man pages but # I can't define USE_IMAKE because it doesn't involve xmkmf -pre-install: @(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man) +pre-reinstall: pre-install + .include diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile index 4f516bf7800b..daa3f49248a5 100644 --- a/japanese/Wnn6-lib/Makefile +++ b/japanese/Wnn6-lib/Makefile @@ -8,8 +8,10 @@ DISTNAME= Wnn4.2 MASTER_SITES= ftp://utsun.s.u-tokyo.ac.jp/fj/ -PKG_CMD= pkg_create -N +IS_INTERACTIVE= yes WRKSRC= ${WRKDIR}/Xsi +PKG_ARGS?= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST \ + -r ${PKGDIR}/REQ -i ${PKGDIR}/INSTALL -p ${PREFIX} # These are necesary because this package uses a different Makefile for # building and installing etc. @@ -19,9 +21,12 @@ pre-build: build: configure pre-build depends ${BUILD_COOKIE} @${TOUCH} ${TOUCH_FLAGS} ${BUILD_COOKIE} +pre-install: + @PREFIX=${PREFIX} ${SCRIPTDIR}/pre-install # This package uses imake's "install.man" target to install man pages but # I can't define USE_IMAKE because it doesn't involve xmkmf -pre-install: @(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man) +pre-reinstall: pre-install + .include diff --git a/japanese/Wnn6/Makefile b/japanese/Wnn6/Makefile index 4f516bf7800b..daa3f49248a5 100644 --- a/japanese/Wnn6/Makefile +++ b/japanese/Wnn6/Makefile @@ -8,8 +8,10 @@ DISTNAME= Wnn4.2 MASTER_SITES= ftp://utsun.s.u-tokyo.ac.jp/fj/ -PKG_CMD= pkg_create -N +IS_INTERACTIVE= yes WRKSRC= ${WRKDIR}/Xsi +PKG_ARGS?= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST \ + -r ${PKGDIR}/REQ -i ${PKGDIR}/INSTALL -p ${PREFIX} # These are necesary because this package uses a different Makefile for # building and installing etc. @@ -19,9 +21,12 @@ pre-build: build: configure pre-build depends ${BUILD_COOKIE} @${TOUCH} ${TOUCH_FLAGS} ${BUILD_COOKIE} +pre-install: + @PREFIX=${PREFIX} ${SCRIPTDIR}/pre-install # This package uses imake's "install.man" target to install man pages but # I can't define USE_IMAKE because it doesn't involve xmkmf -pre-install: @(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man) +pre-reinstall: pre-install + .include diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile index 4f516bf7800b..daa3f49248a5 100644 --- a/japanese/Wnn7-lib/Makefile +++ b/japanese/Wnn7-lib/Makefile @@ -8,8 +8,10 @@ DISTNAME= Wnn4.2 MASTER_SITES= ftp://utsun.s.u-tokyo.ac.jp/fj/ -PKG_CMD= pkg_create -N +IS_INTERACTIVE= yes WRKSRC= ${WRKDIR}/Xsi +PKG_ARGS?= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST \ + -r ${PKGDIR}/REQ -i ${PKGDIR}/INSTALL -p ${PREFIX} # These are necesary because this package uses a different Makefile for # building and installing etc. @@ -19,9 +21,12 @@ pre-build: build: configure pre-build depends ${BUILD_COOKIE} @${TOUCH} ${TOUCH_FLAGS} ${BUILD_COOKIE} +pre-install: + @PREFIX=${PREFIX} ${SCRIPTDIR}/pre-install # This package uses imake's "install.man" target to install man pages but # I can't define USE_IMAKE because it doesn't involve xmkmf -pre-install: @(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man) +pre-reinstall: pre-install + .include