- Upgrade to 2.2.0.

5 files changed, 30 insertions, 29 deletions

diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index e25e6382818d..e8c17f1ccb2e 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tramp
-PORTVERSION=	2.1.19
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	net elisp
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/tramp/distinfo b/net/tramp/distinfo
index e8cfcd32ac30..f1d8e02d724d 100644
--- a/net/tramp/distinfo
+++ b/net/tramp/distinfo
@@ -1,3 +1,2 @@
-MD5 (tramp-2.1.19.tar.gz) = 06dca2dbaae6fde77a24a60d1a109157
-SHA256 (tramp-2.1.19.tar.gz) = 2154d6d455ef88b712dd3c8cc0b7855795b0fa0278fe82371e0f2a0ab5d614df
-SIZE (tramp-2.1.19.tar.gz) = 420412
+SHA256 (tramp-2.2.0.tar.gz) = fcae30c2db65a2f791c8ede45939d482426d1d3c9ba5ee576e704aefd643c3ae
+SIZE (tramp-2.2.0.tar.gz) = 383512
diff --git a/net/tramp/files/patch-configure.ac b/net/tramp/files/patch-configure.ac
index 89b64f73d4d3..59c17fe43a75 100644
--- a/net/tramp/files/patch-configure.ac
+++ b/net/tramp/files/patch-configure.ac
@@ -1,5 +1,5 @@
---- configure.ac.orig	2007-12-23 05:39:52.000000000 -0600
-+++ configure.ac	2008-03-11 10:07:43.000000000 -0500
+--- configure.ac.orig	2010-11-20 19:59:36.000000000 +0900
++++ configure.ac	2010-11-26 23:08:05.306093104 +0900
 @@ -55,11 +55,10 @@
  AC_EMACS_INFO
  
@@ -13,3 +13,9 @@
  if test "${EMACS_GW}" = yes; then
     AC_CONTRIB_FILES([socks_open_network_stream], [socks.el], [optional])
  fi
+@@ -158,4 +157,4 @@
+ # Regenerate autoloads.
+ AC_MSG_NOTICE([regenerate autoloads])
+ rm -f lisp/tramp-loaddefs.el
+-make EMACS_INFO=${EMACS_INFO} -s -C lisp autoloads
++gmake EMACS_INFO=${EMACS_INFO} -s -C lisp autoloads
diff --git a/net/tramp/files/patch-texi-Makefile.in b/net/tramp/files/patch-texi-Makefile.in
index 6bf34153e611..082e23a2828c 100644
--- a/net/tramp/files/patch-texi-Makefile.in
+++ b/net/tramp/files/patch-texi-Makefile.in
@@ -1,21 +1,17 @@
---- texi/Makefile.in.orig	2009-09-27 17:58:50.000000000 +0900
-+++ texi/Makefile.in	2010-05-23 16:27:02.179441897 +0900
-@@ -52,10 +52,10 @@
+--- 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_FILES	= tramp.texi trampver.texi doclicense.texi \
  		  $(if $(findstring yes, @INSTALL_CHAPTER@), trampinst.texi)
- JA_TEXI_FILES	= $(if $(findstring yes, @JA_MANUAL@), tramp_ja.texi)
--INFO_FILES	= $(localinfodir)/tramp \
--		  $(if $(JA_TEXI_FILES), $(localinfodir)/tramp_ja)
--INSTALL_FILES	= $(DESTDIR)$(infodir)/tramp \
--		  $(if $(JA_TEXI_FILES), $(DESTDIR)$(infodir)/tramp_ja)
-+INFO_FILES	= $(localinfodir)/tramp21.info \
-+		  $(if $(JA_TEXI_FILES), $(localinfodir)/tramp_ja.info)
-+INSTALL_FILES	= $(DESTDIR)$(infodir)/tramp21.info \
-+		  $(if $(JA_TEXI_FILES), $(DESTDIR)$(infodir)/tramp_ja.info)
+-INFO_FILES	= $(localinfodir)/tramp
+-INSTALL_FILES	= $(DESTDIR)$(infodir)/tramp
++INFO_FILES	= $(localinfodir)/tramp21.info
++INSTALL_FILES	= $(DESTDIR)$(infodir)/tramp21.info
  CLEAN_FILES	= @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*)
  
  # To be used by maintainer only
-@@ -68,20 +68,23 @@
+@@ -64,20 +64,23 @@
  
  tramp: $(INFO_FILES) $(localinfodir)/dir
  
@@ -27,19 +23,19 @@
  
  distclean: clean
  
--$(localinfodir)/tramp $(localinfodir)/tramp_ja: $(TEXI_FILES) $(JA_TEXI_FILES)
-+$(localinfodir)/%.info: $(TEXI_FILES) $(JA_TEXI_FILES)
+-$(localinfodir)/tramp: $(TEXI_FILES)
++$(localinfodir)/%.info: $(TEXI_FILES)
  	$(MKDIR) $(dir $@)
  	$(MAKEINFO) --footnote-style=end -D $(EMACS_GVFS) -D $(EMACS_GW) \
- 		-D $(EMACS_IMAP) -D $(EMACS_INFO) -D $(JA_MANUAL) \
--		-D $(INSTALL_CHAPTER) -o $@ $(notdir $@).texi
-+		-D $(INSTALL_CHAPTER) -o $@ $*.texi
+ 		-D $(EMACS_IMAP) -D $(EMACS_INFO) -D $(INSTALL_CHAPTER) \
+-		-o $@ $(notdir $@).texi
++		-o $@ $*.texi
  
--$(DESTDIR)$(infodir)/tramp $(DESTDIR)$(infodir)/tramp_ja:
+-$(DESTDIR)$(infodir)/tramp:
 +$(localinfodir)/tramp21.info: $(localinfodir)/tramp.info
 +	cp $(localinfodir)/tramp.info $@
 +
-+$(DESTDIR)$(infodir)/tramp21.info $(DESTDIR)$(infodir)/tramp_ja.info:
++$(DESTDIR)$(infodir)/tramp21.info:
  	$(MKDIR) $(dir $@)
  	$(INSTALL) $(INFO_FILES) $(DESTDIR)$(infodir)
  
diff --git a/net/tramp/pkg-plist b/net/tramp/pkg-plist
index 6fe4e10790f3..942d7356f436 100644
--- a/net/tramp/pkg-plist
+++ b/net/tramp/pkg-plist
@@ -14,8 +14,6 @@
 %%TRAMP_LISPDIR%%/tramp-cmds.elc
 %%TRAMP_LISPDIR%%/tramp-compat.el
 %%TRAMP_LISPDIR%%/tramp-compat.elc
-%%TRAMP_LISPDIR%%/tramp-fish.el
-%%TRAMP_LISPDIR%%/tramp-fish.elc
 %%TRAMP_LISPDIR%%/tramp-ftp.el
 %%TRAMP_LISPDIR%%/tramp-ftp.elc
 %%TRAMP_LISPDIR%%/tramp-gvfs.el
@@ -24,6 +22,9 @@
 %%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
 %%TRAMP_LISPDIR%%/tramp-smb.el
 %%TRAMP_LISPDIR%%/tramp-smb.elc
 @comment %%TRAMP_LISPDIR%%/tramp-util.el