Attachment #85412 for bug #121604

View | Details | Raw Unified | Return to bug 121604
Collapse All | Expand All

Lines 6-12 Link Here

(-)tramp/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= tramp	8	PORTNAME= tramp
9	PORTVERSION= 2.1.7	9	PORTVERSION= 2.1.12
10	PORTREVISION= 2	10	PORTREVISION= 2
11	CATEGORIES= net elisp	11	CATEGORIES= net elisp
12	MASTER_SITES= ${MASTER_SITE_GNU}	12	MASTER_SITES= ${MASTER_SITE_GNU}

Lines 1-3 Link Here

(-)tramp/distinfo (-3 / +3 lines)
1	MD5 (tramp-2.1.7.tar.gz) = afb9d8c2dec35966e8ee093ba17697ba	1	MD5 (tramp-2.1.12.tar.gz) = 03bda407ad337469b8042cee157ecee8
2	SHA256 (tramp-2.1.7.tar.gz) = 11d4d5c4ac2169fde263ec7482d409133486997d8b5459d4307294584bce4b8b	2	SHA256 (tramp-2.1.12.tar.gz) = ac1037ede56966709fbe9519b9cfff404394dbae609bc3253ce41ce512613fb6
3	SIZE (tramp-2.1.7.tar.gz) = 287084	3	SIZE (tramp-2.1.12.tar.gz) = 338034

Lines 1-6 Link Here

(-)tramp/files/patch-configure.ac (-7 / +6 lines)
1	--- configure.ac.orig Sun Jan 16 19:43:17 2005	1	--- configure.ac.orig 2007-12-23 05:39:52.000000000 -0600
2	+++ configure.ac Tue Feb 22 09:45:18 2005	2	+++ configure.ac 2008-03-11 10:07:43.000000000 -0500
3	@@ -58,12 +58,11 @@	3	@@ -55,11 +55,10 @@
4	AC_EMACS_INFO	4	AC_EMACS_INFO
5		5
6	# Handle contrib files. "-" must be encoded as "_".	6	# Handle contrib files. "-" must be encoded as "_".
Lines 9-16 Link Here
9		9
10	AC_CONTRIB_FILES([base64_encode_region], [base64.el])	10	AC_CONTRIB_FILES([base64_encode_region], [base64.el])
11	AC_CONTRIB_FILES([format_spec], [format_spec.el])	11	AC_CONTRIB_FILES([format_spec], [format_spec.el])
12	AC_CONTRIB_FILES([md5], [md5.el], [optional])
13	-AC_CONTRIB_FILES([password_cache_add], [password.el], [optional])	12	-AC_CONTRIB_FILES([password_cache_add], [password.el], [optional])
14	AC_CONTRIB_FILES([uudecode_decode_region], [uudecode.el])	13	if test "${EMACS_GW}" = yes; then
15	dnl run-at-time for XEmacs can be find in fsf-compat. Unfortunately,	14	AC_CONTRIB_FILES([socks_open_network_stream], [socks.el], [optional])
16	dnl password.el doesn't honor it, and it requires run-at-time mandatory.	15	fi




--- 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 \

 CLEAN_FILES	= @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*)
 
 # To be used by maintainer only
@@ -67,19 +67,19 @@
 
 tramp: $(INFO_FILES) $(localinfodir)/dir
 

