svn commit: r336416 - head/net/rp-pppoe
Matthias Andree
mandree at FreeBSD.org
Sat Dec 14 01:51:49 UTC 2013
Author: mandree
Date: Sat Dec 14 01:51:48 2013
New Revision: 336416
URL: http://svnweb.freebsd.org/changeset/ports/336416
Log:
Convert to staging.
Modified:
head/net/rp-pppoe/Makefile
head/net/rp-pppoe/pkg-plist
Modified: head/net/rp-pppoe/Makefile
==============================================================================
--- head/net/rp-pppoe/Makefile Sat Dec 14 01:13:39 2013 (r336415)
+++ head/net/rp-pppoe/Makefile Sat Dec 14 01:51:48 2013 (r336416)
@@ -15,8 +15,8 @@ CONFIGURE_WRKSRC= ${WRKSRC}/src
BUILD_WRKSRC= ${WRKSRC}/src
-MAN5= pppoe.conf.5
-MAN8= pppoe-connect.8 pppoe-setup.8 pppoe-start.8 pppoe-status.8 \
+man5= pppoe.conf.5
+man8= pppoe-connect.8 pppoe-setup.8 pppoe-start.8 pppoe-status.8 \
pppoe-stop.8 pppoe-relay.8 pppoe-server.8 pppoe.8
CONFIG_FILES= firewall-masq firewall-standalone pap-secrets \
@@ -28,7 +28,6 @@ SCRIPT_FILES= pppoe-connect pppoe-init p
OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
# work around "Present But Cannot Be Compiled" issue in GNU configure:
CFLAGS+= -include sys/types.h -include sys/socket.h -include netinet/in.h
@@ -57,37 +56,38 @@ post-patch:
do-install:
# Binaries
+ ${MKDIR} ${STAGEDIR}${PREFIX}/sbin
.for f in pppoe pppoe-server pppoe-relay
- ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f} ${PREFIX}/sbin
+ ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PREFIX}/sbin
.endfor
# Configurations
- ${MKDIR} ${PREFIX}/etc/ppp
+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ppp
.for f in ${CONFIG_FILES}
${INSTALL_DATA} ${WRKSRC}/configs/${f} \
- ${PREFIX}/etc/ppp/${f}.sample
+ ${STAGEDIR}${PREFIX}/etc/ppp/${f}.sample
.endfor
# Manual pages
- ${MKDIR} ${MAN5PREFIX}/man/man5
-.for f in ${MAN5}
- ${INSTALL_MAN} ${WRKSRC}/man/${f} ${MAN5PREFIX}/man/man5
-.endfor
- ${MKDIR} ${MAN8PREFIX}/man/man8
-.for f in ${MAN8}
- ${INSTALL_MAN} ${WRKSRC}/man/${f} ${MAN8PREFIX}/man/man8
+ ${MKDIR} ${STAGEDIR}${MAN5PREFIX}/man/man5
+.for f in ${man5}
+ ${INSTALL_MAN} ${WRKSRC}/man/${f} ${STAGEDIR}${MAN5PREFIX}/man/man5
+.endfor
+ ${MKDIR} ${STAGEDIR}${MAN8PREFIX}/man/man8
+.for f in ${man8}
+ ${INSTALL_MAN} ${WRKSRC}/man/${f} ${STAGEDIR}${MAN8PREFIX}/man/man8
.endfor
# Scripts
.for f in ${SCRIPT_FILES}
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/${f} ${PREFIX}/sbin
+ ${INSTALL_SCRIPT} ${WRKSRC}/scripts/${f} ${STAGEDIR}${PREFIX}/sbin
.endfor
# Startup scripts
.for f in 04pppoe-relay.sh.sample 04pppoe-server.sh.sample
- ${INSTALL_SCRIPT} ${FILESDIR}/${f} ${PREFIX}/etc/rc.d/
+ ${INSTALL_SCRIPT} ${FILESDIR}/${f} ${STAGEDIR}${PREFIX}/etc/rc.d/
.endfor
# Documentation
.ifndef (NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
.endif # NOPORTDOCS
.include <bsd.port.mk>
Modified: head/net/rp-pppoe/pkg-plist
==============================================================================
--- head/net/rp-pppoe/pkg-plist Sat Dec 14 01:13:39 2013 (r336415)
+++ head/net/rp-pppoe/pkg-plist Sat Dec 14 01:51:48 2013 (r336416)
@@ -1,3 +1,20 @@
+ at unexec for i in ppp/pppoe.conf rc.d/04pppoe-server.sh rc.d/04pppoe-relay.sh ; do if cmp -s %D/etc/$i.sample %D/etc/$i ; then rm %D/etc/$i ; fi ; done
+etc/ppp/firewall-masq.sample
+etc/ppp/firewall-standalone.sample
+etc/ppp/pap-secrets.sample
+etc/ppp/pppoe-server-options.sample
+etc/ppp/pppoe.conf.sample
+etc/rc.d/04pppoe-server.sh.sample
+etc/rc.d/04pppoe-relay.sh.sample
+man/man5/pppoe.conf.5.gz
+man/man8/pppoe-connect.8.gz
+man/man8/pppoe-relay.8.gz
+man/man8/pppoe-server.8.gz
+man/man8/pppoe-setup.8.gz
+man/man8/pppoe-start.8.gz
+man/man8/pppoe-status.8.gz
+man/man8/pppoe-stop.8.gz
+man/man8/pppoe.8.gz
sbin/pppoe-connect
sbin/pppoe-init
sbin/pppoe-setup
@@ -7,12 +24,4 @@ sbin/pppoe-stop
sbin/pppoe
sbin/pppoe-relay
sbin/pppoe-server
-etc/ppp/firewall-masq.sample
-etc/ppp/firewall-standalone.sample
-etc/ppp/pap-secrets.sample
-etc/ppp/pppoe-server-options.sample
- at unexec for i in ppp/pppoe.conf rc.d/04pppoe-server.sh rc.d/04pppoe-relay.sh ; do if cmp -s %D/etc/$i.sample %D/etc/$i ; then rm %D/etc/$i ; fi ; done
-etc/ppp/pppoe.conf.sample
-etc/rc.d/04pppoe-server.sh.sample
-etc/rc.d/04pppoe-relay.sh.sample
@unexec rmdir %D/etc/ppp 2>/dev/null || echo "If you are permanently removing pppoe, you should also ``rm -Rf ${PKG_PREFIX}/etc/ppp'' removing any configuration and password files left." | /usr/bin/fmt
More information about the svn-ports-all
mailing list