aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
authornobutaka <nobutaka@FreeBSD.org>2011-05-30 23:37:40 +0800
committernobutaka <nobutaka@FreeBSD.org>2011-05-30 23:37:40 +0800
commit3ecf19497e1b385506ccd29adc9efa322e3722f9 (patch)
tree8dc11190f2fd733dbe82c193a75e64eaf9769eb2 /textproc
parentcbcf161c27da3cbf7314a81cbdbf43dce5e38bf1 (diff)
downloadfreebsd-ports-gnome-3ecf19497e1b385506ccd29adc9efa322e3722f9.tar.gz
freebsd-ports-gnome-3ecf19497e1b385506ccd29adc9efa322e3722f9.tar.zst
freebsd-ports-gnome-3ecf19497e1b385506ccd29adc9efa322e3722f9.zip
Fix undefined symbol of im-uim.so.
Submitted by: Wolfgang Jenkner <wjenkner@inode.at>
Diffstat (limited to 'textproc')
-rw-r--r--textproc/uim-gtk/Makefile3
-rw-r--r--textproc/uim/files/extra-patch-gtk_Makefile.in18
2 files changed, 12 insertions, 9 deletions
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index c0afcff65c3a..964c7a86cdb9 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk/Makefile
@@ -5,6 +5,7 @@
# $FreeBSD$
#
+PORTREVISION= 1
PKGNAMESUFFIX= -gtk
COMMENT= GTK+ modules of uim input method
@@ -26,7 +27,7 @@ IGNORE= requires X11
.endif
do-build:
- (cd ${WRKSRC}/uim && ${GMAKE} libuim-x-util.la)
+ (cd ${WRKSRC}/uim && ${GMAKE} libuim-x-util.la libuim-counted-init.la)
(cd ${WRKSRC}/gtk && ${GMAKE})
(cd ${WRKSRC}/helper && ${GMAKE})
diff --git a/textproc/uim/files/extra-patch-gtk_Makefile.in b/textproc/uim/files/extra-patch-gtk_Makefile.in
index 606969264255..55f8df334c98 100644
--- a/textproc/uim/files/extra-patch-gtk_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk_Makefile.in
@@ -1,25 +1,27 @@
---- gtk/Makefile.in.orig 2011-05-17 13:16:12.000000000 +0900
-+++ gtk/Makefile.in 2011-05-29 02:29:01.000000000 +0900
-@@ -82,10 +82,6 @@
+--- ./gtk/Makefile.in.orig 2011-05-17 06:16:12.000000000 +0200
++++ ./gtk/Makefile.in 2011-05-30 01:30:45.000000000 +0200
+@@ -81,11 +81,9 @@
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(moduledir)"
- LTLIBRARIES = $(module_LTLIBRARIES)
+-LTLIBRARIES = $(module_LTLIBRARIES)
-@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
--@GTK2_TRUE@ $(am__append_1)
++@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.la \
+ @GTK2_TRUE@ $(am__append_1)
++LTLIBRARIES = $(module_LTLIBRARIES)
am__im_uim_la_SOURCES_DIST = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
key-util-gtk.h uim-cand-win-gtk.c uim-cand-win-gtk.h \
uim-cand-win-tbl-gtk.c uim-cand-win-tbl-gtk.h \
-@@ -443,9 +439,8 @@
+@@ -443,8 +441,8 @@
@GTK2_TRUE@module_LTLIBRARIES = $(im_uim_la)
@GTK2_TRUE@im_uim_la_SOURCES = $(IM_UIM_SOURCES)
@GTK2_TRUE@im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@
-@GTK2_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
--@GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
+@GTK2_TRUE@im_uim_la_LIBADD = -luim-scm \
+@GTK2_TRUE@ -luim \
+ @GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
@GTK2_TRUE@ $(am__append_1)
@GTK2_TRUE@IM_UIM_SOURCES = \
- @GTK2_TRUE@ gtk-im-uim.c gtk-im-uim.h key-util-gtk.c key-util-gtk.h \