From cc2af4bd1d1d3d438285704a8f7732975a1999af Mon Sep 17 00:00:00 2001
From: Jun Kuriyama <kuriyama@FreeBSD.org>
Date: Sun, 23 May 2010 08:27:18 +0000
Subject: [PATCH] - Upgrade to 2.1.18.

---
 net/tramp/Makefile                     |  3 +--
 net/tramp/distinfo                     |  6 +++---
 net/tramp/files/patch-texi-Makefile.in | 16 ++++++++--------
 net/tramp/pkg-plist                    |  2 ++
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index d2e94ee707f3..72d449856b21 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tramp
-PORTVERSION=	2.1.16
-PORTREVISION=	4
+PORTVERSION=	2.1.18
 CATEGORIES=	net elisp
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/tramp/distinfo b/net/tramp/distinfo
index 2c5e29f10829..2c01f945946c 100644
--- a/net/tramp/distinfo
+++ b/net/tramp/distinfo
@@ -1,3 +1,3 @@
-MD5 (tramp-2.1.16.tar.gz) = ef5feda6d86b3429963f39eec63891e6
-SHA256 (tramp-2.1.16.tar.gz) = 2c12a7c0c091a2c1e70146c34a9d2b16593c3f7afd26ac79d533be9545761a7d
-SIZE (tramp-2.1.16.tar.gz) = 413988
+MD5 (tramp-2.1.18.tar.gz) = a2fd8749ba1d848ca7002725441c7b7c
+SHA256 (tramp-2.1.18.tar.gz) = c93e3fce3a565f8cb356789e335378dceb0244e381e938c0a2a0c2833a2a67bc
+SIZE (tramp-2.1.18.tar.gz) = 444921
diff --git a/net/tramp/files/patch-texi-Makefile.in b/net/tramp/files/patch-texi-Makefile.in
index 7987ba798ea3..6bf34153e611 100644
--- a/net/tramp/files/patch-texi-Makefile.in
+++ b/net/tramp/files/patch-texi-Makefile.in
@@ -1,6 +1,6 @@
---- texi/Makefile.in.orig	2009-02-23 00:23:33.000000000 +0900
-+++ texi/Makefile.in	2009-06-24 14:30:13.000000000 +0900
-@@ -51,10 +51,10 @@
+--- 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_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)
@@ -15,7 +15,7 @@
  CLEAN_FILES	= @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*)
  
  # To be used by maintainer only
-@@ -67,20 +67,23 @@
+@@ -68,20 +68,23 @@
  
  tramp: $(INFO_FILES) $(localinfodir)/dir
  
@@ -30,10 +30,10 @@
 -$(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_GW) -D $(EMACS_GVFS) \
- 		-D $(EMACS_INFO) -D $(JA_MANUAL) -D $(INSTALL_CHAPTER) \
--		-o $@ $(notdir $@).texi
-+		-o $@ $*.texi
+ 	$(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
  
 -$(DESTDIR)$(infodir)/tramp $(DESTDIR)$(infodir)/tramp_ja:
 +$(localinfodir)/tramp21.info: $(localinfodir)/tramp.info
diff --git a/net/tramp/pkg-plist b/net/tramp/pkg-plist
index 3bcf73527085..6fe4e10790f3 100644
--- a/net/tramp/pkg-plist
+++ b/net/tramp/pkg-plist
@@ -22,6 +22,8 @@
 %%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-smb.el
 %%TRAMP_LISPDIR%%/tramp-smb.elc
 @comment %%TRAMP_LISPDIR%%/tramp-util.el