From owner-svn-ports-all@freebsd.org Wed Dec 27 19:03:57 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CE94AEA71FC; Wed, 27 Dec 2017 19:03:57 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8CC571954; Wed, 27 Dec 2017 19:03:57 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBRJ3uOt052569; Wed, 27 Dec 2017 19:03:56 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBRJ3uPa052566; Wed, 27 Dec 2017 19:03:56 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201712271903.vBRJ3uPa052566@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Wed, 27 Dec 2017 19:03:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457383 - in head/net/tramp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head/net/tramp: . files X-SVN-Commit-Revision: 457383 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Dec 2017 19:03:57 -0000 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 - -.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 +.include 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 -@comment %%TRAMP_LISPDIR%%/tramp-util.el -@comment %%TRAMP_LISPDIR%%/tramp-util.elc %%TRAMP_LISPDIR%%/tramp-uu.el %%TRAMP_LISPDIR%%/tramp-uu.elc -@comment %%TRAMP_LISPDIR%%/tramp-vc.el -@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