diff options
| author | ache <ache@FreeBSD.org> | 2003-09-07 21:09:10 +0800 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2003-09-07 21:09:10 +0800 |
| commit | e460fcb3ffb8339739a973abc2db8177c9cc9ebc (patch) | |
| tree | 41fa1380621bc42efde251356e3e37472b6cac04 /mail | |
| parent | 73b8d7fd41da921f5e6696fdb13cd241ccdfd2e4 (diff) | |
| download | freebsd-ports-gnome-e460fcb3ffb8339739a973abc2db8177c9cc9ebc.tar.gz freebsd-ports-gnome-e460fcb3ffb8339739a973abc2db8177c9cc9ebc.tar.zst freebsd-ports-gnome-e460fcb3ffb8339739a973abc2db8177c9cc9ebc.zip | |
Install rc.d script with -dist suffix to not overwrite real one
Set LC_ALL=C before to avoid bad regex surprises when restarting by hand
Remove socket after killing
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/sentinel/Makefile | 3 | ||||
| -rw-r--r-- | mail/sentinel/files/000.sentinel.sh | 3 | ||||
| -rw-r--r-- | mail/sentinel/pkg-plist | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/mail/sentinel/Makefile b/mail/sentinel/Makefile index 90b1c1de259a..b89a108b4f2e 100644 --- a/mail/sentinel/Makefile +++ b/mail/sentinel/Makefile @@ -7,6 +7,7 @@ PORTNAME= sentinel PORTVERSION= 1.6.5b +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= smfilter @@ -32,7 +33,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sentinel ${PREFIX}/sbin @${MKDIR} ${PREFIX}/var/sentinel ${CHOWN} smmsp:smmsp ${PREFIX}/var/sentinel - ${INSTALL_SCRIPT} ${FILESDIR}/000.sentinel.sh ${PREFIX}/etc/rc.d + ${INSTALL_DATA} ${FILESDIR}/000.sentinel.sh ${PREFIX}/etc/rc.d/000.sentinel.sh-dist ${INSTALL_DATA} ${WRKSRC}/sentinel.cf.SAMPLE ${PREFIX}/etc/sentinel.cf.dist .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/mail/sentinel/files/000.sentinel.sh b/mail/sentinel/files/000.sentinel.sh index 0428f2e880f4..08df334defaf 100644 --- a/mail/sentinel/files/000.sentinel.sh +++ b/mail/sentinel/files/000.sentinel.sh @@ -14,7 +14,7 @@ start) if [ -x ${PREFIX}/sbin/sentinel -a -f ${PREFIX}/etc/sentinel.cf ] then rm -f ${SOCKET} - ${PREFIX}/sbin/sentinel -c ${PREFIX}/etc/sentinel.cf -p unix:${SOCKET} -d && echo -n ' sentinel' + LC_ALL=C ${PREFIX}/sbin/sentinel -c ${PREFIX}/etc/sentinel.cf -p unix:${SOCKET} -d && echo -n ' sentinel' fi ;; stop) @@ -23,6 +23,7 @@ stop) if [ -e ${SOCKET} ] then killall -KILL sentinel + rm -f ${SOCKET} fi ;; *) diff --git a/mail/sentinel/pkg-plist b/mail/sentinel/pkg-plist index 05b751261647..bb34c5311960 100644 --- a/mail/sentinel/pkg-plist +++ b/mail/sentinel/pkg-plist @@ -1,6 +1,6 @@ sbin/sentinel etc/sentinel.cf.dist -etc/rc.d/000.sentinel.sh +etc/rc.d/000.sentinel.sh-dist @exec mkdir %D/var/sentinel @exec chown smmsp:smmsp %D/var/sentinel @unexec rmdir %D/var/sentinel 2>/dev/null || true |