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

[Craig Leres]

>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 at 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 <bsd.port.post.mk>
--- 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%%
- at dirrm etc/syslog-ng
+%%EXAMPLESDIR%%/syslog-ng.conf.sample
+ at dirrm %%EXAMPLESDIR%%
--- patch-pkg-plist ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: