Date: Thu, 26 Jan 2006 12:37:20 -0500 (EST) From: "Eric W.Bates" <ericx@ericx.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92438: mail/pop-before-smtp 1.37 -> 1.39 -- includes patch Message-ID: <20060127235437.B0A2418556@smtp.ericx.net> Resent-Message-ID: <200601280000.k0S00IVV052147@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92438
>Category: ports
>Synopsis: mail/pop-before-smtp 1.37 -> 1.39 -- includes patch
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 28 00:00:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Eric W. Bates
>Release: FreeBSD 6.0-RELEASE i386
>Organization:
Vineyard.NET
>Environment:
System: FreeBSD ethel.ericx.net 6.0-RELEASE FreeBSD 6.0-RELEASE #1: Wed Dec 7 21:51:33 EST 2005 ericx@ethel.ericx.net:/u3/obj/usr/src/sys/ETHEL i386
>Description:
Update version from 1.37 -> 1.39.
rc script now uses rc.subr
>How-To-Repeat:
Not applicable
>Fix:
patch:
diff -ruN pop-before-smtp/Makefile pop-before-smtp.new/Makefile
--- pop-before-smtp/Makefile Sat Jul 9 03:21:03 2005
+++ pop-before-smtp.new/Makefile Wed Jan 25 18:14:59 2006
@@ -6,7 +6,7 @@
#
PORTNAME= pop-before-smtp
-PORTVERSION= 1.37
+PORTVERSION= 1.39
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= popbsmtp
@@ -29,7 +29,7 @@
MAN8= ${PORTNAME}.8
# Override this as you see fit
-POPBSMTP_RC_SCRIPT?= ${PREFIX}/etc/rc.d/pop-before-smtp.sh.sample
+POPBSMTP_RC_SCRIPT?= ${PREFIX}/etc/rc.d/pop-before-smtp.sh
post-patch:
@${REINPLACE_CMD} 's|^#!/usr/bin/perl|#!${PERL}|; \
@@ -44,7 +44,7 @@
${INSTALL_SCRIPT} \
${WRKSRC}/pop-before-smtp-conf.pl \
${PREFIX}/etc/pop-before-smtp-conf.pl.sample
- @${SED} -e "s|%PREFIX%|${PREFIX}|g" \
+ @${SED} -e "s|%PERL%|${PERL}|g; s|%PREFIX%|${PREFIX}|g" \
< ${FILESDIR}/pop-before-smtp.sh > ${POPBSMTP_RC_SCRIPT}
@${CHMOD} 755 ${POPBSMTP_RC_SCRIPT}
.if !defined(NOPORTDOCS)
diff -ruN pop-before-smtp/distinfo pop-before-smtp.new/distinfo
--- pop-before-smtp/distinfo Mon Jan 23 03:35:48 2006
+++ pop-before-smtp.new/distinfo Wed Jan 25 18:08:04 2006
@@ -1,3 +1,3 @@
-MD5 (pop-before-smtp-1.37.tar.gz) = 8c1fc935708163168f7870ccf730fc0e
-SHA256 (pop-before-smtp-1.37.tar.gz) = d577d9ebbc5defeb1519c4ef12285424e0a3e3fed57e46dcdc3d01d53fc00811
-SIZE (pop-before-smtp-1.37.tar.gz) = 36249
+MD5 (pop-before-smtp-1.39.tar.gz) = c54513af8e9a8f2245826b23b6807da4
+SHA256 (pop-before-smtp-1.39.tar.gz) = 19b5b280c1550ba0d3cd9a804b3762d16757c0646ceb4c8dd79c5d036be2b463
+SIZE (pop-before-smtp-1.39.tar.gz) = 38741
diff -ruN pop-before-smtp/files/pop-before-smtp.sh pop-before-smtp.new/files/pop-before-smtp.sh
--- pop-before-smtp/files/pop-before-smtp.sh Sun Oct 5 23:25:48 2003
+++ pop-before-smtp.new/files/pop-before-smtp.sh Thu Jan 26 11:54:41 2006
@@ -1,28 +1,20 @@
#!/bin/sh
# File: pop-before-smtp.sh
# Date: Fri Mar 7 11:20:43 2003
-# Time-stamp: <2003-03-08 23:58:53 ericx>
+# Time-stamp: <2006-01-26 11:54:41 ericx>
# Description: start/stop script for pop-before-smtp daemon
#
# $FreeBSD: ports/mail/pop-before-smtp/files/pop-before-smtp.sh,v 1.1 2003/10/06 03:25:48 edwin Exp $
-# Thanks to ume@FreeBSD.org for a nifty saslauthd.sh to steal from...
-
-action=$1
-
-PREFIX=%PREFIX%
-
-# Suck in the configuration variables.
-if [ -z "${source_rc_confs_defined}" ]; then
- if [ -r /etc/defaults/rc.conf ]; then
- . /etc/defaults/rc.conf
- source_rc_confs
- elif [ -r /etc/rc.conf ]; then
- . /etc/rc.conf
- fi
-fi
-
-# The following pop_before_smtp_* variables may be defined in rc.conf
+# PROVIDE: pop-before-smtp
+# REQUIRE: DAEMON
+# BEFORE: mail
+# KEYWORD: shutdown
+#
+# PLEASE note the distinction between dashes [-] and underscores [_]...
+#
+# The following pop_before_smtp_* variables may be defined in
+# /etc/rc.conf or /etc/rc.conf.d/pop_before_smtp
#
# pop_before_smtp_enable - Set to YES to enable pop-before-smtp
# Default: no
@@ -41,60 +33,26 @@
# Default: /var/run/pop-before-smtp.pid
#
-if [ -z "${pop_before_smtp_enable}" ]; then
- pop_before_smtp_enable=no
-fi
-
-if [ -z "${pop_before_smtp_program}" ]; then
- pop_before_smtp_program=${PREFIX}/sbin/pop-before-smtp
-fi
-
-if [ -z "${pop_before_smtp_config}" ]; then
- pop_before_smtp_config=${PREFIX}/etc/pop-before-smtp-conf.pl
-fi
-
-if [ -z "${pop_before_smtp_flags}" ]; then
- pop_before_smtp_flags=""
-fi
-
-if [ -z "${pop_before_smtp_pid}" ]; then
- pop_before_smtp_pid=/var/run/pop-before-smtp.pid
-fi
-
-rc=0
-
-case "${pop_before_smtp_enable}" in
- [Yy][Ee][Ss])
- case "${action}" in
-
- start)
- if [ -x ${pop_before_smtp_program} ] ; then
- ${pop_before_smtp_program} \
- --config=${pop_before_smtp_config} \
- ${pop_before_smtp_flags} \
- --daemon=${pop_before_smtp_pid} \
- >/dev/null 2>&1 && \
- echo -n " pop-before-smtp "
- fi
- ;;
-
- stop)
- if [ -r ${pop_before_smtp_pid} ]; then
- kill `cat ${pop_before_smtp_pid}` && \
- echo -n " pop-before-smtp"
- rm ${pop_before_smtp_pid}
- fi
- ;;
-
- *)
- echo "usage: $0 {start|stop}" 1>&2
- rc=64
- ;;
- esac
- ;;
- *)
- rc=0
- ;;
-esac
+. /etc/rc.subr
+
+PREFIX=%PREFIX%
+
+# sh interprets dash chars as the numeric minus operator...
+name="pop_before_smtp"
+filename="pop-before-smtp"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+command=${pop_before_smtp_program:-"${PREFIX}/sbin/${filename}"}
+pidfile=${pop_before_smtp_pid:-"/var/run/${filename}.pid"}
+config=${pop_before_smtp_config:-"${PREFIX}/etc/${filename}-conf.pl"}
+
+command_args="--config=${config}"
+command_args="${command_args} ${pop_before_smtp_flags:-''}"
+command_args="${command_args} --daemon=${pidfile}"
+
+command_interpreter=%PERL%
+required_files=${config}
-exit $rc
+run_rc_command "$1"
diff -ruN pop-before-smtp/pkg-plist pop-before-smtp.new/pkg-plist
--- pop-before-smtp/pkg-plist Sat Jul 9 03:21:03 2005
+++ pop-before-smtp.new/pkg-plist Thu Jan 26 11:56:25 2006
@@ -1,6 +1,6 @@
@comment $FreeBSD: ports/mail/pop-before-smtp/pkg-plist,v 1.2 2005/07/08 21:40:48 pav Exp $
etc/pop-before-smtp-conf.pl.sample
-etc/rc.d/pop-before-smtp.sh.sample
+etc/rc.d/pop-before-smtp.sh
sbin/pop-before-smtp
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060127235437.B0A2418556>