From e82d70757935926d0544f5b74f5043c57812ca6a Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Thu, 30 Aug 2007 16:00:47 +0000
Subject: Revert last commit that added a rnCG example file, the script was
totally out of defaults from Porters Handbook and was an error add it.
Suggested by: many people
---
mail/qmail/Makefile | 3 --
mail/qmail/files/rcNG | 83 ---------------------------------------------------
mail/qmail/pkg-plist | 1 -
3 files changed, 87 deletions(-)
delete mode 100644 mail/qmail/files/rcNG
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index c3a58e3fcbc5..5ddd111a3159 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -679,9 +679,6 @@ do-install:
.for i in ${BOOTFILES}
${INSTALL_SCRIPT} ${WRKDIR}/${i:T} ${PREFIX}/boot
.endfor
-. if !defined(SLAVE_LDAP)
- ${INSTALL_SCRIPT} ${FILESDIR}/rcNG ${PREFIX}/boot
-.endif
.for i in 1 5 7 8
@${MKDIR} ${PREFIX}/man/man$i
. for j in ${MAN${i}}
diff --git a/mail/qmail/files/rcNG b/mail/qmail/files/rcNG
deleted file mode 100644
index c60a3325b945..000000000000
--- a/mail/qmail/files/rcNG
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: qmail mail
-# REQUIRE: netif
-# BEFORE: LOGIN
-#
-#writen by Zane C. Bowers <vvelox@vvelox.net>
-
-. /etc/rc.subr
-
-name="qmail"
-rcvars=`set_rcvar`
-start_cmd="qmail_start"
-stop_cmd="qmail_stop"
-
-load_rc_config $name
-
-
-#
-# Add the following lines to /etc/rc.conf to enable qmail:
-# qmail_enable (bool): Turn on QMail.
-# Default: NO
-#
-# qmail_checkpw (str): Tell QMail what chekpassword program to use.
-# Default: /usr/local/bin/checkpassword
-#
-# qmail_checkpwsuccess (str): Tell the server what to run if checkpassword works.
-# Default: /bin/true
-#
-# qmail_server (bool): Wether the SMTP server should be started.
-# Default: YES
-#
-# qmail_server_ip (str): The IP to listen on. 0 means all.
-# Default: 0
-#
-# qmail_server_port (str): The port to listen on. May be numeric or from /etc/services
-# Default: smtp
-#
-# qmail_tcpserver_args (str): Extra args to be passed to tcpserver.
-#
-# qmail_defaultdelivery (str): Default delivery path.
-# Default: ./Maildir
-# qmail_logger (str): The logger to use.
-# Default: splogger qmail
-# qmail_server_logger (str): The logger to use for the SMTP server.
-# Default: /var/qmail/bin/splogger smtpd
-
-[ -z "$qmail_enable" ] && qmail_enable="NO"
-[ -z "$qmail_checkpw" ] && qmail_checkpw="/usr/local/bin/checkpassword"
-[ -z "$qmail_checkpwsuccess" ] && qmail_checkpw="/bin/true"
-[ -z "$qmail_server" ] && qmail_server="YES"
-[ -z "$qmail_server_ip" ] && qmail_server_ip="0"
-[ -z "$qmail_server_port" ] && qmail_server_port="smtp"
-[ -z "$qmail_defaultdelivery" ] && qmail_defaultdelivery="./Maildir"
-[ -z "$qmail_logger" ] && qmail_defaultdelivery="splogger qmail"
-[ -z "$qmail_server_logger" ] && qmail_server_logger="/var/qmail/bin/splogger smtpd"
-
-qmail_start(){
- env - PATH="/var/qmail/bin:$PATH" \
- qmail-start $qmail_defaultdelivery $qmail_server_logger &
-
- if checkyesno qmail_server; then
- qmaildUID=`id qmaild | cut -d\ -f 1 | cut -d= -f 2 | cut -d\( -f 1`
- qnofilesGID=`pw group show qnofiles | cut -d: -f 3`
-
- env - PATH="/var/qmail/bin:$PATH" /usr/local/bin/tcpserver $qmail_tcpserver_args -u \
- $qmaildUID -g $qnofilesGID $qmail_server_ip $qmail_server_port \
- /var/qmail/bin/qmail-smtpd $qmail_checkpw -- /bin/true 2>&1 | $qmail_server_logger &
- fi
-
-}
-
-qmail_stop(){
- killall -9 qmail-send > /dev/null
-
- #tcpserverPID=`ps aux | grep tcpserver | grep ^qmaild | cut -d\ -f 4`
- tcpserverPID=`ps -aw -o pid,user,command | grep tcpserver | grep qmail-smtpd | sed 's/^ *//' | cut -f 1 -d\ `
- [ $tcpserverPID ] && kill -9 $tcpserverPID
- #kill -9 $tcpserverPID
-}
-
-
-run_rc_command "$1"
diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist
index 1bfbb9920974..62a85bd3d959 100644
--- a/mail/qmail/pkg-plist
+++ b/mail/qmail/pkg-plist
@@ -66,7 +66,6 @@ bin/qsmhook
bin/sendmail
bin/splogger
bin/tcp-env
-%%NOT_LDAP%%boot/rcNG
%%NOT_LDAP%%boot/binm1
%%NOT_LDAP%%boot/binm1+df
%%NOT_LDAP%%boot/binm2
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0