upgrade to 0.38.2

fix deinstall problem

PR:		39003
Submitted by:	maintainer

11 files changed, 353 insertions, 102 deletions

diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index db698fbc0224..e43e13d9c989 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier
-PORTVERSION=	0.37.3
+PORTVERSION=	0.38.2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -16,7 +16,9 @@ MAINTAINER=	yds@CoolRat.org
 RUN_DEPENDS=	${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
 
-NO_PACKAGE=	"Goes into an infinite loop during the build"
+.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
+IS_INTERACTIVE=	yes
+.endif
 
 #
 # User-serviceable variables
@@ -43,11 +45,7 @@ LIBEXECDIR=	${PREFIX}/libexec
 LOCALSTATEDIR=	/var/spool/courier
 CACHEDIR=	/var/spool/webmail
 CALENDIR=	/var/spool/calendar
-MIMETYPES=	${LOCALBASE}/etc/apache/mime.types
-
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-IS_INTERACTIVE=	yes
-.endif
+MIMETYPES=	${LOCALBASE}/etc/apache/mime.types:${LOCALBASE}/etc/apache2/mime.types
 
 USE_SUBMAKE=	yes
 USE_PERL5=	yes
@@ -79,10 +77,11 @@ CONFIGURE_ARGS=	--disable-root-check --with-db=db \
 CONFIGURE_ENV=	PATH="${PATH}:${SCRIPTDIR}"
 
 # Respect the make.conf(5) NOUUCP setting
+WITH_TRANSPORT=	local esmtp dsn
 .if defined(NOUUCP)
-CONFIGURE_ARGS+=--with-transport='local esmtp dsn'
 PLIST_SUB+=	SUB_UUCP="@comment "
 .else
+WITH_TRANSPORT+=uucp
 PLIST_SUB+=	SUB_UUCP=""
 .endif
 
@@ -96,9 +95,25 @@ PLIST_SUB+=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" \
 		CACHEOWN="${CACHEOWN}"
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
+		WITH_EXPECT="${WITH_EXPECT:L}" \
+		WITH_GNUPG="${WITH_GNUPG:L}" \
+		WITH_ASPELL="${WITH_ASPELL:L}" \
+		WITH_ISPELL="${WITH_ISPELL:L}" \
+		WITH_LDAP1="${WITH_LDAP1:L}" \
+		WITH_LDAP2="${WITH_LDAP2:L}" \
+		WITH_MYSQL="${WITH_MYSQL:L}" \
+		WITH_PGSQL="${WITH_PGSQL:L}" \
+		WITH_VPOPMAIL="${WITH_VPOPMAIL:L}" \
+		WITH_PROCMAIL="${WITH_PROCMAIL:L}" \
+		WITH_SENDFAX="${WITH_SENDFAX:L}" \
+		WITH_IPV6="${WITH_IPV6:L}" \
+		WITH_TRANSPORT="${WITH_TRANSPORT}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}"
 
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.endif
 .include "${.CURDIR}/Makefile.man"
 .include "${.CURDIR}/Makefile.doc"
 .include "${.CURDIR}/Makefile.own"
@@ -106,10 +121,6 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 pre-everything::
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.${PORTNAME}
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
 post-patch:
 	@${PERL} -pi -e 's:\@datadir\@:\@sysconfdir\@:g;' \
 		${WRKSRC}/*/mk*cert.* \
@@ -184,7 +195,9 @@ post-install:
 	@${CHOWN} -Rh ${MANOWN}:${MANGRP} ${MANPREFIX}/man/man[1-9ln]
 	@${CHOWN} -Rh ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 	@${CHMOD} -R a-w ${DATADIR}
+	@${ECHO} ""
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO} ""
 
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
diff --git a/mail/courier/Makefile.man b/mail/courier/Makefile.man
index 7e452afef6b0..fcdc2e30c7f4 100644
--- a/mail/courier/Makefile.man
+++ b/mail/courier/Makefile.man
@@ -74,3 +74,7 @@ MAN8+=	courieruucp.8
 MLINKS+=courieruucp.8 makeuucpneighbors.8
 .endif
 
+.if defined(WITH_FAX) && ${WITH_FAX} == yes
+MAN8+=	courierfax.8
+.endif
+	
diff --git a/mail/courier/distinfo b/mail/courier/distinfo
index c2f601a76c78..28202f359987 100644
--- a/mail/courier/distinfo
+++ b/mail/courier/distinfo
@@ -1 +1 @@
-MD5 (courier-0.37.3.tar.gz) = c217c98b157c1ca77f17ce61b6135c37
+MD5 (courier-0.38.2.tar.gz) = fe8fd90858882f0c5d4bd871512f7cbb
diff --git a/mail/courier/files/patch-courier::module.fax b/mail/courier/files/patch-courier::module.fax
new file mode 100644
index 000000000000..e0651b1727a1
--- /dev/null
+++ b/mail/courier/files/patch-courier::module.fax
@@ -0,0 +1,35 @@
+--- courier/module.fax/application-pdf.filter.in.orig	Mon Mar  4 19:32:16 2002
++++ courier/module.fax/application-pdf.filter.in	Fri Jun  7 10:21:37 2002
+@@ -8,7 +8,4 @@
+ . @filterbindir@/init
+ 
+ cat >$OUTDIR/.pdf
+-@PDFTOPS@ -q $OUTDIR/.pdf $OUTDIR/.ps
+-rm -f $OUTDIR/.pdf
+-
+-$GS -sDEVICE=faxg3 $FAXRES -dBATCH -sOutputFile=$OUTDIR/f%04d -dNOPAUSE -q -dSAFER - <$OUTDIR/.ps
++exec $GS -sDEVICE=faxg3 $FAXRES -dBATCH -sOutputFile=$OUTDIR/f%04d -dNOPAUSE -q -dSAFER -c save pop -_ <$OUTDIR/.pdf
+--- courier/module.fax/application-postscript.filter.in.orig	Mon Mar  4 19:32:16 2002
++++ courier/module.fax/application-postscript.filter.in	Fri Jun  7 10:20:55 2002
+@@ -7,4 +7,4 @@
+ 
+ . @filterbindir@/init
+ 
+-$GS -sDEVICE=faxg3 $FAXRES -dBATCH -sOutputFile=$OUTDIR/f%04d -dNOPAUSE -q -dSAFER -
++exec $GS -sDEVICE=faxg3 $FAXRES -dBATCH -sOutputFile=$OUTDIR/f%04d -dNOPAUSE -q -dSAFER -_
+--- courier/module.fax/coverpage.in.orig	Mon Mar  4 19:32:16 2002
++++ courier/module.fax/coverpage.in	Fri Jun  7 10:23:51 2002
+@@ -49,4 +49,4 @@
+ rm -f $OUTDIR/.tbl
+ $DPOST <$OUTDIR/.troff >$OUTDIR/.dpost
+ rm -f $OUTDIR/.troff
+-$GS -sDEVICE=faxg3 $FAXRES -dBATCH -sOutputFile=$OUTDIR/f%04d -dNOPAUSE -q -dSAFER - <$OUTDIR/.dpost
++exec $GS -sDEVICE=faxg3 $FAXRES -dBATCH -sOutputFile=$OUTDIR/f%04d -dNOPAUSE -q -dSAFER -_ <$OUTDIR/.dpost
+--- courier/module.fax/text-plain.filter.in.orig	Mon Mar  4 19:32:16 2002
++++ courier/module.fax/text-plain.filter.in	Fri Jun  7 10:24:54 2002
+@@ -27,4 +27,4 @@
+ rm -f $OUTDIR/.troff
+ $DPOST <$OUTDIR/.dpost >$OUTDIR/.ps
+ rm -f $OUTDIR/.dpost
+-$GS -sDEVICE=faxg3 $FAXRES -dBATCH -sOutputFile=$OUTDIR/f%04d -dNOPAUSE -q -dSAFER - <$OUTDIR/.ps
++exec $GS -sDEVICE=faxg3 $FAXRES -dBATCH -sOutputFile=$OUTDIR/f%04d -dNOPAUSE -q -dSAFER -_ <$OUTDIR/.ps
diff --git a/mail/courier/files/patch-courier_perms.sh.in b/mail/courier/files/patch-courier::perms.sh.in
index fd757b9c8db5..fd757b9c8db5 100644
--- a/mail/courier/files/patch-courier_perms.sh.in
+++ b/mail/courier/files/patch-courier::perms.sh.in
diff --git a/mail/courier/pkg-deinstall b/mail/courier/pkg-deinstall
new file mode 100644
index 000000000000..98694542058f
--- /dev/null
+++ b/mail/courier/pkg-deinstall
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $FreeBSD: /tmp/pcvs/ports/mail/courier/Attic/pkg-deinstall,v 1.1 2002-06-08 18:54:01 ijliao Exp $
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
+
+USER=courier
+GROUP=courier
+
+if [ ":$2" = ":POST-DEINSTALL" -a -d /var/spool/courier ]; then
+    if [ -z "${PACKAGE_BUILDING}" ]; then
+        echo ""
+        echo "Warning: Removing user courier will also delete any"
+        echo "	 undelivered mail in the mail queue directories!!!"
+        echo "	 Do *not* do it if you're upgrading and would like"
+        echo "	 courier to continue trying to deliver this mail."
+        echo ""
+    else
+        AFFIRM='-y'
+    fi
+    if /usr/sbin/chown -Rh ${USER}:${GROUP} /var/spool/courier; then
+        /usr/sbin/rmuser ${AFFIRM} ${USER} 2> /dev/null
+    fi
+    if [ -d /var/spool/courier ]; then
+        /usr/sbin/chown root:wheel /var/spool/courier
+    fi
+fi
diff --git a/mail/courier/pkg-descr b/mail/courier/pkg-descr
index 9516c971e6f5..af65c3d49d71 100644
--- a/mail/courier/pkg-descr
+++ b/mail/courier/pkg-descr
@@ -1,8 +1,6 @@
 Courier is a modular multiprotocol mail server that's designed to
 strike a balance between reasonable performance, flexibility and
-features.
-
-A partial list of features:
+features:
    
  * Can be configured to function as an intermediate mail relay, or
    as a mail server that receives mail for one or more domains, or
@@ -16,6 +14,7 @@ A partial list of features:
    certificate is signed by a trusted root CA (a default set of
    root CAs is provided).
  * Mailboxes can be accessed via POP3, IMAP, and HTTP.
+ * A faxmail gateway that forwards E-mail messages via fax.
  * Courier includes a mailing list manager.
  * PAM, LDAP, PostgreSQL, or MySQL authentication. 
  * Authenticated SMTP.
diff --git a/mail/courier/pkg-install b/mail/courier/pkg-install
index 3696864dd0bc..f377ef011d91 100644
--- a/mail/courier/pkg-install
+++ b/mail/courier/pkg-install
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/mail/courier/Attic/pkg-install,v 1.2 2002-01-30 03:56:07 pat Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/courier/Attic/pkg-install,v 1.3 2002-06-08 18:54:01 ijliao Exp $
 #
 
 PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 
+USER=courier;	UID=62
+GROUP=courier;	GID=62
+
 ask() {
     local question default answer
 
@@ -13,7 +16,7 @@ ask() {
     if [ -z "${PACKAGE_BUILDING}" ]; then
         read -p "${question} [${default}]? " answer
     fi
-    if [ x${answer} = x ]; then
+    if [ -z "${answer}" ]; then
         answer=${default}
     fi
     echo ${answer}
@@ -48,10 +51,7 @@ replace() {
     fi
 }
 
-if [ x"$2" = xPRE-INSTALL ]; then
-    USER=courier;	UID=62
-    GROUP=courier;	GID=62
-
+if [ ":$2" = ":PRE-INSTALL" ]; then
     if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
         echo "You already have a group \"${GROUP}\", so I will use it."
     else
@@ -82,7 +82,7 @@ if [ x"$2" = xPRE-INSTALL ]; then
     fi
 fi
 
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
+if [ ":$2" = ":POST-INSTALL" ]; then
     if [ -x /sbin/sysctl ]; then
         OSVERSION=`/sbin/sysctl -n kern.osreldate`
     else
diff --git a/mail/courier/pkg-message b/mail/courier/pkg-message
index 09709bb4b30e..409665972306 100644
--- a/mail/courier/pkg-message
+++ b/mail/courier/pkg-message
@@ -1,4 +1,3 @@
-
 		RTFM before configuring and running Courier!!!
 
 	Check and/or modify the following configuration files to
@@ -12,6 +11,9 @@
 		%%PREFIX%%/etc/courier/esmtpd
 		%%PREFIX%%/etc/courier/esmtpd-msa
 		%%PREFIX%%/etc/courier/esmtpd-ssl
+		%%PREFIX%%/etc/courier/faxcoverpage.tr
+		%%PREFIX%%/etc/courier/faxnotifyrc
+		%%PREFIX%%/etc/courier/faxrc
 		%%PREFIX%%/etc/courier/imapd
 		%%PREFIX%%/etc/courier/imapd-ssl
 		%%PREFIX%%/etc/courier/ldapaddressbook
@@ -30,4 +32,3 @@
 	Documentation (if installed locally) is located in
 	%%PREFIX%%/share/doc/courier/ otherwise see
 	http://www.Courier-MTA.org/
-
diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist
index aca8666d1816..4927f8258a6a 100644
--- a/mail/courier/pkg-plist
+++ b/mail/courier/pkg-plist
@@ -18,6 +18,9 @@
 @unexec cmp -s %D/etc/courier/esmtpd-msa %D/etc/courier/esmtpd-msa.dist && rm -f %D/etc/courier/esmtpd-msa 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/esmtpd-ssl %D/etc/courier/esmtpd-ssl.dist && rm -f %D/etc/courier/esmtpd-ssl 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/esmtpd %D/etc/courier/esmtpd.dist && rm -f %D/etc/courier/esmtpd 2>/dev/null || true
+%%SUB_FAX%%@unexec cmp -s %D/etc/courier/faxcoverpage.tr %D/etc/courier/faxcoverpage.tr.dist && rm -f %D/etc/courier/faxcoverpage.tr 2>/dev/null || true
+%%SUB_FAX%%@unexec cmp -s %D/etc/courier/faxnotifyrc %D/etc/courier/faxnotifyrc.dist && rm -f %D/etc/courier/faxnotifyrc 2>/dev/null || true
+%%SUB_FAX%%@unexec cmp -s %D/etc/courier/faxrc %D/etc/courier/faxrc.dist && rm -f %D/etc/courier/faxrc 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/imapd-ssl %D/etc/courier/imapd-ssl.dist && rm -f %D/etc/courier/imapd-ssl 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/imapd %D/etc/courier/imapd.dist && rm -f %D/etc/courier/imapd 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/ldapaddressbook %D/etc/courier/ldapaddressbook.dist && rm -f %D/etc/courier/ldapaddressbook 2>/dev/null || true
@@ -68,6 +71,9 @@ etc/courier/esmtpd-msa.dist
 etc/courier/esmtpd-ssl.dist
 etc/courier/esmtpd.cnf
 etc/courier/esmtpd.dist
+%%SUB_FAX%%etc/courier/faxcoverpage.tr.dist
+%%SUB_FAX%%etc/courier/faxnotifyrc.dist
+%%SUB_FAX%%etc/courier/faxrc.dist
 etc/courier/imapd-ssl.dist
 etc/courier/imapd.authpam
 etc/courier/imapd.cnf
@@ -79,6 +85,7 @@ etc/courier/maildrop
 etc/courier/maildropfilter
 etc/courier/module.dsn
 etc/courier/module.esmtp
+%%SUB_FAX%%etc/courier/module.fax
 etc/courier/module.local
 %%SUB_UUCP%%etc/courier/module.uucp
 etc/courier/pop3d-ssl.dist
@@ -101,6 +108,9 @@ etc/courier/webmail.authpam
 @exec [ -f %D/etc/courier/esmtpd-msa.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/esmtpd-msa.dist
 @exec [ -f %D/etc/courier/esmtpd-ssl.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/esmtpd-ssl.dist
 @exec [ -f %D/etc/courier/esmtpd.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/esmtpd.dist
+%%SUB_FAX%%@exec [ -f %D/etc/courier/faxcoverpage.tr.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/faxcoverpage.tr.dist
+%%SUB_FAX%%@exec [ -f %D/etc/courier/faxnotifyrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/faxnotifyrc.dist
+%%SUB_FAX%%@exec [ -f %D/etc/courier/faxrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/faxrc.dist
 @exec [ -f %D/etc/courier/imapd-ssl.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/imapd-ssl.dist
 @exec [ -f %D/etc/courier/imapd.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/imapd.dist
 @exec [ -f %D/etc/courier/ldapaddressbook.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/ldapaddressbook.dist
@@ -142,6 +152,7 @@ libexec/courier/modules/esmtp/authend
 libexec/courier/modules/esmtp/authstart
 libexec/courier/modules/esmtp/courieresmtp
 libexec/courier/modules/esmtp/courieresmtpd
+%%SUB_FAX%%libexec/courier/modules/fax/courierfax
 libexec/courier/modules/local/courierdeliver
 libexec/courier/modules/local/courierlocal
 libexec/courier/modules/modules.ctl
@@ -157,6 +168,7 @@ libexec/filters/perlfilter
 @dirrm libexec/authlib
 %%SUB_UUCP%%@dirrm libexec/courier/modules/uucp
 @dirrm libexec/courier/modules/local
+%%SUB_FAX%%@dirrm libexec/courier/modules/fax
 @dirrm libexec/courier/modules/esmtp
 @dirrm libexec/courier/modules/dsn
 @dirrm libexec/courier/modules
@@ -235,35 +247,39 @@ share/courier/courierwebadmin/admin-00machine.html
 share/courier/courierwebadmin/admin-00machine.pl
 share/courier/courierwebadmin/admin-05local.html
 share/courier/courierwebadmin/admin-05local.pl
-share/courier/courierwebadmin/admin-10password.html
 share/courier/courierwebadmin/admin-10password.pl
-share/courier/courierwebadmin/admin-15ldap.pl
-share/courier/courierwebadmin/admin-15ldapa.pl
+share/courier/courierwebadmin/admin-10password.html
 share/courier/courierwebadmin/admin-15ldap.html
+share/courier/courierwebadmin/admin-15ldap.pl
 share/courier/courierwebadmin/admin-15ldapa.html
+share/courier/courierwebadmin/admin-15ldapa.pl
 share/courier/courierwebadmin/admin-15mysql.html
 share/courier/courierwebadmin/admin-15mysql.pl
-share/courier/courierwebadmin/admin-15pgsql.pl
 share/courier/courierwebadmin/admin-15pgsql.html
-share/courier/courierwebadmin/admin-20aliases.html
+share/courier/courierwebadmin/admin-15pgsql.pl
 share/courier/courierwebadmin/admin-20aliases.pl
+share/courier/courierwebadmin/admin-20aliases.html
 share/courier/courierwebadmin/admin-30esmtp.html
 share/courier/courierwebadmin/admin-30esmtp.pl
-share/courier/courierwebadmin/admin-31esmtp.pl
 share/courier/courierwebadmin/admin-31esmtp.html
-share/courier/courierwebadmin/admin-40imap.pl
+share/courier/courierwebadmin/admin-31esmtp.pl
+share/courier/courierwebadmin/admin-34fax.html
+share/courier/courierwebadmin/admin-34fax.pl
+share/courier/courierwebadmin/admin-35fax.html
+share/courier/courierwebadmin/admin-35fax.pl
 share/courier/courierwebadmin/admin-40imap.html
-share/courier/courierwebadmin/admin-45pop3.pl
+share/courier/courierwebadmin/admin-40imap.pl
 share/courier/courierwebadmin/admin-45pop3.html
-share/courier/courierwebadmin/admin-47webmail.html
+share/courier/courierwebadmin/admin-45pop3.pl
 share/courier/courierwebadmin/admin-47webmail.pl
+share/courier/courierwebadmin/admin-47webmail.html
 share/courier/courierwebadmin/admin-50bofh.html
 share/courier/courierwebadmin/admin-50bofh.pl
 share/courier/courierwebadmin/admin-cancel.pl
 share/courier/courierwebadmin/admin-main.html
 share/courier/courierwebadmin/admin-main.pl
-share/courier/courierwebadmin/admin-save.pl
 share/courier/courierwebadmin/admin-save.html
+share/courier/courierwebadmin/admin-save.pl
 share/courier/courierwebadmin/dumpenv.pl
 share/courier/courierwebadmin/login.html
 share/courier/courierwebadmin/notsupp.html
@@ -273,6 +289,16 @@ share/courier/courierwebadmin/webadmin.pm
 @dirrm share/courier/courierwebadmin
 share/courier/esmtpd
 share/courier/esmtpd-ssl
+%%SUB_FAX%%share/courier/faxmail/application-pdf.filter
+%%SUB_FAX%%share/courier/faxmail/application-postscript.filter
+%%SUB_FAX%%share/courier/faxmail/coverpage
+%%SUB_FAX%%share/courier/faxmail/image-gif.filter
+%%SUB_FAX%%share/courier/faxmail/image-jpeg.filter
+%%SUB_FAX%%share/courier/faxmail/image-png.filter
+%%SUB_FAX%%share/courier/faxmail/init
+%%SUB_FAX%%share/courier/faxmail/new_fax
+%%SUB_FAX%%share/courier/faxmail/text-plain.filter
+%%SUB_FAX%%@dirrm share/courier/faxmail
 share/courier/filterctl
 share/courier/imapd
 share/courier/imapd-ssl
@@ -294,59 +320,151 @@ share/courier/perlfilter-wrapper.pl
 share/courier/pop3d
 share/courier/pop3d-ssl
 share/courier/pw2userdb
+share/courier/rootcerts/052e396b.0
 share/courier/rootcerts/0bb21872.0
+share/courier/rootcerts/0c364b2d.0
 share/courier/rootcerts/0e82f83a.0
 share/courier/rootcerts/11f154d6.0
+share/courier/rootcerts/128b9c8d.0
+share/courier/rootcerts/19899da5.0
 share/courier/rootcerts/1a147d5b.0
+share/courier/rootcerts/1bb6c7e0.0
 share/courier/rootcerts/256fd83b.0
 share/courier/rootcerts/2d047263.0
 share/courier/rootcerts/2edf7016.0
+share/courier/rootcerts/31044350.0
+share/courier/rootcerts/3ad48a91.0
+share/courier/rootcerts/3c58f906.0
+share/courier/rootcerts/3e7271e8.0
 share/courier/rootcerts/412bea73.0
+share/courier/rootcerts/418882ac.0
+share/courier/rootcerts/43d4bde2.0
+share/courier/rootcerts/4643210f.0
+share/courier/rootcerts/4d654d1d.0
+share/courier/rootcerts/5480ace1.0
 share/courier/rootcerts/54edfa5d.0
+share/courier/rootcerts/56e607f4.0
+share/courier/rootcerts/594f1775.0
+share/courier/rootcerts/5ee07a24.0
 share/courier/rootcerts/5f5e5caa.0
 share/courier/rootcerts/6166cb50.0
 share/courier/rootcerts/61f6c934.0
+share/courier/rootcerts/66eb5c17.0
 share/courier/rootcerts/66ec64da.0
+share/courier/rootcerts/6981fb07.0
+share/courier/rootcerts/6a15001a.0
 share/courier/rootcerts/6c55cf77.0
 share/courier/rootcerts/6d6ec79c.0
+share/courier/rootcerts/700b8679.0
 share/courier/rootcerts/709afd2b.0
 share/courier/rootcerts/72fa7371.0
+share/courier/rootcerts/73451336.0
+share/courier/rootcerts/739b7930.0
+share/courier/rootcerts/74c26bd0.0
 share/courier/rootcerts/7651b327.0
+share/courier/rootcerts/76d6205a.0
+share/courier/rootcerts/788c9bfc.0
+share/courier/rootcerts/7a9820c1.0
 share/courier/rootcerts/7d3cd826.0
 share/courier/rootcerts/7d453d8f.0
+share/courier/rootcerts/7e74191f.0
+share/courier/rootcerts/81447c6e.0
+share/courier/rootcerts/843b6c51.0
+share/courier/rootcerts/878cf4c6.0
+share/courier/rootcerts/8e6e2991.0
 share/courier/rootcerts/8efac7d4.0
-share/courier/rootcerts/9d0c2a65.0
+share/courier/rootcerts/8f7b96c4.0
+share/courier/rootcerts/95750816.0
+share/courier/rootcerts/97b4211c.0
+share/courier/rootcerts/a15b3b6b.0
+share/courier/rootcerts/a2be0f54.0
+share/courier/rootcerts/a2df7ad7.0
+share/courier/rootcerts/a38484ce.0
+share/courier/rootcerts/a3c60019.0
+share/courier/rootcerts/aaa45464.0
+share/courier/rootcerts/aba-ecom-root-ca.pem
+share/courier/rootcerts/addtrust-class-1-ca-root.pem
+share/courier/rootcerts/addtrust-external-ca-root.pem
+share/courier/rootcerts/addtrust-public-ca-root.pem
+share/courier/rootcerts/addtrust-qualified-ca-root.pem
+share/courier/rootcerts/american-express-certificate-authority.pem
+share/courier/rootcerts/american-express-global-certificate.pem
 share/courier/rootcerts/b0f3e76e.0
 share/courier/rootcerts/b5f329fa.0
+share/courier/rootcerts/ba386118.0
+share/courier/rootcerts/baltimore-cybertrust-code-signing.pem
+share/courier/rootcerts/baltimore-cybertrust-mobile-root.pem
+share/courier/rootcerts/baltimore-cybertrust-root.pem
+share/courier/rootcerts/bankengine.pem
+share/courier/rootcerts/bb0a889c.0
 share/courier/rootcerts/bcdd5959.0
 share/courier/rootcerts/belsign-object-publishing-ca.pem
 share/courier/rootcerts/belsign-secure-server-ca.pem
+share/courier/rootcerts/betrusted-root-ca.pem
 share/courier/rootcerts/bffe8b5d.0
 share/courier/rootcerts/c19d42c7.0
+share/courier/rootcerts/c215bc69.0
 share/courier/rootcerts/c33a80d4.0
 share/courier/rootcerts/c527e4ab.0
+share/courier/rootcerts/c9bc75ba.0
 share/courier/rootcerts/ccf7ff0e.0
+share/courier/rootcerts/certengine.pem
 share/courier/rootcerts/class-1-public-primary-ocsp-responder.pem
 share/courier/rootcerts/class-2-public-primary-ocsp-responder.pem
 share/courier/rootcerts/class-3-public-primary-ocsp-responder.pem
+share/courier/rootcerts/cybertrust-japan-root-ca.pem
+share/courier/rootcerts/cybertrust-japan-secure-server.pem
+share/courier/rootcerts/d2adc77d.0
+share/courier/rootcerts/d593166d.0
 share/courier/rootcerts/d78a75c7.0
+share/courier/rootcerts/db65db21.0
 share/courier/rootcerts/ddc328ff.0
+share/courier/rootcerts/deutsche-telekom-root-ca.pem
 share/courier/rootcerts/dfd0b044.0
+share/courier/rootcerts/digital-signature-trust-co-dstca-00.pem
+share/courier/rootcerts/digital-signature-trust-co-dstca-01.pem
+share/courier/rootcerts/dst-rootca-x1.pem
+share/courier/rootcerts/dst-rootca-x2.pem
+share/courier/rootcerts/e-certify-ca.pem
+share/courier/rootcerts/e-certify-ra.pem
+share/courier/rootcerts/e268a4c5.0
 share/courier/rootcerts/e28f6bbc.0
+share/courier/rootcerts/e7b8d656.0
+share/courier/rootcerts/e9aaa9de.0
 share/courier/rootcerts/ed049835.0
+share/courier/rootcerts/ed524cf5.0
 share/courier/rootcerts/ed62f4e3.0
+share/courier/rootcerts/entrust-net-certification-authority.pem
+share/courier/rootcerts/entrust-net-client-certification-00.pem
+share/courier/rootcerts/entrust-net-client-certification-01.pem
+share/courier/rootcerts/entrust-net-secure-server-certification-00.pem
+share/courier/rootcerts/entrust-net-secure-server-certification-01.pem
+share/courier/rootcerts/equifax-equifax-premium-certificate.pem
+share/courier/rootcerts/equifax-equifax-secure-certificate.pem
+share/courier/rootcerts/equifax-secure-ebusiness-ca-1.pem
+share/courier/rootcerts/equifax-secure-equifax-secure-ebusiness.pem
+share/courier/rootcerts/equifax-secure-global-ebusiness.pem
 share/courier/rootcerts/f10dd942.0
 share/courier/rootcerts/f4996e82.0
 share/courier/rootcerts/f73e89fd.0
+share/courier/rootcerts/fortengine.pem
 share/courier/rootcerts/globalsign-partners-ca.pem
 share/courier/rootcerts/globalsign-primary-class-1-ca.pem
 share/courier/rootcerts/globalsign-primary-class-2-ca.pem
 share/courier/rootcerts/globalsign-primary-class-3-ca.pem
 share/courier/rootcerts/globalsign-root-ca.pem
+share/courier/rootcerts/gp-root-2.pem
+share/courier/rootcerts/gp-root-3.pem
+share/courier/rootcerts/gp-root-4.pem
+share/courier/rootcerts/gp-root-5.pem
+share/courier/rootcerts/gte-cybertrust-global-root.pem
+share/courier/rootcerts/gte-cybertrust-root-5.pem
+share/courier/rootcerts/gte-cybertrust-root.pem
 share/courier/rootcerts/http-www-valicert-com-00.pem
 share/courier/rootcerts/http-www-valicert-com-01.pem
 share/courier/rootcerts/http-www-valicert-com-02.pem
 share/courier/rootcerts/http-www-valicert-net.pem
+share/courier/rootcerts/mailengine.pem
 share/courier/rootcerts/rsa-data-security-inc-secure-server.pem
 share/courier/rootcerts/secure-server-ocsp-responder.pem
 share/courier/rootcerts/tc-trustcenter-for-security-in-00.pem
@@ -359,7 +477,11 @@ share/courier/rootcerts/thawte-personal-freemail-ca.pem
 share/courier/rootcerts/thawte-personal-premium-ca.pem
 share/courier/rootcerts/thawte-premium-server-ca.pem
 share/courier/rootcerts/thawte-server-ca.pem
+share/courier/rootcerts/thawte-timestamping-ca.pem
 share/courier/rootcerts/thawte-universal-ca-root.pem
+share/courier/rootcerts/traderengine.pem
+share/courier/rootcerts/usps-production-ca-1.pem
+share/courier/rootcerts/usps-root-ca.pem
 share/courier/rootcerts/verisign-class-1-public-primary.pem
 share/courier/rootcerts/verisign-class-2-public-primary.pem
 share/courier/rootcerts/verisign-class-3-public-primary.pem
@@ -367,11 +489,17 @@ share/courier/rootcerts/verisign-class-4-public-primary.pem
 share/courier/rootcerts/verisign-inc-class-1-public-primary.pem
 share/courier/rootcerts/verisign-inc-class-2-public-primary.pem
 share/courier/rootcerts/verisign-inc-class-3-public-primary.pem
-share/courier/rootcerts/verisign-inc-class-4-public-primary.pem
 share/courier/rootcerts/verisign-inc-verisign-trust-network-00.pem
 share/courier/rootcerts/verisign-inc-verisign-trust-network-01.pem
 share/courier/rootcerts/verisign-inc-verisign-trust-network-02.pem
 share/courier/rootcerts/verisign-inc-verisign-trust-network-03.pem
+share/courier/rootcerts/verisign-time-stamping-authority.pem
+share/courier/rootcerts/visa-visa-international-service.pem
+share/courier/rootcerts/xcert-ez-by-dst.pem
+share/courier/rootcerts/xcert-international-inc-xcert-root-00.pem
+share/courier/rootcerts/xcert-international-inc-xcert-root-01.pem
+share/courier/rootcerts/xcert-international-inc-xcert-root-02.pem
+share/courier/rootcerts/xcert-international-inc-xcert-root-03.pem
 @dirrm share/courier/rootcerts
 share/courier/sqwebmail/cleancache.pl
 share/courier/sqwebmail/html/en-us/CHARSET
@@ -496,6 +624,7 @@ share/courier/webgpg
 %%PORTDOCS%%share/doc/courier/html/courier.html
 %%PORTDOCS%%share/doc/courier/html/courierd.html
 %%PORTDOCS%%share/doc/courier/html/courierdsn.html
+%%SUB_FAX%%%%PORTDOCS%%share/doc/courier/html/courierfax.html
 %%PORTDOCS%%share/doc/courier/html/courierfilter.html
 %%PORTDOCS%%share/doc/courier/html/courierldapaliasd.html
 %%PORTDOCS%%share/doc/courier/html/couriermlm.html
@@ -582,10 +711,15 @@ share/courier/webgpg
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnsubjectnotice.txt
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnsubjectwarn.txt
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/esmtpauthclient
+%%SUB_FAX%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/faxcoverpage.tr.dist
+%%SUB_FAX%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/faxnotifyrc.dist
+%%SUB_FAX%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/faxrc.dist
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.dsn
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.esmtp
+%%SUB_FAX%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.fax
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.local
 %%SUB_UUCP%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.uucp
+@exec chown -Rh %%BINOWN%%:%%BINGRP%% %D/libexec/authlib
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliascombine
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliascreate
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliasexp
@@ -596,6 +730,7 @@ share/courier/webgpg
 @exec chown %%BINOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/authstart
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/courieresmtp
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/courieresmtpd
+%%SUB_FAX%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/fax/courierfax
 %%SUB_UUCP%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/uucp/courieruucp
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/submit
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/submitmkdir
@@ -607,6 +742,7 @@ share/courier/webgpg
 @exec install -d -o %%BINOWN%% -g %%BINGRP%% -m 0755 /var/spool/courier
 @exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/allfilters
 @exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0770 /var/spool/courier/authdaemon
+%%SUB_FAX%%@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0700 /var/spool/courier/faxtmp
 @exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/filters
 @exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/msgq
 @exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/msgs
@@ -614,16 +750,6 @@ share/courier/webgpg
 @exec install -c -o %%MAILOWN%% -g %%MAILGRP%% -m 0400 /dev/null /var/spool/courier/.noident
 @exec install -d -o %%CACHEOWN%% -g mail -m 0700 /var/spool/webmail
 @exec crontab -u %%CACHEOWN%% %D/etc/courier/crontab 2>/dev/null || true
-@unexec crontab -u %%CACHEOWN%% -l 2>/dev/null || true
-@unexec crontab -u %%CACHEOWN%% -r || true
-@unexec [ -d /var/spool/courier ] && chown -Rh %%MAILOWN%%:%%MAILGRP%% /var/spool/courier
-@unexec echo ""
-@unexec echo "Warning: Removing user courier will also delete any"
-@unexec echo "	 undelivered mail in the mail queue directories!!!"
-@unexec echo "	 Do not do it if you're upgrading and would like"
-@unexec echo "	 courier to continue trying to deliver this mail."
-@unexec echo ""
-@unexec rmuser %%MAILOWN%% 2>/dev/null || true
-@unexec [ -d /var/spool/courier ] && chown 0:0 /var/spool/courier 2>/dev/null || true
+@unexec echo y | crontab -u %%CACHEOWN%% -r || true
 @unexec rm -rf /var/spool/calendar 2>/dev/null || true
 @unexec rm -rf /var/spool/webmail 2>/dev/null || true
diff --git a/mail/courier/scripts/configure.courier b/mail/courier/scripts/configure.courier
index 6eb3772dbb1c..476526d0012e 100644
--- a/mail/courier/scripts/configure.courier
+++ b/mail/courier/scripts/configure.courier
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/courier/scripts/Attic/configure.courier,v 1.2 2002-01-22 04:44:18 dwhite Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/courier/scripts/Attic/configure.courier,v 1.3 2002-06-08 18:54:01 ijliao Exp $
 
 [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ] && exit
 
@@ -13,86 +13,105 @@ else
 	PGSQLINCLUDES=${PGSQLBASE}/include/pgsql
 fi
 
-if [ "${BATCH}" = "yes" ]; then
-	[ "x${ENABLE_EXPECT}"	= "xYES" ] && OPTIONS="${OPTIONS} \"Expect\""
-	[ "x${ENABLE_GNUPG}"	= "xYES" ] && OPTIONS="${OPTIONS} \"GnuPG\""
-	[ "x${ENABLE_ASPELL}"	= "xYES" ] && OPTIONS="${OPTIONS} \"ASpell\""
-	[ "x${ENABLE_ISPELL}"	= "xYES" ] && OPTIONS="${OPTIONS} \"ISpell\""
-	[ "x${ENABLE_LDAP1}"	= "xYES" ] && OPTIONS="${OPTIONS} \"OpenLDAP1\""
-	[ "x${ENABLE_LDAP2}"	= "xYES" ] && OPTIONS="${OPTIONS} \"OpenLDAP2\""
-	[ "x${ENABLE_MYSQL}"	= "xYES" ] && OPTIONS="${OPTIONS} \"MySQL\""
-	[ "x${ENABLE_PGSQL}"	= "xYES" ] && OPTIONS="${OPTIONS} \"PostgreSQL\""
-	[ "x${ENABLE_VPOPMAIL}"	= "xYES" ] && OPTIONS="${OPTIONS} \"VPopMail\""
-	[ "x${ENABLE_PROCMAIL}"	= "xYES" ] && OPTIONS="${OPTIONS} \"Procmail\""
-	[ "x${ENABLE_IPV6}"	= "xYES" ] && OPTIONS="${OPTIONS} \"IPv6\""
+if [ ":${BATCH}" = ':yes' ]; then
+	[ ":${WITH_EXPECT}"	= ':yes' ] && OPTIONS="${OPTIONS} \"Expect\""
+	[ ":${WITH_GNUPG}"	= ':yes' ] && OPTIONS="${OPTIONS} \"GnuPG\""
+	[ ":${WITH_ASPELL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"ASpell\""
+	[ ":${WITH_ISPELL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"ISpell\""
+	[ ":${WITH_LDAP1}"	= ':yes' ] && OPTIONS="${OPTIONS} \"OpenLDAP1\""
+	[ ":${WITH_LDAP2}"	= ':yes' ] && OPTIONS="${OPTIONS} \"OpenLDAP2\""
+	[ ":${WITH_MYSQL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"MySQL\""
+	[ ":${WITH_PGSQL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"PostgreSQL\""
+	[ ":${WITH_VPOPMAIL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"VPopMail\""
+	[ ":${WITH_PROCMAIL}"	= ':yes' ] && OPTIONS="${OPTIONS} \"Procmail\""
+	[ ":${WITH_SENDFAX}"	= ':yes' ] && OPTIONS="${OPTIONS} \"SendFax\""
+	[ ":${WITH_IPV6}"	= ':yes' ] && OPTIONS="${OPTIONS} \"IPv6\""
 	[ -n "${OPTIONS}" ] && set ${OPTIONS}
 else
-	if [ "x${ENABLE_EXPECT}" = "xYES" \
+	if [ ":${WITH_EXPECT}" = ':yes' \
 	  -o -x ${LOCALBASE}/bin/expect ]; then
 		SET_EXPECT="ON"
 	else
 		SET_EXPECT="OFF"
 	fi
-	if [ "x${ENABLE_GNUPG}" = "xYES" \
+	if [ ":${WITH_GNUPG}" = ':yes' \
 	  -o -x ${LOCALBASE}/bin/gpg ]; then
 		SET_GNUPG="ON"
 	else
 		SET_GNUPG="OFF"
 	fi
-	if [ "x${ENABLE_ASPELL}" = "xYES" \
+	if [ ":${WITH_ASPELL}" = ':yes' \
 	  -o -x ${LOCALBASE}/bin/aspell ]; then
 		SET_ASPELL="ON"
+		SET_ISPELL="OFF"
 	else
 		SET_ASPELL="OFF"
 	fi
-	if [ "x${ENABLE_ISPELL}" = "xYES" \
+	if [ ":${WITH_ISPELL}" = ':yes' \
 	  -o -x ${LOCALBASE}/bin/ispell \
-	  -a "x${SET_ASPELL}" = "xOFF" ]; then
+	  -a "${SET_ASPELL}" = "OFF" ]; then
 		SET_ISPELL="ON"
+		SET_ASPELL="OFF"
 	else
 		SET_ISPELL="OFF"
 	fi
-	if [ "x${ENABLE_LDAP1}" = "xYES" \
+	if [ ":${WITH_LDAP1}" = ':yes' \
 	  -o -f ${LOCALBASE}/lib/libldap.so.1 \
 	  -a -f ${LOCALBASE}/lib/liblber.so.1 ]; then
 		SET_LDAP1="ON"
+		SET_LDAP2="OFF"
 	else
 		SET_LDAP1="OFF"
 	fi
-	if [ "x${ENABLE_LDAP2}" = "xYES" \
+	if [ ":${WITH_LDAP2}" = ':yes' \
 	  -o -f ${LOCALBASE}/lib/libldap.so.2 \
-	  -a -f ${LOCALBASE}/lib/liblber.so.2 \
-	  -a "x${SET_LDAP1}" = "xOFF" ]; then
+	  -a -f ${LOCALBASE}/lib/liblber.so.2 ]; then
+		SET_LDAP1="OFF"
 		SET_LDAP2="ON"
 	else
 		SET_LDAP2="OFF"
 	fi
-	if [ "x${ENABLE_MYSQL}" = "xYES" \
+	if [ ":${WITH_MYSQL}" = ':yes' \
 	  -o -f ${LOCALBASE}/lib/mysql/libmysqlclient.so.10 ]; then
 		SET_MYSQL="ON"
 	else
 		SET_MYSQL="OFF"
 	fi
-	if [ "x${ENABLE_PGSQL}" = "xYES" \
+	if [ ":${WITH_PGSQL}" = ':yes' \
 	  -o -f ${PGSQLBASE}/lib/libpq.so.2 ]; then
 		SET_PGSQL="ON"
 	else
 		SET_PGSQL="OFF"
 	fi
-	if [ "x${ENABLE_VPOPMAIL}" = "xYES" \
+	if [ ":${WITH_VPOPMAIL}" = ':yes' \
 	  -o -f ${LOCALBASE}/vpopmail/lib/libvpopmail.a ]; then
 		SET_VPOPMAIL="ON"	# authvchkpw and authmysql
 		SET_MYSQL="OFF"		# are mutually exclusive
 	else
 		SET_VPOPMAIL="OFF"
 	fi
-	if [ "x${ENABLE_PROCMAIL}" = "xYES" \
+	if [ ":${WITH_PROCMAIL}" = ':yes' \
 	  -o -x ${LOCALBASE}/bin/procmail ]; then
 		SET_PROCMAIL="ON"
 	else
 		SET_PROCMAIL="OFF"
 	fi
-	if [ "x${ENABLE_IPV6}" = "xYES" ]; then
+	if [ ":${WITH_SENDFAX}" = ':yes' \
+	  -o -x ${LOCALBASE}/bin/pnmscale \
+	  -a -x ${LOCALBASE}/bin/giftopnm \
+	  -a -x ${LOCALBASE}/bin/jpegtopnm \
+	  -a -x ${LOCALBASE}/bin/ppmtopgm \
+	  -a -x ${LOCALBASE}/bin/pgmtopbm \
+	  -a -x ${LOCALBASE}/bin/pbmtog3 \
+	  -a -x ${LOCALBASE}/bin/g3topbm \
+	  -a -x ${LOCALBASE}/bin/pngtopnm \
+	  -a -x ${LOCALBASE}/bin/pnmtopng \
+	  -a -x ${LOCALBASE}/bin/gs ]; then
+		SET_SENDFAX="ON"
+	else
+		SET_SENDFAX="OFF"
+	fi
+	if [ ":${WITH_IPV6}" = ':yes' ]; then
 		SET_IPV6="ON"
 	else
 		SET_IPV6="OFF"
@@ -111,22 +130,18 @@ MySQL		"MySQL authentication support" ${SET_MYSQL} \
 PostgreSQL	"PostgreSQL authentication support" ${SET_PGSQL} \
 VPopMail	"VPopMail authentication support" ${SET_VPOPMAIL} \
 Procmail	"Procmail local delivery support" ${SET_PROCMAIL} \
+SendFax		"mgetty+sendfax support" ${SET_SENDFAX} \
 IPv6		"IPv6 support (experimental)" ${SET_IPV6} \
-2> $tempfile
+2> ${tempfile}
 
 	retval=$?
 
-	if [ -s $tempfile ]; then
-		set `cat $tempfile`
-	fi
-	rm -f $tempfile
+	[ -s ${tempfile} ] && set `cat ${tempfile}`
+	rm -f ${tempfile}
 
-	case $retval in
-		0)	[ -z "$*" ] && echo "Nothing selected"
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
+	case ${retval} in
+	0)	[ -z "$*" ] && echo "Nothing selected" ;;
+	1)	echo "Cancel pressed." && exit 1 ;;
 	esac
 fi
 
@@ -142,6 +157,7 @@ WITH_PGSQL="--without-authpgsql"
 WITH_VCHKPW="--without-authvchkpw"
 WITH_IPV6="--without-ipv6"
 
+SUB_FAX="@comment "
 SUB_LDAP="@comment "
 SUB_MYSQL="@comment "
 SUB_PGSQL="@comment "
@@ -149,10 +165,10 @@ SUB_PGSQL="@comment "
 while [ "$1" ]; do
 	case $1 in
 		\"Expect\")
-			echo "BUILD_DEPENDS+=	expect:${PORTSDIR}/lang/expect"
+			echo "BUILD_DEPENDS+=	expect:\${PORTSDIR}/lang/expect"
 			;;
 		\"GnuPG\")
-			echo "BUILD_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg"
+			echo "BUILD_DEPENDS+=	gpg:\${PORTSDIR}/security/gnupg"
 			;;
 		\"ASpell\")
 			if [ "$ISPELL" ]; then
@@ -160,8 +176,8 @@ while [ "$1" ]; do
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			echo "BUILD_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell"
-			WITH_ISPELL="--with-ispell=${LOCALBASE}/bin/aspell"
+			echo "BUILD_DEPENDS+=	aspell:\${PORTSDIR}/textproc/aspell"
+			WITH_ISPELL="--with-ispell=\${LOCALBASE}/bin/aspell"
 			ASPELL=1
 			;;
 		\"ISpell\")
@@ -170,8 +186,8 @@ while [ "$1" ]; do
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			echo "BUILD_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell"
-			WITH_ISPELL="--with-ispell=${LOCALBASE}/bin/ispell"
+			echo "BUILD_DEPENDS+=	ispell:\${PORTSDIR}/textproc/ispell"
+			WITH_ISPELL="--with-ispell=\${LOCALBASE}/bin/ispell"
 			ISPELL=1
 			;;
 		\"OpenLDAP1\")
@@ -181,8 +197,8 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "LIB_DEPENDS+=	ldap.1:\${PORTSDIR}/net/openldap"
-			CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
-                        LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+			CPPFLAGS="${CPPFLAGS} -I\${LOCALBASE}/include"
+			LDFLAGS="${LDFLAGS} -L\${LOCALBASE}/lib"
 			WITH_LDAP="--with-authldap"
 			PKGNAMESUFFIX="${PKGNAMESUFFIX}-ldap"
 			SUB_LDAP=""
@@ -195,8 +211,8 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap2"
-			CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
-                        LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+			CPPFLAGS="${CPPFLAGS} -I\${LOCALBASE}/include"
+			LDFLAGS="${LDFLAGS} -L\${LOCALBASE}/lib"
 			WITH_LDAP="--with-authldap"
 			PKGNAMESUFFIX="${PKGNAMESUFFIX}-ldap"
 			SUB_LDAP=""
@@ -209,10 +225,10 @@ while [ "$1" ]; do
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			else
-				echo "LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client"
+				echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
 				WITH_MYSQL="--with-authmysql"
-				WITH_MYSQL="${WITH_MYSQL} --with-mysql-libs=${LOCALBASE}/lib/mysql"
-				WITH_MYSQL="${WITH_MYSQL} --with-mysql-includes=${LOCALBASE}/include/mysql"
+				WITH_MYSQL="${WITH_MYSQL} --with-mysql-libs=\${LOCALBASE}/lib/mysql"
+				WITH_MYSQL="${WITH_MYSQL} --with-mysql-includes=\${LOCALBASE}/include/mysql"
 				PKGNAMESUFFIX="${PKGNAMESUFFIX}-mysql"
 				SUB_MYSQL=""
 			fi	
@@ -226,12 +242,37 @@ while [ "$1" ]; do
 			SUB_PGSQL=""
 			;;
 		\"VPopMail\")
-			echo "BUILD_DEPENDS+=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/vpopmail/lib/libvpopmail.a:\${PORTSDIR}/mail/vpopmail"
 			WITH_VCHKPW="--with-authvchkpw"
 			PKGNAMESUFFIX="${PKGNAMESUFFIX}-vpopmail"
 			;;
 		\"Procmail\")
-			echo "BUILD_DEPENDS+=	procmail:${PORTSDIR}/mail/procmail"
+			echo "BUILD_DEPENDS+=	procmail:\${PORTSDIR}/mail/procmail"
+			;;
+		\"SendFax\")
+			echo "BUILD_DEPENDS+=	gs:\${PORTSDIR}/print/ghostscript-gnu"
+			echo "BUILD_DEPENDS+=	pnmscale:\${PORTSDIR}/graphics/netpbm"
+			echo "BUILD_DEPENDS+=	giftopnm:\${PORTSDIR}/graphics/netpbm"
+			echo "BUILD_DEPENDS+=	jpegtopnm:\${PORTSDIR}/graphics/netpbm"
+			echo "BUILD_DEPENDS+=	ppmtopgm:\${PORTSDIR}/graphics/netpbm"
+			echo "BUILD_DEPENDS+=	pgmtopbm:\${PORTSDIR}/graphics/netpbm"
+			echo "BUILD_DEPENDS+=	pbmtog3:\${PORTSDIR}/graphics/netpbm"
+			echo "BUILD_DEPENDS+=	g3topbm:\${PORTSDIR}/graphics/netpbm"
+			echo "BUILD_DEPENDS+=	pngtopnm:\${PORTSDIR}/graphics/netpbm"
+			echo "BUILD_DEPENDS+=	pnmtopng:\${PORTSDIR}/graphics/netpbm"
+			echo "RUN_DEPENDS+=	gs:\${PORTSDIR}/print/ghostscript-gnu"
+			echo "RUN_DEPENDS+=	pnmscale:\${PORTSDIR}/graphics/netpbm"
+			echo "RUN_DEPENDS+=	giftopnm:\${PORTSDIR}/graphics/netpbm"
+			echo "RUN_DEPENDS+=	jpegtopnm:\${PORTSDIR}/graphics/netpbm"
+			echo "RUN_DEPENDS+=	ppmtopgm:\${PORTSDIR}/graphics/netpbm"
+			echo "RUN_DEPENDS+=	pgmtopbm:\${PORTSDIR}/graphics/netpbm"
+			echo "RUN_DEPENDS+=	pbmtog3:\${PORTSDIR}/graphics/netpbm"
+			echo "RUN_DEPENDS+=	g3topbm:\${PORTSDIR}/graphics/netpbm"
+			echo "RUN_DEPENDS+=	pngtopnm:\${PORTSDIR}/graphics/netpbm"
+			echo "RUN_DEPENDS+=	pnmtopng:\${PORTSDIR}/graphics/netpbm"
+			echo "WITH_FAX=		yes"
+			WITH_TRANSPORT="${WITH_TRANSPORT} fax"
+			SUB_FAX=""
 			;;
 		\"IPv6\")
 			WITH_IPV6=""
@@ -254,7 +295,11 @@ echo "CONFIGURE_ARGS+= ${WITH_MYSQL}"
 echo "CONFIGURE_ARGS+= ${WITH_PGSQL}"
 echo "CONFIGURE_ARGS+= ${WITH_VCHKPW}"
 echo "CONFIGURE_ARGS+= ${WITH_IPV6}"
-echo "PKGNAMESUFFIX=	${PKGNAMESUFFIX}"
+echo "CONFIGURE_ARGS+= --with-transport='${WITH_TRANSPORT}'"
+echo "PLIST_SUB+=	SUB_FAX='${SUB_FAX}'"
 echo "PLIST_SUB+=	SUB_LDAP='${SUB_LDAP}'"
 echo "PLIST_SUB+=	SUB_MYSQL='${SUB_MYSQL}'"
 echo "PLIST_SUB+=	SUB_PGSQL='${SUB_PGSQL}'"
+[ -n "${PKGNAMESUFFIX}" ] && echo "PKGNAMESUFFIX=	${PKGNAMESUFFIX}"
+
+exit 0