- Correct the location of a configuration file

PR:		ports/111462
Reported by:	Brian A. Seklecki <bseklecki@collaborativefusion.com>
Submitted by:	Ivan Lago <ivan.lago@ifom-ieo-campus.it> (maintainer)

12 files changed, 34 insertions, 14 deletions

diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 80db879aa2a8..322baf52f822 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.balabit.com/downloads/syslog-ng/2.0/src/
 
diff --git a/sysutils/syslog-ng-devel/files/pkg-message.in b/sysutils/syslog-ng-devel/files/pkg-message.in
index 10ee06b2da0a..3a30820d764f 100644
--- a/sysutils/syslog-ng-devel/files/pkg-message.in
+++ b/sysutils/syslog-ng-devel/files/pkg-message.in
@@ -2,8 +2,12 @@
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
-1. Create a configuration file named %%PREFIX%%/etc/syslog-ng/syslog-ng.conf
-   (a sample named syslog-ng.conf.sample has been included)
+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
+   %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update
+   move that file in the right place
 
 2. Configure syslog-ng to start automatically by adding the following
    to /etc/rc.conf:
diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.sh.in b/sysutils/syslog-ng-devel/files/syslog-ng.sh.in
index e3c0e335f70d..3f1f0ebac54a 100644
--- a/sysutils/syslog-ng-devel/files/syslog-ng.sh.in
+++ b/sysutils/syslog-ng-devel/files/syslog-ng.sh.in
@@ -24,7 +24,7 @@ name=syslog_ng
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/syslog-ng
-required_files=%%PREFIX%%/etc/syslog-ng/syslog-ng.conf
+required_files=%%PREFIX%%/etc/syslog-ng.conf
 extra_commands=reload
 
 if checkyesno syslog_ng_purgeklog; then
diff --git a/sysutils/syslog-ng2/Makefile b/sysutils/syslog-ng2/Makefile
index 80db879aa2a8..322baf52f822 100644
--- a/sysutils/syslog-ng2/Makefile
+++ b/sysutils/syslog-ng2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.balabit.com/downloads/syslog-ng/2.0/src/
 
diff --git a/sysutils/syslog-ng2/files/pkg-message.in b/sysutils/syslog-ng2/files/pkg-message.in
index 10ee06b2da0a..3a30820d764f 100644
--- a/sysutils/syslog-ng2/files/pkg-message.in
+++ b/sysutils/syslog-ng2/files/pkg-message.in
@@ -2,8 +2,12 @@
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
-1. Create a configuration file named %%PREFIX%%/etc/syslog-ng/syslog-ng.conf
-   (a sample named syslog-ng.conf.sample has been included)
+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
+   %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update
+   move that file in the right place
 
 2. Configure syslog-ng to start automatically by adding the following
    to /etc/rc.conf:
diff --git a/sysutils/syslog-ng2/files/syslog-ng.sh.in b/sysutils/syslog-ng2/files/syslog-ng.sh.in
index e3c0e335f70d..3f1f0ebac54a 100644
--- a/sysutils/syslog-ng2/files/syslog-ng.sh.in
+++ b/sysutils/syslog-ng2/files/syslog-ng.sh.in
@@ -24,7 +24,7 @@ name=syslog_ng
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/syslog-ng
-required_files=%%PREFIX%%/etc/syslog-ng/syslog-ng.conf
+required_files=%%PREFIX%%/etc/syslog-ng.conf
 extra_commands=reload
 
 if checkyesno syslog_ng_purgeklog; then
diff --git a/sysutils/syslog-ng3-devel/Makefile b/sysutils/syslog-ng3-devel/Makefile
index 80db879aa2a8..322baf52f822 100644
--- a/sysutils/syslog-ng3-devel/Makefile
+++ b/sysutils/syslog-ng3-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.balabit.com/downloads/syslog-ng/2.0/src/
 
diff --git a/sysutils/syslog-ng3-devel/files/pkg-message.in b/sysutils/syslog-ng3-devel/files/pkg-message.in
index 10ee06b2da0a..3a30820d764f 100644
--- a/sysutils/syslog-ng3-devel/files/pkg-message.in
+++ b/sysutils/syslog-ng3-devel/files/pkg-message.in
@@ -2,8 +2,12 @@
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
-1. Create a configuration file named %%PREFIX%%/etc/syslog-ng/syslog-ng.conf
-   (a sample named syslog-ng.conf.sample has been included)
+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
+   %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update
+   move that file in the right place
 
 2. Configure syslog-ng to start automatically by adding the following
    to /etc/rc.conf:
diff --git a/sysutils/syslog-ng3-devel/files/syslog-ng.sh.in b/sysutils/syslog-ng3-devel/files/syslog-ng.sh.in
index 549a87625e7a..4e6364251ad4 100644
--- a/sysutils/syslog-ng3-devel/files/syslog-ng.sh.in
+++ b/sysutils/syslog-ng3-devel/files/syslog-ng.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/sysutils/syslog-ng3-devel/files/Attic/syslog-ng.sh.in,v 1.3 2007-03-22 16:30:16 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/sysutils/syslog-ng3-devel/files/Attic/syslog-ng.sh.in,v 1.4 2007-07-28 22:28:08 pav Exp $
 #
 
 # PROVIDE: syslogd
@@ -24,7 +24,7 @@ name=syslog_ng
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/syslog-ng
-required_files=%%PREFIX%%/etc/syslog-ng/syslog-ng.conf
+required_files=%%PREFIX%%/etc/syslog-ng.conf
 extra_commands=reload
 
 if checkyesno syslog_ng_purgeklog; then
diff --git a/sysutils/syslog-ng3/Makefile b/sysutils/syslog-ng3/Makefile
index 80db879aa2a8..322baf52f822 100644
--- a/sysutils/syslog-ng3/Makefile
+++ b/sysutils/syslog-ng3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.balabit.com/downloads/syslog-ng/2.0/src/
 
diff --git a/sysutils/syslog-ng3/files/pkg-message.in b/sysutils/syslog-ng3/files/pkg-message.in
index 10ee06b2da0a..3a30820d764f 100644
--- a/sysutils/syslog-ng3/files/pkg-message.in
+++ b/sysutils/syslog-ng3/files/pkg-message.in
@@ -2,8 +2,12 @@
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
-1. Create a configuration file named %%PREFIX%%/etc/syslog-ng/syslog-ng.conf
-   (a sample named syslog-ng.conf.sample has been included)
+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
+   %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update
+   move that file in the right place
 
 2. Configure syslog-ng to start automatically by adding the following
    to /etc/rc.conf:
diff --git a/sysutils/syslog-ng3/files/syslog-ng.sh.in b/sysutils/syslog-ng3/files/syslog-ng.sh.in
index 157ea30bde81..591a058e4fe2 100644
--- a/sysutils/syslog-ng3/files/syslog-ng.sh.in
+++ b/sysutils/syslog-ng3/files/syslog-ng.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/sysutils/syslog-ng3/files/Attic/syslog-ng.sh.in,v 1.3 2007-03-22 16:30:16 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/sysutils/syslog-ng3/files/Attic/syslog-ng.sh.in,v 1.4 2007-07-28 22:28:08 pav Exp $
 #
 
 # PROVIDE: syslogd
@@ -24,7 +24,7 @@ name=syslog_ng
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/syslog-ng
-required_files=%%PREFIX%%/etc/syslog-ng/syslog-ng.conf
+required_files=%%PREFIX%%/etc/syslog-ng.conf
 extra_commands=reload
 
 if checkyesno syslog_ng_purgeklog; then