From owner-svn-ports-all@freebsd.org Wed Mar 25 09:51:32 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E9C3927C218; Wed, 25 Mar 2020 09:51:32 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48nNg75Ngxz403r; Wed, 25 Mar 2020 09:51:31 +0000 (UTC) (envelope-from mandree@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9125D18B42; Wed, 25 Mar 2020 09:45:14 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02P9jE0I062485; Wed, 25 Mar 2020 09:45:14 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02P9jEU2062484; Wed, 25 Mar 2020 09:45:14 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202003250945.02P9jEU2062484@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Wed, 25 Mar 2020 09:45:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529085 - head/net/rp-pppoe X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/net/rp-pppoe X-SVN-Commit-Revision: 529085 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.29 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, 25 Mar 2020 09:51:33 -0000 Author: mandree Date: Wed Mar 25 09:45:13 2020 New Revision: 529085 URL: https://svnweb.freebsd.org/changeset/ports/529085 Log: net/rp-pppoe: update and clean up REINPLACE_CMD Make sure that ${PREFIX} in some form is spliced before *_all_* occurrences of /etc/ppp, in documentation, samples, etc., except in the CHANGES doc. file. While here, heed the DOCS option (and do not install docs if unset). Drop KERNEL-MODE-PPPOE documentation file, Linux-specific. (Bump PORTREVISION, installed files change.) Reported by: swills@ (by way of his REINPLACE_CMD cleanup endeavor) Modified: head/net/rp-pppoe/Makefile Modified: head/net/rp-pppoe/Makefile ============================================================================== --- head/net/rp-pppoe/Makefile Wed Mar 25 09:40:51 2020 (r529084) +++ head/net/rp-pppoe/Makefile Wed Mar 25 09:45:13 2020 (r529085) @@ -3,6 +3,7 @@ PORTNAME= rp-pppoe PORTVERSION= 3.13 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://dianne.skoll.ca/projects/rp-pppoe/download/ @@ -22,8 +23,7 @@ man8= pppoe-connect.8 pppoe-setup.8 pppoe-start.8 pppo CONFIG_FILES= firewall-masq firewall-standalone pap-secrets \ pppoe-server-options pppoe.conf -DOC_FILES= CHANGES HOW-TO-CONNECT KERNEL-MODE-PPPOE LICENSE \ - PROBLEMS +DOC_FILES= CHANGES HOW-TO-CONNECT LICENSE PROBLEMS SCRIPT_FILES= pppoe-connect pppoe-init pppoe-setup pppoe-start \ pppoe-status pppoe-stop @@ -39,16 +39,17 @@ PORTDOCS= * .endif post-patch: - @${REINPLACE_CMD} -e "s!/etc/ppp!${PREFIX}/etc/ppp!g" ${WRKSRC}/man/* + @${REINPLACE_CMD} -e "s!/etc/ppp!${PREFIX}/etc/ppp!g" \ + ${WRKSRC}/man/* \ + ${WRKSRC}/configs/* \ + ${WRKSRC}/doc/HOW-TO-CONNECT @${REINPLACE_CMD} -e 's!/etc/ppp!$$(prefix)/etc/ppp!g' \ ${WRKSRC}/src/Makefile.in -.for file in pppoe-connect pppoe-init pppoe-setup pppoe-start - @${REINPLACE_CMD} -e 's!/etc/+ppp!$${prefix}/etc/ppp!g' \ +.for file in pppoe-connect pppoe-setup pppoe-start + @${REINPLACE_CMD} -e 's!/etc/ppp!$${prefix}/etc/ppp!g' \ ${WRKSRC}/scripts/${file}.in .endfor @${REINPLACE_CMD} -e 's!pty!tty!g' ${WRKSRC}/scripts/pppoe-connect.in - @${REINPLACE_CMD} -e 's!/var/lock/subsys/adsl!/var/tmp/rp_pppoe_adsl!g' \ - ${WRKSRC}/scripts/pppoe-init.in .for f in pppoe-status pppoe-stop.in @${REINPLACE_CMD} -e "s!/etc/ppp!${PREFIX}/etc/ppp!g" \ ${WRKSRC}/scripts/${f} @@ -86,7 +87,11 @@ do-install: .endfor # Documentation +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} + ${RM} ${STAGEDIR}${DOCSDIR}/KERNEL-MODE-PPPOE + # cleanup REINPLACE_CMD prefix hack leftovers: + ${RM} ${STAGEDIR}${DOCSDIR}/*.bak .include