Date: Mon, 20 Jan 2014 18:30:57 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340441 - branches/2014Q1/net/l2tpd Message-ID: <201401201830.s0KIUveS011354@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Jan 20 18:30:56 2014 New Revision: 340441 URL: http://svnweb.freebsd.org/changeset/ports/340441 QAT: https://qat.redports.org/buildarchive/r340441/ Log: MFH: r340434 * Fix build on 10 * Stagify Sponsored by: Absolight Modified: branches/2014Q1/net/l2tpd/Makefile branches/2014Q1/net/l2tpd/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/l2tpd/Makefile ============================================================================== --- branches/2014Q1/net/l2tpd/Makefile Mon Jan 20 18:30:40 2014 (r340440) +++ branches/2014Q1/net/l2tpd/Makefile Mon Jan 20 18:30:56 2014 (r340441) @@ -10,11 +10,10 @@ MASTER_SITES= SF/${PORTNAME}/L2TPd/${POR MAINTAINER= sobomax@FreeBSD.org COMMENT= An implementation of the layer two tunneling protocol -MAN5= l2tp-secrets.5 l2tpd.conf.5 -MAN8= l2tpd.8 +USES= compiler:nestedfct -NO_STAGE= yes -.include <bsd.port.pre.mk> +PORTDOCS= README +ETCDIR= ${PREFIX}/etc/l2tp do-configure: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/doc/l2tpd.8 \ @@ -22,16 +21,14 @@ do-configure: ${WRKSRC}/doc/l2tpd.conf.5 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/l2tpd ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif - ${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/doc/l2tp-secrets.5 ${PREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.conf.5 ${PREFIX}/man/man5 - ${MKDIR} ${PREFIX}/etc/l2tp - ${INSTALL_DATA} ${WRKSRC}/doc/l2tpd.conf.sample ${PREFIX}/etc/l2tp - ${INSTALL_DATA} ${WRKSRC}/doc/l2tp-secrets.sample ${PREFIX}/etc/l2tp + ${INSTALL_PROGRAM} ${WRKSRC}/l2tpd ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.8 ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/doc/l2tp-secrets.5 ${STAGEDIR}${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.conf.5 ${STAGEDIR}${PREFIX}/man/man5 + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/l2tpd.conf.sample ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/l2tp-secrets.sample ${STAGEDIR}${ETCDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: branches/2014Q1/net/l2tpd/pkg-plist ============================================================================== --- branches/2014Q1/net/l2tpd/pkg-plist Mon Jan 20 18:30:40 2014 (r340440) +++ branches/2014Q1/net/l2tpd/pkg-plist Mon Jan 20 18:30:56 2014 (r340441) @@ -1,6 +1,7 @@ bin/l2tpd -etc/l2tp/l2tp-secrets.sample -etc/l2tp/l2tpd.conf.sample -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm etc/l2tp +%%ETCDIR%%/l2tp-secrets.sample +%%ETCDIR%%/l2tpd.conf.sample +man/man5/l2tp-secrets.5.gz +man/man5/l2tpd.conf.5.gz +man/man8/l2tpd.8.gz +@dirrm %%ETCDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401201830.s0KIUveS011354>