From owner-svn-ports-head@FreeBSD.ORG  Fri Jun  6 01:40:08 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 E9DD8490;
 Fri,  6 Jun 2014 01:40:08 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BCF032223;
 Fri,  6 Jun 2014 01:40:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s561e8Sc012259;
 Fri, 6 Jun 2014 01:40:08 GMT (envelope-from vanilla@svn.freebsd.org)
Received: (from vanilla@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s561e8Ir012256;
 Fri, 6 Jun 2014 01:40:08 GMT (envelope-from vanilla@svn.freebsd.org)
Message-Id: <201406060140.s561e8Ir012256@svn.freebsd.org>
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Fri, 6 Jun 2014 01:40:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356730 - head/net/l4ip
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jun 2014 01:40:09 -0000

Author: vanilla
Date: Fri Jun  6 01:40:08 2014
New Revision: 356730
URL: http://svnweb.freebsd.org/changeset/ports/356730
QAT: https://qat.redports.org/buildarchive/r356730/

Log:
  Stagify, and add @sample to pkg-plist.
  
  Approved by:	portmgr@

Modified:
  head/net/l4ip/Makefile
  head/net/l4ip/pkg-plist

Modified: head/net/l4ip/Makefile
==============================================================================
--- head/net/l4ip/Makefile	Fri Jun  6 01:34:31 2014	(r356729)
+++ head/net/l4ip/Makefile	Fri Jun  6 01:40:08 2014	(r356730)
@@ -14,19 +14,15 @@ COMMENT=	L4 health check daemon for IPFI
 USES=		gmake
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's,service_type_t,script_type_t,g' ${WRKSRC}/service.c
 	${REINPLACE_CMD} -e 's,/usr/sbin,/sbin,g' ${WRKSRC}/l4ip.conf
 	${REINPLACE_CMD} -e '/^CC/d' ${WRKSRC}/${MAKEFILE} ${WRKSRC}/../lion/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/l4ip ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/l4ip.conf ${PREFIX}/etc/l4ip.conf.sample
-.if !exists(${PREFIX}/etc/l4ip.conf)
-	${CP} ${PREFIX}/etc/l4ip.conf.sample ${PREFIX}/etc/l4ip.conf
-.endif
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL} ${WRKSRC}/../samples/*.conf ${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/l4ip ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/l4ip.conf ${STAGEDIR}${PREFIX}/etc/l4ip.conf.sample
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL} ${WRKSRC}/../samples/*.conf ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/net/l4ip/pkg-plist
==============================================================================
--- head/net/l4ip/pkg-plist	Fri Jun  6 01:34:31 2014	(r356729)
+++ head/net/l4ip/pkg-plist	Fri Jun  6 01:40:08 2014	(r356730)
@@ -1,7 +1,5 @@
 sbin/l4ip
-@unexec if cmp -s %D/etc/l4ip.conf %D/etc/l4ip.conf.sample; then rm -f %D/etc/l4ip.conf; fi
-etc/l4ip.conf.sample
-@exec [ -f %B/l4ip.conf ] || cp %B/%f %B/l4ip.conf
+@sample etc/l4ip.conf.sample
 %%EXAMPLESDIR%%/apache1.conf
 %%EXAMPLESDIR%%/apache2.conf
 %%EXAMPLESDIR%%/dns1.conf