Update to 2.0.41

Drop my maintainership

3 files changed, 30 insertions, 43 deletions

diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index a4d162cffab6..f1f4d19721c5 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	tramp
-PORTVERSION=	2.0.36
-PORTREVISION=	1
+PORTVERSION=	2.0.41
 CATEGORIES=	net elisp
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	yoichi@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Transparent remote file access tool for emacsen
 
 EMACS_PORT_NAME?=	emacs21
@@ -22,54 +21,38 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 TRAMP_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-DIRSECTION=	"The Emacs editor and associated tools"
-INFOENTRY=	"* TRAMP: (tramp).                Transparent Remote Access, Multiple Protocol."
-INFOENTRY_JA=	"* TRAMP-J: (tramp_ja).           Transparent Remote Access, Multiple Protocol."
 PLIST_SUB+=	TRAMP_LISPDIR=${TRAMP_LISPDIR} \
 		DIRSECTION=${DIRSECTION} \
 		INFOENTRY=${INFOENTRY} INFOENTRY_JA=${INFOENTRY_JA}
 CONFIGURE_ENV=	TEXI2DVI=no
-CONFIGURE_ARGS= --prefix=${PREFIX} \
+CONFIGURE_ARGS= --with-contrib --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(JAPANESE_INFO)
+CONFIGURE_ARGS+= --with-japanese-manual
+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
+	(cd ${WRKSRC}/contrib; ${GMAKE})
+.for i in format-spec md5
+	(${CP} -p ${WRKSRC}/contrib/${i}.el ${WRKSRC}/contrib/${i}.elc ${BUILD_WRKSRC}/lisp)
+.endfor
+.endif
 
 post-install:
-.if !defined(NOPORTDOCS)
-#	${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 ${EMACS_PORT_NAME} == emacs20
+	(cd ${WRKSRC}/contrib; ${GMAKE} install)
 .endif
+	
 
 .include <bsd.port.mk>
diff --git a/net/tramp/distinfo b/net/tramp/distinfo
index 5e98731e8005..9f17512bdb38 100644
--- a/net/tramp/distinfo
+++ b/net/tramp/distinfo
@@ -1,2 +1,2 @@
-MD5 (tramp-2.0.36.tar.gz) = 2e518e5667c4f859c80956041401a868
-SIZE (tramp-2.0.36.tar.gz) = 262979
+MD5 (tramp-2.0.41.tar.gz) = 2176af2ee6a0651c666b695b5508f923
+SIZE (tramp-2.0.41.tar.gz) = 285435
diff --git a/net/tramp/pkg-plist b/net/tramp/pkg-plist
index 635bf0723e53..1b75a0ca0b8c 100644
--- a/net/tramp/pkg-plist
+++ b/net/tramp/pkg-plist
@@ -4,8 +4,12 @@
 %%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-ftp.el
 %%TRAMP_LISPDIR%%/tramp-ftp.elc
 %%TRAMP_LISPDIR%%/tramp-smb.el
@@ -23,9 +27,9 @@
 %%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
-%%PORTDOCS%%info/tramp
-%%PORTDOCS%%%%JAPANESE_INFO%%info/tramp_ja.info
-%%PORTDOCS%%@exec install-info --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/info/tramp %D/info/dir
-%%PORTDOCS%%%%JAPANESE_INFO%%@exec install-info --section="%%DIRSECTION%%" --entry="%%INFOENTRY_JA%%" %D/info/tramp_ja.info %D/info/dir
+@unexec install-info --delete %D/info/tramp %D/info/dir
+%%JAPANESE_INFO%%@unexec install-info --delete %D/info/tramp_ja %D/info/dir
+info/tramp
+%%JAPANESE_INFO%%info/tramp_ja
+@exec install-info %D/info/tramp %D/info/dir
+%%JAPANESE_INFO%%@exec install-info %D/info/tramp_ja %D/info/dir