diff options
Diffstat (limited to 'textproc/uim')
-rw-r--r-- | textproc/uim/Makefile | 7 | ||||
-rw-r--r-- | textproc/uim/distinfo | 3 | ||||
-rw-r--r-- | textproc/uim/files/patch-Makefile.in | 15 | ||||
-rw-r--r-- | textproc/uim/files/patch-configure | 12 | ||||
-rw-r--r-- | textproc/uim/files/patch-xim:Makefile.in | 11 |
5 files changed, 15 insertions, 33 deletions
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 2c597414e6f5..7bb8a2f5b1b6 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -6,16 +6,14 @@ # PORTNAME= uim -PORTVERSION= 0.2.4 -PORTREVISION= 1 +PORTVERSION= 0.2.8 CATEGORIES= japanese x11 MASTER_SITES= http://freedesktop.org/Software/UimDownload/ MAINTAINER= nobutaka@FreeBSD.org COMMENT= Input method library -LIB_DEPENDS= anthy.0:${PORTSDIR}/japanese/anthy \ - iconv.3:${PORTSDIR}/converters/libiconv +LIB_DEPENDS= anthy.0:${PORTSDIR}/japanese/anthy USE_X_PREFIX= yes USE_PERL5_BUILD=yes @@ -23,6 +21,7 @@ INSTALLS_SHLIB= yes WANT_GNOME= yes USE_GNOME= gnometarget glib20 USE_GMAKE= yes +USE_ICONV= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo index 33684f442957..68ce6fb3d2ec 100644 --- a/textproc/uim/distinfo +++ b/textproc/uim/distinfo @@ -1 +1,2 @@ -MD5 (uim-0.2.4.tar.gz) = c8c72dd472e4c1f1225d785549bfc106 +MD5 (uim-0.2.8.tar.gz) = bdc727d0df3466f165e0f1933e8c07ed +SIZE (uim-0.2.8.tar.gz) = 653270 diff --git a/textproc/uim/files/patch-Makefile.in b/textproc/uim/files/patch-Makefile.in index 8944327835d2..ad26f10fb061 100644 --- a/textproc/uim/files/patch-Makefile.in +++ b/textproc/uim/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Dec 8 21:20:20 2003 -+++ Makefile.in Sun Dec 21 01:41:32 2003 -@@ -187,7 +187,7 @@ +--- Makefile.in.orig Tue Feb 3 02:41:53 2004 ++++ Makefile.in Sun Feb 8 23:53:06 2004 +@@ -194,7 +194,7 @@ DISTCLEANFILES = uim.pc @@ -9,12 +9,3 @@ pkgconfig_DATA = uim.pc noinst_PROGRAMS = $(gtk_entry) uim-agent -@@ -198,7 +198,7 @@ - @GTK2_TRUE@gtk_entry_CFLAGS = @GTK2_CFLAGS@ - - uim_agent_SOURCES = agent.c --uim_agent_LDADD = uim/libuim.la -+uim_agent_LDADD = uim/libuim.la -liconv - - ACLOCAL_AMFLAGS = -I m4 - subdir = . diff --git a/textproc/uim/files/patch-configure b/textproc/uim/files/patch-configure index 8797a60d41af..69f6d74b560c 100644 --- a/textproc/uim/files/patch-configure +++ b/textproc/uim/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed Dec 31 01:26:36 2003 -+++ configure Wed Dec 31 23:56:57 2003 -@@ -19085,6 +19085,7 @@ +--- 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" @@ -8,13 +8,15 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -19223,11 +19224,6 @@ +@@ -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 +-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; }; } diff --git a/textproc/uim/files/patch-xim:Makefile.in b/textproc/uim/files/patch-xim:Makefile.in deleted file mode 100644 index 74878dad9beb..000000000000 --- a/textproc/uim/files/patch-xim:Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- xim/Makefile.in.orig Wed Dec 10 23:36:10 2003 -+++ xim/Makefile.in Wed Dec 10 23:37:25 2003 -@@ -182,7 +182,7 @@ - - bin_PROGRAMS = uim-xim - uim_xim_LDFLAGS = -L/usr/lib -L/usr/X11R6/lib --uim_xim_LDADD = -lXext -lX11 ../uim/libuim.la -+uim_xim_LDADD = -lXext -lX11 ../uim/libuim.la -liconv - - uim_xim_SOURCES = \ - main.cpp convdisp.cpp \ |