3 files changed, 39 insertions, 38 deletions

diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index de4035c0a7c4..c9520473976d 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tramp
-PORTVERSION=	2.0.29
+PORTVERSION=	2.0.36
 CATEGORIES=	net elisp
 MASTER_SITES=	http://savannah.nongnu.org/download/tramp/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -16,8 +16,8 @@ COMMENT=	Transparent remote file access tool for emacsen
 
 EMACS_PORT_NAME?=	emacs21
 
-BUILD_WRKSRC=	${WRKSRC}/lisp
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 
 TRAMP_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 DIRSECTION=	"The Emacs editor and associated tools"
@@ -26,46 +26,47 @@ INFOENTRY_JA=	"* TRAMP-J: (tramp_ja).           Transparent Remote Access, Multi
 PLIST_SUB+=	TRAMP_LISPDIR=${TRAMP_LISPDIR} \
 		DIRSECTION=${DIRSECTION} \
 		INFOENTRY=${INFOENTRY} INFOENTRY_JA=${INFOENTRY_JA}
+CONFIGURE_ARGS= --prefix=${PREFIX} \
+		--with-lispdir=${PREFIX}/${TRAMP_LISPDIR}
 
-.if !defined(NOPORTDOCS) && defined(JAPANESE_INFO)
-BUILD_DEPENDS+=	jmakeinfo:${PORTSDIR}/japanese/texinfo
-PLIST_SUB+=	JAPANESE_INFO=""
-.else
+
+#.if !defined(NOPORTDOCS) && defined(JAPANESE_INFO)
+#BUILD_DEPENDS+=	jmakeinfo:${PORTSDIR}/japanese/texinfo
+#PLIST_SUB+=	JAPANESE_INFO=""
+#.else
 PLIST_SUB+=	JAPANESE_INFO="@comment "
-.endif
+#.endif
 
 .if ${EMACS_PORT_NAME} == emacs20
+MAKE_ARGS+=	USE_CONTRIB=yes
 PLIST_SUB+=	EMACS20_ONLY=""
 .else
 PLIST_SUB+=	EMACS20_ONLY="@comment "
 .endif
 
-pre-build:
-.if ${EMACS_PORT_NAME} == emacs20
-.for i in format-spec md5
-	(cd ${WRKSRC}/contrib; ${EMACS_CMD} -batch -f batch-byte-compile ${i}.el)
-	(${CP} -p ${WRKSRC}/contrib/${i}.el ${WRKSRC}/contrib/${i}.elc ${BUILD_WRKSRC})
-.endfor
-.endif
-post-build:
-.if !defined(NOPORTDOCS)
-#	(cd ${WRKSRC}/texi; ${GMAKE} EMACS=${EMACS_CMD} MAKEINFO=makeinfo tramp.info)
-.if defined(JAPANESE_INFO)
-	(cd ${WRKSRC}/texi; ${GMAKE} EMACS=${EMACS_CMD} MAKEINFO=jmakeinfo tramp_ja.info)
-.endif
-.endif
+#pre-build:
+#.if ${EMACS_PORT_NAME} == emacs20
+#.for i in format-spec md5
+#	(cd ${WRKSRC}/contrib; ${EMACS_CMD} -batch -f batch-byte-compile ${i}.el)
+#	(${CP} -p ${WRKSRC}/contrib/${i}.el ${WRKSRC}/contrib/${i}.elc ${BUILD_WRKSRC})
+#.endfor
+#.endif
+#post-build:
+#.if !defined(NOPORTDOCS)
+##	(cd ${WRKSRC}/texi; ${GMAKE} EMACS=${EMACS_CMD} MAKEINFO=makeinfo tramp.info)
+#.if defined(JAPANESE_INFO)
+#	(cd ${WRKSRC}/texi; ${GMAKE} EMACS=${EMACS_CMD} MAKEINFO=jmakeinfo tramp_ja.info)
+#.endif
+#.endif
 
-do-install:
-	${MKDIR} ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-	${INSTALL_DATA} ${BUILD_WRKSRC}/*.el ${BUILD_WRKSRC}/*.elc ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/tramp2/*.el ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+post-install:
 .if !defined(NOPORTDOCS)
-	${INSTALL_DATA} ${WRKSRC}/info/tramp ${PREFIX}/info
+#	${INSTALL_DATA} ${WRKSRC}/info/tramp ${PREFIX}/info
 	install-info --section=${DIRSECTION} --entry=${INFOENTRY} ${PREFIX}/info/tramp ${PREFIX}/info/dir
-.if defined(JAPANESE_INFO)
-	${INSTALL_DATA} ${WRKSRC}/texi/tramp_ja.info ${PREFIX}/info
-	install-info --section=${DIRSECTION} --entry=${INFOENTRY_JA} ${PREFIX}/info/tramp_ja.info ${PREFIX}/info/dir
-.endif
+#.if defined(JAPANESE_INFO)
+#	${INSTALL_DATA} ${WRKSRC}/texi/tramp_ja.info ${PREFIX}/info
+#	install-info --section=${DIRSECTION} --entry=${INFOENTRY_JA} ${PREFIX}/info/tramp_ja.info ${PREFIX}/info/dir
+#.endif
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/tramp/distinfo b/net/tramp/distinfo
index ba9ef6df5a30..ea71f0353aea 100644
--- a/net/tramp/distinfo
+++ b/net/tramp/distinfo
@@ -1 +1 @@
-MD5 (tramp-2.0.29.tar.gz) = 043afe0f68799fb48b11c23a6d67ba4d
+MD5 (tramp-2.0.36.tar.gz) = 2e518e5667c4f859c80956041401a868
diff --git a/net/tramp/pkg-plist b/net/tramp/pkg-plist
index 5436c22666fe..635bf0723e53 100644
--- a/net/tramp/pkg-plist
+++ b/net/tramp/pkg-plist
@@ -1,7 +1,11 @@
+%%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%%/uudecode.el
+%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/uudecode.elc
 %%TRAMP_LISPDIR%%/tramp-ftp.el
 %%TRAMP_LISPDIR%%/tramp-ftp.elc
 %%TRAMP_LISPDIR%%/tramp-smb.el
@@ -15,13 +19,9 @@
 %%TRAMP_LISPDIR%%/tramp.el
 %%TRAMP_LISPDIR%%/tramp.elc
 %%TRAMP_LISPDIR%%/trampcache.el
-%%TRAMP_LISPDIR%%/tramp2-cache.el
-%%TRAMP_LISPDIR%%/tramp2-compat.el
-%%TRAMP_LISPDIR%%/tramp2-enc.el
-%%TRAMP_LISPDIR%%/tramp2-hack.el
-%%TRAMP_LISPDIR%%/tramp2-ops.el
-%%TRAMP_LISPDIR%%/tramp2-util.el
-%%TRAMP_LISPDIR%%/tramp2.el
+%%TRAMP_LISPDIR%%/trampcache.elc
+%%TRAMP_LISPDIR%%/trampver.el
+%%TRAMP_LISPDIR%%/trampver.elc
 @dirrm %%TRAMP_LISPDIR%%
 %%PORTDOCS%%@unexec install-info --delete --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/info/tramp %D/info/dir
 %%PORTDOCS%%%%JAPANESE_INFO%%@unexec install-info --delete --section="%%DIRSECTION%%" --entry="%%INFOENTRY_JA%%" %D/info/tramp_ja.info %D/info/dir