Update to 1.4.2.

This commit is contained in:
MANTANI Nobutaka 2008-03-23 15:06:40 +00:00
parent 4a9b60f70e
commit 51666d1a1b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=209625
10 changed files with 12 additions and 103 deletions

View File

@ -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}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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);

View File

@ -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 { \

View File

@ -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