[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: canna-lib (pkg/16150)
今度こそ本当に直ったと思います。（←信用なし。）
* ${XMKMF} に ${MAKE_FLAGS} を渡さないといけなかった（ので
${USE_IMAKE} に変えてはいけなかった…）
* LinkFileList は ${FILESDIR}/LinkFileList.rules で旧版を定義し、
各 Imakefile でこれを include
* IRproto をインクルード（？）
ではおやすみなさい。
diff -Nru canna-lib.orig/Makefile canna-lib/Makefile
--- canna-lib.orig/Makefile Thu Apr 4 00:47:26 2002
+++ canna-lib/Makefile Thu Apr 4 00:48:19 2002
@@ -18,7 +18,7 @@
INSTALL_TARGET= install install.man
-USE_IMAKE= # defined
+#USE_IMAKE= # defined
BUILD_DEFS+= USE_INET6
.include "../../mk/bsd.prefs.mk"
@@ -47,6 +47,16 @@
@${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"'; ${ECHO}; } | ${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 -Nru canna-lib.orig/distinfo canna-lib/distinfo
--- canna-lib.orig/distinfo Thu Apr 4 00:47:26 2002
+++ canna-lib/distinfo Thu Apr 4 00:48:19 2002
@@ -9,7 +9,8 @@
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 -Nru canna-lib.orig/files/LinkFileList.rules canna-lib/files/LinkFileList.rules
--- canna-lib.orig/files/LinkFileList.rules Thu Jan 1 09:00:00 1970
+++ canna-lib/files/LinkFileList.rules Thu Apr 4 00:48:19 2002
@@ -0,0 +1,20 @@
+XCOMM $NetBSD$
+
+/*
+ * 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 -Nru canna-lib.orig/patches/patch-ab canna-lib/patches/patch-ab
--- canna-lib.orig/patches/patch-ab Thu Apr 4 00:47:26 2002
+++ canna-lib/patches/patch-ab Thu Apr 4 00:48:19 2002
@@ -20,20 +20,3 @@
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 -Nru canna-lib.orig/patches/patch-af canna-lib/patches/patch-af
--- canna-lib.orig/patches/patch-af Thu Jan 1 09:00:00 1970
+++ canna-lib/patches/patch-af Thu Apr 4 00:48:19 2002
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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 <errno.h>
+ #include <sys/types.h>