summaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorjwise <jwise>2002-04-13 03:02:26 +0000
committerjwise <jwise>2002-04-13 03:02:26 +0000
commit8fad028713f6eda9acd108e0935a90d55e3aaabe (patch)
treebc34f9ba858721263da60106da481d01d95ef2bf /japanese
parentadd3dce72a63e0fe1c7738e248d6abb6e827cf1f (diff)
downloadpkgsrc-8fad028713f6eda9acd108e0935a90d55e3aaabe.tar.gz
Revert patch-ab to revision 1.1, as suggested by jlam@netbsd.org.
Fixes build problem with canna-server picked up by bulk build system.
Diffstat (limited to 'japanese')
-rw-r--r--japanese/canna-lib/distinfo4
-rw-r--r--japanese/canna-lib/patches/patch-ab36
2 files changed, 18 insertions, 22 deletions
diff --git a/japanese/canna-lib/distinfo b/japanese/canna-lib/distinfo
index 231608324f2..0e467e545fc 100644
--- a/japanese/canna-lib/distinfo
+++ b/japanese/canna-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/04/04 16:03:16 uebayasi Exp $
+$NetBSD: distinfo,v 1.5 2002/04/13 03:02:26 jwise Exp $
SHA1 (Canna35b2.tar.gz) = 66742205272cbc6bd91f272596381f761feac0a2
Size (Canna35b2.tar.gz) = 1333329 bytes
@@ -9,7 +9,7 @@ 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) = 45470a70c3fd313a24eae6ed7705fc3b37141e0c
+SHA1 (patch-ab) = 38f3ad4e022299a4dfd8d9391b1742b0d0f02a71
SHA1 (patch-ac) = 8f910e59d71ef09434a40abde698d730ed7fc1c5
SHA1 (patch-ad) = dd2eb94e75dc4789e298aa1601280d32fbe5ec96
SHA1 (patch-ae) = e44c60ddf1e042ab5df1457b6723071c38baae02
diff --git a/japanese/canna-lib/patches/patch-ab b/japanese/canna-lib/patches/patch-ab
index 59ac3bc1562..f55f2ae1a70 100644
--- a/japanese/canna-lib/patches/patch-ab
+++ b/japanese/canna-lib/patches/patch-ab
@@ -1,22 +1,18 @@
-$NetBSD: patch-ab,v 1.3 2002/04/04 16:03:18 uebayasi Exp $
+$NetBSD: patch-ab,v 1.4 2002/04/13 03:02:26 jwise Exp $
---- Imakefile.orig Wed Apr 3 01:19:05 2002
-+++ Imakefile
-@@ -4,7 +4,7 @@
- #define IHaveSubdirs
- #define PassCDebugFlags
- WORLDOPTS = -k
-- SUBDIRS = lib canna server cmd dic misc doc
-+ SUBDIRS = lib canna cmd/forcpp cmd/kpdic dic/phono misc doc
- INCLUDE = ./include/canna
- AllTarget(cannaconf.h)
- MakeSubdirs($(SUBDIRS))
-@@ -22,7 +22,7 @@
- CANNAROOT = .
- SERVERDIR = server dic/phono dic/ideo
- CLIENTDIR = cmd dic/phono misc
--SGSDIR = canna lib
-+SGSDIR = lib canna dic/phono misc doc
+--- ./Imakefile.orig Wed Nov 27 16:01:34 1996
++++ ./Imakefile Fri Jul 30 19:17:44 1999
+@@ -61,5 +61,5 @@
+ do \
+ (cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
+- $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
++ $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \
+ done
+
+@@ -69,5 +69,5 @@
+ do \
+ (cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
+- $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
++ $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \
+ done
- install:: mkbindir mklibdir mkdicdir mkerrdir
- instserver:: mkdicdir mkerrdir