mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

- Fix pkg-plist.

Browse Source 
- Fix build error on 7-stable and 8-current. [1]
- Fix build error on amd64. [2]

PR:		ports/117325 [1], ports/117677 [2]
Submitted by:	Takuya Harada <tharada@e-mail.jp> [1],
	  	Yoshiaki Kasahara <kasahara@nc.kyushu-u.ac.jp> [2]
Approved by:	portmgr (pav)
This commit is contained in:
MANTANI Nobutaka 2007-11-11 06:37:21 +00:00
parent 9b214ca018
commit 29d6bee6b5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=202619
6 changed files with 78 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
textproc/uim/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= uim
PORTVERSION= 1.4.1
PORTREVISION= 1
CATEGORIES?= textproc
MASTER_SITES= http://uim.googlecode.com/files/ \
http://uim.freedesktop.org/releases/uim/stable/

13
textproc/uim/files/patch-sigscheme_libgcroots_include_private_gcconfig.h Normal file
View File

@ -0,0 +1,13 @@
--- sigscheme/libgcroots/include/private/gcconfig.h.orig 2007-01-06 12:00:59.000000000 +0900
+++ sigscheme/libgcroots/include/private/gcconfig.h 2007-11-04 18:15:32.000000000 +0900
@@ -320,6 +320,10 @@
# define I386
# define mach_type_known
# endif
+# if defined(FREEBSD) && (defined(__amd64__))
+# define X86_64
+# define mach_type_known
+# endif
# if defined(__NetBSD__) && (defined(i386) || defined(__i386__))
# define I386
# define mach_type_known

31
textproc/uim/files/patch-sigscheme_src_alloc.c Normal file
View File

@ -0,0 +1,31 @@
--- 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

10
textproc/uim/files/patch-sigscheme_src_sigscheme.h Normal file
View File

@ -0,0 +1,10 @@
--- 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);

22
textproc/uim/files/patch-sigscheme_src_storage-compact.h Normal file
View File

@ -0,0 +1,22 @@
--- 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 { \

1
textproc/uim/pkg-plist
View File

@ -225,6 +225,7 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/util.scm
%%DATADIR%%/viqr.scm
%%DATADIR%%/zaurus.scm
@dirrm include/libgcroots
@dirrm include/sigscheme
@dirrm include/uim
@dirrm lib/uim/plugin