diff options
| author | joerg <joerg> | 2009-02-07 22:47:14 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-02-07 22:47:14 +0000 |
| commit | 41ced864876020af50ff059ac90687a2cf1a6627 (patch) | |
| tree | 23caf636c212532b6e150c72f5f4425fc5441341 /inputmethod | |
| parent | 70fed9027b9ac9defdb2ca74d0ded5fe834113dd (diff) | |
| download | pkgsrc-41ced864876020af50ff059ac90687a2cf1a6627.tar.gz | |
Fix mysterious C++ failure as pth's pthread.h defines system as macro
which makes the stdlib.h prototype goes away. Avoid this by forcing real
system calls.
Remove a static declaration that is shadowing an extern, resulting in
the creation of a text relocation.
Diffstat (limited to 'inputmethod')
| -rw-r--r-- | inputmethod/unicon-im/Makefile | 12 | ||||
| -rw-r--r-- | inputmethod/unicon-im/distinfo | 3 | ||||
| -rw-r--r-- | inputmethod/unicon-im/patches/patch-am | 12 |
3 files changed, 24 insertions, 3 deletions
diff --git a/inputmethod/unicon-im/Makefile b/inputmethod/unicon-im/Makefile index 4fae3594aa7..9519aa279d7 100644 --- a/inputmethod/unicon-im/Makefile +++ b/inputmethod/unicon-im/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2007/02/15 14:38:33 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2009/02/07 22:47:14 joerg Exp $ DISTNAME= unicon-1.2 PKGNAME= unicon-im-1.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= inputmethod MASTER_SITES= http://www.opencjk.org/~yumj/download/ @@ -10,10 +10,18 @@ MAINTAINER= rxg@NetBSD.org HOMEPAGE= http://www.opencjk.org/~yumj/project-chinput.html COMMENT= Libraries and modules of Unicon +PKG_DESTDIR_SUPPORT= user-destdir + USE_LANGUAGES= c c++ USE_LIBTOOL= YES GNU_CONFIGURE= YES +.include "../../mk/bsd.prefs.mk" + +CFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=0 + +INSTALL_MAKE_FLAGS= prefix=${DESTDIR}${PREFIX} + .include "../../devel/pth/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/unicon-im/distinfo b/inputmethod/unicon-im/distinfo index 54602f9a321..afd09daad5e 100644 --- a/inputmethod/unicon-im/distinfo +++ b/inputmethod/unicon-im/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2007/03/24 16:04:56 joerg Exp $ +$NetBSD: distinfo,v 1.7 2009/02/07 22:47:14 joerg Exp $ SHA1 (unicon-1.2.tar.gz) = 61854d160547f645f8033f0b4fd15ebb15ab92a8 RMD160 (unicon-1.2.tar.gz) = c862f03ba561fe4c3641cf8b364a9bae40a78c03 @@ -14,3 +14,4 @@ SHA1 (patch-ah) = 1e9413af0b2904cb17a028d5cedfd1ded6eca22b SHA1 (patch-ai) = de5452fea6a9183cc008fd0b8f37b00e7f4a066c SHA1 (patch-aj) = 13592873c58a68837fd9a62052640121452dd343 SHA1 (patch-ak) = e73ed21080cf92db41038acec7ea3f574b3bad59 +SHA1 (patch-am) = 36bed0bf2167a3ab5919d02d191e405e68687108 diff --git a/inputmethod/unicon-im/patches/patch-am b/inputmethod/unicon-im/patches/patch-am new file mode 100644 index 00000000000..1fbfc25d552 --- /dev/null +++ b/inputmethod/unicon-im/patches/patch-am @@ -0,0 +1,12 @@ +$NetBSD: patch-am,v 1.1 2009/02/07 22:47:14 joerg Exp $ + +--- ImmModules/TL-1/xl_hzinput.c.orig 2009-02-07 23:43:25.000000000 +0100 ++++ ImmModules/TL-1/xl_hzinput.c +@@ -46,7 +46,6 @@ + + #define error printf + +-static void UnloadInputMethod (hz_input_table *p); + void ResetInput (HzInputTable_T *pClient); + static void GetAssociatePhrases (HzInputTable_T *pClient, unsigned char *p); + static void FindMatchKey (HzInputTable_T *pClient); |