SOURCES: Canna-conf.patch - update to 3.7p3

[glen]

Author: glen                         Date: Thu Apr 13 15:40:27 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update to 3.7p3

---- Files affected:
SOURCES:
   Canna-conf.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/Canna-conf.patch
diff -u SOURCES/Canna-conf.patch:1.1 SOURCES/Canna-conf.patch:1.2
--- SOURCES/Canna-conf.patch:1.1	Sat Mar  9 21:59:19 2002
+++ SOURCES/Canna-conf.patch	Thu Apr 13 17:40:22 2006
@@ -1,50 +1,58 @@
-diff -Nur Canna35b2.orig/Canna.conf Canna35b2/Canna.conf
---- Canna35b2.orig/Canna.conf	Thu Nov 28 11:27:01 1996
-+++ Canna35b2/Canna.conf	Sat Mar  9 19:13:20 2002
-@@ -128,27 +128,27 @@
-  * $Id$
-  */
+--- Canna37p3/Canna.conf~	2006-04-13 14:18:56.625048078 +0300
++++ Canna37p3/Canna.conf	2006-04-13 14:25:47.404240386 +0300
+@@ -109,12 +109,12 @@
+ # define DefErrDir $(cannaPrefix)/log
+ # define DefLibCannaDir $(cannaExecPrefix)/lib
+ #else 
+-# define DefCannaPrefix /usr/local/canna
++# define DefCannaPrefix /usr
+ # ifdef ObsoleteInstallDir
+ #  define DefErrDir /usr/spool/canna
+ #  define DefLibCannaDir /usr/lib
+ # else
+-#  define DefErrDir /var/log
++#  define DefErrDir /var/log/canna
+ #  define DefLibCannaDir $(cannaExecPrefix)/lib
+ # endif
+ #endif
+@@ -169,13 +169,13 @@
+ #define ModernElfLink NO /* experimental */
  
--cannaBinDir = /usr/local/canna/bin
--cannaSrvDir = /usr/local/canna/bin
--cannaLibDir = /usr/local/canna/lib
--cannaManDir = /usr/local/canna/man
--cannaIncDir = /usr/local/canna/include/canna
-+cannaBinDir = /usr/bin
-+cannaSrvDir = /usr/sbin
-+cannaLibDir = /var/lib/canna
-+cannaManDir = /usr/share/man/ja
-+cannaIncDir = /usr/include/canna
- libCannaDir = /usr/lib
- 
--ErrDir  = /usr/spool/canna
-+ErrDir  = /var/log/canna
- 
- wcharDefinition = -DCANNA_WCHAR
- Wlib =
--JapaneseLocale = japanese
-+JapaneseLocale = ja_JP.eucJP
  
 -cannaOwner = bin
 -cannaGroup = bin
 +cannaOwner = canna
 +cannaGroup = canna
  
- cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
- 
- pointerIntegerDef =
- 
--cannaDsoRev = 1
-+cannaDsoRev = 1.0.0
-     /* SunOS 4.x ¤ň¤ŞťČ¤¤¤ÎĘý¤Ç shared object ¤ňÍřÍѤš¤ëžěšç¤Ë¤Ď
-             cannaDsoRev = 1.1
-     ¤ČťŘÄꤡ¤Ć¤Ż¤Ŕ¤ľ¤¤ĄŁ¤Ţ¤żĄ˘FreeBSD ¤ňÍřÍѤš¤ëžěšç¤ĎĄ˘
-@@ -170,7 +170,7 @@
- #define JAPANESEMAN
- 
- /* locale ĽÇĽŁĽěĽŻĽČĽę¤ňťý¤Ă¤Ć¤¤¤ëžěšç¤Ď°Ę˛ź¤ňľ­˝Ň¤š¤ë */
--/* #define LOCALE_DIR /usr/lib/locale */
-+#define LOCALE_DIR /usr/share/locale
- 
- /* Ľ¨ĽóĽ¸ĽóĽšĽ¤ĽĂĽÁľĄÇ˝¤ňťČ¤Ś¤Î¤Ç¤˘¤ě¤ĐĽłĽáĽóĽČ¤ň¤Ď¤ş¤š */
- /* ˘¨Ăí Canna version 3.5 ¤Ç¤ĎĽłĽáĽóĽČ¤ň¤Ď¤ş¤ľ¤Ę¤¤¤Ç¤Ż¤Ŕ¤ľ¤¤ */
+ #ifdef InstallAsUser
+ cannaOwnerGroup =
+ #else
+-cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
++cannaOwnerGroup =
+ #endif
+ 
+ cannaDsoRev = 1.2
+@@ -199,9 +199,9 @@
+ CHGRP = :
+ CHMOD = :
+ #else
+-CHOWN = chown
+-CHGRP = chgrp
+-CHMOD = chmod
++CHOWN = :
++CHGRP = :
++CHMOD = :
+ #endif
+ 
+ /* ĆüËܸěĽŢĽËĽĺĽ˘Ľë¤ňťČ¤ď¤Ę¤¤¤Î¤Ç¤˘¤ě¤ĐĽłĽáĽóĽČĽ˘ĽŚĽČ */
+--- Canna37p3/server/Imakefile~	2006-04-13 14:33:32.394645446 +0300
++++ Canna37p3/server/Imakefile	2006-04-13 14:34:10.555499249 +0300
+@@ -6,7 +6,7 @@
+ #ifdef __EMX__
+          INSTFLAGS = $(INSTUGIDFLAGS)
+ #else
+-         INSTFLAGS = -s $(INSTUGIDFLAGS)
++         INSTFLAGS = $(INSTUGIDFLAGS)
+ #endif
+            DEFINES = $(CANNASERVER_DEFINES) $(SIGNAL_DEFINES) ConnectionFlags
+           INCLUDES = -I$(CANNAROOT)/include
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/Canna-conf.patch?r1=1.1&r2=1.2&f=u