[pkgsrc/trunk]: pkgsrc/inputmethod/canna Honour PKGMANDIR

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b1d401c3a75b
branches:  trunk
changeset: 542522:b1d401c3a75b
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue May 20 18:53:17 2008 +0000

description:
Honour PKGMANDIR

diffstat:

 inputmethod/canna/distinfo         |   4 ++--
 inputmethod/canna/patches/patch-aa |  23 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r 6efbee9edb90 -r b1d401c3a75b inputmethod/canna/distinfo
--- a/inputmethod/canna/distinfo        Tue May 20 18:53:16 2008 +0000
+++ b/inputmethod/canna/distinfo        Tue May 20 18:53:17 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/12/30 15:16:21 joerg Exp $
+$NetBSD: distinfo,v 1.8 2008/05/20 18:53:17 tnn Exp $
 
 SHA1 (Canna36p4.tar.gz) = 4edc22e2e4e5c6db42daa2083fabb53aa1ae8168
 RMD160 (Canna36p4.tar.gz) = 7f8bb7f5d87e6b939ff2b84edf58072c75a5d09d
 Size (Canna36p4.tar.gz) = 1455672 bytes
-SHA1 (patch-aa) = eb21b7beaa66c4d0c5815599dc49b7c0b7eb3a40
+SHA1 (patch-aa) = 6bb6da1cc2a458ebbcfe09fe19a371d7e8aea7da
 SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9
 SHA1 (patch-ac) = a81a07db87d3b501dedd423e148a8e7e1d1804c4
 SHA1 (patch-ad) = d4b5720c206f81124e0d53e71590de86f66c524c
diff -r 6efbee9edb90 -r b1d401c3a75b inputmethod/canna/patches/patch-aa
--- a/inputmethod/canna/patches/patch-aa        Tue May 20 18:53:16 2008 +0000
+++ b/inputmethod/canna/patches/patch-aa        Tue May 20 18:53:17 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2003/07/31 13:04:40 uebayasi Exp $
+$NetBSD: patch-aa,v 1.3 2008/05/20 18:53:17 tnn Exp $
 
---- Canna.conf.orig    Sat Jan 25 17:47:47 2003
+--- Canna.conf.orig    2003-09-22 12:27:12.000000000 +0200
 +++ Canna.conf
 @@ -133,18 +133,18 @@
  /* root¤Ë¤Ê¤é¤º¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë»þ¤Ï¤³¤ì¤òÄêµÁ¤·¤Æ²¼¤µ¤¤ */
@@ -24,7 +24,16 @@
  #  define DefLibCannaDir $(cannaExecPrefix)/lib
  # endif
  #endif
-@@ -173,10 +173,10 @@
+@@ -164,7 +164,7 @@ XCOMM cannaLibDir = /var/lib/canna
+ XCOMM cannaLibDir = /var/db/canna
+ cannaLibDir = DefCannaLibDir
+ XCOMM cannaManDir = $(cannaPrefix)/share/man
+-cannaManDir = $(cannaPrefix)/man
++cannaManDir = $(cannaPrefix)/$(PKGMANDIR)
+ cannaIncDir = $(cannaPrefix)/include/canna
+ 
+ libCannaDir = DefLibCannaDir
+@@ -173,10 +173,10 @@ ErrDir  = DefErrDir
  /* ¼¡¤Î3¹Ô¤ÏÊѹ¹¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤ */
  wcharDefinition = -DCANNA_WCHAR
  Wlib =
@@ -38,7 +47,7 @@
  
  #ifdef InstallAsUser
  cannaOwnerGroup =
-@@ -246,7 +246,7 @@
+@@ -249,7 +249,7 @@ dontHaveRename = 0
   * ¥³¥Þ¥ó¥ÉÎà¤ò¥ê¥ó¥¯¤¹¤ë»þ¤Ï¡¢¼¡¤ò YES ¤Ë¤·¤Æ¤¯¤À¤¤¡£
   */
  /* #define UseInstalledLibCanna YES */
@@ -47,7 +56,7 @@
  
  DicDir   = $(cannaLibDir)/dic
  
-@@ -291,18 +291,18 @@
+@@ -294,18 +294,18 @@ DicDir   = $(cannaLibDir)/dic
      DEPCANNALIB = $(libCannaDir)/libcanna.a
  #endif
  # endif
@@ -71,7 +80,7 @@
  #endif /* UseInstalledLibCanna */
  
  #if UseInstalledLibCanna
-@@ -311,14 +311,14 @@
+@@ -314,14 +314,14 @@ DicDir   = $(cannaLibDir)/dic
  # else
      DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
  # endif
@@ -90,7 +99,7 @@
  #endif /* UseInstalledLibCanna */
  
  /*
-@@ -335,7 +335,7 @@
+@@ -338,7 +338,7 @@ DicDir   = $(cannaLibDir)/dic
       SCRIPTS_DEFINES = 
  
  #ifdef JAPANESEMAN