ports/54438: ports update: net/tramp

Kang-min Liu gugod at gafe.ath.cx
Sun Jul 13 14:20:15 UTC 2003


>Number:         54438
>Category:       ports
>Synopsis:       ports update: net/tramp
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 13 07:20:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Kang-min Liu
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
no job
>Environment:
System: FreeBSD l2.gugod.org 4.8-STABLE FreeBSD 4.8-STABLE #0: Mon Jun 30 00:03:53 CST 2003 root at l2.gugod.org:/usr/obj/usr/src/sys/L2 i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

Apply this patch to net/tramp ports.

---->8----
diff -ruN tramp.orig/Makefile tramp/Makefile
--- tramp.orig/Makefile	Fri Mar  7 14:08:04 2003
+++ tramp/Makefile	Sun Jul 13 22:14:26 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tramp
-PORTVERSION=	2.0.29
+PORTVERSION=	2.0.35
 CATEGORIES=	net elisp
 MASTER_SITES=	http://savannah.nongnu.org/download/tramp/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -18,54 +18,27 @@
 
 BUILD_WRKSRC=	${WRKSRC}/lisp
 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}
-
-.if !defined(NOPORTDOCS) && defined(JAPANESE_INFO)
-BUILD_DEPENDS+=	jmakeinfo:${PORTSDIR}/japanese/texinfo
-PLIST_SUB+=	JAPANESE_INFO=""
-.else
-PLIST_SUB+=	JAPANESE_INFO="@comment "
-.endif
+CONFIGURE_ARGS= --prefix=${PREFIX} \
+	--with-lispdir=${PREFIX}/${TRAMP_LISPDIR}
+PLIST_SUB+=	TRAMP_LISPDIR=${TRAMP_LISPDIR}
 
 .if ${EMACS_PORT_NAME} == emacs20
+USE_CONTRIB=1
 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
+PKGMESSAGE=     ${WRKDIR}/pkg-message
 
-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}
-.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
-.endif
+post-extract:
+	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g; s=%%TRAMP_LISPDIR%%=${TRAMP_LISPDIR}=g" ${FILESDIR}/pkg-message  > ${PKGMESSAGE}
+
+post-install:
+	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff -ruN tramp.orig/distinfo tramp/distinfo
--- tramp.orig/distinfo	Sun Feb  9 20:39:15 2003
+++ tramp/distinfo	Sun Jul 13 19:44:37 2003
@@ -1 +1 @@
-MD5 (tramp-2.0.29.tar.gz) = 043afe0f68799fb48b11c23a6d67ba4d
+MD5 (tramp-2.0.35.tar.gz) = dec020f511ae0a59cf12e34a60b68d19
diff -ruN tramp.orig/files/patch-aa tramp/files/patch-aa
--- tramp.orig/files/patch-aa	Thu Jan  1 08:00:00 1970
+++ tramp/files/patch-aa	Sun Jul 13 21:43:24 2003
@@ -0,0 +1,12 @@
+--- lisp/Makefile.in.orig	Mon May 26 15:01:46 2003
++++ lisp/Makefile.in	Sun Jul 13 21:41:09 2003
+@@ -59,7 +59,8 @@
+ 	$(EM) $?
+ 
+ install: $(wildcard *.el *.elc)
+-	$(INSTALL) $? $(lispdir)
++	mkdir -p $(lispdir)
++	$(INSTALL) $? $(lispdir)
+ 
+ clean:
+ 	$(RM) $(CLEAN_FILES)
diff -ruN tramp.orig/files/patch-ab tramp/files/patch-ab
--- tramp.orig/files/patch-ab	Thu Jan  1 08:00:00 1970
+++ tramp/files/patch-ab	Sun Jul 13 21:14:23 2003
@@ -0,0 +1,18 @@
+-- texi/Makefile.in.orig	Wed Apr  9 03:28:52 2003
++++ texi/Makefile.in	Sun Jul 13 21:13:17 2003
+@@ -33,6 +33,7 @@
+ MAKEINFO	= @MAKEINFO@ --no-split
+ TEXI2DVI	= @TEXI2DVI@
+ INSTALL		= install -m644
++INSTALL_INFO	= install-info
+ RM		= -rm -f
+ 
+ prefix		= @prefix@
+@@ -49,6 +50,7 @@
+ 
+ install: $(localinfodir)/tramp
+ 	$(INSTALL) $< $(infodir)
++	$(INSTALL_INFO) $< $(infodir)/dir
+ 
+ clean:
+ 	$(RM) $(CLEAN_FILES)
diff -ruN tramp.orig/files/pkg-message tramp/files/pkg-message
--- tramp.orig/files/pkg-message	Thu Jan  1 08:00:00 1970
+++ tramp/files/pkg-message	Sun Jul 13 22:14:49 2003
@@ -0,0 +1,10 @@
+***********************************************************
+
+Add these 2 lines to your .emacs:
+
+    (add-to-list 'load-path "%%PREFIX%%/%%TRAMP_LISPDIR%%")
+    (require 'tramp)
+
+and enjoy the tramp.
+
+***********************************************************
diff -ruN tramp.orig/pkg-plist tramp/pkg-plist
--- tramp.orig/pkg-plist	Tue Jan 14 03:25:31 2003
+++ tramp/pkg-plist	Sun Jul 13 20:44:59 2003
@@ -15,17 +15,12 @@
 %%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%%/tramp-efs.el
+%%TRAMP_LISPDIR%%/tramp-efs.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
-%%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
+ at unexec install-info --delete %D/info/tramp %D/info/dir
+info/tramp
+ at exec install-info %D/info/tramp %D/info/dir
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list