From owner-svn-ports-head@FreeBSD.ORG Sun Jul 27 14:40:25 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BBCD2FD8; Sun, 27 Jul 2014 14:40:25 +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 A927A2208; Sun, 27 Jul 2014 14:40:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6REePAA040343; Sun, 27 Jul 2014 14:40:25 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6REePce040341; Sun, 27 Jul 2014 14:40:25 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407271440.s6REePce040341@svn.freebsd.org> From: John Marino Date: Sun, 27 Jul 2014 14:40:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363072 - head/sysutils/syslog-ng 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jul 2014 14:40:25 -0000 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 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 -@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 -@exec test -f %B/scl.conf || cp %B/%f %B/scl.conf -@unexec if cmp -s %D/etc/syslog-ng.conf %D/etc/syslog-ng.conf.dist; then rm -f %D/etc/syslog-ng.conf; fi +@sample etc/scl.conf.sample etc/syslog-ng.conf.dist -@exec test -f %B/syslog-ng.conf || cp %B/%f %B/syslog-ng.conf -etc/syslog-ng.conf.sample +@sample etc/syslog-ng.conf.sample bin/loggen bin/pdbtool bin/update-patterndb