ports/169333: [PATCH] sysutils/syslog-ng2: move sample config to EXAMPLESDIR

[Craig Leres]

The following reply was made to PR ports/169333; it has been noted by GNATS.

From: Craig Leres <leres at ee.lbl.gov>
To: bug-followup at FreeBSD.org, leres at 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 <bsd.port.post.mk>
 --- 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%%
 - at dirrm etc/syslog-ng
 +%%EXAMPLESDIR%%/syslog-ng.conf.sample
 + at dirrm %%EXAMPLESDIR%%
 --- Patch.txt ends here ---