From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 10 20:50:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 ESMTP id AC137620 for ; Thu, 10 Oct 2013 20:50:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 87AD82C92 for ; Thu, 10 Oct 2013 20:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AKo0vX068991 for ; Thu, 10 Oct 2013 20:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r9AKo0v2068990; Thu, 10 Oct 2013 20:50:00 GMT (envelope-from gnats) Resent-Date: Thu, 10 Oct 2013 20:50:00 GMT Resent-Message-Id: <201310102050.r9AKo0v2068990@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jimmy Olgeni 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 ESMTP id CD0822F6 for ; Thu, 10 Oct 2013 20:44:25 +0000 (UTC) (envelope-from olgeni@olgeni.com) Received: from olgeni.olgeni.com (host-156-246-171-31.cloudsigma.com [31.171.246.156]) by mx1.freebsd.org (Postfix) with ESMTP id 82EF62BFF for ; Thu, 10 Oct 2013 20:44:25 +0000 (UTC) Received: by olgeni.olgeni.com (Postfix, from userid 58) id BADC61744B6; Thu, 10 Oct 2013 22:44:24 +0200 (CEST) Received: from olgeni.olgeni (vpn-olgeni [10.2.0.2]) by olgeni.olgeni.com (Postfix) with ESMTP id 63F911744C7; Thu, 10 Oct 2013 22:44:19 +0200 (CEST) Received: from olgeni.olgeni (localhost [127.0.0.1]) by olgeni.olgeni (8.14.7/8.14.7) with ESMTP id r9AKiIqr027028; Thu, 10 Oct 2013 22:44:19 +0200 (CEST) (envelope-from olgeni@olgeni.olgeni) Received: (from olgeni@localhost) by olgeni.olgeni (8.14.7/8.14.7/Submit) id r9AKiIPw026119; Thu, 10 Oct 2013 22:44:18 +0200 (CEST) (envelope-from olgeni) Message-Id: <201310102044.r9AKiIPw026119@olgeni.olgeni> Date: Thu, 10 Oct 2013 22:44:18 +0200 (CEST) From: Jimmy Olgeni To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/182882: staging support for syslog-ng Cc: cy@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Jimmy Olgeni List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 20:50:00 -0000 >Number: 182882 >Category: ports >Synopsis: staging support for syslog-ng >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Oct 10 20:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Jimmy Olgeni >Release: FreeBSD 9.1-STABLE amd64 >Organization: >Environment: System: FreeBSD olgeni 9.1-STABLE FreeBSD 9.1-STABLE #1 r249688: Sat Apr 20 13:28:27 CEST 2013 root@olgeni:/usr/obj/usr/src/sys/RELENG_9.amd64 amd64 >Description: Random things that came up while upgrading: - Add staging support - Handle scl.conf like syslog-ng.conf (with scl.conf.dist) - Always install syslog-ng.conf.sample/dist, since they are example files - Use mkdir -p in pkg-plist to fix warning during reinstallations/upgrades - Sort pkg-plist - General cleanup >How-To-Repeat: >Fix: Index: Makefile =================================================================== --- Makefile (revision 329980) +++ Makefile (working copy) @@ -34,15 +34,10 @@ USES= pkgconfig -NO_STAGE= yes .include LIB_DEPENDS= evtlog.0:${PORTSDIR}/sysutils/eventlog -MAN1= loggen.1 pdbtool.1 syslog-ng-ctl.1 -MAN5= syslog-ng.conf.5 -MAN8= syslog-ng.8 - USE_LDCONFIG= yes USE_RC_SUBR= syslog-ng GNU_CONFIGURE= yes @@ -144,22 +139,17 @@ 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 post-install: .if ${PORT_OPTIONS:MDOCS} - ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \ - ${PREFIX}/share/doc/syslog-ng \ - ${PREFIX}/share/doc/syslog-ng - ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/syslog-ng - ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/syslog-ng - ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/syslog-ng + ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR} .endif - @if [ ! -f ${PREFIX}/etc/syslog-ng.conf.sample ]; then \ - ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc; \ - fi - @if [ ! -f ${PREFIX}/etc/syslog-ng.conf.dist ]; then \ - ${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist ${PREFIX}/etc; \ - fi - @${CAT} ${PKGMESSAGE} + ${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 .include Index: pkg-plist =================================================================== --- pkg-plist (revision 329980) +++ pkg-plist (working copy) @@ -1,31 +1,33 @@ @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true -etc/scl.conf +@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 etc/syslog-ng.conf.dist -@exec test -f %B/syslog-ng.conf || cp -p %B/%f %B/syslog-ng.conf +@exec test -f %B/syslog-ng.conf || cp %B/%f %B/syslog-ng.conf etc/syslog-ng.conf.sample bin/loggen bin/pdbtool bin/update-patterndb -sbin/syslog-ng -sbin/syslog-ng-ctl include/syslog-ng/afinter.h include/syslog-ng/alarms.h include/syslog-ng/apphook.h include/syslog-ng/atomic.h include/syslog-ng/block-ref-parser.h +include/syslog-ng/cfg-args.h include/syslog-ng/cfg-grammar.h +include/syslog-ng/cfg-lexer-subst.h include/syslog-ng/cfg-lexer.h include/syslog-ng/cfg-parser.h +include/syslog-ng/cfg-tree.h include/syslog-ng/cfg.h include/syslog-ng/children.h -include/syslog-ng/cfg-args.h -include/syslog-ng/cfg-lexer-subst.h include/syslog-ng/compat.h include/syslog-ng/control.h include/syslog-ng/crypto.h include/syslog-ng/dnscache.h include/syslog-ng/driver.h +include/syslog-ng/file-perms.h include/syslog-ng/filter-expr-parser.h include/syslog-ng/filter.h include/syslog-ng/gprocess.h @@ -36,7 +38,6 @@ include/syslog-ng/logmsg.h include/syslog-ng/logparser.h include/syslog-ng/logpipe.h -include/syslog-ng/logproto.h include/syslog-ng/logproto-buffered-server.h include/syslog-ng/logproto-builtins.h include/syslog-ng/logproto-client.h @@ -47,6 +48,7 @@ include/syslog-ng/logproto-server.h include/syslog-ng/logproto-text-client.h include/syslog-ng/logproto-text-server.h +include/syslog-ng/logproto.h include/syslog-ng/logqueue-fifo.h include/syslog-ng/logqueue.h include/syslog-ng/logreader.h @@ -80,24 +82,19 @@ include/syslog-ng/tlscontext.h include/syslog-ng/tlstransport.h include/syslog-ng/utils.h +include/syslog-ng/uuid.h include/syslog-ng/value-pairs.h include/syslog-ng/versioning.h -include/syslog-ng/cfg-tree.h -include/syslog-ng/file-perms.h -include/syslog-ng/uuid.h include/syslog-ng/vptransform.h +lib/libsyslog-ng-3.4.3.so lib/libsyslog-ng.la lib/libsyslog-ng.so -lib/libsyslog-ng-3.4.3.so -libdata/pkgconfig/syslog-ng.pc -lib/syslog-ng/libcryptofuncs.la -lib/syslog-ng/libcryptofuncs.so +lib/syslog-ng/libafamqp.la +lib/syslog-ng/libafamqp.so lib/syslog-ng/libaffile.la lib/syslog-ng/libaffile.so lib/syslog-ng/libafmongodb.la lib/syslog-ng/libafmongodb.so -lib/syslog-ng/libafamqp.la -lib/syslog-ng/libafamqp.so lib/syslog-ng/libafprog.la lib/syslog-ng/libafprog.so lib/syslog-ng/libafsocket-notls.la @@ -109,6 +106,8 @@ lib/syslog-ng/libbasicfuncs.so lib/syslog-ng/libconfgen.la lib/syslog-ng/libconfgen.so +lib/syslog-ng/libcryptofuncs.la +lib/syslog-ng/libcryptofuncs.so lib/syslog-ng/libcsvparser.la lib/syslog-ng/libcsvparser.so lib/syslog-ng/libdbparser.la @@ -119,6 +118,14 @@ lib/syslog-ng/libsyslogformat.so lib/syslog-ng/libsystem-source.la lib/syslog-ng/libsystem-source.so +libdata/pkgconfig/syslog-ng.pc +man/man1/loggen.1.gz +man/man1/pdbtool.1.gz +man/man1/syslog-ng-ctl.1.gz +man/man5/syslog-ng.conf.5.gz +man/man8/syslog-ng.8.gz +sbin/syslog-ng +sbin/syslog-ng-ctl share/include/scl/pacct/plugin.conf share/include/scl/syslogconf/README share/include/scl/syslogconf/convert-syslogconf.awk @@ -135,14 +142,14 @@ %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm include/syslog-ng -@dirrm lib/syslog-ng +@dirrm share/xsd +@dirrmtry share/tools @dirrm share/include/scl/system @dirrm share/include/scl/syslogconf @dirrm share/include/scl/pacct @dirrm share/include/scl @dirrm share/include -@dirrmtry share/tools -@dirrm share/xsd -@exec mkdir %D/etc/patterndb.d +@dirrm lib/syslog-ng +@dirrm include/syslog-ng +@exec mkdir -p %D/etc/patterndb.d @dirrmtry etc/patterndb.d >Release-Note: >Audit-Trail: >Unformatted: