head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2:1.2.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2002.05.31.15.33.15; author seb; state dead; branches; next 1.2; 1.2 date 99.12.08.09.16.26; author rh; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 99.08.27.04.09.28; author sakamoto; state Exp; branches 1.1.1.1; next ; 1.2.2.1 date 2002.06.23.18.48.45; author jlam; state dead; branches; next ; 1.1.1.1 date 99.08.27.04.09.28; author sakamoto; state Exp; branches; next ; desc @@ 1.3 log @Remove all package and category files from the japanese category. This effectively retire the japanese category. @ text @$NetBSD: patch-aa,v 1.2 1999/12/08 09:16:26 rh Exp $ --- Canna.conf.orig Thu Nov 28 11:27:01 1996 +++ Canna.conf Wed Dec 8 10:14:38 1999 @@@@ -129,19 +129,19 @@@@ */ -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 -libCannaDir = /usr/lib +cannaBinDir = ${PREFIX}/bin +cannaSrvDir = ${PREFIX}/sbin +cannaLibDir = ${PREFIX}/share/canna +cannaManDir = ${PREFIX}/man/ja_JP.EUC +cannaIncDir = ${PREFIX}/include/canna +libCannaDir = ${PREFIX}/lib -ErrDir = /usr/spool/canna +ErrDir = ${CANNA_SPOOL} wcharDefinition = -DCANNA_WCHAR Wlib = -JapaneseLocale = japanese +JapaneseLocale = ja_JP.eucJP -cannaOwner = bin -cannaGroup = bin +cannaOwner = ${CANNAOWNER} +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 @@@@ -202,8 +202,7 @@@@ * コマンド類をリンクする時は、次を YES にしてくだい。 */ -/* #define UseInstalledLibCanna YES */ -#define UseInstalledLibCanna NO +#define UseInstalledLibCanna YES -DicDir = $(cannaLibDir)/dic +DicDir = ${DICT_DIR}/canna #ifdef NeXT @@@@ -240,16 +239,16 @@@@ #endif # endif - CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB) + CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB) #else /* ! UseInstalledLibCanna */ # if DoSharedLib - DEPCANNALIB = $(CANNASRC)/libcanna.$(sharedLibExtension) + DEPCANNALIB = $(libCannaDir)/libcanna.$(sharedLibExtension) # else #ifdef __EMX__ - DEPCANNALIB = $(CANNASRC)/canna.a + DEPCANNALIB = $(libCannaDir)/canna.a #else - DEPCANNALIB = $(CANNASRC)/libcanna.a + DEPCANNALIB = $(libCannaDir)/libcanna.a #endif # endif - CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB) + CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB) #endif /* UseInstalledLibCanna */ @@@@ -260,12 +259,12 @@@@ DEPCANNALIB16 = $(libCannaDir)/libcanna16.a # endif - CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB) + CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB) #else /* ! UseInstalledLibCanna */ # if DoSharedLib - DEPCANNALIB16 = $(CANNASRC)/libcanna16.$(sharedLibExtension) + DEPCANNALIB16 = $(libCannaDir)/libcanna16.$(sharedLibExtension) # else - DEPCANNALIB16 = $(CANNASRC)/libcanna16.a + DEPCANNALIB16 = $(libCannaDir)/libcanna16.a # endif - CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB) + CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB) #endif /* UseInstalledLibCanna */ @ 1.2 log @defuzz @ text @d1 1 a1 1 $NetBSD$ @ 1.2.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 1999/12/08 09:16:26 rh Exp $ @ 1.1 log @Initial revision @ text @d3 3 a5 4 --- Canna.conf.orig Thu Nov 28 19:27:01 1996 +++ Canna.conf Fri Aug 27 10:04:28 1999 @@@@ -128,27 +128,27 @@@@ * $Id: Canna.conf,v 3.13 1996/11/28 10:27:01 kon Exp $ d35 1 a35 1 d42 1 a42 3 と指定してください。また、FreeBSD を利用する場合は、 @@@@ -201,10 +201,9 @@@@ * インストール済みの共有ライブラリを用いて Canna の d53 1 a53 3 #define NO_X_ENV @@@@ -239,18 +238,18 @@@@ DEPCANNALIB = $(libCannaDir)/libcanna.a d75 1 a75 3 #if UseInstalledLibCanna @@@@ -259,14 +258,14 @@@@ # else a91 1 /* @ 1.1.1.1 log @Japanese input tty frontend for Canna using uum by Osamu OISHI . @ text @@