diff options
| -rw-r--r-- | inputmethod/uim/Makefile | 8 | ||||
| -rw-r--r-- | inputmethod/uim/distinfo | 5 | ||||
| -rw-r--r-- | inputmethod/uim/patches/patch-ad | 40 | ||||
| -rw-r--r-- | inputmethod/uim/patches/patch-ae | 13 | ||||
| -rw-r--r-- | inputmethod/uim/patches/patch-af | 14 |
5 files changed, 78 insertions, 2 deletions
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile index 6d31d10a649..b72703fb5d1 100644 --- a/inputmethod/uim/Makefile +++ b/inputmethod/uim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2011/07/21 13:05:57 obache Exp $ +# $NetBSD: Makefile,v 1.53 2011/09/14 16:57:41 hans Exp $ # .include "../../inputmethod/uim/Makefile.common" @@ -19,6 +19,12 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-emacs CONFIGURE_ARGS+= --with-libgcroots=installed +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "SunOS" +MAKE_ENV+= SunOS_LDFLAGS="-shared -mimpure-text" +CFLAGS.SunOS+= -std=c99 -D__EXTENSIONS__ +.endif + .include "options.mk" PLIST_VARS+= editline diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo index 3d1c180e124..3ca09a23847 100644 --- a/inputmethod/uim/distinfo +++ b/inputmethod/uim/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.19 2011/05/29 06:13:57 obache Exp $ +$NetBSD: distinfo,v 1.20 2011/09/14 16:57:41 hans Exp $ SHA1 (uim-1.7.0.tar.bz2) = b79ed80c2557e804e6d3d2771a213a29cd932a73 RMD160 (uim-1.7.0.tar.bz2) = e866f4270e60d0590a0a37331f3ccf64d7e48fbf Size (uim-1.7.0.tar.bz2) = 6402469 bytes SHA1 (patch-ab) = d5bf71cf3ecea94bed70e05c1b0e6f77ac5766c5 SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791 +SHA1 (patch-ad) = bf898a6dfe50ed24a9644a4384aa78b0c7910b91 +SHA1 (patch-ae) = affb5979dcf10aedfe90616937d79ab612beb083 +SHA1 (patch-af) = 99910571de2ea509504ccf3d1c7a14a9b75af68e diff --git a/inputmethod/uim/patches/patch-ad b/inputmethod/uim/patches/patch-ad new file mode 100644 index 00000000000..4cc801a8e53 --- /dev/null +++ b/inputmethod/uim/patches/patch-ad @@ -0,0 +1,40 @@ +$NetBSD: patch-ad,v 1.1 2011/09/14 16:57:41 hans Exp $ + +--- uim/Makefile.in.orig 2011-05-17 06:16:18.000000000 +0200 ++++ uim/Makefile.in 2011-09-13 15:25:17.188833173 +0200 +@@ -166,7 +166,7 @@ libuim_custom_enabler_la_OBJECTS = \ + $(am_libuim_custom_enabler_la_OBJECTS) + libuim_custom_enabler_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libuim_custom_enabler_la_LDFLAGS) $(LDFLAGS) -o $@ ++ $(libuim_custom_enabler_la_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@ + libuim_custom_la_DEPENDENCIES = libuim-scm.la libuim.la + am_libuim_custom_la_OBJECTS = libuim_custom_la-uim-custom.lo + libuim_custom_la_OBJECTS = $(am_libuim_custom_la_OBJECTS) +@@ -219,7 +219,7 @@ am_libuim_lolevel_la_OBJECTS = libuim_lo + libuim_lolevel_la_OBJECTS = $(am_libuim_lolevel_la_OBJECTS) + libuim_lolevel_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libuim_lolevel_la_LDFLAGS) $(LDFLAGS) -o $@ ++ $(libuim_lolevel_la_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@ + libuim_look_la_DEPENDENCIES = libuim-scm.la libuim.la \ + libuim-bsdlook.la + am_libuim_look_la_OBJECTS = libuim_look_la-look.lo +@@ -273,7 +273,7 @@ am_libuim_scm_la_OBJECTS = libuim_scm_la + libuim_scm_la_OBJECTS = $(am_libuim_scm_la_OBJECTS) + libuim_scm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libuim_scm_la_CFLAGS) \ +- $(CFLAGS) $(libuim_scm_la_LDFLAGS) $(LDFLAGS) -o $@ ++ $(CFLAGS) $(libuim_scm_la_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@ + libuim_skk_la_DEPENDENCIES = libuim-scm.la libuim.la libuim-bsdlook.la + am_libuim_skk_la_OBJECTS = libuim_skk_la-skk.lo + libuim_skk_la_OBJECTS = $(am_libuim_skk_la_OBJECTS) +@@ -382,7 +382,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ $(LDFLAGS) $(SunOS_LDFLAGS) -o $@ + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ diff --git a/inputmethod/uim/patches/patch-ae b/inputmethod/uim/patches/patch-ae new file mode 100644 index 00000000000..219f400bd8c --- /dev/null +++ b/inputmethod/uim/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2011/09/14 16:57:41 hans Exp $ + +--- sigscheme/configure.orig 2011-09-13 15:53:22.544782355 +0200 ++++ sigscheme/configure 2011-09-13 15:56:13.848433241 +0200 +@@ -16000,7 +16000,7 @@ if test "x$ac_cv_func_strdup" = xyes; th + _ACEOF + + # Overrides _POSIX_C_SOURCE +- $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h ++ $as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h + + + fi diff --git a/inputmethod/uim/patches/patch-af b/inputmethod/uim/patches/patch-af new file mode 100644 index 00000000000..b3f86afdc6c --- /dev/null +++ b/inputmethod/uim/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1 2011/09/14 16:57:41 hans Exp $ + +--- fep/uim-fep.h.orig 2011-01-07 03:09:56.000000000 +0100 ++++ fep/uim-fep.h 2011-09-13 16:13:02.686629427 +0200 +@@ -41,6 +41,9 @@ + #include <sys/ioctl.h> + #endif + /* solaris でwinsizeを使うために必要 */ ++#ifdef __sun ++#include <sys/termios.h> ++#endif + #ifdef HAVE_CURSES_H + #include <curses.h> + #endif |