svn commit: r382026 - head/sysutils/syslog-ng34

[Cy Schubert]

Author: cy
Date: Mon Mar 23 19:20:15 2015
New Revision: 382026
URL: https://svnweb.freebsd.org/changeset/ports/382026
QAT: https://qat.redports.org/buildarchive/r382026/

Log:
  Convert to sample. This also fixes PR/198583.
  
  PR:		195853

Modified:
  head/sysutils/syslog-ng34/Makefile
  head/sysutils/syslog-ng34/pkg-plist

Modified: head/sysutils/syslog-ng34/Makefile
==============================================================================
--- head/sysutils/syslog-ng34/Makefile	Mon Mar 23 19:18:35 2015	(r382025)
+++ head/sysutils/syslog-ng34/Makefile	Mon Mar 23 19:20:15 2015	(r382026)
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.4.8
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	sysutils
 DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
 PKGNAMESUFFIX=	34
@@ -128,8 +128,8 @@ CONFIGURE_ARGS+=        --disable-linux-
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' ${WRKSRC}/configure
-	@${LN} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
-	@${LN} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.dist
+	@${LN} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.sample
+	@${LN} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
@@ -139,7 +139,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 .endif
 	${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/scl/scl.conf.dist ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.sample ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/scl/scl.conf.sample ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.post.mk>

Modified: head/sysutils/syslog-ng34/pkg-plist
==============================================================================
--- head/sysutils/syslog-ng34/pkg-plist	Mon Mar 23 19:18:35 2015	(r382025)
+++ head/sysutils/syslog-ng34/pkg-plist	Mon Mar 23 19:20:15 2015	(r382026)
@@ -1,15 +1,9 @@
 @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
- at unexec if cmp -s %D/etc/scl.conf %D/etc/scl.conf.dist; then rm -f %D/etc/scl.conf; fi
-etc/scl.conf.dist
- at exec test -f %B/scl.conf || cp %B/%f %B/scl.conf
- at unexec if cmp -s %D/etc/syslog-ng.conf %D/etc/syslog-ng.conf.dist; then rm -f %D/etc/syslog-ng.conf; fi
-etc/syslog-ng.conf.dist
- at exec test -f %B/syslog-ng.conf || cp %B/%f %B/syslog-ng.conf
-etc/syslog-ng.conf.sample
+ at sample etc/syslog-ng.conf.sample
 bin/loggen
 bin/pdbtool
 bin/update-patterndb
-etc/scl.conf
+ at sample etc/scl.conf.sample
 %%ETCDIR%%.conf
 include/syslog-ng/afinter.h
 include/syslog-ng/alarms.h