- Upgrade to 2.2.1.

svn path=/head/; revision=271881

net/tramp/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tramp
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 CATEGORIES=	net elisp
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}

net/tramp/distinfo

@@ -1,2 +1,2 @@
-SHA256 (tramp-2.2.0.tar.gz) = fcae30c2db65a2f791c8ede45939d482426d1d3c9ba5ee576e704aefd643c3ae
-SIZE (tramp-2.2.0.tar.gz) = 383512
+SHA256 (tramp-2.2.1.tar.gz) = e2cfd81d5b99571fb0b210fe95954e6dbda54c6b6c209983c72e07dd2f50b27d
+SIZE (tramp-2.2.1.tar.gz) = 378532

net/tramp/files/patch-texi-Makefile.in

@@ -1,6 +1,6 @@
---- texi/Makefile.in.orig	2010-09-02 18:08:14.000000000 +0900
-+++ texi/Makefile.in	2010-11-24 10:08:49.148740448 +0900
-@@ -50,8 +50,8 @@
+--- texi/Makefile.in.orig	2011-02-13 20:38:54.000000000 +0900
++++ texi/Makefile.in	2011-03-27 19:47:32.881845864 +0900
+@@ -48,8 +48,8 @@
  
  TEXI_FILES	= tramp.texi trampver.texi doclicense.texi \
  		  $(if $(findstring yes, @INSTALL_CHAPTER@), trampinst.texi)
@@ -11,7 +11,7 @@
  CLEAN_FILES	= @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*)
  
  # To be used by maintainer only
-@@ -64,20 +64,23 @@
+@@ -62,19 +62,22 @@
  
  tramp: $(INFO_FILES) $(localinfodir)/dir
  
@@ -27,9 +27,8 @@
 +$(localinfodir)/%.info: $(TEXI_FILES)
  	$(MKDIR) $(dir $@)
  	$(MAKEINFO) --footnote-style=end -D $(EMACS_GVFS) -D $(EMACS_GW) \
- 		-D $(EMACS_IMAP) -D $(EMACS_INFO) -D $(INSTALL_CHAPTER) \
--		-o $@ $(notdir $@).texi
-+		-o $@ $*.texi
+-		-D $(EMACS_INFO) -D $(INSTALL_CHAPTER) -o $@ $(notdir $@).texi
++		-D $(EMACS_INFO) -D $(INSTALL_CHAPTER) -o $@ $*.texi
  
 -$(DESTDIR)$(infodir)/tramp:
 +$(localinfodir)/tramp21.info: $(localinfodir)/tramp.info

net/tramp/pkg-plist

@@ -20,8 +20,6 @@
 %%TRAMP_LISPDIR%%/tramp-gvfs.elc
 %%TRAMP_LISPDIR%%/tramp-gw.el
 %%TRAMP_LISPDIR%%/tramp-gw.elc
-%%TRAMP_LISPDIR%%/tramp-imap.el
-%%TRAMP_LISPDIR%%/tramp-imap.elc
 %%TRAMP_LISPDIR%%/tramp-loaddefs.el
 %%TRAMP_LISPDIR%%/tramp-sh.el
 %%TRAMP_LISPDIR%%/tramp-sh.elc