aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--textproc/uim-el/Makefile2
-rw-r--r--textproc/uim-el/distinfo6
-rw-r--r--textproc/uim-kde/pkg-plist1
-rw-r--r--textproc/uim-qt/Makefile1
-rw-r--r--textproc/uim/Makefile2
-rw-r--r--textproc/uim/distinfo6
-rw-r--r--textproc/uim/files/extra-patch-qt_Makefile.in32
-rw-r--r--textproc/uim/files/patch-gtk:Makefile.in14
8 files changed, 33 insertions, 31 deletions
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index c1609a74f20b..b4195e758932 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= uim-el
-PORTVERSION= 1.5.0
+PORTVERSION= 1.5.1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index abf188cc9a6b..5eef3511b300 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,3 +1,3 @@
-MD5 (uim-1.5.0.tar.gz) = 6661a0d1ef0a7167c8bc2e336bbbf197
-SHA256 (uim-1.5.0.tar.gz) = 2e7f9942ca2c7deffe35c190e85ef8f8b93215903c452868170e7220d4a4cb13
-SIZE (uim-1.5.0.tar.gz) = 4368685
+MD5 (uim-1.5.1.tar.gz) = 5f14fe31b3cbb46bff500f140b47e8d6
+SHA256 (uim-1.5.1.tar.gz) = 43d9658e25f1b894f23f3686325d6f2be145d1ed1602271b26c03ca37239d5b7
+SIZE (uim-1.5.1.tar.gz) = 4384116
diff --git a/textproc/uim-kde/pkg-plist b/textproc/uim-kde/pkg-plist
index f3a9885ee766..0b79e5bb032b 100644
--- a/textproc/uim-kde/pkg-plist
+++ b/textproc/uim-kde/pkg-plist
@@ -1,3 +1,4 @@
+lib/kde3/uim_panelapplet.a
lib/kde3/uim_panelapplet.la
lib/kde3/uim_panelapplet.so
share/apps/kicker/applets/uimapplet.desktop
diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile
index e9d3ecf7a8e5..05015d674c9e 100644
--- a/textproc/uim-qt/Makefile
+++ b/textproc/uim-qt/Makefile
@@ -33,6 +33,7 @@ IGNORE= requires X11
.endif
do-build:
+ (cd ${WRKSRC}/uim && ${SETENV} ${MAKE_ENV} ${GMAKE} libuim-counted-init.la)
(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE})
do-install:
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 66fe74ef40c7..438dfa57d514 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= uim
-PORTVERSION= 1.5.0
+PORTVERSION= 1.5.1
CATEGORIES?= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index abf188cc9a6b..5eef3511b300 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,3 +1,3 @@
-MD5 (uim-1.5.0.tar.gz) = 6661a0d1ef0a7167c8bc2e336bbbf197
-SHA256 (uim-1.5.0.tar.gz) = 2e7f9942ca2c7deffe35c190e85ef8f8b93215903c452868170e7220d4a4cb13
-SIZE (uim-1.5.0.tar.gz) = 4368685
+MD5 (uim-1.5.1.tar.gz) = 5f14fe31b3cbb46bff500f140b47e8d6
+SHA256 (uim-1.5.1.tar.gz) = 43d9658e25f1b894f23f3686325d6f2be145d1ed1602271b26c03ca37239d5b7
+SIZE (uim-1.5.1.tar.gz) = 4384116
diff --git a/textproc/uim/files/extra-patch-qt_Makefile.in b/textproc/uim/files/extra-patch-qt_Makefile.in
index c6214de303d0..f398759005b2 100644
--- a/textproc/uim/files/extra-patch-qt_Makefile.in
+++ b/textproc/uim/files/extra-patch-qt_Makefile.in
@@ -1,10 +1,10 @@
---- qt/Makefile.in.orig 2008-05-06 14:23:16.000000000 +0900
-+++ qt/Makefile.in 2008-05-06 23:25:02.000000000 +0900
+--- qt/Makefile.in.orig 2008-05-17 12:42:12.000000000 +0900
++++ qt/Makefile.in 2008-05-18 23:56:08.000000000 +0900
@@ -107,10 +107,6 @@
extraLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(applet_LTLIBRARIES) $(extra_LTLIBRARIES) \
$(noinst_LTLIBRARIES)
--@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_DEPENDENCIES = \
+-@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(am__append_10)
@@ -56,7 +56,7 @@
@PREF_TRUE@@QT_TRUE@ uim_pref_qt-pref-keyeditformbase.$(OBJEXT)
uim_pref_qt_OBJECTS = $(am_uim_pref_qt_OBJECTS) \
$(nodist_uim_pref_qt_OBJECTS)
--@PREF_TRUE@@QT_TRUE@uim_pref_qt_DEPENDENCIES = \
+-@PREF_TRUE@@QT_TRUE@uim_pref_qt_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la
@@ -73,10 +73,10 @@
uim_toolbar_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_toolbar_qt_CXXFLAGS) $(CXXFLAGS) \
-@@ -577,8 +561,8 @@
+@@ -579,8 +563,8 @@
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS) @X_CFLAGS@
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
- @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LIBADD = \
+ @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LIBADD = $(top_builddir)/uim/libuim-counted-init.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
+@QT_IMMODULE_TRUE@@QT_TRUE@ -luim-scm \
@@ -84,7 +84,7 @@
@QT_IMMODULE_TRUE@@QT_TRUE@ $(am__append_10)
# Toolbar Common
-@@ -588,8 +572,8 @@
+@@ -590,8 +574,8 @@
@QT_TRUE@libtoolbarcommon_la_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@libtoolbarcommon_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
@@ -95,7 +95,7 @@
# Toolbar Standalone
-@@ -598,8 +582,8 @@
+@@ -600,8 +584,8 @@
@QT_TRUE@uim_toolbar_qt_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@uim_toolbar_qt_LDFLAGS = $(QT_LDFLAGS)
@@ -106,7 +106,7 @@
# Toolbar applet
-@@ -608,8 +592,8 @@
+@@ -610,8 +594,8 @@
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_CXXFLAGS = -I@KDE_INCLUDE_DIR@ $(QT_CXXFLAGS)
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LDFLAGS = -avoid-version -module -no-undefined -Wl,--no-undefined -Wl,--allow-shlib-undefined -L@KDE_LIB_DIR@ $(QT_LDFLAGS)
@@ -117,7 +117,7 @@
@APPLET_KDE_TRUE@@QT_TRUE@ libtoolbarcommon.la -lkdeui -lkdecore
-@@ -617,16 +601,16 @@
+@@ -619,16 +603,16 @@
@QT_TRUE@uim_candwin_qt_SOURCES = candwin-qt.cpp candwin-qt.h qtgettext.h
@QT_TRUE@uim_candwin_qt_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@uim_candwin_qt_LDFLAGS = $(QT_LDFLAGS)
@@ -138,16 +138,16 @@
# Pref
-@@ -643,9 +627,9 @@
-
+@@ -646,9 +630,9 @@
@PREF_TRUE@@QT_TRUE@uim_pref_qt_CXXFLAGS = $(QT_CXXFLAGS)
@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDFLAGS = $(QT_LDFLAGS)
--@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDADD = $(top_builddir)/uim/libuim-custom.la \
+ @PREF_TRUE@@QT_TRUE@uim_pref_qt_LDADD = $(top_builddir)/uim/libuim-counted-init.la \
+-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la
-+@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDADD = -luim-custom \
-+@PREF_TRUE@@QT_TRUE@ -luim-scm \
-+@PREF_TRUE@@QT_TRUE@ -luim
++@PREF_TRUE@@QT_TRUE@ -luim-custom \
++@PREF_TRUE@@QT_TRUE@ -luim-scm \
++@PREF_TRUE@@QT_TRUE@ -luim
@QT_TRUE@CLEANFILES = \
@QT_TRUE@ $(MOC_FILES) \
diff --git a/textproc/uim/files/patch-gtk:Makefile.in b/textproc/uim/files/patch-gtk:Makefile.in
index 997ac8f28587..60ee6d7c4a2e 100644
--- a/textproc/uim/files/patch-gtk:Makefile.in
+++ b/textproc/uim/files/patch-gtk:Makefile.in
@@ -1,6 +1,6 @@
---- gtk/Makefile.in.orig Wed Jan 3 21:36:56 2007
-+++ gtk/Makefile.in Wed Jan 3 21:38:08 2007
-@@ -364,15 +364,15 @@
+--- gtk/Makefile.in.orig 2008-05-17 12:42:10.000000000 +0900
++++ gtk/Makefile.in 2008-05-18 22:12:18.000000000 +0900
+@@ -427,15 +427,15 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
@@ -9,8 +9,8 @@
- @list='$(module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
- else :; fi; \
- done
+@GTK2_TRUE@ @$(NORMAL_INSTALL)
@@ -18,8 +18,8 @@
+@GTK2_TRUE@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \
+@GTK2_TRUE@ if test -f $$p; then \
+@GTK2_TRUE@ f=$(am__strip_dir) \
-+@GTK2_TRUE@ echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
-+@GTK2_TRUE@ $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
++@GTK2_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
++@GTK2_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
+@GTK2_TRUE@ else :; fi; \
+@GTK2_TRUE@ done
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 12:18:59 +0000