aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobutaka <nobutaka@FreeBSD.org>2005-06-27 03:42:42 +0800
committernobutaka <nobutaka@FreeBSD.org>2005-06-27 03:42:42 +0800
commitd68a98218296fb1e1487dfed5f649599527cc54e (patch)
tree2de8d60eff0064fae55105d553ebed861c01811f
parentac7737837c8674485a15d5aa0c974d1733ffa315 (diff)
downloadfreebsd-ports-gnome-d68a98218296fb1e1487dfed5f649599527cc54e.tar.gz
freebsd-ports-gnome-d68a98218296fb1e1487dfed5f649599527cc54e.tar.zst
freebsd-ports-gnome-d68a98218296fb1e1487dfed5f649599527cc54e.zip
Update to 0.4.7.
-rw-r--r--japanese/uim/Makefile5
-rw-r--r--japanese/uim/distinfo4
-rw-r--r--japanese/uim/files/patch-scm:skk-custom.scm12
-rw-r--r--japanese/uim/files/patch-uim:context.h22
-rw-r--r--japanese/uim/pkg-plist2
-rw-r--r--textproc/uim/Makefile5
-rw-r--r--textproc/uim/distinfo4
-rw-r--r--textproc/uim/files/patch-scm:skk-custom.scm12
-rw-r--r--textproc/uim/files/patch-uim:context.h22
-rw-r--r--textproc/uim/pkg-plist2
10 files changed, 26 insertions, 64 deletions
diff --git a/japanese/uim/Makefile b/japanese/uim/Makefile
index 1ac04b402d26..db0969fe2177 100644
--- a/japanese/uim/Makefile
+++ b/japanese/uim/Makefile
@@ -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}
diff --git a/japanese/uim/distinfo b/japanese/uim/distinfo
index 199bd328f50b..ea95bc247897 100644
--- a/japanese/uim/distinfo
+++ b/japanese/uim/distinfo
@@ -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
diff --git a/japanese/uim/files/patch-scm:skk-custom.scm b/japanese/uim/files/patch-scm:skk-custom.scm
index 6de03484da18..895f1ad6738a 100644
--- a/japanese/uim/files/patch-scm:skk-custom.scm
+++ b/japanese/uim/files/patch-scm:skk-custom.scm
@@ -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")
diff --git a/japanese/uim/files/patch-uim:context.h b/japanese/uim/files/patch-uim:context.h
deleted file mode 100644
index fc4da7781f4c..000000000000
--- a/japanese/uim/files/patch-uim:context.h
+++ /dev/null
@@ -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)
diff --git a/japanese/uim/pkg-plist b/japanese/uim/pkg-plist
index 8aa11bab2320..09864ce8867a 100644
--- a/japanese/uim/pkg-plist
+++ b/japanese/uim/pkg-plist
@@ -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
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 1ac04b402d26..db0969fe2177 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -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}
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 199bd328f50b..ea95bc247897 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -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
diff --git a/textproc/uim/files/patch-scm:skk-custom.scm b/textproc/uim/files/patch-scm:skk-custom.scm
index 6de03484da18..895f1ad6738a 100644
--- a/textproc/uim/files/patch-scm:skk-custom.scm
+++ b/textproc/uim/files/patch-scm:skk-custom.scm
@@ -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")
diff --git a/textproc/uim/files/patch-uim:context.h b/textproc/uim/files/patch-uim:context.h
deleted file mode 100644
index fc4da7781f4c..000000000000
--- a/textproc/uim/files/patch-uim:context.h
+++ /dev/null
@@ -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)
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index 8aa11bab2320..09864ce8867a 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -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