From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 22 20:10:09 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A4EC01065670 for ; Fri, 22 Jun 2012 20:10:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 799A78FC19 for ; Fri, 22 Jun 2012 20:10:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5MKA9Nl038102 for ; Fri, 22 Jun 2012 20:10:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5MKA9Sb038101; Fri, 22 Jun 2012 20:10:09 GMT (envelope-from gnats) Resent-Date: Fri, 22 Jun 2012 20:10:09 GMT Resent-Message-Id: <201206222010.q5MKA9Sb038101@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, Craig Leres Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 02E88106566C for ; Fri, 22 Jun 2012 20:07:22 +0000 (UTC) (envelope-from leres@ee.lbl.gov) Received: from fun.ee.lbl.gov (fun.ee.lbl.gov [IPv6:2620:83:8000:102::ca]) by mx1.freebsd.org (Postfix) with ESMTP id DFFF08FC1C for ; Fri, 22 Jun 2012 20:07:21 +0000 (UTC) Received: from ice.ee.lbl.gov (ice.ee.lbl.gov [131.243.2.213]) (authenticated bits=0) by fun.ee.lbl.gov (8.14.5/8.14.5) with ESMTP id q5MK7LTc055318 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Fri, 22 Jun 2012 13:07:21 -0700 (PDT) Message-Id: <4FE4D079.6030404@ee.lbl.gov> Date: Fri, 22 Jun 2012 13:07:21 -0700 From: Craig Leres To: FreeBSD-gnats-submit@FreeBSD.org Cc: leres@ee.lbl.gov Subject: ports/169333: [PATCH] sysutils/syslog-ng2: move sample config to EXAMPLESDIR X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jun 2012 20:10:09 -0000 >Number: 169333 >Category: ports >Synopsis: [PATCH] sysutils/syslog-ng2: move sample config to EXAMPLESDIR >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: Fri Jun 22 20:10:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Craig Leres >Release: FreeBSD 8.2-RELEASE amd64 >Organization: Lawrence Berkeley National Laboratory >Environment: System: FreeBSD hot.ee.lbl.gov 8.2-RELEASE FreeBSD 8.2-RELEASE #13: Wed Jun 13 18:31:18 PDT 2012 leres@hot.ee.lbl.gov:/usr/src/8.2-RELEASE/sys/amd64/compile/LBLIPV6 amd64 >Description: The syslog-ng2 port installs a copy of the sample config in /usr/local/etc/syslog-ng even though the actual config now lives in /usr/local/etc. It makes more sense to put this under /usr/local/share/examples than to clutter /usr/local/etc. >How-To-Repeat: With syslog-ng2 installed: hot 77 % ls -l /usr/local/etc/syslog-ng total 6 -r--r--r-- 1 root wheel 5564 Jun 22 12:52 syslog-ng.conf.sample >Fix: Please see attached patches. --- patch-Makefile begins here --- --- Makefile.orig 2012-06-22 12:38:26.000000000 -0700 +++ Makefile 2012-06-22 12:42:06.000000000 -0700 @@ -7,6 +7,7 @@ PORTNAME= syslog-ng PORTVERSION= 2.0.10 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/ PKGNAMESUFFIX= 2 @@ -57,10 +58,8 @@ ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/syslog-ng ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/syslog-ng .endif - @if [ ! -f ${PREFIX}/etc/syslog-ng/syslog-ng.conf.sample ]; then \ - ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${PREFIX}/etc/syslog-ng; \ - ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc/syslog-ng; \ - fi + ${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${EXAMPLESDIR} @${CAT} ${PKGMESSAGE} .include --- patch-Makefile ends here --- --- patch-files-pkg-message.in begins here --- --- files/pkg-message.in.orig 2010-03-26 23:14:03.000000000 -0700 +++ files/pkg-message.in 2012-06-22 12:47:05.000000000 -0700 @@ -4,8 +4,8 @@ 1. Create a configuration file named %%PREFIX%%/etc/syslog-ng.conf (a sample named syslog-ng.conf.sample has been included in - %%PREFIX%%/etc/syslog-ng). Note that this is a change in 2.0.2 - version, previous ones put the config file in + %%EXAMPLESDIR%%). Note that this is a change in + 2.0.2 version, previous ones put the config file in %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update move that file in the right place @@ -18,7 +18,7 @@ adding a line to the end of your /etc/rc.conf file that reads: syslogd_enable="NO" - + 4. Shut down the standard FreeBSD syslogd: kill `cat /var/run/syslog.pid` --- patch-files-pkg-message.in ends here --- --- patch-pkg-plist begins here --- --- pkg-plist.orig 2008-04-15 10:59:21.000000000 -0700 +++ pkg-plist 2012-06-22 12:49:36.000000000 -0700 @@ -1,5 +1,4 @@ @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true -etc/syslog-ng/syslog-ng.conf.sample bin/loggen sbin/syslog-ng %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -9,4 +8,5 @@ %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm etc/syslog-ng +%%EXAMPLESDIR%%/syslog-ng.conf.sample +@dirrm %%EXAMPLESDIR%% --- patch-pkg-plist ends here --- >Release-Note: >Audit-Trail: >Unformatted: