Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Jun 2014 01:40:08 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r356730 - head/net/l4ip
Message-ID:  <201406060140.s561e8Ir012256@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406060140.s561e8Ir012256>