- Update to 1.1.0.

- Mark textproc/uim-m17nlib IGNORE since it requires m17n-lib-1.3.1 or later.

4 files changed, 17 insertions, 38 deletions

diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 008684fd60ca..c69efb834939 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	uim-el
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://uim.freedesktop.org/releases/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index d80d16d60ecb..504107f76c0b 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,3 +1,3 @@
-MD5 (uim-1.0.1.tar.gz) = 1de96cb9ca0c570c0d04678a95f9c75a
-SHA256 (uim-1.0.1.tar.gz) = cfd3a906763d0474576fd07b0ffcfbc829075a750fc4fe28dcb4e37999e4d57f
-SIZE (uim-1.0.1.tar.gz) = 1924484
+MD5 (uim-1.1.0.tar.gz) = 40a886894ea31be876380e64b3387442
+SHA256 (uim-1.1.0.tar.gz) = 57d5799fd76bde17df859ebaffb7883c468f4bf8bb42f2bb9569c4e4b52e4ee0
+SIZE (uim-1.1.0.tar.gz) = 2092779
diff --git a/textproc/uim-el/files/patch-emacs_Makefile.in b/textproc/uim-el/files/patch-emacs_Makefile.in
index 97dbd1f0ff29..46d3677a6d6f 100644
--- a/textproc/uim-el/files/patch-emacs_Makefile.in
+++ b/textproc/uim-el/files/patch-emacs_Makefile.in
@@ -1,36 +1,15 @@
---- emacs/Makefile.in.orig	Fri Dec 16 17:10:53 2005
-+++ emacs/Makefile.in	Sat Dec 24 07:54:33 2005
-@@ -391,19 +391,6 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--install-binPROGRAMS: $(bin_PROGRAMS)
--	@$(NORMAL_INSTALL)
--	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
--	@list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
--	  if test -f $$p \
--	     || test -f $$p1 \
--	  ; then \
--	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
--	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
--	  else :; fi; \
--	done
- 
- uninstall-binPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
-@@ -419,9 +406,6 @@
- 	  echo " rm -f $$p $$f"; \
- 	  rm -f $$p $$f ; \
- 	done
--uim-el-agent$(EXEEXT): $(uim_el_agent_OBJECTS) $(uim_el_agent_DEPENDENCIES) 
--	@rm -f uim-el-agent$(EXEEXT)
--	$(LINK) $(uim_el_agent_LDFLAGS) $(uim_el_agent_OBJECTS) $(uim_el_agent_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -765,7 +749,7 @@
+--- emacs/Makefile.in.orig	Fri Jun  9 10:47:01 2006
++++ emacs/Makefile.in	Mon Jun 12 01:12:29 2006
+@@ -37,8 +37,6 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@UIM_EL_TRUE@bin_PROGRAMS = uim-el-agent$(EXEEXT) \
+-@UIM_EL_TRUE@	uim-el-helper-agent$(EXEEXT)
+ subdir = emacs
+ DIST_COMMON = README $(am__dist_uimel_lisp_DATA_DIST) \
+ 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING INSTALL
+@@ -874,7 +872,7 @@
  	done
  check-am: all-am
  check: check-am
diff --git a/textproc/uim-el/pkg-plist b/textproc/uim-el/pkg-plist
index 44d6c1b471d4..3a4e87d16c97 100644
--- a/textproc/uim-el/pkg-plist
+++ b/textproc/uim-el/pkg-plist
@@ -1,5 +1,6 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-candidate.el
 %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-debug.el
+%%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-helper.el
 %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-key.el
 %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-keymap.el
 %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-leim.el