From d94b368e069c6e2467616314ee6d5ee1b0f816c7 Mon Sep 17 00:00:00 2001 From: uebayasi Date: Thu, 4 Apr 2002 16:03:16 +0000 Subject: Retry of the previous fix... * Include old LinkFileList macro just after Canna.conf in each Imakefile. * Don't use USE_IMAKE. We need to pass MAKE_FLAGS to XMKMF. * s/DISTDIR/DESTDIR/ --- japanese/canna-lib/Makefile | 24 +++++++++++++++++++++--- japanese/canna-lib/distinfo | 5 +++-- japanese/canna-lib/files/LinkFileList.rules | 20 ++++++++++++++++++++ japanese/canna-lib/patches/patch-ab | 19 +------------------ japanese/canna-lib/patches/patch-af | 13 +++++++++++++ 5 files changed, 58 insertions(+), 23 deletions(-) create mode 100644 japanese/canna-lib/files/LinkFileList.rules create mode 100644 japanese/canna-lib/patches/patch-af (limited to 'japanese') diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile index e90733c23c5..8da49d5ad42 100644 --- a/japanese/canna-lib/Makefile +++ b/japanese/canna-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/04/02 16:29:22 uebayasi Exp $ +# $NetBSD: Makefile,v 1.9 2002/04/04 16:03:16 uebayasi Exp $ # DISTNAME= Canna35b2 @@ -18,7 +18,8 @@ COMMENT= Kana-Kanji conversion system (library) INSTALL_TARGET= install install.man -USE_IMAKE= # defined +# XXX USE_IMAKE can't pass MAKE_FLAGS to XMKMF. +#USE_IMAKE= # defined BUILD_DEFS+= USE_INET6 .include "../../mk/bsd.prefs.mk" @@ -29,7 +30,7 @@ INET6= # empty .endif CANNAOWNER?= daemon CANNAGROUP?= daemon -DICT_DIR?= ${DISTDIR}/var/dict +DICT_DIR?= ${DESTDIR}/var/dict MAKE_ENV+= CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \ DICT_DIR=${DICT_DIR} INET6=${INET6} PLIST_SUBST= CANNAOWNER=${CANNAOWNER} \ @@ -37,6 +38,10 @@ PLIST_SUBST= CANNAOWNER=${CANNAOWNER} \ DICT_DIR=${DICT_DIR} \ PREFIX=${PREFIX} +# (1) Change SUBDIRS. +# (2) Don't install `forcpp', `kpdic'. +# (3) Include ${FILESDIR}/LinkFileList.rules just after including Canna.conf +# in Imakefiles. post-patch: @${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig @${SED} -e 's|\(SUBDIRS = lib canna\).*\( misc\)|\1 cmd/forcpp cmd/kpdic dic/phono\2|' \ @@ -47,6 +52,19 @@ post-patch: @${SED} -e '/InstallProgram/d' ${WRKSRC}/cmd/${f}/Imakefile.orig \ > ${WRKSRC}/cmd/${f}/Imakefile .endfor + @${FIND} ${WRKSRC} -name Imakefile -print | \ + while read f; do \ + ${CP} $$f $${f}.orig; \ + { \ + ${ECHO} '/#include ".*\/Canna.conf"$$/a\'; + ${ECHO} '#include "${FILESDIR}/LinkFileList.rules"'; \ + } | ${SED} -f /dev/stdin $${f}.orig >$$f; \ + done + +# We need to pass ${MAKE_ENV} to ${XMKMF} +do-configure: + @cd ${WRKSRC} && \ + ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} ${MAKE_ENV} ${XMKMF} post-configure: @${LN} -s ${WRKSRC}/server/*.h ${WRKSRC}/include diff --git a/japanese/canna-lib/distinfo b/japanese/canna-lib/distinfo index 6b3746463f4..231608324f2 100644 --- a/japanese/canna-lib/distinfo +++ b/japanese/canna-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/04/02 16:29:23 uebayasi Exp $ +$NetBSD: distinfo,v 1.4 2002/04/04 16:03:16 uebayasi Exp $ SHA1 (Canna35b2.tar.gz) = 66742205272cbc6bd91f272596381f761feac0a2 Size (Canna35b2.tar.gz) = 1333329 bytes @@ -9,7 +9,8 @@ Size (Canna35b2-unoff2.patch.gz) = 11375 bytes SHA1 (Canna35b2-hack1.patch.gz) = 24ab2baf104ef9748f92bd5315d4100a7ee961ab Size (Canna35b2-hack1.patch.gz) = 8384 bytes SHA1 (patch-aa) = d74119cb2c37a3db1c5d5417c1e35362b1eac655 -SHA1 (patch-ab) = b224a611de298a1c029350e1f734571f7bf657d1 +SHA1 (patch-ab) = 45470a70c3fd313a24eae6ed7705fc3b37141e0c SHA1 (patch-ac) = 8f910e59d71ef09434a40abde698d730ed7fc1c5 SHA1 (patch-ad) = dd2eb94e75dc4789e298aa1601280d32fbe5ec96 SHA1 (patch-ae) = e44c60ddf1e042ab5df1457b6723071c38baae02 +SHA1 (patch-af) = 2700fc8395895176c16562af66ea5bf0b13d4e10 diff --git a/japanese/canna-lib/files/LinkFileList.rules b/japanese/canna-lib/files/LinkFileList.rules new file mode 100644 index 00000000000..f3b9a974ef9 --- /dev/null +++ b/japanese/canna-lib/files/LinkFileList.rules @@ -0,0 +1,20 @@ +XCOMM $NetBSD: LinkFileList.rules,v 1.1 2002/04/04 16:03:17 uebayasi Exp $ + +/* + * Old LinkFileList definition necessary to compile Canna on XFree86 4.2. + */ + +#ifdef LinkFileList +#undef LinkFileList +#endif + +/* + * LinkFileList - link a list of files from one place to another + */ +#ifndef LinkFileList +#define LinkFileList(step,list,dir,sub) @@\ +step:: list @@\ + @MakeFlagsToShellFlags(i,set +e); \ @@\ + echo " cd" dir; cd dir && \ @@\ + for i in list; do (set -x; RemoveFile($$i); $(LN) sub/$$i .); done +#endif diff --git a/japanese/canna-lib/patches/patch-ab b/japanese/canna-lib/patches/patch-ab index 6d8dc229043..59ac3bc1562 100644 --- a/japanese/canna-lib/patches/patch-ab +++ b/japanese/canna-lib/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2002/04/02 16:29:23 uebayasi Exp $ +$NetBSD: patch-ab,v 1.3 2002/04/04 16:03:18 uebayasi Exp $ --- Imakefile.orig Wed Apr 3 01:19:05 2002 +++ Imakefile @@ -20,20 +20,3 @@ $NetBSD: patch-ab,v 1.2 2002/04/02 16:29:23 uebayasi Exp $ install:: mkbindir mklibdir mkdicdir mkerrdir instserver:: mkdicdir mkerrdir -@@ -39,7 +39,15 @@ - MakeDirectoriesLong(mkerrdir, $(ErrDir), $(cannaOwner), $(cannaGroup)) - #endif - --LinkFileList(includes,cannaconf.h,$(CANNAROOT)/include,..) -+/* XXX The definition of LinkFileList macro changes in XFree86 4.2.0, -+ which leads a ciritical compilation error. So we expand the macro -+ with the prior definition. */ -+/* LinkFileList(includes,cannaconf.h,$(CANNAROOT)/include,..) */ -+includes:: cannaconf.h -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \ -+ echo " cd" $(CANNAROOT)/include; cd $(CANNAROOT)/include && \ -+ for i in cannaconf.h; do (set -x; $(RM) $$i; $(LN) ../$$i .); done - - canna:: - @echo "" diff --git a/japanese/canna-lib/patches/patch-af b/japanese/canna-lib/patches/patch-af new file mode 100644 index 00000000000..76aee7aa0c9 --- /dev/null +++ b/japanese/canna-lib/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2002/04/04 16:03:18 uebayasi Exp $ + +--- lib/RKC/convert.c.orig Wed May 22 22:02:57 1996 ++++ lib/RKC/convert.c +@@ -32,7 +32,7 @@ + #ifndef WIN + #include "sglobal.h" + #endif +-#include "IRproto.h" ++#include "../server/IRproto.h" + + #include + #include -- cgit v1.2.3