Date: Sun, 2 Mar 2003 21:39:12 +0900 (JST) From: KOMATSU Shinichiro <koma2@jiro.c.u-tokyo.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48835: maintainer-update: japanese/skkinput3 to 3.0.6 Message-ID: <20030302123913.57B8F72501@jiro.c.u-tokyo.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 48835
>Category: ports
>Synopsis: maintainer-update: japanese/skkinput3 to 3.0.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 02 04:40:09 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: KOMATSU Shinichiro
>Release: FreeBSD 4.6.2-RELEASE i386
>Organization:
>Environment:
FreeBSD 4.6.2-RELEASE i386
>Description:
- Upgrade skkinput3 to 3.0.6
- Add the knob to enable skk10 support (USE_SKK10)
- Add ChangeLog
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/skkinput3/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- Makefile 21 Feb 2003 12:29:06 -0000 1.12
+++ Makefile 1 Mar 2003 15:28:46 -0000
@@ -6,10 +6,10 @@
#
PORTNAME= skkinput3
-PORTVERSION= ${SRCVERSION}.${PATCHLEVEL}
+PORTVERSION= 3.0.6
CATEGORIES= japanese x11
-MASTER_SITES= http://downloads.sourceforge.jp/skkinput3/1504/
-DISTNAME= skkinput-${SRCVERSION}_${PATCHLEVEL}
+MASTER_SITES= http://downloads.sourceforge.jp/skkinput3/2222/
+DISTNAME= skkinput-${PORTVERSION}
MAINTAINER= koma2@jiro.c.u-tokyo.ac.jp
COMMENT= An SKK-like Japanese input method for X11
@@ -18,6 +18,13 @@
NO_INSTALL_MANPAGES= yes
+.if defined(USE_SKK10)
+USE_REINPLACE= yes
+PLIST_SUB= SKK8="@comment " SKK10=""
+.else
+PLIST_SUB= SKK8="" SKK10="@comment "
+.endif
+
.include <bsd.port.pre.mk>
# sanity check
@@ -33,10 +40,14 @@
RUN_DEPENDS= ${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skkserv
.endif
-SRCVERSION= 3.0
-PATCHLEVEL= 3.1
+DOCS= *.jis dot.skkinput ChangeLog
-DOCS= *.jis dot.skkinput
+.if defined(USE_SKK10)
+post-patch:
+ ${REINPLACE_CMD} -e '/\(#define.*UseSkk8\)/ s/^/XCOMM /' \
+ -e '/XCOMM.*#define.*UseSkk10/ s/XCOMM[[:space:]]*//' \
+ ${WRKSRC}/Skkinput.conf
+.endif
.if !defined(NOPORTDOCS)
post-install:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/japanese/skkinput3/distinfo,v
retrieving revision 1.5
diff -u -u -r1.5 distinfo
--- distinfo 9 Nov 2002 01:06:48 -0000 1.5
+++ distinfo 1 Mar 2003 15:28:46 -0000
@@ -1 +1 @@
-MD5 (skkinput-3.0_3.1.tar.gz) = 7bdf1f8beaba5ffa6eb2ea5dc31f7c5b
+MD5 (skkinput-3.0.6.tar.gz) = 96b4a37e71bb415b6fced59bbc02372e
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/skkinput3/pkg-plist,v
retrieving revision 1.5
diff -u -u -r1.5 pkg-plist
--- pkg-plist 13 Sep 2002 10:18:23 -0000 1.5
+++ pkg-plist 1 Mar 2003 15:28:46 -0000
@@ -2,8 +2,18 @@
lib/X11/skkinput3/init.el
lib/X11/skkinput3/skk.el
lib/X11/skkinput3/skk-startup.el
-lib/X11/skkinput3/skk-trial.el
+%%SKK8%%lib/X11/skkinput3/skk-trial.el
+%%SKK10%%lib/X11/skkinput3/advice.el
+%%SKK10%%lib/X11/skkinput3/custom.el
+%%SKK10%%lib/X11/skkinput3/skk-comp.el
+%%SKK10%%lib/X11/skkinput3/skk-foreword.el
+%%SKK10%%lib/X11/skkinput3/skk-kcode.el
+%%SKK10%%lib/X11/skkinput3/skk-look.el
+%%SKK10%%lib/X11/skkinput3/skk-num.el
+%%SKK10%%lib/X11/skkinput3/skk-server.el
+%%SKK10%%lib/X11/skkinput3/skk-vars.el
@dirrm lib/X11/skkinput3
+%%PORTDOCS%%share/doc/skkinput3/ChangeLog
%%PORTDOCS%%share/doc/skkinput3/README-lisp.jis
%%PORTDOCS%%share/doc/skkinput3/README.jis
%%PORTDOCS%%share/doc/skkinput3/dot.skkinput
Index: files/patch-Skkinput.conf
===================================================================
RCS file: /home/ncvs/ports/japanese/skkinput3/files/patch-Skkinput.conf,v
retrieving revision 1.1
diff -u -u -r1.1 patch-Skkinput.conf
--- files/patch-Skkinput.conf 13 Sep 2002 10:18:23 -0000 1.1
+++ files/patch-Skkinput.conf 1 Mar 2003 15:28:46 -0000
@@ -1,10 +1,14 @@
---- Skkinput.conf.orig Sat Aug 10 00:47:48 2002
-+++ Skkinput.conf Wed Aug 14 15:54:45 2002
-@@ -1,10 +1,10 @@
+--- Skkinput.conf.orig Fri Jan 10 23:57:00 2003
++++ Skkinput.conf Tue Jan 21 21:06:51 2003
+@@ -1,6 +1,6 @@
/* skk.el, init.el install directory
*/
-ELISP_DIR = $(LIBDIR)/skkinput
+ELISP_DIR = $(LIBDIR)/skkinput3
+
+ /* If you want skk10.62a compatible mode,
+ * uncomment UseSkk10 and comment UseSkk8.
+@@ -10,7 +10,7 @@
/* Skkinput3 Window uses these fonts.
*/
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030302123913.57B8F72501>