Remove all redirections -- rc.subr(8) now takes care of it.

This commit is contained in:
ajacoutot 2011-03-17 16:49:27 +00:00
parent 17233cd48d
commit 1ffbcaa750
22 changed files with 58 additions and 56 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.146 2011/03/09 18:51:48 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.147 2011/03/17 16:49:27 ajacoutot Exp $
COMMENT-main= PostgreSQL RDBMS (client)
COMMENT-server= PostgreSQL RDBMS (server)
@ -12,7 +12,7 @@ PKGNAME-server= postgresql-server-${VERSION}
PKGNAME-docs= postgresql-docs-${VERSION}
PKGNAME-contrib=postgresql-contrib-${VERSION}
REVISION-server= 1
REVISION-server= 2
CATEGORIES= databases
SHARED_LIBS= ecpg 7.2 \

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: postgresql.rc,v 1.7 2011/03/09 18:51:48 ajacoutot Exp $
# $OpenBSD: postgresql.rc,v 1.8 2011/03/17 16:49:27 ajacoutot Exp $
daemon="${TRUEPREFIX}/bin/postgres"
daemon_user="_postgresql"
@ -16,7 +16,7 @@ rc_start() {
}
rc_stop() {
${rcexec} "${bin} -D ${datadir} stop -m fast" >/dev/null || \
${rcexec} "${bin} -D ${datadir} stop -m fast" || \
${rcexec} "${bin} -D ${datadir} stop -m immediate"
}

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.19 2011/03/17 16:49:27 ajacoutot Exp $
COMMENT= interface between mailer MTA and content checkers
DISTNAME= amavisd-new-2.6.4
REVISION= 5
REVISION= 6
CATEGORIES= mail security
HOMEPAGE= http://www.ijs.si/software/amavisd/

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: amavisd.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: amavisd.rc,v 1.5 2011/03/17 16:49:27 ajacoutot Exp $
daemon="${TRUEPREFIX}/sbin/amavisd"
@ -9,11 +9,11 @@ daemon="${TRUEPREFIX}/sbin/amavisd"
pexp="perl: amavisd"
rc_stop() {
${daemon} stop 2>/dev/null
${daemon} stop
}
rc_reload() {
${daemon} reload 2>/dev/null
${daemon} reload
}
rc_cmd $1

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2011/03/09 18:51:48 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.6 2011/03/17 16:49:27 ajacoutot Exp $
COMMENT = mail server storing messages in a database
DISTNAME = archiveopteryx-3.1.3
REVISION = 1
REVISION = 2
CATEGORIES = mail databases
HOMEPAGE = http://www.archiveopteryx.org/

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: aox.rc,v 1.2 2011/03/09 18:51:48 ajacoutot Exp $
# $OpenBSD: aox.rc,v 1.3 2011/03/17 16:49:27 ajacoutot Exp $
daemon="${TRUEPREFIX}/bin/aox"
@ -10,11 +10,11 @@ pexp="${TRUEPREFIX}/sbin/archiveopteryx -f"
rc_reload=NO
rc_start() {
${daemon} start 2>/dev/null
${daemon} start
}
rc_stop() {
${daemon} stop 2>/dev/null
${daemon} stop
}
rc_cmd $1

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2011/03/17 16:49:27 ajacoutot Exp $
COMMENT-main= authentication library for courier
COMMENT-ldap= ldap authentication module for courier-authLib
@ -13,7 +13,7 @@ PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
PKGNAME-pgsql= ${DISTNAME:S/lib-/lib-pgsql-/}
PKGNAME-userdb= ${DISTNAME:S/lib-/lib-userdb-/}
REVISION-main= 3
REVISION-main= 4
REVISION-ldap= 1
REVISION-mysql= 1
REVISION-pgsql= 1

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: courier_authdaemond.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: courier_authdaemond.rc,v 1.4 2011/03/17 16:49:27 ajacoutot Exp $
daemon="${TRUEPREFIX}/sbin/authdaemond"
@ -10,11 +10,11 @@ pexp=".*courierlogger.*-start ${TRUEPREFIX}/libexec/courier-authlib/authdaemond"
rc_start() {
mkdir -p /var/run/courier{,-auth}/
${daemon} start 2>/dev/null
${daemon} start
}
rc_stop() {
${daemon} stop 2>/dev/null
${daemon} stop
}
rc_cmd $1

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.68 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.69 2011/03/17 16:49:27 ajacoutot Exp $
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
@ -6,9 +6,9 @@ COMMENT-pop3= pop3 server for maildir format mailboxes
V= 4.8.0
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
REVISION-main= 4
REVISION-main= 5
FULLPKGNAME-pop3= courier-pop3-${V}
REVISION-pop3= 4
REVISION-pop3= 5
FULLPKGPATH-pop3= mail/courier-imap,-pop3
CATEGORIES= mail

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: courier_imap-ssl.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: courier_imap-ssl.rc,v 1.4 2011/03/17 16:49:27 ajacoutot Exp $
daemon="${TRUEPREFIX}/libexec/imapd-ssl.rc"
@ -9,11 +9,11 @@ daemon="${TRUEPREFIX}/libexec/imapd-ssl.rc"
pexp=".*courierlogger.*imapd-ssl.pid"
rc_start() {
${daemon} start 2>/dev/null
${daemon} start
}
rc_stop() {
${daemon} stop 2>/dev/null
${daemon} stop
}
rc_cmd $1

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: courier_imap.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: courier_imap.rc,v 1.4 2011/03/17 16:49:27 ajacoutot Exp $
daemon="${TRUEPREFIX}/libexec/imapd.rc"
@ -9,11 +9,11 @@ daemon="${TRUEPREFIX}/libexec/imapd.rc"
pexp=".*courierlogger.*imapd.pid"
rc_start() {
${daemon} start 2>/dev/null
${daemon} start
}
rc_stop() {
${daemon} stop 2>/dev/null
${daemon} stop
}
rc_cmd $1

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: courier_pop3-ssl.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: courier_pop3-ssl.rc,v 1.4 2011/03/17 16:49:27 ajacoutot Exp $
daemon="${TRUEPREFIX}/libexec/pop3d-ssl.rc"
@ -9,11 +9,11 @@ daemon="${TRUEPREFIX}/libexec/pop3d-ssl.rc"
pexp=".*courierlogger.*pop3d-ssl.pid"
rc_start() {
${daemon} start 2>/dev/null
${daemon} start
}
rc_stop() {
${daemon} stop 2>/dev/null
${daemon} stop
}
rc_cmd $1

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: courier_pop3.rc,v 1.3 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: courier_pop3.rc,v 1.4 2011/03/17 16:49:27 ajacoutot Exp $
daemon="${TRUEPREFIX}/libexec/pop3d.rc"
@ -9,11 +9,11 @@ daemon="${TRUEPREFIX}/libexec/pop3d.rc"
pexp=".*courierlogger.*pop3d.pid"
rc_start() {
${daemon} start 2>/dev/null
${daemon} start
}
rc_stop() {
${daemon} stop 2>/dev/null
${daemon} stop
}
rc_cmd $1

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.7 2011/03/09 18:51:48 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.8 2011/03/17 16:49:27 ajacoutot Exp $
COMMENT= management tool for Ubiquiti wireless devices
DISTNAME= aircontrol-1.3.6-beta
PKGNAME= ${DISTNAME:S/-beta/beta/}
REVISION= 0
REVISION= 1
CATEGORIES= net

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: aircontrol.rc,v 1.2 2011/03/09 18:51:48 ajacoutot Exp $
# $OpenBSD: aircontrol.rc,v 1.3 2011/03/17 16:49:27 ajacoutot Exp $
daemon="${TRUEPREFIX}/bin/catalina.sh"
daemon_flags="-Xmx768M -server"
@ -22,7 +22,7 @@ rc_stop() {
${rcexec} \
"CATALINA_OPTS=\"${daemon_flags}\" \
JAVA_HOME=\"$(javaPathHelper -h aircontrol)\" \
${daemon} stop" 2>/dev/null
${daemon} stop"
}
rc_cmd $1

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.52 2011/03/03 10:18:53 jasper Exp $
# $OpenBSD: Makefile,v 1.53 2011/03/17 16:49:27 ajacoutot Exp $
COMMENT-main= framework for Multicast DNS Service Discovery
COMMENT-gtk= GUI client utilities for avahi
@ -16,7 +16,7 @@ PKGNAME-mono= mono-avahi-${V}
PKGNAME-qt3= avahi-qt3-${V}
PKGNAME-qt4= avahi-qt4-${V}
REVISION-main= 3
REVISION-main= 4
REVISION-mono= 0
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: avahi_daemon.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: avahi_daemon.rc,v 1.6 2011/03/17 16:49:27 ajacoutot Exp $
daemon="${TRUEPREFIX}/sbin/avahi-daemon"
daemon_flags="-D"
@ -12,11 +12,11 @@ rc_check() {
}
rc_reload() {
${daemon} --reload 2> /dev/null
${daemon} --reload
}
rc_stop() {
${daemon} --kill 2> /dev/null
${daemon} --kill
}
rc_cmd $1

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: avahi_dnsconfd.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: avahi_dnsconfd.rc,v 1.6 2011/03/17 16:49:27 ajacoutot Exp $
daemon="${TRUEPREFIX}/sbin/avahi-dnsconfd"
daemon_flags="-D"
@ -12,11 +12,11 @@ rc_check() {
}
rc_reload() {
${daemon} --refresh 2> /dev/null
${daemon} --refresh
}
rc_stop() {
${daemon} --kill 2> /dev/null
${daemon} --kill
}
rc_cmd $1

