diff options
author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2008-03-23 15:06:40 +0000 |
---|---|---|
committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2008-03-23 15:06:40 +0000 |
commit | 51666d1a1b1523586e2977601d8d6366b6533d64 (patch) | |
tree | 545017cd1470179f2530a616fe60880c324a10bd /textproc | |
parent | 4a9b60f70e54599c80e74d6944de2c2214ff9a85 (diff) | |
download | ports-51666d1a1b1523586e2977601d8d6366b6533d64.tar.gz ports-51666d1a1b1523586e2977601d8d6366b6533d64.zip |
Notes
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/uim-el/Makefile | 5 | ||||
-rw-r--r-- | textproc/uim-el/distinfo | 6 | ||||
-rw-r--r-- | textproc/uim-el/files/patch-sigscheme_configure | 13 | ||||
-rw-r--r-- | textproc/uim/Makefile | 7 | ||||
-rw-r--r-- | textproc/uim/distinfo | 6 | ||||
-rw-r--r-- | textproc/uim/files/patch-sigscheme_configure | 13 | ||||
-rw-r--r-- | textproc/uim/files/patch-sigscheme_src_alloc.c | 31 | ||||
-rw-r--r-- | textproc/uim/files/patch-sigscheme_src_sigscheme.h | 10 | ||||
-rw-r--r-- | textproc/uim/files/patch-sigscheme_src_storage-compact.h | 22 | ||||
-rw-r--r-- | textproc/uim/pkg-plist | 2 |
10 files changed, 12 insertions, 103 deletions
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index 9e527f9f9267..3edf4d5d8d2e 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -6,10 +6,9 @@ # PORTNAME= uim-el -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.2 CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ - http://uim.freedesktop.org/releases/uim/stable/ +MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMESUFFIX= -${EMACS_PORT_NAME} DISTNAME= uim-${PORTVERSION} diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo index 2d120f98144e..3221b2d0a564 100644 --- a/textproc/uim-el/distinfo +++ b/textproc/uim-el/distinfo @@ -1,3 +1,3 @@ -MD5 (uim-1.4.1.tar.gz) = 69c9882f88c8eaebcc9bf22370fb3f1a -SHA256 (uim-1.4.1.tar.gz) = 14e5df46f4536a4bfffb80bcd168bc8649bb2562f059edd6369a92ac380ec752 -SIZE (uim-1.4.1.tar.gz) = 3564166 +MD5 (uim-1.4.2.tar.gz) = 7898dd27ace119b63ad490cad46b812e +SHA256 (uim-1.4.2.tar.gz) = 802cfa81a2b09365a5a633f17e18348278d4316de2b7721372f9a96b958dd6b1 +SIZE (uim-1.4.2.tar.gz) = 3658097 diff --git a/textproc/uim-el/files/patch-sigscheme_configure b/textproc/uim-el/files/patch-sigscheme_configure deleted file mode 100644 index 149b508b56ea..000000000000 --- a/textproc/uim-el/files/patch-sigscheme_configure +++ /dev/null @@ -1,13 +0,0 @@ ---- sigscheme/configure.orig 2007-09-25 00:33:59.000000000 +0900 -+++ sigscheme/configure 2007-09-25 00:34:05.000000000 +0900 -@@ -44974,7 +44974,9 @@ - _ax_feature_list_expanded='' - for feature in $ax_feature_list_all; do - _ax_feature_val=`eval echo '${'use_$feature'}'` -- _ax_feature_val=${_ax_feature_val:no} -+ if test -z $_ax_feature_val; then -+ _ax_feature_val=no -+ fi - if test "x$_ax_feature_val" != xno; then - _ax_feature_list_expanded="$_ax_feature_list_expanded $feature" - fi diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index b1374f2886ac..4d16dc8f64d0 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -6,11 +6,10 @@ # PORTNAME= uim -PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTVERSION= 1.4.2 CATEGORIES?= textproc -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ - http://uim.freedesktop.org/releases/uim/stable/ +MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} + .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) PKGNAMESUFFIX= -nox11 .endif diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo index 2d120f98144e..3221b2d0a564 100644 --- a/textproc/uim/distinfo +++ b/textproc/uim/distinfo @@ -1,3 +1,3 @@ -MD5 (uim-1.4.1.tar.gz) = 69c9882f88c8eaebcc9bf22370fb3f1a -SHA256 (uim-1.4.1.tar.gz) = 14e5df46f4536a4bfffb80bcd168bc8649bb2562f059edd6369a92ac380ec752 -SIZE (uim-1.4.1.tar.gz) = 3564166 +MD5 (uim-1.4.2.tar.gz) = 7898dd27ace119b63ad490cad46b812e +SHA256 (uim-1.4.2.tar.gz) = 802cfa81a2b09365a5a633f17e18348278d4316de2b7721372f9a96b958dd6b1 +SIZE (uim-1.4.2.tar.gz) = 3658097 diff --git a/textproc/uim/files/patch-sigscheme_configure b/textproc/uim/files/patch-sigscheme_configure deleted file mode 100644 index 149b508b56ea..000000000000 --- a/textproc/uim/files/patch-sigscheme_configure +++ /dev/null @@ -1,13 +0,0 @@ ---- sigscheme/configure.orig 2007-09-25 00:33:59.000000000 +0900 -+++ sigscheme/configure 2007-09-25 00:34:05.000000000 +0900 -@@ -44974,7 +44974,9 @@ - _ax_feature_list_expanded='' - for feature in $ax_feature_list_all; do - _ax_feature_val=`eval echo '${'use_$feature'}'` -- _ax_feature_val=${_ax_feature_val:no} -+ if test -z $_ax_feature_val; then -+ _ax_feature_val=no -+ fi - if test "x$_ax_feature_val" != xno; then - _ax_feature_list_expanded="$_ax_feature_list_expanded $feature" - fi diff --git a/textproc/uim/files/patch-sigscheme_src_alloc.c b/textproc/uim/files/patch-sigscheme_src_alloc.c deleted file mode 100644 index 62ee857a733c..000000000000 --- a/textproc/uim/files/patch-sigscheme_src_alloc.c +++ /dev/null @@ -1,31 +0,0 @@ ---- sigscheme/src/alloc.c.orig 2007-01-07 01:46:46.000000000 +0900 -+++ sigscheme/src/alloc.c 2007-11-04 18:01:05.000000000 +0900 -@@ -181,7 +181,6 @@ - return copied; - } - --#if 0 - /* For 'name' slot of symbol object on storage-compact. If your malloc(3) does - * not ensure 8-bytes alignment, Complete this function and hook this into - * symbol object creation and modification. -- YamaKen 2006-05-30 */ -@@ -192,17 +191,16 @@ - size_t size; - - /* Use ScmCell-alignment to ensure at least 8-bytes aligned. */ -- if ((uintptr_t)ptr % sizeof(ScmCell)) { -+ if ((uintptr_t)str % sizeof(ScmCell)) { - size = strlen(str) + sizeof(""); -- copied = scm_malloc_aligned8(size); -+ copied = scm_malloc_aligned(size); - strcpy(copied, str); - free(str); - return copied; - } else { -- return ptr; -+ return str; - } - } --#endif - - /*======================================= - Extendable Local Buffer diff --git a/textproc/uim/files/patch-sigscheme_src_sigscheme.h b/textproc/uim/files/patch-sigscheme_src_sigscheme.h deleted file mode 100644 index 872ddf216b23..000000000000 --- a/textproc/uim/files/patch-sigscheme_src_sigscheme.h +++ /dev/null @@ -1,10 +0,0 @@ ---- sigscheme/src/sigscheme.h.orig 2007-03-15 01:15:06.000000000 +0900 -+++ sigscheme/src/sigscheme.h 2007-11-04 18:01:05.000000000 +0900 -@@ -1242,6 +1242,7 @@ - SCM_EXPORT void *scm_calloc(size_t number, size_t size); - SCM_EXPORT void *scm_realloc(void *ptr, size_t size); - SCM_EXPORT char *scm_strdup(const char *str); -+SCM_EXPORT char *scm_align_str(char *str); - - /* storage-gc.c */ - SCM_EXPORT void scm_gc_protect(ScmObj *var); diff --git a/textproc/uim/files/patch-sigscheme_src_storage-compact.h b/textproc/uim/files/patch-sigscheme_src_storage-compact.h deleted file mode 100644 index acaa19292191..000000000000 --- a/textproc/uim/files/patch-sigscheme_src_storage-compact.h +++ /dev/null @@ -1,22 +0,0 @@ ---- sigscheme/src/storage-compact.h.orig 2007-01-07 01:46:46.000000000 +0900 -+++ sigscheme/src/storage-compact.h 2007-11-04 18:01:05.000000000 +0900 -@@ -639,11 +639,14 @@ - (SCM_ASSERT(SCM_ALIGNED_SYMBOL_NAME(n)), \ - SCM_SET_Y(SCM_SYMBOL_PTR(o), (scm_uintobj_t)(n) | SCM_MTAG_SYMBOL)) - #define SCM_ISAL_SYMBOL_INIT(o, n, c) \ -- (SCM_ASSERT(SCM_ALIGNED_SYMBOL_NAME(n)), \ -- SCM_INIT((o), \ -- (c), \ -- (scm_uintobj_t)(n) | SCM_MTAG_SYMBOL, \ -- SCM_PTAG_MISC)) -+ do { \ -+ char *_s = scm_align_str(n); \ -+ (SCM_ASSERT(SCM_ALIGNED_SYMBOL_NAME(_s)), \ -+ SCM_INIT((o), \ -+ (c), \ -+ (scm_uintobj_t)(_s) | SCM_MTAG_SYMBOL, \ -+ SCM_PTAG_MISC)); \ -+ } while (0) - #define SCM_CELL_SYMBOLP(c) SCM_MISC_CELL_TYPEP((c), SYMBOL) - #define SCM_CELL_SYMBOL_FIN(c) \ - do { \ diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist index 5e32daa0b413..0fb0ebc2573b 100644 --- a/textproc/uim/pkg-plist +++ b/textproc/uim/pkg-plist @@ -25,7 +25,7 @@ include/uim/uim.h lib/libgcroots.a lib/libgcroots.la lib/libgcroots.so -lib/libgcroots.so.0 +lib/libgcroots.so.1 lib/libuim-custom.a lib/libuim-custom.la lib/libuim-custom.so |