From b0da8e8b0214ffe70ace6681fef59ef8e78e793d Mon Sep 17 00:00:00 2001
From: rh <rh@pkgsrc.org>
Date: Wed, 8 Dec 1999 08:18:24 +0000
Subject: defuzz

---
 japanese/canna-lib/files/patch-sum  |  4 ++--
 japanese/canna-lib/patches/patch-aa | 24 ++++++++----------------
 2 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'japanese/canna-lib')

diff --git a/japanese/canna-lib/files/patch-sum b/japanese/canna-lib/files/patch-sum
index af1fd6a6332..5451c196c02 100644
--- a/japanese/canna-lib/files/patch-sum
+++ b/japanese/canna-lib/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.3 1999/09/06 07:25:16 sakamoto Exp $
+$NetBSD: patch-sum,v 1.4 1999/12/08 08:24:43 rh Exp $
 
-MD5 (patch-aa) = cdc53f1676a8add00d1c713e3f156681
+MD5 (patch-aa) = aca638a5b0fa561dcacb27590ff9a70a
 MD5 (patch-ab) = 9c308687cdc856ed489713dc2e929014
 MD5 (patch-ac) = a1fd7fea8cc51e12336ab061a6e2a838
diff --git a/japanese/canna-lib/patches/patch-aa b/japanese/canna-lib/patches/patch-aa
index ed1c5bfa8f5..1ef02c255a6 100644
--- a/japanese/canna-lib/patches/patch-aa
+++ b/japanese/canna-lib/patches/patch-aa
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
+$NetBSD: patch-aa,v 1.3 1999/12/08 08:24:44 rh Exp $
 
---- Canna.conf.orig	Thu Nov 28 19:27:01 1996
-+++ Canna.conf	Fri Aug 27 10:04:28 1999
-@@ -128,27 +128,27 @@
-  * $Id: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
+--- Canna.conf.orig	Thu Nov 28 11:27:01 1996
++++ Canna.conf	Wed Dec  8 09:21:56 1999
+@@ -129,19 +129,19 @@
   */
  
 -cannaBinDir = /usr/local/canna/bin
@@ -33,16 +32,14 @@ $NetBSD: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
 +cannaGroup = ${CANNAGROUP}
  
  cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
- 
+@@ -149,5 +149,5 @@
  pointerIntegerDef =
  
 -cannaDsoRev = 1
 +cannaDsoRev = 1.0
      /* SunOS 4.x をお使いの方で shared object を利用する場合には
              cannaDsoRev = 1.1
-     と指定してください。また、FreeBSD を利用する場合は、
-@@ -201,10 +201,9 @@
-  * インストール済みの共有ライブラリを用いて Canna の
+@@ -202,8 +202,7 @@
   * コマンド類をリンクする時は、次を YES にしてくだい。
   */
 -/* #define UseInstalledLibCanna YES */
@@ -53,9 +50,7 @@ $NetBSD: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
 +DicDir   = ${DICT_DIR}/canna
  
  #ifdef NeXT
- #define NO_X_ENV
-@@ -239,18 +238,18 @@
-     DEPCANNALIB = $(libCannaDir)/libcanna.a
+@@ -240,16 +239,16 @@
  #endif
  # endif
 -       CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
@@ -77,9 +72,7 @@ $NetBSD: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
 +       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
  #endif /* UseInstalledLibCanna */
  
- #if UseInstalledLibCanna
-@@ -259,14 +258,14 @@
- # else
+@@ -260,12 +259,12 @@
      DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
  # endif
 -       CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
@@ -96,4 +89,3 @@ $NetBSD: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
 +       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
  #endif /* UseInstalledLibCanna */
  
- /*
-- 
cgit v1.2.3