diff options
author | Sergey Matveychuk <sem@FreeBSD.org> | 2006-03-29 21:20:19 +0000 |
---|---|---|
committer | Sergey Matveychuk <sem@FreeBSD.org> | 2006-03-29 21:20:19 +0000 |
commit | ed57847eedc086401ec2c4ac474a496abc547eb7 (patch) | |
tree | 1df70984119e696e710bdd20569457d47837d534 /sysutils/syslog-ng | |
parent | 9d85abb85763c89c6dd492db4a01a0893d807278 (diff) | |
download | ports-ed57847eedc086401ec2c4ac474a496abc547eb7.tar.gz ports-ed57847eedc086401ec2c4ac474a496abc547eb7.zip |
- Update to 1.6.9
- Remove USE_REINPLACE
- rcNGfy
PR: ports/95011
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=158401
Diffstat (limited to 'sysutils/syslog-ng')
-rw-r--r-- | sysutils/syslog-ng/Makefile | 10 | ||||
-rw-r--r-- | sysutils/syslog-ng/distinfo | 6 | ||||
-rw-r--r-- | sysutils/syslog-ng/files/syslog-ng.sh.in | 36 | ||||
-rw-r--r-- | sysutils/syslog-ng/files/syslog-ng.sh.sample | 20 | ||||
-rw-r--r-- | sysutils/syslog-ng/pkg-message | 18 | ||||
-rw-r--r-- | sysutils/syslog-ng/pkg-plist | 2 |
6 files changed, 48 insertions, 44 deletions
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index bfc32a372ff9..9a7a074fd883 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -6,7 +6,7 @@ # PORTNAME= syslog-ng -PORTVERSION= 1.6.8 +PORTVERSION= 1.6.9 CATEGORIES= sysutils MASTER_SITES= http://www.balabit.com/downloads/syslog-ng/1.6/src/ \ http://www.balabit.com/downloads/syslog-ng/1.6/src/old/ @@ -14,13 +14,11 @@ MASTER_SITES= http://www.balabit.com/downloads/syslog-ng/1.6/src/ \ MAINTAINER= vince@blue-box.net COMMENT= A powerful syslogd replacement -BUILD_DEPENDS= ${LOCALBASE}/lib/libol.a:${PORTSDIR}/devel/libol - MAN5= syslog-ng.conf.5 MAN8= syslog-ng.8 +USE_RC_SUBR= syslog-ng.sh GNU_CONFIGURE= yes -USE_REINPLACE= yes USE_GCC= 3.3+ PKGMESSAGE= ${WRKDIR}/MESSAGE @@ -57,10 +55,6 @@ post-install: ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${PREFIX}/etc/syslog-ng; \ ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc/syslog-ng; \ fi - @if [ ! -f ${PREFIX}/etc/rc.d/syslog-ng.sh.sample ]; then \ - ${ECHO} "Installing ${PREFIX}/etc/rc.d/syslog-ng.sh.sample startup file."; \ - ${INSTALL_SCRIPT} ${FILESDIR}/syslog-ng.sh.sample ${PREFIX}/etc/rc.d/syslog-ng.sh.sample; \ - fi @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo index f1f2f5040aca..f362a5042bf8 100644 --- a/sysutils/syslog-ng/distinfo +++ b/sysutils/syslog-ng/distinfo @@ -1,3 +1,3 @@ -MD5 (syslog-ng-1.6.8.tar.gz) = ffbad7e8e6dcbe385820b8ffba23b622 -SHA256 (syslog-ng-1.6.8.tar.gz) = 3c841fd89599ffb770cdf2844426980d75dc3dab12e0f707e4cbb51937f6125e -SIZE (syslog-ng-1.6.8.tar.gz) = 383589 +MD5 (syslog-ng-1.6.9.tar.gz) = 5280a86b4f5c25b2ba157c8cea302cf0 +SHA256 (syslog-ng-1.6.9.tar.gz) = e7f2d6dbeae17c14245cd20e9893d0144b969d98a29c230d4e8a0c9cc0f7dde9 +SIZE (syslog-ng-1.6.9.tar.gz) = 765341 diff --git a/sysutils/syslog-ng/files/syslog-ng.sh.in b/sysutils/syslog-ng/files/syslog-ng.sh.in new file mode 100644 index 000000000000..341143b8a2f3 --- /dev/null +++ b/sysutils/syslog-ng/files/syslog-ng.sh.in @@ -0,0 +1,36 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: syslogd +# REQUIRE: mountcritremote cleanvar +# BEFORE: SERVERS + +# +# Add the following line to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +#syslog_ng_enable="YES" +# + +. %%RC_SUBR%% + +name=syslog_ng +rcvar=`set_rcvar` + +command=%%PREFIX%%/sbin/syslog-ng +required_files=%%PREFIX%%/etc/syslog-ng/syslog-ng.conf +pidfile=/var/run/syslog.pid +extra_commands=reload +stop_postcmd=stop_postcmd + +load_rc_config $name + +: ${syslog_ng_enable:="NO"} + +stop_postcmd() { + rm -f $pidfile +} + +run_rc_command "$1" diff --git a/sysutils/syslog-ng/files/syslog-ng.sh.sample b/sysutils/syslog-ng/files/syslog-ng.sh.sample deleted file mode 100644 index 9aff5b0d38eb..000000000000 --- a/sysutils/syslog-ng/files/syslog-ng.sh.sample +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -case "$1" in -start) - [ -x ${PREFIX}/sbin/syslog-ng ] && ${PREFIX}/sbin/syslog-ng && echo -n ' syslog-ng' - ;; -stop) - killall syslog-ng && echo -n ' syslog-ng' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac - -exit 0 diff --git a/sysutils/syslog-ng/pkg-message b/sysutils/syslog-ng/pkg-message index 9ed8ef14e716..223446c811e0 100644 --- a/sysutils/syslog-ng/pkg-message +++ b/sysutils/syslog-ng/pkg-message @@ -5,19 +5,13 @@ syslog-ng is now installed! To replace FreeBSD's standard syslogd 1. Create a configuration file named __PREFIX__/etc/syslog-ng/syslog-ng.conf (a sample named syslog-ng.conf.sample has been included) -2. If you are using FreeBSD 4.4 or later, add these lines to your /etc/rc.conf: +2. Configure syslog-ng to start automatically by adding the following + to /etc/rc.conf: - syslogd_program="__PREFIX__/sbin/syslog-ng" - syslogd_flags="" + syslog_ng_enable="YES" -3. If you are using FreeBSD 4.3 or earlier, follow these steps: - - a. Configure syslog-ng to start automatically by creating a startup script - in __PREFIX__/etc/rc.d. (a sample named syslog-ng.sh.sample has been - included) - - b. Prevent the standard FreeBSD syslogd from starting automatically by - adding a line to the end of your /etc/rc.conf file that reads: +3. Prevent the standard FreeBSD syslogd from starting automatically by + adding a line to the end of your /etc/rc.conf file that reads: syslogd_enable="NO" @@ -27,5 +21,5 @@ syslog-ng is now installed! To replace FreeBSD's standard syslogd 5. Start syslog-ng: - __PREFIX__/sbin/syslog-ng + __PREFIX__/etc/rc.d/syslog-ng.sh start diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist index 41592866d63c..a7f0e6066d8a 100644 --- a/sysutils/syslog-ng/pkg-plist +++ b/sysutils/syslog-ng/pkg-plist @@ -1,4 +1,4 @@ -etc/rc.d/syslog-ng.sh.sample +@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true etc/syslog-ng/syslog-ng.conf.sample sbin/syslog-ng %%PORTDOCS%%%%DOCSDIR%%/AUTHORS |