6 files changed, 29 insertions, 44 deletions

diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index 5f66b1ae9aa5..06b212e720ef 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tramp
-PORTVERSION=	2.1.7
-PORTREVISION=	2
+PORTVERSION=	2.1.12
 CATEGORIES=	net elisp
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +16,6 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Transparent remote file access tool for emacsen
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:261
@@ -36,6 +34,8 @@ CONFIGURE_ARGS+=	--with-japanese-manual
 INFO+=		tramp
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if ${EMACS_PORT_NAME} == emacs20
 PLIST_SUB+=	EMACS20_ONLY=""
 .else
@@ -53,4 +53,4 @@ post-install:
 	(cd ${WRKSRC}/contrib; ${GMAKE} install)
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/tramp/distinfo b/net/tramp/distinfo
index 6f09446d5751..aaad5ca7571c 100644
--- a/net/tramp/distinfo
+++ b/net/tramp/distinfo
@@ -1,3 +1,3 @@
-MD5 (tramp-2.1.7.tar.gz) = afb9d8c2dec35966e8ee093ba17697ba
-SHA256 (tramp-2.1.7.tar.gz) = 11d4d5c4ac2169fde263ec7482d409133486997d8b5459d4307294584bce4b8b
-SIZE (tramp-2.1.7.tar.gz) = 287084
+MD5 (tramp-2.1.12.tar.gz) = 03bda407ad337469b8042cee157ecee8
+SHA256 (tramp-2.1.12.tar.gz) = ac1037ede56966709fbe9519b9cfff404394dbae609bc3253ce41ce512613fb6
+SIZE (tramp-2.1.12.tar.gz) = 338034
diff --git a/net/tramp/files/patch-configure.ac b/net/tramp/files/patch-configure.ac
index 7ce9acd3a8e8..89b64f73d4d3 100644
--- a/net/tramp/files/patch-configure.ac
+++ b/net/tramp/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	Sun Jan 16 19:43:17 2005
-+++ configure.ac	Tue Feb 22 09:45:18 2005
-@@ -58,12 +58,11 @@
+--- configure.ac.orig	2007-12-23 05:39:52.000000000 -0600
++++ configure.ac	2008-03-11 10:07:43.000000000 -0500
+@@ -55,11 +55,10 @@
  AC_EMACS_INFO
  
  # Handle contrib files. "-" must be encoded as "_".
@@ -9,8 +9,7 @@
  
  AC_CONTRIB_FILES([base64_encode_region],   [base64.el])
  AC_CONTRIB_FILES([format_spec],            [format_spec.el])
- AC_CONTRIB_FILES([md5],                    [md5.el],         [optional])
 -AC_CONTRIB_FILES([password_cache_add],     [password.el],    [optional])
- AC_CONTRIB_FILES([uudecode_decode_region], [uudecode.el])
- dnl run-at-time for XEmacs can be find in fsf-compat. Unfortunately,
- dnl password.el doesn't honor it, and it requires run-at-time mandatory.
+ if test "${EMACS_GW}" = yes; then
+    AC_CONTRIB_FILES([socks_open_network_stream], [socks.el], [optional])
+ fi
diff --git a/net/tramp/files/patch-texi-Makefile.in b/net/tramp/files/patch-texi-Makefile.in
index 212478dbb1b0..13b232a9235e 100644
--- a/net/tramp/files/patch-texi-Makefile.in
+++ b/net/tramp/files/patch-texi-Makefile.in
@@ -1,7 +1,7 @@
---- texi/Makefile.in.orig	Wed Mar 15 06:27:20 2006
-+++ texi/Makefile.in	Tue Sep  5 08:44:47 2006
-@@ -50,10 +50,10 @@
- TEXI_FILES	= tramp.texi trampver.texi \
+--- texi/Makefile.in.orig	2007-09-28 09:32:11.000000000 -0500
++++ texi/Makefile.in	2008-03-11 10:11:25.000000000 -0500
+@@ -51,10 +51,10 @@
+ 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 \
@@ -15,7 +15,7 @@
  CLEAN_FILES	= @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*)
  
  # To be used by maintainer only
-@@ -66,19 +66,19 @@
+@@ -67,19 +67,19 @@
  
  tramp: $(INFO_FILES) $(localinfodir)/dir
  
@@ -30,9 +30,9 @@
 -$(localinfodir)/tramp $(localinfodir)/tramp_ja: $(TEXI_FILES) $(JA_TEXI_FILES)
 +$(localinfodir)/%.info: $(TEXI_FILES) $(JA_TEXI_FILES)
  	$(MKDIR) $(dir $@)
- 	$(MAKEINFO) --footnote-style=end -D $(EMACS_INFO) -D $(JA_MANUAL) \
--		-D $(INSTALL_CHAPTER) -o $@ $(notdir $@).texi
-+		-D $(INSTALL_CHAPTER) -o $@ $*.texi
+ 	$(MAKEINFO) --footnote-style=end -D $(EMACS_GW) -D $(EMACS_INFO) \
+-		-D $(JA_MANUAL) -D $(INSTALL_CHAPTER) -o $@ $(notdir $@).texi
++		-D $(JA_MANUAL) -D $(INSTALL_CHAPTER) -o $@ $*.texi
  
 -$(DESTDIR)$(infodir)/tramp $(DESTDIR)$(infodir)/tramp_ja:
 +$(DESTDIR)$(infodir)/tramp.info $(DESTDIR)$(infodir)/tramp_ja.info:
diff --git a/net/tramp/files/patch-tramp.el b/net/tramp/files/patch-tramp.el
index 48e7d1b9cd8b..e69de29bb2d1 100644
--- a/net/tramp/files/patch-tramp.el
+++ b/net/tramp/files/patch-tramp.el
@@ -1,22 +0,0 @@
---- lisp/tramp.el.orig	Sat Sep 23 19:12:34 2006
-+++ lisp/tramp.el	Sat Sep 23 19:13:19 2006
-@@ -5922,8 +5922,8 @@
-   "Return the right method string to use.
- This is METHOD, if non-nil. Otherwise, do a lookup in
- `tramp-default-method-alist'."
--  (if (tramp-completion-mode)
--      method
-+;  (if (tramp-completion-mode)
-+;      method
-     (or method
- 	(let ((choices tramp-default-method-alist)
- 	      lmethod item)
-@@ -5934,7 +5934,7 @@
- 	      (setq lmethod (nth 2 item))
- 	      (setq choices nil)))
- 	  lmethod)
--	tramp-default-method)))
-+	tramp-default-method));)
- 
- (defsubst tramp-find-user (method user host)
-   "Return the right user string to use.
diff --git a/net/tramp/pkg-plist b/net/tramp/pkg-plist
index 75646ab4ac7f..d7793ddff932 100644
--- a/net/tramp/pkg-plist
+++ b/net/tramp/pkg-plist
@@ -10,8 +10,16 @@
 %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/uudecode.elc
 %%TRAMP_LISPDIR%%/password.el
 %%TRAMP_LISPDIR%%/password.elc
+%%TRAMP_LISPDIR%%/tramp-cmds.el
+%%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-gw.el
+%%TRAMP_LISPDIR%%/tramp-gw.elc
 %%TRAMP_LISPDIR%%/tramp-smb.el
 %%TRAMP_LISPDIR%%/tramp-smb.elc
 %%TRAMP_LISPDIR%%/tramp-util.el