From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 15 21:10:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2C071065686 for ; Tue, 15 Jul 2008 21:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 784458FC28 for ; Tue, 15 Jul 2008 21:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m6FLA3i3029675 for ; Tue, 15 Jul 2008 21:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m6FLA34a029674; Tue, 15 Jul 2008 21:10:03 GMT (envelope-from gnats) Resent-Date: Tue, 15 Jul 2008 21:10:03 GMT Resent-Message-Id: <200807152110.m6FLA34a029674@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Philip M. Gollucci" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 371E11065682 for ; Tue, 15 Jul 2008 21:07:46 +0000 (UTC) (envelope-from pgollucci@riderwayinc.com) Received: from riderwayinc.com (riderwayinc.com [74.93.213.161]) by mx1.freebsd.org (Postfix) with ESMTP id D4ADB8FC13 for ; Tue, 15 Jul 2008 21:07:45 +0000 (UTC) (envelope-from pgollucci@riderwayinc.com) Received: from riderwayinc.com (localhost [127.0.0.1]) by riderwayinc.com (8.14.2/8.14.2) with ESMTP id m6FL7eha010637 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO); Tue, 15 Jul 2008 21:07:40 GMT (envelope-from pgollucci@riderwayinc.com) Received: (from pgollucci@localhost) by riderwayinc.com (8.14.2/8.14.2/Submit) id m6FL7Zav010636; Tue, 15 Jul 2008 21:07:35 GMT (envelope-from pgollucci) Message-Id: <200807152107.m6FL7Zav010636@riderwayinc.com> Date: Tue, 15 Jul 2008 21:07:35 GMT From: "Philip M. Gollucci" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: anray@FreeBSD.org Subject: ports/125652: [PATCH] mail/masqmail: USE_RC_SUBR != yes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2008 21:10:03 -0000 >Number: 125652 >Category: ports >Synopsis: [PATCH] mail/masqmail: USE_RC_SUBR != yes >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: Tue Jul 15 21:10:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 7.0-RELEASE amd64 >Organization: Riderway Inc. >Environment: System: FreeBSD riderwayinc.com 7.0-RELEASE FreeBSD 7.0-RELEASE #2: Thu Feb 28 21:20:48 UTC 2008 >Description: - Respect NO_INSTALL_MANPAGES - repocopy [files/masqmail.sh -> files/masqmail.in] itectu@: no more .sh dougb@: move load_config above variables checks - use PORTDOCS - Bump PORTREVISION Added file(s): - files/masqmail.in Removed file(s): - files/masqmail.sh Port maintainer (anray@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- masqmail-0.2.21_2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/masqmail/Makefile,v retrieving revision 1.13 diff -u -u -r1.13 Makefile --- Makefile 6 Jun 2008 13:42:55 -0000 1.13 +++ Makefile 15 Jul 2008 21:06:38 -0000 @@ -7,7 +7,7 @@ PORTNAME= masqmail PORTVERSION= 0.2.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -15,8 +15,10 @@ MAINTAINER= anray@FreeBSD.org COMMENT= Mail server for hosts, not permanently connected to the internet +.if !defined (NO_INSTALL_MANPAGES) MAN5= masqmail.aliases.5 masqmail.conf.5 masqmail.get.5 masqmail.route.5 MAN8= masqmail.8 mservdetect.8 +.endif GNU_CONFIGURE= yes CFLAGS+= -Wno-trigraphs @@ -25,6 +27,10 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +.if !defined (NOPORTDOCS) +PORTDOCS= AUTHORS COPYING INSTALL NEWS README TODO +.endif + .if defined(WITH_LIBCRYPTO) CONFIGURE_ARGS+= --with-libcrypto .endif @@ -51,15 +57,9 @@ .endif USE_GNOME= glib20 -USE_RC_SUBR= yes - -post-build: - @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%RC_SUBR%%,${RC_SUBR},g' \ - ${FILESDIR}/masqmail.sh > ${WRKDIR}/masqmail.sh +USE_RC_SUBR= masqmail post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/masqmail.sh ${PREFIX}/etc/rc.d/masqmail.sh ${MKDIR} ${PREFIX}/etc/masqmail ${CHOWN} mailnull:mail ${PREFIX}/etc/masqmail ${INSTALL_DATA} -o mailnull -g mail ${WRKSRC}/examples/masqmail.conf ${PREFIX}/etc/masqmail/masqmail.conf-dist @@ -68,7 +68,7 @@ .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} -.for i in AUTHORS COPYING INSTALL NEWS README TODO +.for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/mail/masqmail/pkg-plist,v retrieving revision 1.3 diff -u -u -r1.3 pkg-plist --- pkg-plist 26 Dec 2005 11:43:54 -0000 1.3 +++ pkg-plist 15 Jul 2008 21:06:38 -0000 @@ -2,7 +2,6 @@ etc/masqmail/masqmail.conf-dist etc/masqmail/masqmail.get-dist etc/masqmail/masqmail.route-dist -etc/rc.d/masqmail.sh sbin/masqmail share/masqmail/tpl/failmsg.tpl share/masqmail/tpl/failmsg.tpl.de @@ -11,14 +10,7 @@ share/masqmail/tpl/warnmsg.tpl share/masqmail/tpl/warnmsg.tpl.de share/masqmail/tpl/warnmsg.tpl.fr -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO @dirrm share/masqmail/tpl @dirrm share/masqmail @dirrm etc/masqmail -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir /var/log/masqmail 2>/dev/null || true +@dirrmtry /var/log/masqmail Index: files/masqmail.in =================================================================== RCS file: files/masqmail.in diff -N files/masqmail.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/masqmail.in 15 Jul 2008 21:06:38 -0000 @@ -0,0 +1,62 @@ +#!/bin/sh +# +# $FreeBSD: ports/mail/masqmail/files/masqmail.sh,v 1.3 2006/02/20 20:47:12 dougb Exp $ +# + +# PROVIDE: mail +# REQUIRE: LOGIN +# KEYWORD: shutdown +# we make mail start late, so that things like .forward's are not +# processed until the system is fully operational + +# +# Add the following lines to /etc/rc.conf to enable masqmail: +# +#masqmail_enable="YES" +# +# See masqmail(8) for flags +# + +. %%RC_SUBR%% + +name=masqmail +rcvar=`set_rcvar` + +command=%%PREFIX%%/sbin/masqmail +required_dirs=/var/log/masqmail +required_files=%%PREFIX%%/etc/masqmail/masqmail.conf + +start_precmd=start_precmd +stop_postcmd=stop_postcmd + +extra_commands="reload" + +load_rc_config $name +# set defaults +masqmail_enable=${masqmail_enable:-"NO"} +masqmail_flags=${masqmail_flags:-"-bd -q30m"} + +start_precmd() +{ + case $sendmail_enable in + [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + warn "sendmail_enable should be set to NONE" + ;; + [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) + case $sendmail_submit_enable in + [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + warn "sendmail_submit_enable should be set to NO" + ;; + esac + ;; + [Nn][Oo][Nn][Ee]) + ;; + esac +} + +stop_postcmd() +{ + rm -f $pidfile +} + +run_rc_command "$1" Index: files/masqmail.sh =================================================================== RCS file: files/masqmail.sh diff -N files/masqmail.sh --- files/masqmail.sh 20 Feb 2006 20:47:12 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,63 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/mail/masqmail/files/masqmail.sh,v 1.3 2006/02/20 20:47:12 dougb Exp $ -# - -# PROVIDE: mail -# REQUIRE: LOGIN -# KEYWORD: shutdown -# we make mail start late, so that things like .forward's are not -# processed until the system is fully operational - -# -# Add the following lines to /etc/rc.conf to enable masqmail: -# -#masqmail_enable="YES" -# -# See masqmail(8) for flags -# - -. %%RC_SUBR%% - -name=masqmail -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/masqmail -required_dirs=/var/log/masqmail -required_files=%%PREFIX%%/etc/masqmail/masqmail.conf - -start_precmd=start_precmd -stop_postcmd=stop_postcmd - -extra_commands="reload" - -start_precmd() -{ - case $sendmail_enable in - [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - warn "sendmail_enable should be set to NONE" - ;; - [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) - case $sendmail_submit_enable in - [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - warn "sendmail_submit_enable should be set to NO" - ;; - esac - ;; - [Nn][Oo][Nn][Ee]) - ;; - esac -} - -stop_postcmd() -{ - rm -f $pidfile -} - -# set defaults - -masqmail_enable=${masqmail_enable:-"NO"} -masqmail_flags=${masqmail_flags:-"-bd -q30m"} - -load_rc_config $name -run_rc_command "$1" --- masqmail-0.2.21_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: