From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 22 22:20:16 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 0ECCD1065792 for ; Fri, 22 Jun 2012 22:20:15 +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 ABEF08FC17 for ; Fri, 22 Jun 2012 22:20:15 +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 q5MMKFGL061651 for ; Fri, 22 Jun 2012 22:20:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5MMKFG2061650; Fri, 22 Jun 2012 22:20:15 GMT (envelope-from gnats) Date: Fri, 22 Jun 2012 22:20:15 GMT Message-Id: <201206222220.q5MMKFG2061650@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Craig Leres Cc: Subject: Re: 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 Reply-To: Craig Leres List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jun 2012 22:20:16 -0000 The following reply was made to PR ports/169333; it has been noted by GNATS. From: Craig Leres To: bug-followup@FreeBSD.org, leres@ee.lbl.gov Cc: Subject: Re: ports/169333: [PATCH] sysutils/syslog-ng2: move sample config to EXAMPLESDIR Date: Fri, 22 Jun 2012 15:10:18 -0700 I never seem to have the best luck with attachments to the PR system; here's a single attachment containing all three patches: --- Patch.txt 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 --- 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` --- 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.txt ends here ---