-$(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_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:




--- 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.

Return to bug 121604

Lines 1-7 Link Here

(-)tramp/files/patch-texi-Makefile.in (-8 / +8 lines)
1	--- texi/Makefile.in.orig Wed Mar 15 06:27:20 2006	1	--- texi/Makefile.in.orig 2007-09-28 09:32:11.000000000 -0500
2	+++ texi/Makefile.in Tue Sep 5 08:44:47 2006	2	+++ texi/Makefile.in 2008-03-11 10:11:25.000000000 -0500
3	@@ -50,10 +50,10 @@	3	@@ -51,10 +51,10 @@
4	TEXI_FILES = tramp.texi trampver.texi \	4	TEXI_FILES = tramp.texi trampver.texi doclicense.texi \
5	$(if $(findstring yes, @INSTALL_CHAPTER@), trampinst.texi)	5	$(if $(findstring yes, @INSTALL_CHAPTER@), trampinst.texi)
6	JA_TEXI_FILES = $(if $(findstring yes, @JA_MANUAL@), tramp_ja.texi)	6	JA_TEXI_FILES = $(if $(findstring yes, @JA_MANUAL@), tramp_ja.texi)
7	-INFO_FILES = $(localinfodir)/tramp \	7	-INFO_FILES = $(localinfodir)/tramp \
Lines 15-21 Link Here
15	CLEAN_FILES = @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*)	15	CLEAN_FILES = @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*)
16		16
17	# To be used by maintainer only	17	# To be used by maintainer only
18	@@ -66,19 +66,19 @@	18	@@ -67,19 +67,19 @@
19		19
20	tramp: $(INFO_FILES) $(localinfodir)/dir	20	tramp: $(INFO_FILES) $(localinfodir)/dir
21		21
Lines 30-38 Link Here
30	-$(localinfodir)/tramp $(localinfodir)/tramp_ja: $(TEXI_FILES) $(JA_TEXI_FILES)	30	-$(localinfodir)/tramp $(localinfodir)/tramp_ja: $(TEXI_FILES) $(JA_TEXI_FILES)
31	+$(localinfodir)/%.info: $(TEXI_FILES) $(JA_TEXI_FILES)	31	+$(localinfodir)/%.info: $(TEXI_FILES) $(JA_TEXI_FILES)
32	$(MKDIR) $(dir $@)	32	$(MKDIR) $(dir $@)
33	$(MAKEINFO) --footnote-style=end -D $(EMACS_INFO) -D $(JA_MANUAL) \	33	$(MAKEINFO) --footnote-style=end -D $(EMACS_GW) -D $(EMACS_INFO) \
34	- -D $(INSTALL_CHAPTER) -o $@ $(notdir $@).texi	34	- -D $(JA_MANUAL) -D $(INSTALL_CHAPTER) -o $@ $(notdir $@).texi
35	+ -D $(INSTALL_CHAPTER) -o $@ $*.texi	35	+ -D $(JA_MANUAL) -D $(INSTALL_CHAPTER) -o $@ $*.texi
36		36
37	-$(DESTDIR)$(infodir)/tramp $(DESTDIR)$(infodir)/tramp_ja:	37	-$(DESTDIR)$(infodir)/tramp $(DESTDIR)$(infodir)/tramp_ja:
38	+$(DESTDIR)$(infodir)/tramp.info $(DESTDIR)$(infodir)/tramp_ja.info:	38	+$(DESTDIR)$(infodir)/tramp.info $(DESTDIR)$(infodir)/tramp_ja.info:

Lines 1-22 Link Here

(-)tramp/files/patch-tramp.el (-22 lines)
1	--- lisp/tramp.el.orig Sat Sep 23 19:12:34 2006
2	+++ lisp/tramp.el Sat Sep 23 19:13:19 2006
3	@@ -5922,8 +5922,8 @@
4	"Return the right method string to use.
5	This is METHOD, if non-nil. Otherwise, do a lookup in
6	`tramp-default-method-alist'."
7	- (if (tramp-completion-mode)
8	- method
9	+; (if (tramp-completion-mode)
10	+; method
11	(or method
12	(let ((choices tramp-default-method-alist)
13	lmethod item)
14	@@ -5934,7 +5934,7 @@
15	(setq lmethod (nth 2 item))
16	(setq choices nil)))
17	lmethod)
18	- tramp-default-method)))
19	+ tramp-default-method));)
20
21	(defsubst tramp-find-user (method user host)
22	"Return the right user string to use.