svn commit: r529085 - head/net/rp-pppoe
Matthias Andree
mandree at FreeBSD.org
Wed Mar 25 09:51:33 UTC 2020
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 <bsd.port.mk>
More information about the svn-ports-head
mailing list