From owner-freebsd-ports Thu Nov 9 14:50:15 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D8F6237B4C5 for ; Thu, 9 Nov 2000 14:50:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id OAA10795; Thu, 9 Nov 2000 14:50:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FCED37B479; Thu, 9 Nov 2000 14:46:09 -0800 (PST) Message-Id: <20001109224609.3FCED37B479@hub.freebsd.org> Date: Thu, 9 Nov 2000 14:46:09 -0800 (PST) From: dwcjr@inethouston.net To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/22728: Update mail/postfix-current Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 22728 >Category: ports >Synopsis: Update mail/postfix-current >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Nov 09 14:50:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: David W. Chapman Jr. >Release: 4.1.1-STABLE >Organization: Raintree Network Services >Environment: >Description: Add option for postfix benchmark Fix spacing error in writing to /etc/mail/mailer.conf update pkg-plist to include postfix benchmark binaries >How-To-Repeat: >Fix: diff -urN postfix-current.orig/Makefile postfix-current/Makefile --- postfix-current.orig/Makefile Tue Nov 7 08:18:19 2000 +++ postfix-current/Makefile Tue Nov 7 14:16:35 2000 @@ -21,6 +21,39 @@ MAINTAINER= dwcjr@inethouston.net +MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ + postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \ + sendmail.1 + +MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \ + transport.5 virtual.5 + +MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ + master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \ + spawn.8 trivial-rewrite.8 + +CONF1= access aliases canonical main.cf master.cf \ + regexp_table relocated transport virtual + +CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \ + sample-filter.cf sample-local.cf sample-misc.cf \ + sample-rate.cf sample-regexp.cf sample-relocated.cf \ + sample-resource.cf sample-rewrite.cf sample-smtp.cf \ + sample-smtpd.cf sample-transport.cf sample-virtual.cf + +BIN1= bounce cleanup error flush lmtp local master nqmgr pickup \ + pipe qmgr showq smtp smtpd spawn trivial-rewrite + +BIN2= postalias postcat postconf postdrop postfix \ + postkick postlog postmap postsuper sendmail + +.if defined(WITH_TEST) +BIN3= smtp-sink smtp-source +PLIST_SUB+= WITH_TEST="" +.else +PLIST_SUB+= WITH_TEST="@comment " +.endif + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -72,32 +105,6 @@ PLIST_SUB+= WITH_SASL="@comment " .endif -MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ - postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \ - sendmail.1 - -MAN5= access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \ - transport.5 virtual.5 - -MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ - master.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 \ - spawn.8 trivial-rewrite.8 - -CONF1= access aliases canonical main.cf master.cf \ - regexp_table relocated transport virtual - -CONF2= sample-aliases.cf sample-canonical.cf sample-debug.cf \ - sample-filter.cf sample-local.cf sample-misc.cf \ - sample-rate.cf sample-regexp.cf sample-relocated.cf \ - sample-resource.cf sample-rewrite.cf sample-smtp.cf \ - sample-smtpd.cf sample-transport.cf sample-virtual.cf - -BIN1= bounce cleanup error flush lmtp local master nqmgr pickup \ - pipe qmgr showq smtp smtpd spawn trivial-rewrite - -BIN2= postalias postcat postconf postdrop postfix \ - postkick postlog postmap postsuper sendmail - post-patch: (cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ @@ -141,6 +148,14 @@ ${PREFIX}/sbin .endfor +.if defined(WITH_TEST) +.for file in ${BIN3} + @${INSTALL_PROGRAM} \ + ${WRKSRC}/src/smtpstone/${file} \ + ${PREFIX}/sbin +.endfor +.endif + .for file in ${MAN1} @${INSTALL_MAN} \ ${WRKSRC}/man/man1/${file} \ @@ -183,10 +198,10 @@ ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >>/etc/mail/mailer.conf + ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff -urN postfix-current.orig/pkg-plist postfix-current/pkg-plist --- postfix-current.orig/pkg-plist Tue Nov 7 08:18:19 2000 +++ postfix-current/pkg-plist Tue Nov 7 14:16:54 2000 @@ -56,5 +56,7 @@ sbin/postsuper sbin/postdrop sbin/sendmail +%%WITH_TEST%%sbin/smtp-sink +%%WITH_TEST%%sbin/smtp-source @dirrm etc/postfix @dirrm libexec/postfix >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message