pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/inputmethod/skkserv Now, newer SKK-JISYO is installed ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/45d07a9e2a81
branches: trunk
changeset: 577691:45d07a9e2a81
user: obache <obache%pkgsrc.org@localhost>
date: Sat Jul 17 08:57:18 2010 +0000
description:
Now, newer SKK-JISYO is installed as skk-jisyo and jisyo-tools are skktools.
So let to only install skkserv by this package.
Based on Ryo ONODERA's pkgsrc-wip/skkserv.
Bump PKGREVISION.
diffstat:
inputmethod/skkserv/DESCR | 6 +-
inputmethod/skkserv/Makefile | 31 ++---
inputmethod/skkserv/PLIST | 8 +-
inputmethod/skkserv/distinfo | 13 +-
inputmethod/skkserv/patches/patch-aa | 21 ----
inputmethod/skkserv/patches/patch-af | 41 +++----
inputmethod/skkserv/patches/patch-ag | 151 ------------------------------
inputmethod/skkserv/patches/patch-ah | 14 --
inputmethod/skkserv/patches/patch-bsearch | 27 +---
inputmethod/skkserv/patches/patch-jisyo | 112 ----------------------
10 files changed, 41 insertions(+), 383 deletions(-)
diffs (truncated from 632 to 300 lines):
diff -r faecb3ef5474 -r 45d07a9e2a81 inputmethod/skkserv/DESCR
--- a/inputmethod/skkserv/DESCR Sat Jul 17 08:52:30 2010 +0000
+++ b/inputmethod/skkserv/DESCR Sat Jul 17 08:57:18 2010 +0000
@@ -1,6 +1,4 @@
skkserv is a dictionary server for SKK (Simple Kana to
Kanji conversion) programs, including skk.el (Emacs Lisp),
-skkfep (tty-based frontend), and skkinput (X11 frontend).
-
- This package also contains manipulation tools of
-SKK-format dictionaries.
+skkfep (tty-based frontend), and skkinput (X11 frontend),
+uim-skk, scim-skk.
diff -r faecb3ef5474 -r 45d07a9e2a81 inputmethod/skkserv/Makefile
--- a/inputmethod/skkserv/Makefile Sat Jul 17 08:52:30 2010 +0000
+++ b/inputmethod/skkserv/Makefile Sat Jul 17 08:57:18 2010 +0000
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.21 2010/02/14 22:07:38 dholland Exp $
+# $NetBSD: Makefile,v 1.22 2010/07/17 08:57:18 obache Exp $
DISTNAME= skk9.6
PKGNAME= skkserv-3.9.4
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= japanese inputmethod
MASTER_SITES= ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
-PATCHFILES= SKK-JISYO.L.diff.gz
-PATCH_SITES= http://www.ht-net21.ne.jp/%7Enaoki-w/skk/
-PATCH_DIST_ARGS= -d ${WRKSRC}/jisyo --forward --quiet
-
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://skk.kuis.kyoto-u.ac.jp/
COMMENT= Dictionary server for Simple Kana-Kanji conversion programs
+DEPENDS= skk-jisyo>=200708:../../inputmethod/skk-jisyo
+
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/skk-9.6
@@ -23,6 +21,7 @@
DIST_SUBDIR= skk
GNU_CONFIGURE= YES
+BUILD_DIRS= skkserv
.include "../../mk/bsd.prefs.mk"
@@ -39,27 +38,19 @@
SKKSERV_GID?= 32766 # nogroup
MAKE_ENV+= SKKUID=${SKKSERV_UID:Q} SKKGID=${SKKSERV_GID:Q}
-# tmp for building dictionary. ~16MB required. mfs would be much faster.
-TMPDIR?= ${WRKDIR}
+RCD_SCRIPTS= skkserv
-RCD_SCRIPTS= skkserv
+SUBST_CLASSES+= ver-num
+SUBST_STAGE.ver-num= pre-configure
+SUBST_MESSAGE.ver-num= Fixing version number and its comments.
+SUBST_FILES.ver-num= skkserv/skkserv.c
+SUBST_SED.ver-num= -e 's,"${PKGVERSION_NOREV} ","${PKGVERSION} (binary search) ",g'
INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
INSTALLATION_DIRS= share/skk
-post-build:
- :
- : Merging dictionaries....
- :
- ${WRKSRC}/jisyo-tools/skkdic-expr -d ${TMPDIR} \
- ${WRKSRC}/jisyo/SKK-JISYO.L + ${WRKSRC}/jisyo/SKK-JISYO.JIS2 | \
- ${WRKSRC}/jisyo-tools/skkdic-sort >${WRKDIR}/SKK-JISYO.L
-
post-install:
- ${INSTALL_DATA} ${WRKDIR}/SKK-JISYO.L ${DESTDIR}${PREFIX}/share/skk/SKK-JISYO.L
${INSTALL_DATA} ${WRKSRC}/skkserv/README ${DESTDIR}${PREFIX}/share/skk/README.skkserv
- ${INSTALL_DATA} ${WRKSRC}/jisyo-tools/README.1st ${DESTDIR}${PREFIX}/share/skk/README.1st.jisyo-tools
- ${INSTALL_DATA} ${WRKSRC}/jisyo-tools/README ${DESTDIR}${PREFIX}/share/skk/README.jisyo-tools
.include "../../mk/bsd.pkg.mk"
diff -r faecb3ef5474 -r 45d07a9e2a81 inputmethod/skkserv/PLIST
--- a/inputmethod/skkserv/PLIST Sat Jul 17 08:52:30 2010 +0000
+++ b/inputmethod/skkserv/PLIST Sat Jul 17 08:57:18 2010 +0000
@@ -1,10 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:01:32 joerg Exp $
-bin/skkdic-expr
-bin/skkdic-sort
-bin/skkdic-count
+@comment $NetBSD: PLIST,v 1.5 2010/07/17 08:57:18 obache Exp $
libexec/skkserv
share/examples/rc.d/skkserv
-share/skk/SKK-JISYO.L
share/skk/README.skkserv
-share/skk/README.1st.jisyo-tools
-share/skk/README.jisyo-tools
diff -r faecb3ef5474 -r 45d07a9e2a81 inputmethod/skkserv/distinfo
--- a/inputmethod/skkserv/distinfo Sat Jul 17 08:52:30 2010 +0000
+++ b/inputmethod/skkserv/distinfo Sat Jul 17 08:57:18 2010 +0000
@@ -1,19 +1,12 @@
-$NetBSD: distinfo,v 1.4 2010/02/14 22:07:38 dholland Exp $
+$NetBSD: distinfo,v 1.5 2010/07/17 08:57:18 obache Exp $
SHA1 (skk/skk9.6.tar.gz) = f462b4586dff6e36bfe331a526e054c3f6c3aad9
RMD160 (skk/skk9.6.tar.gz) = af182063e92f993cd2d9a69d7f89109ef0631526
Size (skk/skk9.6.tar.gz) = 2407653 bytes
-SHA1 (skk/SKK-JISYO.L.diff.gz) = aecf9a7aa8607b9e9a4a3c7e74268ffb09c775ad
-RMD160 (skk/SKK-JISYO.L.diff.gz) = 74f6ca601b314e9c0f20cc7dce80dc084e1efba4
-Size (skk/SKK-JISYO.L.diff.gz) = 15533 bytes
-SHA1 (patch-aa) = d9ee708fe5dcf36258256bdb4ba4c8d7e16905da
SHA1 (patch-ab) = 5103484679c5d82a8d79460cc24e8857fc89460a
SHA1 (patch-ac) = 3a1818c3bb453b69eb23154ed0daa6909275774b
SHA1 (patch-ad) = 27abe12b627e8e5c5de0a78fab3a5f4551f3c0f7
SHA1 (patch-ae) = 356b3bab93365bb769a340b99979161f07f60de4
-SHA1 (patch-af) = 0ee1792a36a220096048801346c466c9e3ec2736
-SHA1 (patch-ag) = 9d972fe066228d77214693bdfdcc14a827db79d2
-SHA1 (patch-ah) = c5c75fa2b74e7878b3a489be458f5000889d316d
+SHA1 (patch-af) = 010ee51ad8b8e078fc14e7297fbcdf7259245014
SHA1 (patch-ai) = 38f6169507d12c500298cba555a57b77cafa19c4
-SHA1 (patch-bsearch) = d753fe29c2d0301a9e7bbf8c2d1f624447761cad
-SHA1 (patch-jisyo) = 0711c55fb8df69648bd182de68ea6a69d42ac9af
+SHA1 (patch-bsearch) = 32a0ab43b6695e19748abed250dd0e1ad632260b
diff -r faecb3ef5474 -r 45d07a9e2a81 inputmethod/skkserv/patches/patch-aa
--- a/inputmethod/skkserv/patches/patch-aa Sat Jul 17 08:52:30 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
-
---- Makefile.in.orig Mon Feb 3 18:21:39 1997
-+++ Makefile.in Tue Dec 21 20:03:09 1999
-@@ -33,7 +33,7 @@
- JISYO = @JISYO@
- JISYODIR = $(datadir)/skk
-
--SUBDIRS = lisp skkserv jisyo-tools doc etc
-+SUBDIRS = skkserv jisyo-tools
-
- MDEFINES = CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' \
- EMACS='$(EMACS)' JISYO='$(JISYO)' JISYODIR='$(JISYODIR)' \
-@@ -50,7 +50,6 @@
- echo making $@ in $$subdir; \
- (cd $$subdir && $(MAKE) $(MDEFINES) $@) || exit 1; \
- done
-- $(INSTALL_DATA) jisyo/$(JISYO) $(JISYODIR)/$(JISYO)
-
- clean:
- cd lisp; $(MAKE) clean
diff -r faecb3ef5474 -r 45d07a9e2a81 inputmethod/skkserv/patches/patch-af
--- a/inputmethod/skkserv/patches/patch-af Sat Jul 17 08:52:30 2010 +0000
+++ b/inputmethod/skkserv/patches/patch-af Sat Jul 17 08:57:18 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $
+$NetBSD: patch-af,v 1.2 2010/07/17 08:57:18 obache Exp $
---- skkserv/skkserv.c.orig Tue Jan 21 04:16:36 1997
-+++ skkserv/skkserv.c Mon Nov 6 00:12:57 2000
-@@ -100,14 +100,16 @@
+--- skkserv/skkserv.c.orig 1997-01-20 19:16:36.000000000 +0000
++++ skkserv/skkserv.c
+@@ -100,8 +100,10 @@
#define SERVER_NOT_FOUND "4"
#define SERVER_FULL "9"
@@ -14,14 +14,7 @@
/*
* Global Variables
- */
-
--char pgmver[] = "3.9.4 "; /* version number */
-+char pgmver[] = "3.9.4nb1 "; /* version number */
-
- char *pgmnm; /* program name */
- char *jname; /* name of shared dictionary */
-@@ -121,6 +123,9 @@
+@@ -121,6 +123,9 @@ int format; /* 0 (old-style) / non-0 (n
int jtab1[KANAMOJI]; /* index-table by 1st letter (1st part)*/
int jtab2[KANAMOJI]; /* index-table by 1st letter (2nd part)*/
int initsock; /* socket for waiting requests */
@@ -31,7 +24,7 @@
int clientsock[MAXCLNT]; /* socket for each client */
int nclients; /* max index for active clients */
-@@ -130,8 +135,18 @@
+@@ -130,8 +135,18 @@ char *argv[];
int parg;
int setjisho = 0;
int ctlterm; /* fildes for control terminal */
@@ -51,7 +44,7 @@
pgmnm = argv[0];
debug = 0;
errout = stderr;
-@@ -200,7 +215,10 @@
+@@ -200,7 +215,10 @@ char *argv[];
fclose(stderr);
/* detach child process from control terminal */
@@ -63,7 +56,7 @@
if ((ctlterm = open("/dev/tty", 2)) >= 0) {
ioctl(ctlterm, TIOCNOTTY, 0);
close(ctlterm);
-@@ -215,6 +233,7 @@
+@@ -215,6 +233,7 @@ char *argv[];
signal(SIGHUP, SIG_IGN);
if (fork() != 0) exit(0);
#endif
@@ -71,7 +64,7 @@
} else { /* debug mode */
fprintf(errout, "SKK-JISYO is %s\n", jname);
fflush(errout);
-@@ -222,7 +241,7 @@
+@@ -222,7 +241,7 @@ char *argv[];
if (errout != stderr) fclose(stderr);
}
@@ -80,7 +73,7 @@
/* 1993/6/5 by kam, re-read dictionary by "INT" signal */
nclients = 0;
-@@ -244,8 +263,11 @@
+@@ -244,8 +263,11 @@ showusage()
mksock()
{
struct sockaddr_in sin;
@@ -93,7 +86,7 @@
bzero((char*)&sin, sizeof(sin));
sin.sin_family = AF_INET;
-@@ -262,16 +284,54 @@
+@@ -262,16 +284,54 @@ mksock()
sin.sin_port = htons(portnum);
if ((initsock = socket(PF_INET, SOCK_STREAM, 0)) < 0)
@@ -154,7 +147,7 @@
fflush(errout);
}
}
-@@ -303,8 +363,19 @@
+@@ -303,8 +363,19 @@ mkjtab()
mkoldjtab(buf);
}
@@ -175,7 +168,7 @@
{
if (fclose(jisho) < 0) {
fprintf(stderr,
-@@ -455,15 +526,22 @@
+@@ -455,15 +526,22 @@ mknewjtab()
main_loop()
{
fd_set readfds, writefds, exceptfds;
@@ -200,7 +193,7 @@
if (select(MAXDTAB, &readfds, &writefds, &exceptfds, NULL) < 0) {
if (errno == EINTR) /* if signal happens */
continue;
-@@ -474,16 +552,32 @@
+@@ -474,16 +552,32 @@ main_loop()
fflush(errout);
}
@@ -235,7 +228,7 @@
/* naiive scheduling */
for (i = 0; i < nclients; i ++)
-@@ -511,16 +605,20 @@
+@@ -511,16 +605,20 @@ main_loop()
* get bit pattern of read file descriptor
*/
@@ -262,7 +255,7 @@
}
/*
-@@ -724,6 +822,9 @@
+@@ -724,6 +822,9 @@ set_hname()
exit(1);
}
hentry = gethostbyname(hname);
@@ -272,7 +265,7 @@
#ifdef NO_ADDR_LIST
strcat(hname, ":");
strcat(hname, hentry->h_addr);
-@@ -736,6 +837,7 @@
+@@ -736,6 +837,7 @@ set_hname()
strcat(hname, inet_ntoa(*(struct in_addr *)*p++));
}
#endif
diff -r faecb3ef5474 -r 45d07a9e2a81 inputmethod/skkserv/patches/patch-ag
--- a/inputmethod/skkserv/patches/patch-ag Sat Jul 17 08:52:30 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2010/02/14 22:07:38 dholland Exp $
-
---- jisyo-tools/skkdic-expr.c.orig 1996-12-17 05:51:28.000000000 +0000
-+++ jisyo-tools/skkdic-expr.c
-@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass A
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
Home |
Main Index |
Thread Index |
Old Index