From owner-svn-ports-all@FreeBSD.ORG  Mon Jan 20 18:30:57 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CC69367A;
 Mon, 20 Jan 2014 18:30:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9EFB91D2C;
 Mon, 20 Jan 2014 18:30:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0KIUvph011356;
 Mon, 20 Jan 2014 18:30:57 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0KIUveS011354;
 Mon, 20 Jan 2014 18:30:57 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201401201830.s0KIUveS011354@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 20 Jan 2014 18:30:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r340441 - branches/2014Q1/net/l2tpd
X-SVN-Group: ports-branches
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jan 2014 18:30:57 -0000

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%%