aboutsummaryrefslogtreecommitdiff
path: root/textproc/uim
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2006-07-27 15:11:48 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2006-07-27 15:11:48 +0000
commitd79d028eafefba17470c24f3c7e25ccf4e574d7d (patch)
tree877fdd4d66d28fd712a9db8a93982c6dc32601cb /textproc/uim
parent94c3476358bd6e677270852b2d9e6aaeea28f422 (diff)
downloadports-d79d028eafefba17470c24f3c7e25ccf4e574d7d.tar.gz
ports-d79d028eafefba17470c24f3c7e25ccf4e574d7d.zip
Link libuim properly to fix breakage of uim plugins.
Notes
Notes: svn path=/head/; revision=168887
Diffstat (limited to 'textproc/uim')
-rw-r--r--textproc/uim/Makefile1
-rw-r--r--textproc/uim/files/extra-patch-uim_Makefile.in16
2 files changed, 10 insertions, 7 deletions
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index bec1cdccb2f8..29287f8155f0 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -7,6 +7,7 @@
PORTNAME= uim
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES?= textproc
MASTER_SITES= http://uim.freedesktop.org/releases/
.if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
diff --git a/textproc/uim/files/extra-patch-uim_Makefile.in b/textproc/uim/files/extra-patch-uim_Makefile.in
index 5611a43b3386..aef951b38cd9 100644
--- a/textproc/uim/files/extra-patch-uim_Makefile.in
+++ b/textproc/uim/files/extra-patch-uim_Makefile.in
@@ -1,5 +1,5 @@
---- uim/Makefile.in.orig Tue Jun 13 01:03:14 2006
-+++ uim/Makefile.in Tue Jun 13 01:03:25 2006
+--- uim/Makefile.in.orig Fri Jul 7 11:16:53 2006
++++ uim/Makefile.in Fri Jul 28 00:01:50 2006
@@ -89,14 +89,11 @@
libLTLIBRARIES_INSTALL = $(INSTALL)
uim_pluginLTLIBRARIES_INSTALL = $(INSTALL)
@@ -39,35 +39,37 @@
am__libuim_scim_la_SOURCES_DIST = scim.cpp
@SCIM_TRUE@am_libuim_scim_la_OBJECTS = libuim_scim_la-scim.lo
libuim_scim_la_OBJECTS = $(am_libuim_scim_la_OBJECTS)
-@@ -491,27 +484,25 @@
+@@ -491,27 +484,27 @@
$(am__append_5)
libuim_custom_la_SOURCES = uim-custom.c
@M17NLIB_TRUE@libuim_m17nlib_la_SOURCES = m17nlib.c
-@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim.la
-+@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@
++@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ -luim
@M17NLIB_TRUE@libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@M17NLIB_TRUE@libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir)
@SCIM_TRUE@libuim_scim_la_SOURCES = scim.cpp
-@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ libuim.la
-+@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@
++@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ -luim
@SCIM_TRUE@libuim_scim_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@SCIM_TRUE@libuim_scim_la_CXXFLAGS = -I$(top_srcdir) @SCIM_CFLAGS@
@CANNA_TRUE@libuim_canna_la_SOURCES = canna.c
-@CANNA_TRUE@libuim_canna_la_LIBADD = libuim.la -lcanna
-+@CANNA_TRUE@libuim_canna_la_LIBADD = -lcanna
++@CANNA_TRUE@libuim_canna_la_LIBADD = -lcanna -luim
@CANNA_TRUE@libuim_canna_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@CANNA_TRUE@libuim_canna_la_CPPFLAGS = -I$(top_srcdir)
@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_SOURCES = anthy.c
-@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LIBADD = @ANTHY_LIBS@ libuim.la
-+@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LIBADD = @ANTHY_LIBS@
++@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LIBADD = @ANTHY_LIBS@ -luim
@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_CPPFLAGS = -I$(top_srcdir)
@MANA_TRUE@libuim_mana_la_SOURCES = mana.c
-@MANA_TRUE@libuim_mana_la_LIBADD = libuim.la
++@MANA_TRUE@libuim_mana_la_LIBADD = -luim
@MANA_TRUE@libuim_mana_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@MANA_TRUE@libuim_mana_la_CPPFLAGS = -I$(top_srcdir)
@PRIME_TRUE@libuim_prime_la_SOURCES = prime.c
-@PRIME_TRUE@libuim_prime_la_LIBADD = libuim.la
++@PRIME_TRUE@libuim_prime_la_LIBADD = -luim
@PRIME_TRUE@libuim_prime_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@PRIME_TRUE@libuim_prime_la_CPPFLAGS = -I$(top_srcdir)
libuim_skk_la_SOURCES = skk.c