svn commit: r363072 - head/sysutils/syslog-ng

[John Marino]

Author: marino
Date: Sun Jul 27 14:40:24 2014
New Revision: 363072
URL: http://svnweb.freebsd.org/changeset/ports/363072
QAT: https://qat.redports.org/buildarchive/r363072/

Log:
  sysutils/syslog-ng: Fix jenkin complaints
  
  The errors reported by jenkins didn't have anything to do with the changes
  mandated by the referenced PR.  Fix pre-existing check-plist and stage-qa
  errors with the use of @sample keyword and install-strip INSTALL_TARGET.
  While here, wrap some lines to respect 80-column terminal limits.
  
  PR:		191769
  reported by:	jenkins

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

Modified: head/sysutils/syslog-ng/Makefile
==============================================================================
--- head/sysutils/syslog-ng/Makefile	Sun Jul 27 14:31:16 2014	(r363071)
+++ head/sysutils/syslog-ng/Makefile	Sun Jul 27 14:40:24 2014	(r363072)
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.5.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
 DISTFILES=	syslog-ng_${DISTVERSION}.tar.gz
@@ -42,6 +42,7 @@ USE_RC_SUBR=	syslog-ng
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
+INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 		--enable-dynamic-linking \
@@ -143,9 +144,10 @@ CONFIGURE_ARGS+=        --disable-linux-
 .endif
 
 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
+	@${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' \
+		${WRKSRC}/configure
+	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
+	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
@@ -157,9 +159,11 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${STAGEDIR}${PREFIX}/man/man5/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${PREFIX}/man/man8/
-	${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}/lib/ivykis/src/include/iv*.h ${STAGEDIR}${PREFIX}/include/syslog-ng/
+	${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample \
+		${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist \
+		${WRKSRC}/scl/scl.conf.sample ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \
+		${STAGEDIR}${PREFIX}/include/syslog-ng/
 
 .include <bsd.port.mk>

Modified: head/sysutils/syslog-ng/pkg-plist
==============================================================================
--- head/sysutils/syslog-ng/pkg-plist	Sun Jul 27 14:31:16 2014	(r363071)
+++ head/sysutils/syslog-ng/pkg-plist	Sun Jul 27 14:40:24 2014	(r363072)
@@ -1,11 +1,7 @@
 @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
+ at sample etc/scl.conf.sample
 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