Update to 0.4.7.

This commit is contained in:
MANTANI Nobutaka 2005-06-26 19:42:42 +00:00
parent 44f0fa9c7f
commit ef48641145
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=138048
10 changed files with 26 additions and 64 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= uim
PORTVERSION= 0.4.6
PORTREVISION= 3
PORTVERSION= 0.4.7
CATEGORIES= japanese x11
MASTER_SITES= http://uim.freedesktop.org/releases/
@ -31,6 +30,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim
PLIST_SUB+= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
MAN1= uim-xim.1
.include <bsd.port.pre.mk>
.if ${HAVE_GNOME:Mgtk20}

View file

@ -1,2 +1,2 @@
MD5 (uim-0.4.6.tar.gz) = a61636b7eb4cab6c09eb3d661d1d7db4
SIZE (uim-0.4.6.tar.gz) = 1467039
MD5 (uim-0.4.7.tar.gz) = 1ba750aa3ab7b5d1aedd26340ca83b82
SIZE (uim-0.4.7.tar.gz) = 1545941

View file

@ -1,12 +1,12 @@
--- scm/skk-custom.scm.orig Tue May 17 19:06:47 2005
+++ scm/skk-custom.scm Tue May 17 19:13:48 2005
@@ -168,8 +168,7 @@
;; dictionary
;;
--- scm/skk-custom.scm.orig Tue Jun 14 05:46:11 2005
+++ scm/skk-custom.scm Mon Jun 27 02:29:34 2005
@@ -338,8 +338,7 @@
(lambda ()
skk-use-skkserv?))
-(define-custom 'skk-dic-file-name (string-append (sys-datadir)
- "/skk/SKK-JISYO.L")
+(define-custom 'skk-dic-file-name "%%LOCALBASE%%/share/skk/SKK-JISYO.L"
'(skk dictionary)
'(skk-dict)
'(pathname)
(_ "Dictionary file")

View file

@ -1,22 +0,0 @@
--- uim/context.h.orig Sat Feb 5 11:50:05 2005
+++ uim/context.h Sun Jun 5 16:43:06 2005
@@ -156,13 +156,16 @@
#ifdef ENABLE_NLS
#define UIM_PREPARE_SAVING_TEXTDOMAIN_CODESET() \
- const char *orig_encoding, *client_encoding;
+ char *enc, *orig_encoding = NULL; \
+ const char *client_encoding;
#define UIM_SWITCH_TEXTDOMAIN_CODESET(uc) \
- orig_encoding = bind_textdomain_codeset(GETTEXT_PACKAGE, NULL); \
+ if ((enc = bind_textdomain_codeset(GETTEXT_PACKAGE, NULL))) \
+ orig_encoding = strdup(enc); \
client_encoding = (uc) ? ((struct uim_context_ *)uc)->encoding : uim_last_client_encoding; \
bind_textdomain_codeset(GETTEXT_PACKAGE, client_encoding);
#define UIM_RESTORE_TEXTDOMAIN_CODESET() \
- bind_textdomain_codeset(GETTEXT_PACKAGE, orig_encoding);
+ bind_textdomain_codeset(GETTEXT_PACKAGE, orig_encoding); \
+ free(orig_encoding);
#else /* ENABLE_NLS */
#define UIM_PREPARE_SAVING_TEXTDOMAIN_CODESET()
#define UIM_SWITCH_TEXTDOMAIN_CODESET(uc)

View file

@ -87,6 +87,7 @@ share/uim/pyload.scm
share/uim/pyunihan.scm
share/uim/rk.scm
share/uim/romaja.scm
share/uim/scim.scm
share/uim/skk-custom.scm
share/uim/skk-editor.scm
share/uim/skk-key-custom.scm
@ -103,6 +104,7 @@ share/uim/tables/korean-hangul3.table
share/uim/tcode.scm
share/uim/tutcode-key-custom.scm
share/uim/tutcode.scm
share/uim/uim-db.scm
share/uim/uim-sh.scm
share/uim/ustr.scm
share/uim/util.scm

View file

@ -6,8 +6,7 @@
#
PORTNAME= uim
PORTVERSION= 0.4.6
PORTREVISION= 3
PORTVERSION= 0.4.7
CATEGORIES= japanese x11
MASTER_SITES= http://uim.freedesktop.org/releases/
@ -31,6 +30,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim
PLIST_SUB+= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
MAN1= uim-xim.1
.include <bsd.port.pre.mk>
.if ${HAVE_GNOME:Mgtk20}

View file

@ -1,2 +1,2 @@
MD5 (uim-0.4.6.tar.gz) = a61636b7eb4cab6c09eb3d661d1d7db4
SIZE (uim-0.4.6.tar.gz) = 1467039
MD5 (uim-0.4.7.tar.gz) = 1ba750aa3ab7b5d1aedd26340ca83b82
SIZE (uim-0.4.7.tar.gz) = 1545941

View file

@ -1,12 +1,12 @@
--- scm/skk-custom.scm.orig Tue May 17 19:06:47 2005
+++ scm/skk-custom.scm Tue May 17 19:13:48 2005
@@ -168,8 +168,7 @@
;; dictionary
;;
--- scm/skk-custom.scm.orig Tue Jun 14 05:46:11 2005
+++ scm/skk-custom.scm Mon Jun 27 02:29:34 2005
@@ -338,8 +338,7 @@
(lambda ()
skk-use-skkserv?))
-(define-custom 'skk-dic-file-name (string-append (sys-datadir)
- "/skk/SKK-JISYO.L")
+(define-custom 'skk-dic-file-name "%%LOCALBASE%%/share/skk/SKK-JISYO.L"
'(skk dictionary)
'(skk-dict)
'(pathname)
(_ "Dictionary file")

View file

@ -1,22 +0,0 @@
--- uim/context.h.orig Sat Feb 5 11:50:05 2005
+++ uim/context.h Sun Jun 5 16:43:06 2005
@@ -156,13 +156,16 @@
#ifdef ENABLE_NLS
#define UIM_PREPARE_SAVING_TEXTDOMAIN_CODESET() \
- const char *orig_encoding, *client_encoding;
+ char *enc, *orig_encoding = NULL; \
+ const char *client_encoding;
#define UIM_SWITCH_TEXTDOMAIN_CODESET(uc) \
- orig_encoding = bind_textdomain_codeset(GETTEXT_PACKAGE, NULL); \
+ if ((enc = bind_textdomain_codeset(GETTEXT_PACKAGE, NULL))) \
+ orig_encoding = strdup(enc); \
client_encoding = (uc) ? ((struct uim_context_ *)uc)->encoding : uim_last_client_encoding; \
bind_textdomain_codeset(GETTEXT_PACKAGE, client_encoding);
#define UIM_RESTORE_TEXTDOMAIN_CODESET() \
- bind_textdomain_codeset(GETTEXT_PACKAGE, orig_encoding);
+ bind_textdomain_codeset(GETTEXT_PACKAGE, orig_encoding); \
+ free(orig_encoding);
#else /* ENABLE_NLS */
#define UIM_PREPARE_SAVING_TEXTDOMAIN_CODESET()
#define UIM_SWITCH_TEXTDOMAIN_CODESET(uc)

View file

@ -87,6 +87,7 @@ share/uim/pyload.scm
share/uim/pyunihan.scm
share/uim/rk.scm
share/uim/romaja.scm
share/uim/scim.scm
share/uim/skk-custom.scm
share/uim/skk-editor.scm
share/uim/skk-key-custom.scm
@ -103,6 +104,7 @@ share/uim/tables/korean-hangul3.table
share/uim/tcode.scm
share/uim/tutcode-key-custom.scm
share/uim/tutcode.scm
share/uim/uim-db.scm
share/uim/uim-sh.scm
share/uim/ustr.scm
share/uim/util.scm