svn commit: r457383 - in head/net/tramp: . files
Tijl Coosemans
tijl at FreeBSD.org
Wed Dec 27 19:03:57 UTC 2017
Author: tijl
Date: Wed Dec 27 19:03:56 2017
New Revision: 457383
URL: https://svnweb.freebsd.org/changeset/ports/457383
Log:
- Replace a patch for configure.ac with a post-patch command for
configure so USE_AUTOTOOLS can be removed.
- Remove obsolete references to --with-contrib, --with-japanese-manual
and emacs20.
- Remove 21 from tramp21.info (old version?).
Deleted:
head/net/tramp/files/patch-configure.ac
Modified:
head/net/tramp/Makefile
head/net/tramp/files/patch-texi-Makefile.in
head/net/tramp/pkg-plist
Modified: head/net/tramp/Makefile
==============================================================================
--- head/net/tramp/Makefile Wed Dec 27 18:10:45 2017 (r457382)
+++ head/net/tramp/Makefile Wed Dec 27 19:03:56 2017 (r457383)
@@ -13,41 +13,19 @@ COMMENT= Transparent remote file access tool for emacs
USE_EMACS= yes
+GNU_CONFIGURE= 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} \
+CONFIGURE_ARGS= --with-lispdir=${PREFIX}/${TRAMP_LISPDIR} \
--with-emacs=${EMACS_CMD}
-INFO= tramp21
+INFO= tramp
-.if defined(JAPANESE_INFO)
-CONFIGURE_ARGS+= --with-japanese-manual
-INFO+= tramp
-.endif
+post-patch:
+ @${REINPLACE_CMD} 's/^make/${MAKE_CMD}/' ${WRKSRC}/configure
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/net/tramp/files/patch-texi-Makefile.in
==============================================================================
--- head/net/tramp/files/patch-texi-Makefile.in Wed Dec 27 18:10:45 2017 (r457382)
+++ head/net/tramp/files/patch-texi-Makefile.in Wed Dec 27 19:03:56 2017 (r457383)
@@ -6,17 +6,8 @@
$(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
++INFO_FILES = $(localinfodir)/tramp.info
++INSTALL_FILES = $(DESTDIR)$(infodir)/tramp.info
CLEAN_FILES = @TRAMP_CLEAN_FILES@ $(wildcard $(localinfodir)/*)
# 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)
Modified: head/net/tramp/pkg-plist
==============================================================================
--- head/net/tramp/pkg-plist Wed Dec 27 18:10:45 2017 (r457382)
+++ head/net/tramp/pkg-plist Wed Dec 27 19:03:56 2017 (r457383)
@@ -1,15 +1,7 @@
-%%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%%/tramp-adb.el
%%TRAMP_LISPDIR%%/tramp-adb.elc
+%%TRAMP_LISPDIR%%/tramp-cache.el
+%%TRAMP_LISPDIR%%/tramp-cache.elc
%%TRAMP_LISPDIR%%/tramp-cmds.el
%%TRAMP_LISPDIR%%/tramp-cmds.elc
%%TRAMP_LISPDIR%%/tramp-compat.el
@@ -25,15 +17,9 @@
%%TRAMP_LISPDIR%%/tramp-sh.elc
%%TRAMP_LISPDIR%%/tramp-smb.el
%%TRAMP_LISPDIR%%/tramp-smb.elc
- at comment %%TRAMP_LISPDIR%%/tramp-util.el
- at comment %%TRAMP_LISPDIR%%/tramp-util.elc
%%TRAMP_LISPDIR%%/tramp-uu.el
%%TRAMP_LISPDIR%%/tramp-uu.elc
- at comment %%TRAMP_LISPDIR%%/tramp-vc.el
- at 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
More information about the svn-ports-head
mailing list