View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.135 2011/03/15 13:49:44 sthen Exp $
# $OpenBSD: Makefile,v 1.136 2011/03/17 16:49:27 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT-main= SMB and CIFS client and server for UNIX
COMMENT-docs= additional documentation and examples for Samba
REVISION-main= 0
DISTNAME= samba-3.5.8
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: nmbd.rc,v 1.2 2011/03/09 19:37:47 ajacoutot Exp $
# $OpenBSD: nmbd.rc,v 1.3 2011/03/17 16:49:27 ajacoutot Exp $
daemon="/usr/local/libexec/nmbd"
daemon_flags="-D"
@ -10,7 +10,7 @@ daemon_flags="-D"
smbcontrol="${TRUEPREFIX}/bin/smbcontrol"
rc_check() {
${smbcontrol} nmbd ping 2>/dev/null
${smbcontrol} nmbd ping
}
rc_reload() {
@ -18,7 +18,7 @@ rc_reload() {
}
rc_stop() {
${smbcontrol} nmbd shutdown 2>/dev/null
${smbcontrol} nmbd shutdown
}
rc_cmd $1

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: smbd.rc,v 1.2 2011/03/09 19:37:47 ajacoutot Exp $
# $OpenBSD: smbd.rc,v 1.3 2011/03/17 16:49:27 ajacoutot Exp $
daemon="/usr/local/libexec/smbd"
daemon_flags="-D"
@ -10,7 +10,7 @@ daemon_flags="-D"
smbcontrol="${TRUEPREFIX}/bin/smbcontrol"
rc_check() {
${smbcontrol} smbd ping 2>/dev/null
${smbcontrol} smbd ping
}
rc_reload() {
@ -18,7 +18,7 @@ rc_reload() {
}
rc_stop() {
${smbcontrol} smbd shutdown 2>/dev/null
${smbcontrol} smbd shutdown
}
rc_cmd $1

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: winbindd.rc,v 1.2 2011/03/09 19:37:47 ajacoutot Exp $
# $OpenBSD: winbindd.rc,v 1.3 2011/03/17 16:49:27 ajacoutot Exp $
daemon="/usr/local/libexec/winbindd"
daemon_flags="-D"
@ -10,7 +10,7 @@ daemon_flags="-D"
smbcontrol="${TRUEPREFIX}/bin/smbcontrol"
rc_check() {
${smbcontrol} winbindd ping 2>/dev/null
${smbcontrol} winbindd ping
}
rc_reload() {
@ -18,7 +18,7 @@ rc_reload() {
}
rc_stop() {
${smbcontrol} winbindd shutdown 2>/dev/null
${smbcontrol} winbindd shutdown
}
rc_cmd $1