3 files changed, 28 insertions, 9 deletions

diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index 8d0d1d767966..36c5cb158b0a 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tramp
-PORTVERSION=	0.0.20011123
+PORTVERSION=	0.0.20011228
 CATEGORIES=	net elisp
 MASTER_SITES=	http://tramp.sourceforge.net/download/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -16,7 +16,9 @@ MAINTAINER=	yoichi@FreeBSD.org
 
 EMACS_PORT_NAME?=	emacs21
 
-BUILD_WRKSRC=	${WRKSRC}/lisp
+USE_GMAKE=	yes
+MAKE_ARGS+=	DIRS=lisp
+
 TRAMP_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 DIRSECTION=	"The Emacs editor and associated tools"
 INFOENTRY=	"* TRAMP: (tramp).                Transparent Remote Access, Multiple Protocol."
@@ -32,13 +34,32 @@ PLIST_SUB+=	JAPANESE_INFO=""
 PLIST_SUB+=	JAPANESE_INFO="@comment "
 .endif
 
+.if ${EMACS_PORT_NAME} == emacs20
+PLIST_SUB+=	EMACS20_ONLY=""
+.else
+PLIST_SUB+=	EMACS20_ONLY="@comment "
+.endif
+
+post-patch:
+	${PERL} -pi -e "s@ format-spec.elc@@g;\
+			s@ base64.elc@@g" ${WRKSRC}/lisp/Makefile
+
 post-build:
+.if ${EMACS_PORT_NAME} == emacs20
+	(cd ${WRKSRC}/contrib; ${GMAKE} EMACS=${EMACS_CMD} format-spec.elc)
+.endif
 .if !defined(NOPORTDOCS) && defined(JAPANESE_INFO)
 	(cd ${WRKSRC}/texi; jmakeinfo --no-split tramp_ja.texi)
 .endif
+	${RM} ${WRKSRC}/lisp/base64.el ${WRKSRC}/lisp/format-spec.el
+
 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}/lisp/*.el ${WRKSRC}/lisp/*.elc ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+.if ${EMACS_PORT_NAME} == emacs20
+	${INSTALL_DATA} ${WRKSRC}/contrib/format-spec.el ${WRKSRC}/contrib/format-spec.elc ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+.endif
+	${INSTALL_DATA} ${WRKSRC}/tramp2/*.el ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 .if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKSRC}/texi/tramp.info ${PREFIX}/info
 	install-info --section=${DIRSECTION} --entry=${INFOENTRY} ${PREFIX}/info/tramp.info ${PREFIX}/info/dir
diff --git a/net/tramp/distinfo b/net/tramp/distinfo
index 36641a73ca24..31b53a7a86ee 100644
--- a/net/tramp/distinfo
+++ b/net/tramp/distinfo
@@ -1 +1 @@
-MD5 (tramp.tar.gz) = bed6c927143c024bc06042c6e4bb4963
+MD5 (tramp.tar.gz) = 8c0a273ba006b13deb79633b4140e980
diff --git a/net/tramp/pkg-plist b/net/tramp/pkg-plist
index 538bdccc8c43..a62a2c9225f5 100644
--- a/net/tramp/pkg-plist
+++ b/net/tramp/pkg-plist
@@ -1,13 +1,12 @@
-%%TRAMP_LISPDIR%%/base64.el
-%%TRAMP_LISPDIR%%/base64.elc
-%%TRAMP_LISPDIR%%/format-spec.el
-%%TRAMP_LISPDIR%%/format-spec.elc
+%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/format-spec.el
+%%EMACS20_ONLY%%%%TRAMP_LISPDIR%%/format-spec.elc
 %%TRAMP_LISPDIR%%/tramp-util.el
 %%TRAMP_LISPDIR%%/tramp-util.elc
 %%TRAMP_LISPDIR%%/tramp-vc.el
 %%TRAMP_LISPDIR%%/tramp-vc.elc
 %%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
@@ -15,7 +14,6 @@
 %%TRAMP_LISPDIR%%/tramp2-ops.el
 %%TRAMP_LISPDIR%%/tramp2-util.el
 %%TRAMP_LISPDIR%%/tramp2.el
-%%TRAMP_LISPDIR%%/trampcache.el
 @dirrm %%TRAMP_LISPDIR%%
 %%PORTDOCS%%@unexec install-info --delete --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/info/tramp.info %D/info/dir
 %%PORTDOCS%%%%JAPANESE_INFO%%@unexec install-info --delete --section="%%DIRSECTION%%" --entry="%%INFOENTRY_JA%%" %D/info/tramp_ja.info %D/info/dir