Update to 0.3.4.2.

5 files changed, 17 insertions, 44 deletions

diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index d5c1fcf0fced..6479e25b1c44 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	uim
-PORTVERSION=	0.3.3
+PORTVERSION=	0.3.4.2
 CATEGORIES=	japanese x11
 MASTER_SITES=	http://freedesktop.org/Software/UimDownload/
 
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_PERL5_BUILD=yes
 INSTALLS_SHLIB=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gnometarget glib20
+USE_GNOME=	lthack gnometarget glib20
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_LIBTOOL_VER=13
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index dc2303ee4e86..da0b98b295b1 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,2 +1,2 @@
-MD5 (uim-0.3.3.tar.gz) = d8efb5a44b7f7ef246b52a3887d3dc1a
-SIZE (uim-0.3.3.tar.gz) = 815632
+MD5 (uim-0.3.4.2.tar.gz) = f7f614845a872e1de46de0540388649a
+SIZE (uim-0.3.4.2.tar.gz) = 824389
diff --git a/textproc/uim/files/patch-Makefile.in b/textproc/uim/files/patch-Makefile.in
index ad26f10fb061..c73f080216db 100644
--- a/textproc/uim/files/patch-Makefile.in
+++ b/textproc/uim/files/patch-Makefile.in
@@ -1,8 +1,8 @@
---- Makefile.in.orig	Tue Feb  3 02:41:53 2004
-+++ Makefile.in	Sun Feb  8 23:53:06 2004
-@@ -194,7 +194,7 @@
+--- Makefile.in.orig	Wed Apr  7 13:38:51 2004
++++ Makefile.in	Wed Apr  7 23:23:22 2004
+@@ -201,7 +201,7 @@
  
- DISTCLEANFILES = uim.pc
+ DISTCLEANFILES = uim.pc intltool-extract intltool-merge intltool-update
  
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/textproc/uim/files/patch-configure b/textproc/uim/files/patch-configure
deleted file mode 100644
index 69f6d74b560c..000000000000
--- a/textproc/uim/files/patch-configure
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.orig	Tue Feb  3 02:41:54 2004
-+++ configure	Mon Feb  9 00:06:45 2004
-@@ -19045,6 +19045,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -19183,13 +19184,6 @@
- if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-    { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
- echo "$as_me: error: perl 5.x required for intltool" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--if `perl -e "require XML::Parser" 2>/dev/null`; then
--:
--else
--   { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
diff --git a/textproc/uim/files/patch-helper:Makefile.in b/textproc/uim/files/patch-helper:Makefile.in
index a3c6c7c0e612..b2c7abf24154 100644
--- a/textproc/uim/files/patch-helper:Makefile.in
+++ b/textproc/uim/files/patch-helper:Makefile.in
@@ -1,14 +1,11 @@
---- helper/Makefile.in.orig	Wed Dec 31 01:27:22 2003
-+++ helper/Makefile.in	Thu Jan  1 03:27:05 2004
-@@ -187,8 +187,9 @@
+--- helper/Makefile.in.orig	Wed Apr  7 05:45:42 2004
++++ helper/Makefile.in	Wed Apr  7 22:21:03 2004
+@@ -203,7 +203,7 @@
  
- EXTRA_DIST = GNOME_UimApplet.server.in.in 
- 
--serverdir = $(libdir)/bonobo/servers
--server_DATA = GNOME_UimApplet.server
-+serverdir = $(prefix)/libdata/bonobo/servers
-+@APPLET_TRUE@server_DATA = GNOME_UimApplet.server
-+@APPLET_FALSE@server_DATA = 
- server_in_files = $(server_DATA:=.in)
- server_in_in_files = $(server_in_files:=.in)
+ @APPLET_TRUE@uim_helper_applet_SOURCES = helper-applet.c helper-toolbar-common-gtk.c
  
+-@APPLET_TRUE@serverdir = $(libdir)/bonobo/servers
++@APPLET_TRUE@serverdir = $(prefix)/libdata/bonobo/servers
+ @APPLET_TRUE@server_DATA = GNOME_UimApplet.server
+ @APPLET_TRUE@server_in_files = $(server_DATA:=.in)
+ @APPLET_TRUE@server_in_in_files = $(server_in_files:=.in)