diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-i18n/canna/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-i18n/canna/files')
-rw-r--r-- | app-i18n/canna/files/canna-3.7-gentoo.diff.in | 144 | ||||
-rw-r--r-- | app-i18n/canna/files/canna-3.7_p3-strip.patch | 142 | ||||
-rw-r--r-- | app-i18n/canna/files/canna-3.7_p3.confd | 7 | ||||
-rw-r--r-- | app-i18n/canna/files/canna-3.7_p3.initd | 42 | ||||
-rw-r--r-- | app-i18n/canna/files/canna-kpdef-gentoo.diff | 18 | ||||
-rw-r--r-- | app-i18n/canna/files/canna.confd | 8 | ||||
-rw-r--r-- | app-i18n/canna/files/canna.hosts | 1 | ||||
-rw-r--r-- | app-i18n/canna/files/canna.initd | 37 | ||||
-rw-r--r-- | app-i18n/canna/files/update-canna-dics_dir | 36 |
9 files changed, 435 insertions, 0 deletions
diff --git a/app-i18n/canna/files/canna-3.7-gentoo.diff.in b/app-i18n/canna/files/canna-3.7-gentoo.diff.in new file mode 100644 index 000000000000..940c97f6dcaa --- /dev/null +++ b/app-i18n/canna/files/canna-3.7-gentoo.diff.in @@ -0,0 +1,144 @@ +diff -urN Canna37b1.ORIG/Canna.conf Canna37b1/Canna.conf +--- Canna37b1.ORIG/Canna.conf 2003-09-27 15:23:08.000000000 +0900 ++++ Canna37b1/Canna.conf 2003-09-27 19:09:13.000000000 +0900 +@@ -114,7 +114,7 @@ + # 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 +@@ -140,16 +140,18 @@ + # define ModernElfLinkAvailable NO + #endif + +-cannaPrefix = DefCannaPrefix ++cannaPrefix = /usr + cannaExecPrefix = $(cannaPrefix) + cannaBinDir = $(cannaExecPrefix)/bin + cannaSrvDir = DefCannaSrvDir + XCOMM cannaLibDir = /var/lib/canna + XCOMM cannaLibDir = /var/db/canna + cannaLibDir = DefCannaLibDir +-XCOMM cannaManDir = $(cannaPrefix)/share/man +-cannaManDir = $(cannaPrefix)/man ++cannaManDir = $(cannaPrefix)/share/man ++XCOMM cannaManDir = $(cannaPrefix)/man + cannaIncDir = $(cannaPrefix)/include/canna ++cannaDocDir = $(cannaPrefix)/share/doc/@cannapkgver@ ++cannaShareDir = $(cannaPrefix)/share/canna + + libCannaDir = DefLibCannaDir + ErrDir = DefErrDir +@@ -158,7 +160,7 @@ + #define SupportOldWchar 1 + + /* IPv6¤òÍѤ¤¤ë¾ì¹ç¤Ï1¤ÈÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤ */ +-#define UseInet6 0 /* requires newer IPv6 implementation */ ++/* #define UseInet6 0 /* requires newer IPv6 implementation */ + + /* 3.2·Ï¤«¤é3.6·Ï¤Þ¤Ç¤Î·Á¼°¤Î¼½ñ¤òºî¤ë¾ì¹ç¤Ï¤³¤ì¤òÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤ */ + /* #define DIC_3_6_COMPAT */ +@@ -237,7 +239,7 @@ + /* #define UseInstalledLibCanna YES */ + #define UseInstalledLibCanna NO + +-DicDir = $(cannaLibDir)/dic ++DicDir = /var/lib/canna/dic + + /* ¤³¤³¤«¤é²¼¤ÏÊѹ¹ÉÔÍפǤ¹ */ + +diff -urN Canna37b1.ORIG/Imakefile Canna37b1/Imakefile +--- Canna37b1.ORIG/Imakefile 2003-09-25 15:30:20.000000000 +0900 ++++ Canna37b1/Imakefile 2003-09-27 19:09:00.000000000 +0900 +@@ -55,6 +55,7 @@ + @echo "#define CANNAHOSTFILE '$(cannaLibDir)/cannahost'" >> junkjunk + @echo "/* for lib/canna */" >> junkjunk + @echo "#define CANNALIBDIR '$(cannaLibDir)'" >> junkjunk ++ @echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junkjunk + @echo "#define SUPPORT_OLD_WCHAR '$(supportOldWchar)'" >> junkjunk + @echo "/* for scripts */" >> junkjunk + @echo "#define CANNABINDIR $(cannaBinDir)" >> junkjunk +@@ -83,6 +84,7 @@ + echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\ + echo "/* for lib/canna */";\ + echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \ ++ echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \ + echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \ + echo "/* for scripts */";\ + echo "#define CANNABINDIR $(cannaBinDir)"; \ +diff -urN Canna37b1.ORIG/dic/phono/Imakefile Canna37b1/dic/phono/Imakefile +--- Canna37b1.ORIG/dic/phono/Imakefile 2002-10-19 17:27:40.000000000 +0900 ++++ Canna37b1/dic/phono/Imakefile 2003-09-27 19:09:00.000000000 +0900 +@@ -27,9 +27,10 @@ + + ROMAJI_DIC_DEF = -DSHIFT + +- DICDIR = $(cannaLibDir)/dic +- SAMPLEDIR = $(cannaLibDir)/sample +- SAMPLESRCDIR = $(cannaLibDir)/sample/src ++ DICDIR = $(DicDir) ++ CANNASHAREDIR = $(cannaShareDir) ++ SAMPLEDIR = $(cannaDocDir)/sample ++ SAMPLESRCDIR = $(cannaDocDir)/sample/src + + KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \ + lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \ +@@ -69,7 +70,7 @@ + MakeDirectories(install,$(DICDIR)) + MakeDirectories(install,$(SAMPLESRCDIR)) + +-InstallMultiple($(ROMKANA_TABLES),$(DICDIR)) ++InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR)) + + #ifdef USE_OBSOLETE_STYLE_FILENAME + InstallNonExec(default.kpdef,$(SAMPLESRCDIR)) +diff -urN Canna37b1.ORIG/lib/canna/romaji.c Canna37b1/lib/canna/romaji.c +--- Canna37b1.ORIG/lib/canna/romaji.c 2003-09-17 17:50:53.000000000 +0900 ++++ Canna37b1/lib/canna/romaji.c 2003-09-27 19:09:00.000000000 +0900 +@@ -427,7 +427,7 @@ + } + } + +-#if 0 /* currently CANNASHAREDDIR is not defined */ ++#if 1 /* currently CANNASHAREDDIR is defined */ + if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */ + extern jrUserInfoStruct *uinfo; + +diff -urN Canna37b1.ORIG/misc/Imakefile Canna37b1/misc/Imakefile +--- Canna37b1.ORIG/misc/Imakefile 2003-03-05 04:23:53.000000000 +0900 ++++ Canna37b1/misc/Imakefile 2003-09-27 19:09:00.000000000 +0900 +@@ -48,7 +48,7 @@ + MakeLintLibSubdirs($(SUBDIRS)) + MakeLintSubdirs($(SUBDIRS),install.ln,install.ln) + +-MakeDirectories(install,$(cannaLibDir)/sample/src) ++MakeDirectories(install,$(cannaDocDir)/sample/src) + + #ifdef USE_OBSOLETE_STYLE_FILENAME + default.canna: default.ca +@@ -58,8 +58,8 @@ + $(CP) default.ca default.canna + #endif + +-InstallNonExec(default.canna,$(cannaLibDir)) +-InstallNonExec(is.c,$(cannaLibDir)/sample/src) ++InstallNonExec(default.canna,$(cannaDocDir)) ++InstallNonExec(is.c,$(cannaDocDir)/sample/src) + + clean:: + $(RM) $(PROGRAMS) +diff -urN Canna37b1.ORIG/misc/initfiles/Imakefile Canna37b1/misc/initfiles/Imakefile +--- Canna37b1.ORIG/misc/initfiles/Imakefile 2003-02-04 05:13:01.000000000 +0900 ++++ Canna37b1/misc/initfiles/Imakefile 2003-09-27 19:09:00.000000000 +0900 +@@ -6,7 +6,7 @@ + #endif + + CANNAROOT = ../.. +- SAMPLEDIR = $(cannaLibDir)/sample ++ SAMPLEDIR = $(cannaShareDir) + + all:: + diff --git a/app-i18n/canna/files/canna-3.7_p3-strip.patch b/app-i18n/canna/files/canna-3.7_p3-strip.patch new file mode 100644 index 000000000000..ebcde1ef733a --- /dev/null +++ b/app-i18n/canna/files/canna-3.7_p3-strip.patch @@ -0,0 +1,142 @@ +diff -Naur Canna37p3.orig/config.log Canna37p3/config.log +--- Canna37p3.orig/config.log 1970-01-01 09:00:00.000000000 +0900 ++++ Canna37p3/config.log 2009-09-21 10:25:33.000000000 +0900 +@@ -0,0 +1,126 @@ ++This file contains any messages produced by compilers while ++running configure, to aid debugging if configure makes a mistake. ++ ++It was created by canna configure 3.7p3, which was ++generated by GNU Autoconf 2.59. Invocation command line was ++ ++ $ ./configure ++ ++## --------- ## ++## Platform. ## ++## --------- ## ++ ++hostname = lets ++uname -m = x86_64 ++uname -r = 2.6.31-gentoo ++uname -s = Linux ++uname -v = #1 SMP PREEMPT Fri Sep 11 17:39:06 JST 2009 ++ ++/usr/bin/uname -p = Intel(R) Core(TM)2 Duo CPU L7300 @ 1.40GHz ++/bin/uname -X = unknown ++ ++/bin/arch = unknown ++/usr/bin/arch -k = unknown ++/usr/convex/getsysinfo = unknown ++hostinfo = unknown ++/bin/machine = unknown ++/usr/bin/oslevel = unknown ++/bin/universe = unknown ++ ++PATH: /usr/local/bin ++PATH: /usr/bin ++PATH: /bin ++PATH: /opt/bin ++PATH: /usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/gcc-bin/4.3.3 ++PATH: /usr/x86_64-pc-linux-gnu/gcc-bin/4.4.1 ++PATH: /usr/kde/3.5/bin ++PATH: /usr/qt/3/bin ++PATH: /opt/android-sdk-1.5/tools ++PATH: /opt/android-sdk-1.5/platforms/android-1.5/tools ++PATH: /usr/games/bin ++ ++ ++## ----------- ## ++## Core tests. ## ++## ----------- ## ++ ++configure:1307: error: You cannot invloke configure directly. ++ ++## ---------------- ## ++## Cache variables. ## ++## ---------------- ## ++ ++ac_cv_env_CC_set= ++ac_cv_env_CC_value= ++ac_cv_env_CFLAGS_set= ++ac_cv_env_CFLAGS_value= ++ac_cv_env_CPPFLAGS_set= ++ac_cv_env_CPPFLAGS_value= ++ac_cv_env_CPP_set= ++ac_cv_env_CPP_value= ++ac_cv_env_LDFLAGS_set= ++ac_cv_env_LDFLAGS_value= ++ac_cv_env_build_alias_set= ++ac_cv_env_build_alias_value= ++ac_cv_env_host_alias_set= ++ac_cv_env_host_alias_value= ++ac_cv_env_target_alias_set= ++ac_cv_env_target_alias_value= ++ ++## ----------------- ## ++## Output variables. ## ++## ----------------- ## ++ ++CC='' ++CFLAGS='' ++CPP='' ++CPPFLAGS='' ++DEFS='' ++ECHO_C='' ++ECHO_N='-n' ++ECHO_T='' ++EGREP='' ++EXEEXT='' ++LDFLAGS='' ++LIBOBJS='' ++LIBS='' ++LTLIBOBJS='' ++OBJEXT='' ++PACKAGE_BUGREPORT='canna-dev@lists.sourceforge.jp' ++PACKAGE_NAME='canna' ++PACKAGE_STRING='canna 3.7p3' ++PACKAGE_TARNAME='canna' ++PACKAGE_VERSION='3.7p3' ++PATH_SEPARATOR=':' ++SHELL='/bin/sh' ++ac_ct_CC='' ++bindir='${exec_prefix}/bin' ++build_alias='' ++datadir='${prefix}/share' ++exec_prefix='NONE' ++host_alias='' ++includedir='${prefix}/include' ++infodir='${prefix}/info' ++libdir='${exec_prefix}/lib' ++libexecdir='${exec_prefix}/libexec' ++localstatedir='${prefix}/var' ++mandir='${prefix}/man' ++oldincludedir='/usr/include' ++prefix='NONE' ++program_transform_name='s,x,x,' ++sbindir='${exec_prefix}/sbin' ++sharedstatedir='${prefix}/com' ++sysconfdir='${prefix}/etc' ++target_alias='' ++ ++## ----------- ## ++## confdefs.h. ## ++## ----------- ## ++ ++#define PACKAGE_BUGREPORT "canna-dev@lists.sourceforge.jp" ++#define PACKAGE_NAME "canna" ++#define PACKAGE_STRING "canna 3.7p3" ++#define PACKAGE_TARNAME "canna" ++#define PACKAGE_VERSION "3.7p3" ++ ++configure: exit 1 +diff -Naur Canna37p3.orig/server/Imakefile Canna37p3/server/Imakefile +--- Canna37p3.orig/server/Imakefile 2004-04-27 06:48:37.000000000 +0900 ++++ Canna37p3/server/Imakefile 2009-09-21 10:28:48.000000000 +0900 +@@ -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 diff --git a/app-i18n/canna/files/canna-3.7_p3.confd b/app-i18n/canna/files/canna-3.7_p3.confd new file mode 100644 index 000000000000..d3fdce5425a2 --- /dev/null +++ b/app-i18n/canna/files/canna-3.7_p3.confd @@ -0,0 +1,7 @@ +CANNASERVER_ENABLE_SYSLOG="yes" + +# Specify user to run as +CANNASERVER_OWNER="bin" + +# Options for cannaserver +CANNASERVER_OPTS="" diff --git a/app-i18n/canna/files/canna-3.7_p3.initd b/app-i18n/canna/files/canna-3.7_p3.initd new file mode 100644 index 000000000000..d6445626b24d --- /dev/null +++ b/app-i18n/canna/files/canna-3.7_p3.initd @@ -0,0 +1,42 @@ +#!/sbin/runscript +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna +CANNASERVER_LOGFILE="/var/log/canna/CANNA0msgs" + +depend() { + after logger +} + +start() { + if [ -S /tmp/.iroha_unix/IROHA ] ; then + /usr/sbin/cannakill >/dev/null 2>&1 + fi + rm -f /tmp/.iroha_unix/IROHA + + if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ] ; then + CANNASERVER_OPTS="${CANNASERVER_OPTS} -syslog" + else + touch "${CANNASERVER_LOGFILE}" + chmod u+w "${CANNASERVER_LOGFILEj}" + fi + + if [ ! -z "${CANNASERVER_OWNER}" ] ; then + if [ -f "${CANNASERVER_LOGFILE}" ] ; then + chown "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}" + fi + CANNASERVER_OPTS="${CANNASERVER_OPTS} -u ${CANNASERVER_OWNER}" + fi + + ebegin "Starting canna" + /usr/sbin/cannaserver ${CANNASERVER_OPTS} + eend $? "Failed to start canna" +} + +stop() { + ebegin "Stopping canna" + /usr/sbin/cannakill + eend $? "Failed to stop canna" +} diff --git a/app-i18n/canna/files/canna-kpdef-gentoo.diff b/app-i18n/canna/files/canna-kpdef-gentoo.diff new file mode 100644 index 000000000000..f458c53efdd7 --- /dev/null +++ b/app-i18n/canna/files/canna-kpdef-gentoo.diff @@ -0,0 +1,18 @@ +--- default.kpdef.orig 2002-10-19 17:27:40.000000000 +0900 ++++ default.kpdef 2003-12-13 00:54:51.000000000 +0900 +@@ -350,3 +350,15 @@ + _ ¡² + / ¡¿ + \\ ¡ï ++ ++# some useful romkan symbols ++z, ¡Å ++z- ¡Á ++z. ¡Ä ++z/ ¡¦ ++z[ ¡Ø ++z] ¡Ù ++zh ¢« ++zj ¢ ++zk ¢¬ ++zl ¢ª diff --git a/app-i18n/canna/files/canna.confd b/app-i18n/canna/files/canna.confd new file mode 100644 index 000000000000..1cb421388735 --- /dev/null +++ b/app-i18n/canna/files/canna.confd @@ -0,0 +1,8 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Config file for /etc/init.d/canna + +# Specify user to run as +CANNASERVER_OPTS="" diff --git a/app-i18n/canna/files/canna.hosts b/app-i18n/canna/files/canna.hosts new file mode 100644 index 000000000000..509143d86315 --- /dev/null +++ b/app-i18n/canna/files/canna.hosts @@ -0,0 +1 @@ +unix diff --git a/app-i18n/canna/files/canna.initd b/app-i18n/canna/files/canna.initd new file mode 100644 index 000000000000..d26393b179a4 --- /dev/null +++ b/app-i18n/canna/files/canna.initd @@ -0,0 +1,37 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# CANNASERVER_OPTS is defined in /etc/conf.d/canna + +depend() { + after logger +} + +start() { + if [ -S /tmp/.iroha_unix/IROHA ] ; then + /usr/sbin/cannakill >/dev/null 2>&1 + fi + rm -f /tmp/.iroha_unix/IROHA + + if [ "${CANNASERVER_OPTS}" = "${CANNASERVER_OPTS/-syslog/}" ] ; then + if [ ! -f /var/log/canna/CANNA0msgs ] ; then + touch /var/log/canna/CANNA0msgs + fi + if [ "${CANNASERVER_OPTS}" != "${CANNASERVER_OPTS/-u/}" ] ; then + chown `echo ${CANNASERVER_OPTS} | sed -e 's/.*-u *\(\w*\).*/\1/'` /var/log/canna/CANNA0msgs + fi + chmod u+w /var/log/canna/CANNA0msgs + fi + + ebegin "Starting canna" + /usr/sbin/cannaserver ${CANNASERVER_OPTS} + eend $? "Failed to start canna" +} + +stop() { + ebegin "Stopping canna" + /usr/sbin/cannakill + eend $? "Failed to stop canna" +} diff --git a/app-i18n/canna/files/update-canna-dics_dir b/app-i18n/canna/files/update-canna-dics_dir new file mode 100644 index 000000000000..a57290ec3bad --- /dev/null +++ b/app-i18n/canna/files/update-canna-dics_dir @@ -0,0 +1,36 @@ +#!/bin/sh +# update-canna-dics_dir +# compiles dics.dir files for Canna Server +# Copyright 2001 ISHIKAWA Mutsumi +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. + +SRC=/var/lib/canna/dic/dics.d +DEST=/var/lib/canna/dic/canna + +for DIR in $SRC $DEST; do + VALID=yes + if [ ! -d $DIR ]; then + echo "$0: $DIR does not exist or is not a directory." >&2 + VALID= + fi +done + +if [ -n "$VALID" ]; then + # write new dics.dir file in case we are interrupted + echo '# dics.dir -- automatically generated file. DO NOT EDIT.' > $DEST/dics.dir.update-new +# echo '# To modify, see update-canna-dics_dir(8). >> $DEST/dics.dir.update-new + # are there any files to process? + if [ "$(echo $SRC/*.dics.dir)" != "$SRC/*.dics.dir" ]; then + for file in $SRC/*.dics.dir; do + echo "# $file" >> $DEST/dics.dir.update-new + cat $file >> $DEST/dics.dir.update-new + done + mv $DEST/dics.dir.update-new $DEST/dics.dir + else + # no files to process, remove the one + rm -f $DEST/dics.dir + fi +fi + +exit |