Index: head/net/tramp/Makefile =================================================================== --- head/net/tramp/Makefile (revision 427359) +++ head/net/tramp/Makefile (revision 427360) @@ -1,53 +1,53 @@ # Created by: Yoichi NAKAYAMA # $FreeBSD$ PORTNAME= tramp -PORTVERSION= 2.2.7 -PORTREVISION= 2 +PORTVERSION= 2.3.0 +#PORTREVISION= 0 CATEGORIES= net elisp MASTER_SITES= GNU PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= kuriyama@FreeBSD.org COMMENT= Transparent remote file access tool for emacsen USE_EMACS= yes USES= cpe gmake makeinfo USE_AUTOTOOLS= autoconf CPE_VENDOR= gnu TRAMP_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} PLIST_SUB+= TRAMP_LISPDIR=${TRAMP_LISPDIR} CONFIGURE_ENV= TEXI2DVI=no CONFIGURE_ARGS= --with-contrib --prefix=${PREFIX} \ --with-lispdir=${PREFIX}/${TRAMP_LISPDIR} \ --with-emacs=${EMACS_CMD} INFO= tramp21 .if defined(JAPANESE_INFO) CONFIGURE_ARGS+= --with-japanese-manual INFO+= tramp .endif .include .if ${EMACS_PORT_NAME} == emacs20 PLIST_SUB+= EMACS20_ONLY="" .else PLIST_SUB+= EMACS20_ONLY="@comment " .endif pre-build: .if ${EMACS_PORT_NAME} == emacs20 (cd ${WRKSRC}/contrib; ${MAKE_CMD}) .endif ${LN} -sf ../contrib/password.el ${WRKSRC}/lisp post-install: .if ${EMACS_PORT_NAME} == emacs20 (cd ${WRKSRC}/contrib; ${MAKE_CMD} install) .endif .include Index: head/net/tramp/distinfo =================================================================== --- head/net/tramp/distinfo (revision 427359) +++ head/net/tramp/distinfo (revision 427360) @@ -1,2 +1,3 @@ -SHA256 (tramp-2.2.7.tar.gz) = ce9df3f898ccd56c5c0607d17456b4cfe14f8584c4c9ba25bbc009c44f0078d7 -SIZE (tramp-2.2.7.tar.gz) = 813729 +TIMESTAMP = 1480165959 +SHA256 (tramp-2.3.0.tar.gz) = f12dcc04aa2939d9b8e5501630db20499ad707e88b07630207c0794e89a83ceb +SIZE (tramp-2.3.0.tar.gz) = 428407 Index: head/net/tramp/files/patch-configure.ac =================================================================== --- head/net/tramp/files/patch-configure.ac (revision 427359) +++ head/net/tramp/files/patch-configure.ac (revision 427360) @@ -1,21 +1,8 @@ ---- 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 - - # Handle contrib files. "-" must be encoded as "_". --TRAMP_CONTRIB_FILES= -+TRAMP_CONTRIB_FILES=password.el - - AC_CONTRIB_FILES([base64_encode_region], [base64.el]) - AC_CONTRIB_FILES([format_spec], [format_spec.el]) --AC_CONTRIB_FILES([password_cache_add], [password.el], [optional]) - if test "${EMACS_GW}" = yes; then - AC_CONTRIB_FILES([socks_open_network_stream], [socks.el], [optional]) - fi -@@ -158,4 +157,4 @@ +--- configure.ac.orig 2016-06-26 19:35:17.000000000 +0900 ++++ configure.ac 2016-11-26 22:49:34.137729000 +0900 +@@ -140,4 +140,4 @@ # Regenerate autoloads. AC_MSG_NOTICE([regenerate autoloads]) rm -f lisp/tramp-loaddefs.el --make EMACS_INFO=${EMACS_INFO} -s -C lisp autoloads +-make EMACS=${EMACS} -s -C lisp autoloads +gmake EMACS_INFO=${EMACS_INFO} -s -C lisp autoloads Index: head/net/tramp/files/patch-texi-Makefile.in =================================================================== --- head/net/tramp/files/patch-texi-Makefile.in (revision 427359) +++ head/net/tramp/files/patch-texi-Makefile.in (revision 427360) @@ -1,40 +1,22 @@ ---- 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/Makefile.in.orig 2016-01-25 20:09:17.000000000 +0900 ++++ texi/Makefile.in 2016-11-29 15:30:25.384280000 +0900 +@@ -45,8 +45,8 @@ - TEXI_FILES = tramp.texi trampver.texi doclicense.texi \ + TEXI_FILES = tramp.texi trampver.texi doclicense.texi docstyle.texi \ $(if $(findstring yes, @INSTALL_CHAPTER@), trampinst.texi) -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 -@@ -62,19 +62,22 @@ + # To be used by maintainer only. +@@ -59,7 +59,7 @@ tramp: $(INFO_FILES) $(localinfodir)/dir -install: tramp $(INSTALL_FILES) $(DESTDIR)$(infodir)/dir +install: tramp $(INSTALL_FILES) clean: $(RM) $(CLEAN_FILES) - - distclean: clean - --$(localinfodir)/tramp: $(TEXI_FILES) -+$(localinfodir)/%.info: $(TEXI_FILES) - $(MKDIR) $(dir $@) - $(MAKEINFO) --footnote-style=end -D $(EMACS_GVFS) -D $(EMACS_GW) \ -- -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 -+ cp $(localinfodir)/tramp.info $@ -+ -+$(DESTDIR)$(infodir)/tramp21.info: - $(MKDIR) $(dir $@) - $(INSTALL) $(INFO_FILES) $(DESTDIR)$(infodir) - Index: head/net/tramp/pkg-plist =================================================================== --- head/net/tramp/pkg-plist (revision 427359) +++ head/net/tramp/pkg-plist (revision 427360) @@ -1,41 +1,39 @@ %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/base64.el %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/base64.elc %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/format-spec.el %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/format-spec.elc %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/md5.el %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/md5.elc %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/run-at-time.el %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/run-at-time.elc %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/uudecode.el %%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/uudecode.elc -%%TRAMP_LISPDIR%%/password.el -%%TRAMP_LISPDIR%%/password.elc %%TRAMP_LISPDIR%%/tramp-adb.el %%TRAMP_LISPDIR%%/tramp-adb.elc %%TRAMP_LISPDIR%%/tramp-cmds.el %%TRAMP_LISPDIR%%/tramp-cmds.elc %%TRAMP_LISPDIR%%/tramp-compat.el %%TRAMP_LISPDIR%%/tramp-compat.elc %%TRAMP_LISPDIR%%/tramp-ftp.el %%TRAMP_LISPDIR%%/tramp-ftp.elc %%TRAMP_LISPDIR%%/tramp-gvfs.el %%TRAMP_LISPDIR%%/tramp-gvfs.elc %%TRAMP_LISPDIR%%/tramp-gw.el %%TRAMP_LISPDIR%%/tramp-gw.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 @comment %%TRAMP_LISPDIR%%/tramp-util.elc %%TRAMP_LISPDIR%%/tramp-uu.el %%TRAMP_LISPDIR%%/tramp-uu.elc @comment %%TRAMP_LISPDIR%%/tramp-vc.el @comment %%TRAMP_LISPDIR%%/tramp-vc.elc %%TRAMP_LISPDIR%%/tramp.el %%TRAMP_LISPDIR%%/tramp.elc %%TRAMP_LISPDIR%%/tramp-cache.el %%TRAMP_LISPDIR%%/tramp-cache.elc %%TRAMP_LISPDIR%%/trampver.el %%TRAMP_LISPDIR%%/trampver.elc