summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsergei <sergei@FreeBSD.org>2004-01-15 15:12:32 +0000
committersergei <sergei@FreeBSD.org>2004-01-15 15:12:32 +0000
commitfd8065e3ac68598644fc6ac18a9f58dd7b4605bb (patch)
tree997606c9d39485a30de9ed22c3c09914ecd47948
parent5757940070152dc2eb407ca784a9ffe369866369 (diff)
downloadFreeBSD-ports-fd8065e3ac68598644fc6ac18a9f58dd7b4605bb.zip
FreeBSD-ports-fd8065e3ac68598644fc6ac18a9f58dd7b4605bb.tar.gz
- Update to 0.44.2
- Fix LDAP support build problems - CONFLICTS has been expanded - WITH_GHOSTSCRIPT_AFPL support has been changed to honor GSPORT - WITH_TRANSPORT+=uucp changed since uucp is no longer part of the base system and NOUUCP is no longer a /etc/make.conf tunable for buildworld - WITH_EXPECT not being set now adds --disable-changepass which causes the suid authdaemon.passwd to not be installed. - devel/fam dependency is now non-optional since the port will use the library if it finds it regardless of one's intention to use it or not. For instance if libfam is installed and one doe not want it used by courier but chosses the WITH_LDAP support than libfam will get sucked in as well. Then the user deletes fam and courier breaks because the user had no idea courier depended on it. So until courier gets a configure --without-fam tunable this should be a mandatory dependency. - and last but not least etc/rc.d/courier.sh startup script has been rewritten to work with rc.subr which allows one to move it to /etc/rc.d/courier and have it just work. :) PR: 61112 Submitted by: Yarema <yds@CoolRat.org>
-rw-r--r--mail/courier/Makefile142
-rw-r--r--mail/courier/Makefile.man10
-rw-r--r--mail/courier/distinfo2
-rw-r--r--mail/courier/files/courier.sh154
-rw-r--r--mail/courier/files/patch-configure12
-rw-r--r--mail/courier/files/patch-courier::configure15
-rw-r--r--mail/courier/files/patch-courier::configure.in21
-rw-r--r--mail/courier/pkg-descr2
-rw-r--r--mail/courier/pkg-install6
-rw-r--r--mail/courier/pkg-message21
-rw-r--r--mail/courier/pkg-plist90
-rw-r--r--mail/courier/scripts/configure.courier112
12 files changed, 348 insertions, 239 deletions
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 99033f4..2030c71 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= courier
-PORTVERSION= 0.44.0
+PORTVERSION= 0.44.2
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= courier
@@ -14,6 +14,19 @@ MASTER_SITE_SUBDIR= courier
MAINTAINER= ports@FreeBSD.org
COMMENT= Courier SMTP IMAP POP3 HTTP mail server suite
+CONFLICTS= exim-4.* courier-imap-2.* maildrop-1.* \
+ postfix-1.* postfix-2.* \
+ qmail-1.* qmail-*-1.* \
+ sendmail-8.* sendmail-*-8.* \
+ smail-3.* sqwebmail-3.* zmailer-2.*
+
+.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
+GSPORT?= print/ghostscript-afpl
+.else
+GSPORT?= print/ghostscript-gnu
+.endif
+
+LIB_DEPENDS= fam.0:${PORTSDIR}/devel/fam
RUN_DEPENDS= ${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
@@ -35,11 +48,10 @@ IMAGEURL?= /webmail
CACHEOWN?= pop
MAILDROPDEFAULT?=./Maildir
# End of user-serviceable variables
-CONFLICTS= postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-MAILOWN= mailnull
-MAILGRP= mailnull
-MAILUID= 26
-MAILGID= 26
+MAILOWN= courier
+MAILGRP= courier
+MAILUID= 465
+MAILGID= 465
ETCDIR= ${PREFIX}/etc
SYSCONFDIR= ${ETCDIR}/courier
USERDB= ${ETCDIR}/userdb
@@ -54,10 +66,19 @@ USE_SUBMAKE= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_OPENSSL= yes
-USE_AUTOMAKE_VER=15
-CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash
+USE_RC_SUBR= yes
+USE_REINPLACE= yes
+USE_LIBTOOL_VER=15
+
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash \
+ CPPFLAGS='${CPPFLAGS}' \
+ LDFLAGS='${LDFLAGS}'
+MAKE_ENV:= ${CONFIGURE_ENV}
CONFIGURE_ARGS= --disable-root-check --with-db=db \
--enable-syslog=1 --enable-use-flock \
+ --program-transform-name=s,^,, \
--with-mailuser=${MAILOWN} \
--with-mailgroup=${MAILGRP} \
--with-mailuid=${MAILUID} \
@@ -75,15 +96,7 @@ CONFIGURE_ARGS= --disable-root-check --with-db=db \
--with-calendardir=${CALENDIR} \
--with-default-maildrop=${MAILDROPDEFAULT} \
--enable-workarounds-for-imap-client-bugs
-
-# Respect the make.conf(5) NOUUCP setting
-WITH_TRANSPORT= local esmtp dsn
-.if defined(NOUUCP)
-PLIST_SUB+= SUB_UUCP="@comment "
-.else
-WITH_TRANSPORT+=uucp
-PLIST_SUB+= SUB_UUCP=""
-.endif
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
PKGMESSAGE= ${WRKDIR}/.PKGMESSAGE
@@ -99,16 +112,14 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
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_LDAP="${WITH_LDAP: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_UUCP="${WITH_UUCP:L}" \
WITH_IPV6="${WITH_IPV6:L}" \
- WITH_TRANSPORT="${WITH_TRANSPORT}" \
- WITH_GHOSTSCRIPT_AFPL="${WITH_GHOSTSCRIPT_AFPL:L}" \
TOUCH="${TOUCH}" \
MKDIR="${MKDIR}"
@@ -120,14 +131,34 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
.include "${.CURDIR}/Makefile.own"
pre-everything::
- @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.${PORTNAME}
-
-.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
@${ECHO_MSG} ""
- @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use"
- @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one"
+ @${ECHO_MSG} "You may use the following build options:"
@${ECHO_MSG} ""
+ @${ECHO_MSG} " WITH_EXPECT=yes Expect support for WebMail change passwd"
+ @${ECHO_MSG} " WITH_GNUPG=yes GNU Privacy Guard support for WebMail"
+ @${ECHO_MSG} " WITH_ASPELL=yes ASpell support for WebMail"
+ @${ECHO_MSG} " WITH_ISPELL=yes ISpell support for WebMail"
+ @${ECHO_MSG} " WITH_LDAP=yes OpenLDAP 2.x authentication support"
+.if !defined(WANT_OPENLDAP_VER)
+ @${ECHO_MSG} " WANT_OPENLDAP_VER=?? See <bsd.port.mk> for legal values"
+.endif
+ @${ECHO_MSG} " WITH_MYSQL=yes MySQL authentication support"
+ @${ECHO_MSG} " WITH_PGSQL=yes PostgreSQL authentication support"
+ @${ECHO_MSG} " WITH_VPOPMAIL=yes VPopMail authentication support"
+ @${ECHO_MSG} " WITH_PROCMAIL=yes Procmail local delivery support"
+ @${ECHO_MSG} " WITH_SENDFAX=yes mgetty+sendfax support"
+.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
+ @${ECHO_MSG} " WITH_GHOSTSCRIPT_AFPL=yes to use AFPL Postscript"
+ @${ECHO_MSG} " interpreter instead of GNU one"
+ @${ECHO_MSG} " for mgetty+sendfax support"
.endif
+ @${ECHO_MSG} " WITH_UUCP=yes UUCP support"
+ @${ECHO_MSG} " WITH_IPV6=yes Pv6 support"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} " BATCH=yes To skip INTERACTIVE selection"
+ @${ECHO_MSG} " of above tunables"
+ @${ECHO_MSG} ""
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.${PORTNAME}
post-patch:
@${PERL} -pi -e 's:\@datadir\@:\@sysconfdir\@:g;' \
@@ -141,46 +172,39 @@ post-patch:
${WRKSRC}/*/*/*.cnf.in
pre-configure:
- @${SED} s:%%PREFIX%%:${PREFIX}: \
- ${.CURDIR}/pkg-message \
- > ${WRKDIR}/.PKGMESSAGE
- @${SED} s:%%PREFIX%%:${PREFIX}: \
- ${FILESDIR}/crontab \
- > ${WRKDIR}/crontab
-
-# patch around a bug in autoconf where the INSTALL macro does
-# not get set properly in directories more than one level deep
+ @${SED} -e s:%%RC_SUBR%%:${RC_SUBR}: \
+ -e s:%%PREFIX%%:${PREFIX}: ${FILESDIR}/courier.sh > ${WRKDIR}/courier.sh
+ @${SED} -e s:%%PREFIX%%:${PREFIX}: ${.CURDIR}/pkg-message > ${WRKDIR}/.PKGMESSAGE
+ @${SED} -e s:%%PREFIX%%:${PREFIX}: ${FILESDIR}/crontab > ${WRKDIR}/crontab
+
post-build:
- @${PERL} -pi -e 's:^(auth)\s+(required).*:$$1\t\t$$2\tpam_unix.so\ttry_first_pass:g; \
- s:^(account)\s+(required).*:$$1 \t$$2\tpam_unix.so:g; \
- s:^(session)\s+(required).*:$$1 \t$$2\tpam_permit.so:g;' \
+ @${PERL} -pi -e 's:^(auth)\s+(required).*:$$1\t\t$$2\tpam_unix.so\ttry_first_pass:g;' \
+ -e 's:^(account)\s+(required).*:$$1 \t$$2\tpam_unix.so:g;' \
+ -e 's:^(session)\s+(required).*:$$1 \t$$2\tpam_permit.so:g;' \
${WRKSRC}/*/*.authpam* \
${WRKSRC}/*/*/*.authpam*
- @${PERL} -pi -e 's:^transform = .*freebsd.*:transform = s,x,x:;' ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile ${WRKSRC}/*/*/Makefile
- @${LN} ${WRKSRC}/gpglib/README.html ${WRKSRC}/gpglib/README.gpglib.html
- @${LN} ${WRKSRC}/imap/FAQ ${WRKSRC}/imap/FAQ.imap
- @${LN} ${WRKSRC}/imap/FAQ.html ${WRKSRC}/imap/FAQ.imap.html
- @${LN} ${WRKSRC}/imap/README ${WRKSRC}/imap/README.imap
- @${LN} ${WRKSRC}/imap/README.html ${WRKSRC}/imap/README.imap.html
- @${LN} ${WRKSRC}/maildrop/README.html ${WRKSRC}/maildrop/README.maildrop.html
- @${LN} ${WRKSRC}/pcp/README.html ${WRKSRC}/pcp/README.pcp.html
- @${LN} ${WRKSRC}/webmail/BUGS ${WRKSRC}/webmail/BUGS.webmail
- @${LN} ${WRKSRC}/webmail/BUGS.html ${WRKSRC}/webmail/BUGS.webmail.html
- @${LN} ${WRKSRC}/webmail/SECURITY ${WRKSRC}/webmail/SECURITY.webmail
- @${LN} ${WRKSRC}/webmail/SECURITY.html ${WRKSRC}/webmail/SECURITY.webmail.html
+ @${LN} -f ${WRKSRC}/gpglib/README.html ${WRKSRC}/gpglib/README.gpglib.html
+ @${LN} -f ${WRKSRC}/imap/FAQ ${WRKSRC}/imap/FAQ.imap
+ @${LN} -f ${WRKSRC}/imap/FAQ.html ${WRKSRC}/imap/FAQ.imap.html
+ @${LN} -f ${WRKSRC}/imap/README ${WRKSRC}/imap/README.imap
+ @${LN} -f ${WRKSRC}/imap/README.html ${WRKSRC}/imap/README.imap.html
+ @${LN} -f ${WRKSRC}/maildrop/README.html ${WRKSRC}/maildrop/README.maildrop.html
+ @${LN} -f ${WRKSRC}/pcp/README.html ${WRKSRC}/pcp/README.pcp.html
+ @${LN} -f ${WRKSRC}/webmail/BUGS ${WRKSRC}/webmail/BUGS.webmail
+ @${LN} -f ${WRKSRC}/webmail/BUGS.html ${WRKSRC}/webmail/BUGS.webmail.html
+ @${LN} -f ${WRKSRC}/webmail/SECURITY ${WRKSRC}/webmail/SECURITY.webmail
+ @${LN} -f ${WRKSRC}/webmail/SECURITY.html ${WRKSRC}/webmail/SECURITY.webmail.html
pre-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- @${STRIP_CMD} ${PREFIX}/libexec/courier/modules/*/*
@${LN} -f ${SYSCONFDIR}/maildrop ${SYSCONFDIR}/maildropfilter
@${INSTALL_DATA} /dev/null ${SYSCONFDIR}/locallowercase
- @${INSTALL_SCRIPT} ${FILESDIR}/courier.sh ${PREFIX}/etc/rc.d
@${INSTALL_DATA} ${WRKDIR}/crontab ${PREFIX}/etc/courier/
+ @${INSTALL_SCRIPT} ${WRKDIR}/courier.sh ${PREFIX}/etc/rc.d/
.for file in ${OWNER0}
- @${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/${file}
+ @-${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/${file}
.endfor
@${GREP} '^@exec ' ${TMPPLIST} \
| ${SED} -e 's:^@exec ::' -e 's:%D:${PREFIX}:g' \
@@ -204,6 +228,16 @@ post-install:
@${ECHO_MSG} ""
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG} ""
+.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
+ @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.else
+ @${ECHO_MSG} " To activate Courier in /etc/mail/mailer.conf or to"
+ @${ECHO_MSG} " replace {sendmail,mailq,newaliases} with Courier"
+ @${ECHO_MSG} " versions execute the following as root user:"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "PKG_PREFIX=\"${PREFIX}\" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL"
+ @${ECHO_MSG} ""
+.endif
post-clean:
@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
diff --git a/mail/courier/Makefile.man b/mail/courier/Makefile.man
index 77809ac..4a8e368 100644
--- a/mail/courier/Makefile.man
+++ b/mail/courier/Makefile.man
@@ -71,12 +71,12 @@ MLINKS= dot-forward.1 dotforward.1 \
makeuserdb.8 pw2userdb.8 \
makeuserdb.8 vchkpw2userdb.8
-.if !defined(NOUUCP)
-MAN8+= courieruucp.8
-MLINKS+=courieruucp.8 makeuucpneighbors.8
-.endif
-
.if defined(WITH_FAX) && ${WITH_FAX} == yes
MAN8+= courierfax.8
.endif
+.if defined(WITH_UUCP) && ${WITH_UUCP} == yes
+MAN8+= courieruucp.8
+MLINKS+=courieruucp.8 makeuucpneighbors.8
+.endif
+
diff --git a/mail/courier/distinfo b/mail/courier/distinfo
index 493e765..4fb94c7 100644
--- a/mail/courier/distinfo
+++ b/mail/courier/distinfo
@@ -1 +1 @@
-MD5 (courier-0.44.0.tar.bz2) = acf6721a56f94791adf4fd7f56ba3e38
+MD5 (courier-0.44.2.tar.bz2) = 8c607c70a692d8f8ccb769a3f96d2f28
diff --git a/mail/courier/files/courier.sh b/mail/courier/files/courier.sh
index fe9339f..e185bae 100644
--- a/mail/courier/files/courier.sh
+++ b/mail/courier/files/courier.sh
@@ -1,29 +1,50 @@
#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/courier/files/Attic/courier.sh,v 1.2 2002-01-30 03:56:09 pat Exp $
#
-# This is the ${PREFIX}/etc/rc.d file for Courier SMTP, IMAP and POP3 servers
+# $FreeBSD: /tmp/pcvs/ports/mail/courier/files/Attic/courier.sh,v 1.3 2004-01-15 15:12:32 sergei Exp $
#
# Adapted for FreeBSD from courier.sysvinit
#
# NOTE: The 'restart' here does a "hard" stop, and a start. Be gentle, use
# "courierd restart" for a kindler, gentler, restart.
#
+# PROVIDE: mail
+# REQUIRE: LOGIN
+# BEFORE: securelevel
+# KEYWORD: FreeBSD shutdown
+#
+# NOTE for FreeBSD 5.0+:
+# If you want this script to start with the base rc scripts
+# move courier.sh to /etc/rc.d/courier
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-prefix="${PREFIX}"
+prefix="%%PREFIX%%"
exec_prefix="${prefix}"
sysconfdir="${prefix}/etc/courier"
sbindir="${exec_prefix}/sbin"
+bindir="${exec_prefix}/bin"
libexecdir="${prefix}/libexec"
datadir="${prefix}/share/courier"
-arg=${1:-start}
-case $arg in
-start) # First time after install create aliases.dat and makesmtpaccess.dat
+# Define these courier_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/courier
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+courier_enable=${courier_enable:-"NO"} # Run Courier-MTA (YES/NO).
+
+. %%RC_SUBR%%
+
+name="courier"
+rcvar=`set_rcvar`
+
+start_cmd="${name}_start"
+stop_cmd="${name}_stop"
+extra_commands="restart"
+
+courier_start()
+{ # First time after install create aliases.dat and makesmtpaccess.dat
+ echo -n "Starting"
if [ ! -f ${sysconfdir}/aliases.dat \
-a -x ${sbindir}/makealiases ]; then
@@ -65,29 +86,39 @@ start) # First time after install create aliases.dat and makesmtpaccess.dat
fi
if [ -x ${sbindir}/courierfilter ]; then
- ${sbindir}/courierfilter start && echo -n " courierfilter"
+ echo -n " courierfilter"
+ ${sbindir}/courierfilter start
fi
if [ -x ${libexecdir}/authlib/authdaemond ]; then
- ${libexecdir}/authlib/authdaemond start && echo -n " authdaemond"
+ echo -n " authdaemond"
+ ${libexecdir}/authlib/authdaemond start
fi
if [ -x ${sbindir}/courierldapaliasd ]; then
- ${sbindir}/courierldapaliasd start && echo -n " courierldapaliasd"
+ echo -n " courierldapaliasd"
+ ${sbindir}/courierldapaliasd start
fi
case "`cat ${sysconfdir}/calendarmode 2>/dev/null`" in
net)
if [ -x ${libexecdir}/courier/pcpd ]; then
- ${libexecdir}/courier/pcpd start && echo -n " pcpd"
+ echo -n " pcpd"
+ ${libexecdir}/courier/pcpd start
fi
;;
*)
;;
esac
+ if [ -x ${libexecdir}/courier/sqwebmaild ]; then
+ echo -n " webmail"
+ ${libexecdir}/courier/sqwebmaild start
+ fi
+
if [ -x ${sbindir}/courier ]; then
- ${sbindir}/courier start && echo -n " courierd"
+ echo -n " courierd"
+ ${sbindir}/courier start
fi
if [ "$esmtpdcert" = 1 ]; then
@@ -106,7 +137,8 @@ start) # First time after install create aliases.dat and makesmtpaccess.dat
case $ESMTPDSTART in
[Yy]*)
if [ -x ${sbindir}/esmtpd ]; then
- ${sbindir}/esmtpd start && echo -n " esmtpd"
+ echo -n " esmtpd"
+ ${sbindir}/esmtpd start
fi
;;
esac
@@ -118,7 +150,8 @@ start) # First time after install create aliases.dat and makesmtpaccess.dat
case $ESMTPDSTART in
[Yy]*)
if [ -x ${sbindir}/esmtpd-msa ]; then
- ${sbindir}/esmtpd-msa start && echo -n " esmtpd-msa"
+ echo -n " esmtpd-msa"
+ ${sbindir}/esmtpd-msa start
fi
;;
esac
@@ -131,7 +164,8 @@ start) # First time after install create aliases.dat and makesmtpaccess.dat
[Yy]*)
if [ -x $COURIERTLS \
-a -x ${sbindir}/esmtpd-ssl ]; then
- ${sbindir}/esmtpd-ssl start && echo -n " esmtpd-ssl"
+ echo -n " esmtpd-ssl"
+ ${sbindir}/esmtpd-ssl start
fi
;;
esac
@@ -143,7 +177,8 @@ start) # First time after install create aliases.dat and makesmtpaccess.dat
case $IMAPDSTART in
[Yy]*)
if [ -x ${sbindir}/imapd ]; then
- ${sbindir}/imapd start && echo -n " imapd"
+ echo -n " imapd"
+ ${sbindir}/imapd start
fi
;;
esac
@@ -161,7 +196,8 @@ start) # First time after install create aliases.dat and makesmtpaccess.dat
${sbindir}/mkimapdcert >/dev/null 2>&1
fi
if [ -x ${sbindir}/imapd-ssl ]; then
- ${sbindir}/imapd-ssl start && echo -n " imapd-ssl"
+ echo -n " imapd-ssl"
+ ${sbindir}/imapd-ssl start
fi
fi
;;
@@ -174,7 +210,8 @@ start) # First time after install create aliases.dat and makesmtpaccess.dat
case $POP3DSTART in
[Yy]*)
if [ -x ${sbindir}/pop3d ]; then
- ${sbindir}/pop3d start && echo -n " pop3d"
+ echo -n " pop3d"
+ ${sbindir}/pop3d start
fi
;;
esac
@@ -187,76 +224,91 @@ start) # First time after install create aliases.dat and makesmtpaccess.dat
[Yy]*) # If we do not have a certificate, make one up.
if [ -x $COURIERTLS ]; then
if [ ! -f ${sysconfdir}/pop3d.pem \
- -a -x ${sbindir}/mkpop3dcert ]; then
+ -a -x ${sbindir}/mkpop3dcert ]; then
echo -n " generating-POP3-SSL-certificate..."
${sbindir}/mkpop3dcert >/dev/null 2>&1
fi
if [ -x ${sbindir}/pop3d-ssl ]; then
- ${sbindir}/pop3d-ssl start && echo -n " pop3d-ssl"
+ echo -n " pop3d-ssl"
+ ${sbindir}/pop3d-ssl start
fi
fi
;;
esac
fi
- ;;
-stop) # kill courier services in the reverse order of starting them
+ echo "."
+}
+
+courier_stop()
+{ # kill courier services in the reverse order of starting them
+ echo -n "Stopping"
+
if [ -x ${sbindir}/pop3d-ssl ]; then
- ${sbindir}/pop3d-ssl stop && echo -n " pop3d-ssl"
+ echo -n " pop3d-ssl"
+ ${sbindir}/pop3d-ssl stop
fi
if [ -x ${sbindir}/pop3d ]; then
- ${sbindir}/pop3d stop && echo -n " pop3d"
+ echo -n " pop3d"
+ ${sbindir}/pop3d stop
fi
if [ -x ${sbindir}/imapd-ssl ]; then
- ${sbindir}/imapd-ssl stop && echo -n " imapd-ssl"
+ echo -n " imapd-ssl"
+ ${sbindir}/imapd-ssl stop
fi
if [ -x ${sbindir}/imapd ]; then
- ${sbindir}/imapd stop && echo -n " imapd"
+ echo -n " imapd"
+ ${sbindir}/imapd stop
fi
if [ -x ${sbindir}/esmtpd-ssl ]; then
- ${sbindir}/esmtpd-ssl stop && echo -n " esmtpd-ssl"
+ echo -n " esmtpd-ssl"
+ ${sbindir}/esmtpd-ssl stop
fi
if [ -x ${sbindir}/esmtpd-msa ]; then
- ${sbindir}/esmtpd-msa stop && echo -n " esmtpd-msa"
+ echo -n " esmtpd-msa"
+ ${sbindir}/esmtpd-msa stop
fi
if [ -x ${sbindir}/esmtpd ]; then
- ${sbindir}/esmtpd stop && echo -n " esmtpd"
+ echo -n " esmtpd"
+ ${sbindir}/esmtpd stop
fi
if [ -x ${sbindir}/courier ]; then
- ${sbindir}/courier stop && echo -n " courierd"
+ echo -n " courierd"
+ ${sbindir}/courier stop
+ fi
+
+ if [ -x ${libexecdir}/courier/sqwebmaild ]; then
+ echo -n " webmail"
+ ${libexecdir}/courier/sqwebmaild stop
fi
if [ -x ${libexecdir}/courier/pcpd ]; then
- ${libexecdir}/courier/pcpd stop && echo -n " pcpd"
+ echo -n " pcpd"
+ ${libexecdir}/courier/pcpd stop
fi
if [ -x ${sbindir}/courierldapaliasd ]; then
- ${sbindir}/courierldapaliasd stop && echo -n " courierldapaliasd"
+ echo -n " courierldapaliasd"
+ ${sbindir}/courierldapaliasd stop
fi
if [ -x ${libexecdir}/authlib/authdaemond ]; then
- ${libexecdir}/authlib/authdaemond stop && echo -n " authdaemond"
+ echo -n " authdaemond"
+ ${libexecdir}/authlib/authdaemond stop
fi
if [ -x ${sbindir}/courierfilter ]; then
- ${sbindir}/courierfilter stop && echo " courierfilter"
+ echo -n " courierfilter"
+ ${sbindir}/courierfilter stop
fi
- ;;
-restart)
- $0 stop
- $0 start
- ;;
-*)
- echo ""
- echo "Usage: `basename $0` { start | stop | restart }"
- echo ""
- exit 64
- ;;
-esac
-exit 0
+ echo "."
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/courier/files/patch-configure b/mail/courier/files/patch-configure
new file mode 100644
index 0000000..3259d6b
--- /dev/null
+++ b/mail/courier/files/patch-configure
@@ -0,0 +1,12 @@
+--- configure.orig Fri Nov 28 20:37:46 2003
++++ configure Wed Jan 7 03:17:25 2004
+@@ -18967,9 +18967,6 @@
+ echo "$as_me: WARNING: === the INSTALL file you should have known this. So" >&2;}
+ { echo "$as_me:$LINENO: WARNING: === you better read INSTALL again" >&5
+ echo "$as_me: WARNING: === you better read INSTALL again" >&2;}
+- { { echo "$as_me:$LINENO: error: aborted." >&5
+-echo "$as_me: error: aborted." >&2;}
+- { (exit 1); exit 1; }; }
+ fi
+ fi
+
diff --git a/mail/courier/files/patch-courier::configure b/mail/courier/files/patch-courier::configure
new file mode 100644
index 0000000..c6d3287
--- /dev/null
+++ b/mail/courier/files/patch-courier::configure
@@ -0,0 +1,15 @@
+--- courier/configure.orig Sat Nov 15 15:13:43 2003
++++ courier/configure Wed Jan 7 03:22:36 2004
+@@ -21208,9 +21208,9 @@
+
+ if test "$testmode" = "0"
+ then
+- INSTALL_PROGRAM='${INSTALL} -m 700'
+- INSTALL_SCRIPT='${INSTALL} -m 700'
+- INSTALL_DATA='${INSTALL} -m 600'
++ INSTALL_PROGRAM='${BSD_INSTALL_PROGRAM}'
++ INSTALL_SCRIPT='${BSD_INSTALL_SCRIPT}'
++ INSTALL_DATA='${BSD_INSTALL_DATA}'
+ fi
+
+ ac_ext=cc
diff --git a/mail/courier/files/patch-courier::configure.in b/mail/courier/files/patch-courier::configure.in
deleted file mode 100644
index abd0dc0..0000000
--- a/mail/courier/files/patch-courier::configure.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- courier/configure.in.orig Sun Mar 16 17:35:34 2003
-+++ courier/configure.in Sat Aug 9 16:36:22 2003
-@@ -465,12 +465,12 @@
-
- # Automake stupidity
-
--if test "$testmode" = "0"
--then
-- INSTALL_PROGRAM='${INSTALL} -m 700'
-- INSTALL_SCRIPT='${INSTALL} -m 700'
-- INSTALL_DATA='${INSTALL} -m 600'
--fi
-+#if test "$testmode" = "0"
-+#then
-+# INSTALL_PROGRAM='${INSTALL} -m 700'
-+# INSTALL_SCRIPT='${INSTALL} -m 700'
-+# INSTALL_DATA='${INSTALL} -m 600'
-+#fi
-
- AC_LANG_CPLUSPLUS
- AC_CACHE_CHECK([if the C++ compiler needs -fhandle-exceptions],
diff --git a/mail/courier/pkg-descr b/mail/courier/pkg-descr
index af65c3d..afa4308 100644
--- a/mail/courier/pkg-descr
+++ b/mail/courier/pkg-descr
@@ -13,7 +13,7 @@ features:
client can optionally require that the remote server's X.509
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.
+ * Mailboxes can be accessed via POP3, IMAP, SMAP, and HTTP.
* A faxmail gateway that forwards E-mail messages via fax.
* Courier includes a mailing list manager.
* PAM, LDAP, PostgreSQL, or MySQL authentication.
diff --git a/mail/courier/pkg-install b/mail/courier/pkg-install
index 3342bb0..4592e47 100644
--- a/mail/courier/pkg-install
+++ b/mail/courier/pkg-install
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: /tmp/pcvs/ports/mail/courier/Attic/pkg-install,v 1.4 2003-12-11 14:01:59 sergei Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/courier/Attic/pkg-install,v 1.5 2004-01-15 15:12:32 sergei Exp $
#
PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-USER=mailnull; UID=26
-GROUP=mailnull; GID=26
+USER=courier; UID=465
+GROUP=courier; GID=465
ask() {
local question default answer
diff --git a/mail/courier/pkg-message b/mail/courier/pkg-message
index 4096659..8f030f0 100644
--- a/mail/courier/pkg-message
+++ b/mail/courier/pkg-message
@@ -25,10 +25,25 @@
depending on which authentication services you chose to
omit.
- Do not forget to update /etc/pam.conf with the contents of
- %%PREFIX%%/etc/courier/*.authpam. See /etc/pam.conf(8) for
- further assistance.
+ Do not forget to update /etc/pam.d/ or /etc/pam.conf with
+ the contents of %%PREFIX%%/etc/courier/*.authpam.
+
+ To enable Courier-MTA to start at boot time,
+ set these variables in your /etc/rc.conf file:
+
+ courier_enable="YES"
+ sendmail_enable="NONE"
+
+ Also, you will want to disable some Sendmail
+ specific daily maintenance routines in your
+ /etc/periodic.conf file:
+
+ daily_clean_hoststat_enable="NO"
+ daily_status_mail_rejects_enable="NO"
+ daily_status_include_submit_mailq="NO"
+ daily_submit_queuerun="NO"
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 5ed49af..7bb0bf5 100644
--- a/mail/courier/pkg-plist
+++ b/mail/courier/pkg-plist
@@ -137,7 +137,7 @@ libexec/authlib/authdaemond
%%SUB_MYSQL%%libexec/authlib/authdaemond.mysql
%%SUB_PGSQL%%libexec/authlib/authdaemond.pgsql
libexec/authlib/authdaemond.plain
-libexec/authlib/changepwd/authdaemon.passwd
+%%SUB_EXPECT%%libexec/authlib/changepwd/authdaemon.passwd
libexec/authlib/changepwd/authsystem.passwd
libexec/courier/aliascombine
libexec/courier/aliascreate
@@ -159,6 +159,7 @@ libexec/courier/modules/local/courierlocal
libexec/courier/modules/modules.ctl
%%SUB_UUCP%%libexec/courier/modules/uucp/courieruucp
libexec/courier/pcpd
+libexec/courier/sqwebmaild
libexec/courier/submit
libexec/courier/submitmkdir
libexec/courier/webmail/webadmin
@@ -248,8 +249,8 @@ 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.pl
share/courier/courierwebadmin/admin-10password.html
+share/courier/courierwebadmin/admin-10password.pl
share/courier/courierwebadmin/admin-15ldap.html
share/courier/courierwebadmin/admin-15ldap.pl
share/courier/courierwebadmin/admin-15ldapa.html
@@ -258,8 +259,8 @@ share/courier/courierwebadmin/admin-15mysql.html
share/courier/courierwebadmin/admin-15mysql.pl
share/courier/courierwebadmin/admin-15pgsql.html
share/courier/courierwebadmin/admin-15pgsql.pl
-share/courier/courierwebadmin/admin-20aliases.pl
share/courier/courierwebadmin/admin-20aliases.html
+share/courier/courierwebadmin/admin-20aliases.pl
share/courier/courierwebadmin/admin-30esmtp.html
share/courier/courierwebadmin/admin-30esmtp.pl
share/courier/courierwebadmin/admin-31esmtp.html
@@ -272,8 +273,8 @@ share/courier/courierwebadmin/admin-40imap.html
share/courier/courierwebadmin/admin-40imap.pl
share/courier/courierwebadmin/admin-45pop3.html
share/courier/courierwebadmin/admin-45pop3.pl
-share/courier/courierwebadmin/admin-47webmail.pl
share/courier/courierwebadmin/admin-47webmail.html
+share/courier/courierwebadmin/admin-47webmail.pl
share/courier/courierwebadmin/admin-50bofh.html
share/courier/courierwebadmin/admin-50bofh.pl
share/courier/courierwebadmin/admin-cancel.pl
@@ -546,43 +547,56 @@ share/courier/sqwebmail/html/en-us/printredirect.html
share/courier/sqwebmail/html/en-us/quickadd.html
share/courier/sqwebmail/html/en-us/readmsg.html
share/courier/sqwebmail/html/en-us/redirect.html
+share/courier/sqwebmail/html/en-us/smileys.txt
share/courier/sqwebmail/html/en-us/spellchk.html
+share/courier/sqwebmail/html/en
@dirrm share/courier/sqwebmail/html/en-us
-@exec [ -L %D/share/courier/sqwebmail/html/en ] || ln -sf en-us %D/share/courier/sqwebmail/html/en 2>/dev/null || true
-@unexec rm -f %D/share/courier/sqwebmail/html/en 2>/dev/null || true
@dirrm share/courier/sqwebmail/html
-share/courier/sqwebmail/images/bg.gif
-share/courier/sqwebmail/images/bluebottomleft.gif
-share/courier/sqwebmail/images/bluebottomright.gif
-share/courier/sqwebmail/images/bluetopleft.gif
-share/courier/sqwebmail/images/bluetopright.gif
-share/courier/sqwebmail/images/calendar.gif
-share/courier/sqwebmail/images/cancel.gif
-share/courier/sqwebmail/images/folder.gif
-share/courier/sqwebmail/images/folder2.gif
-share/courier/sqwebmail/images/folders.gif
-share/courier/sqwebmail/images/forward.gif
-share/courier/sqwebmail/images/forwardatt.gif
-share/courier/sqwebmail/images/fullheaders.gif
-share/courier/sqwebmail/images/graybottomright.gif
-share/courier/sqwebmail/images/graybottomleft.gif
-share/courier/sqwebmail/images/graytopleft.gif
-share/courier/sqwebmail/images/graytopright.gif
-share/courier/sqwebmail/images/left.gif
-share/courier/sqwebmail/images/left2.gif
-share/courier/sqwebmail/images/logo.gif
-share/courier/sqwebmail/images/print.gif
-share/courier/sqwebmail/images/reply.gif
-share/courier/sqwebmail/images/replyall.gif
-share/courier/sqwebmail/images/replylist.gif
-share/courier/sqwebmail/images/right.gif
-share/courier/sqwebmail/images/right2.gif
-share/courier/sqwebmail/images/save.gif
-share/courier/sqwebmail/images/sep.gif
-share/courier/sqwebmail/images/signin.gif
+share/courier/sqwebmail/images/bg.png
+share/courier/sqwebmail/images/bluebottomleft.png
+share/courier/sqwebmail/images/bluebottomright.png
+share/courier/sqwebmail/images/bluetopleft.png
+share/courier/sqwebmail/images/bluetopright.png
+share/courier/sqwebmail/images/calendar.png
+share/courier/sqwebmail/images/cancel.png
+share/courier/sqwebmail/images/eventadd.png
+share/courier/sqwebmail/images/eventedit.png
+share/courier/sqwebmail/images/first.png
+share/courier/sqwebmail/images/folder.png
+share/courier/sqwebmail/images/folder2.png
+share/courier/sqwebmail/images/folders.png
+share/courier/sqwebmail/images/forward.png
+share/courier/sqwebmail/images/forwardatt.png
+share/courier/sqwebmail/images/fullheaders.png
+share/courier/sqwebmail/images/graybottomleft.png
+share/courier/sqwebmail/images/graybottomright.png
+share/courier/sqwebmail/images/graytopleft.png
+share/courier/sqwebmail/images/graytopright.png
+share/courier/sqwebmail/images/last.png
+share/courier/sqwebmail/images/left.png
+share/courier/sqwebmail/images/left2.png
+share/courier/sqwebmail/images/logo.png
+share/courier/sqwebmail/images/print.png
+share/courier/sqwebmail/images/reply.png
+share/courier/sqwebmail/images/replyall.png
+share/courier/sqwebmail/images/replylist.png
+share/courier/sqwebmail/images/right.png
+share/courier/sqwebmail/images/right2.png
+share/courier/sqwebmail/images/save.png
+share/courier/sqwebmail/images/sep.png
+share/courier/sqwebmail/images/signin.png
+share/courier/sqwebmail/images/sm-frowney.png
+share/courier/sqwebmail/images/sm-frowney2.png
+share/courier/sqwebmail/images/sm-notsmiley.png
+share/courier/sqwebmail/images/sm-notsmiley2.png
+share/courier/sqwebmail/images/sm-ohno.png
+share/courier/sqwebmail/images/sm-smiley.png
+share/courier/sqwebmail/images/sm-smiley2.png
+share/courier/sqwebmail/images/sm-wink.png
+share/courier/sqwebmail/images/sm-wink2.png
share/courier/sqwebmail/images/sqwebmail.css
-share/courier/sqwebmail/images/trash2.gif
-share/courier/sqwebmail/images/uncancel.gif
+share/courier/sqwebmail/images/trash2.png
+share/courier/sqwebmail/images/uncancel.png
@dirrm share/courier/sqwebmail/images
share/courier/sqwebmail/ldapsearch
share/courier/sqwebmail/sendit.sh
@@ -630,7 +644,7 @@ share/courier/vchkpw2userdb
%%PORTDOCS%%%%DOCSDIR%%/html/courierpop3d.html
%%PORTDOCS%%%%DOCSDIR%%/html/couriertcpd.html
%%PORTDOCS%%%%DOCSDIR%%/html/couriertls.html
-%%PORTDOCS%%%%SUB_UUCP%%%%DOCSDIR%%/html/courieruucp.html
+%%SUB_UUCP%%%%PORTDOCS%%%%DOCSDIR%%/html/courieruucp.html
%%PORTDOCS%%%%DOCSDIR%%/html/deliverquota.html
%%PORTDOCS%%%%DOCSDIR%%/html/dot-courier.html
%%PORTDOCS%%%%DOCSDIR%%/html/dot-forward.html
diff --git a/mail/courier/scripts/configure.courier b/mail/courier/scripts/configure.courier
index c719caf..f4ee0b6 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.10 2003-08-31 01:30:02 edwin Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/courier/scripts/Attic/configure.courier,v 1.11 2004-01-15 15:12:32 sergei Exp $
[ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ] && exit
@@ -18,13 +18,13 @@ if [ ":${BATCH}" = ':yes' ]; then
[ ":${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_LDAP}" = ':yes' ] && OPTIONS="${OPTIONS} \"OpenLDAP\""
[ ":${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_UUCP}" = ':yes' ] && OPTIONS="${OPTIONS} \"UUCP\""
[ ":${WITH_IPV6}" = ':yes' ] && OPTIONS="${OPTIONS} \"IPv6\""
[ -n "${OPTIONS}" ] && set ${OPTIONS}
else
@@ -55,21 +55,12 @@ else
else
SET_ISPELL="OFF"
fi
- 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 [ ":${WITH_LDAP2}" = ':yes' \
+ if [ ":${WITH_LDAP}" = ':yes' \
-o -f ${LOCALBASE}/lib/libldap.so.2 \
-a -f ${LOCALBASE}/lib/liblber.so.2 ]; then
- SET_LDAP1="OFF"
- SET_LDAP2="ON"
+ SET_LDAP="ON"
else
- SET_LDAP2="OFF"
+ SET_LDAP="OFF"
fi
if [ ":${WITH_MYSQL}" = ':yes' \
-o -f ${LOCALBASE}/lib/mysql/libmysqlclient.so.12 ]; then
@@ -97,7 +88,8 @@ else
SET_PROCMAIL="OFF"
fi
if [ ":${WITH_SENDFAX}" = ':yes' \
- -o -x ${LOCALBASE}/bin/pnmscale \
+ -o -x ${LOCALBASE}/sbin/sendfax \
+ -a -x ${LOCALBASE}/bin/pnmscale \
-a -x ${LOCALBASE}/bin/giftopnm \
-a -x ${LOCALBASE}/bin/jpegtopnm \
-a -x ${LOCALBASE}/bin/ppmtopgm \
@@ -111,6 +103,13 @@ else
else
SET_SENDFAX="OFF"
fi
+ if [ ":${WITH_UUCP}" = ':yes' \
+ -o -x ${LOCALBASE}/bin/uux \
+ -o -x /usr/bin/uux ]; then
+ SET_UUCP="ON"
+ else
+ SET_UUCP="OFF"
+ fi
if [ ":${WITH_IPV6}" = ':yes' ]; then
SET_IPV6="ON"
else
@@ -124,14 +123,14 @@ Expect "Expect support for WebMail change passwd" ${SET_EXPECT} \
GnuPG "GNU Privacy Guard support for WebMail" ${SET_GNUPG} \
ASpell "ASpell support for WebMail" ${SET_ASPELL} \
ISpell "ISpell support for WebMail" ${SET_ISPELL} \
-OpenLDAP1 "OpenLDAP 1.x authentication support" ${SET_LDAP1} \
-OpenLDAP2 "OpenLDAP 2.x authentication support" ${SET_LDAP2} \
+OpenLDAP "OpenLDAP 2.x authentication support" ${SET_LDAP} \
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} \
+UUCP "UUCP support" ${SET_UUCP} \
+IPv6 "IPv6 support" ${SET_IPV6} \
2> ${tempfile}
retval=$?
@@ -150,6 +149,8 @@ exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "PREFIX= ${PREFIX}"
+WITH_TRANSPORT="local esmtp dsn"
+WITH_EXPECT="--disable-changepass"
WITH_ISPELL="--without-ispell"
WITH_LDAP="--without-authldap"
WITH_MYSQL="--without-authmysql"
@@ -157,15 +158,19 @@ WITH_PGSQL="--without-authpgsql"
WITH_VCHKPW="--without-authvchkpw"
WITH_IPV6="--without-ipv6"
+SUB_EXPECT="@comment "
SUB_FAX="@comment "
SUB_LDAP="@comment "
SUB_MYSQL="@comment "
SUB_PGSQL="@comment "
+SUB_UUCP="@comment "
while [ "$1" ]; do
case $1 in
\"Expect\")
echo "BUILD_DEPENDS+= expect:\${PORTSDIR}/lang/expect"
+ WITH_EXPECT=""
+ SUB_EXPECT=""
;;
\"GnuPG\")
echo "BUILD_DEPENDS+= gpg:\${PORTSDIR}/security/gnupg"
@@ -190,33 +195,11 @@ while [ "$1" ]; do
WITH_ISPELL="--with-ispell=\${LOCALBASE}/bin/ispell"
ISPELL=1
;;
- \"OpenLDAP1\")
- if [ "$OPENLDAP2" ]; then
- echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
- rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- exit 1
- fi
- echo "LIB_DEPENDS+= ldap.1:\${PORTSDIR}/net/openldap12"
- CPPFLAGS="${CPPFLAGS} -I\${LOCALBASE}/include"
- LDFLAGS="${LDFLAGS} -L\${LOCALBASE}/lib"
- WITH_LDAP="--with-authldap"
- PKGNAMESUFFIX="${PKGNAMESUFFIX}-ldap"
- SUB_LDAP=""
- OPENLDAP1=1
- ;;
- \"OpenLDAP2\")
- if [ "$OPENLDAP1" ]; then
- echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
- rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- exit 1
- fi
- echo "LIB_DEPENDS+= ldap.2:\${PORTSDIR}/net/openldap21-client"
- CPPFLAGS="${CPPFLAGS} -I\${LOCALBASE}/include"
- LDFLAGS="${LDFLAGS} -L\${LOCALBASE}/lib"
+ \"OpenLDAP\")
+ echo "USE_OPENLDAP= yes"
WITH_LDAP="--with-authldap"
PKGNAMESUFFIX="${PKGNAMESUFFIX}-ldap"
SUB_LDAP=""
- OPENLDAP2=1
;;
\"MySQL\")
if [ -f ${LOCALBASE}/vpopmail/lib/libvpopmail.a ]; then
@@ -225,7 +208,7 @@ while [ "$1" ]; do
rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
exit 1
else
- echo "USE_MYSQL= YES"
+ echo "USE_MYSQL= yes"
WITH_MYSQL="--with-authmysql"
WITH_MYSQL="${WITH_MYSQL} --with-mysql-libs=\${LOCALBASE}/lib/mysql"
WITH_MYSQL="${WITH_MYSQL} --with-mysql-includes=\${LOCALBASE}/include/mysql"
@@ -251,12 +234,7 @@ while [ "$1" ]; do
echo "BUILD_DEPENDS+= procmail:\${PORTSDIR}/mail/procmail"
;;
\"SendFax\")
- if [ "x${WITH_GHOSTSCRIPT_AFPL}" = "xyes" ]
- then
- echo "BUILD_DEPENDS+= gs:\${PORTSDIR}/print/ghostscript-afpl"
- else
- echo "BUILD_DEPENDS+= gs:\${PORTSDIR}/print/ghostscript-gnu"
- fi
+ echo "BUILD_DEPENDS+= sendfax:\${PORTSDIR}/comms/mgetty+sendfax"
echo "BUILD_DEPENDS+= pnmscale:\${PORTSDIR}/graphics/netpbm"
echo "BUILD_DEPENDS+= giftopnm:\${PORTSDIR}/graphics/netpbm"
echo "BUILD_DEPENDS+= jpegtopnm:\${PORTSDIR}/graphics/netpbm"
@@ -266,7 +244,8 @@ while [ "$1" ]; do
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 "BUILD_DEPENDS+= gs:\${PORTSDIR}/\${GSPORT}"
+ echo "RUN_DEPENDS+= sendfax:\${PORTSDIR}/comms/mgetty+sendfax"
echo "RUN_DEPENDS+= pnmscale:\${PORTSDIR}/graphics/netpbm"
echo "RUN_DEPENDS+= giftopnm:\${PORTSDIR}/graphics/netpbm"
echo "RUN_DEPENDS+= jpegtopnm:\${PORTSDIR}/graphics/netpbm"
@@ -276,10 +255,19 @@ while [ "$1" ]; do
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"
+ echo "RUN_DEPENDS+= gs:\${PORTSDIR}/\${GSPORT}"
+ echo "WITH_FAX= yes"
WITH_TRANSPORT="${WITH_TRANSPORT} fax"
SUB_FAX=""
;;
+ \"UUCP\")
+ if [ ! -x /usr/bin/uux ]; then
+ echo "BUILD_DEPENDS+= uux:\${PORTSDIR}/net/freebsd-uucp"
+ echo "RUN_DEPENDS+= uux:\${PORTSDIR}/net/freebsd-uucp"
+ fi
+ WITH_TRANSPORT="${WITH_TRANSPORT} uucp"
+ SUB_UUCP=""
+ ;;
\"IPv6\")
WITH_IPV6=""
;;
@@ -292,20 +280,20 @@ while [ "$1" ]; do
shift
done
-[ -n "${CPPFLAGS}" ] && echo "CONFIGURE_ENV+= CPPFLAGS='${CPPFLAGS}'"
-[ -n "${LDFLAGS}" ] && echo "CONFIGURE_ENV+= LDFLAGS='${LDFLAGS}'"
-[ -n "${LIBS}" ] && echo "CONFIGURE_ENV+= LIBS='${LIBS}'"
-echo "CONFIGURE_ARGS+= ${WITH_ISPELL}"
-echo "CONFIGURE_ARGS+= ${WITH_LDAP}"
-echo "CONFIGURE_ARGS+= ${WITH_MYSQL}"
-echo "CONFIGURE_ARGS+= ${WITH_PGSQL}"
-echo "CONFIGURE_ARGS+= ${WITH_VCHKPW}"
-echo "CONFIGURE_ARGS+= ${WITH_IPV6}"
-echo "CONFIGURE_ARGS+= --with-transport='${WITH_TRANSPORT}'"
+echo "CONFIGURE_ARGS+=${WITH_EXPECT}"
+echo "CONFIGURE_ARGS+=${WITH_ISPELL}"
+echo "CONFIGURE_ARGS+=${WITH_LDAP}"
+echo "CONFIGURE_ARGS+=${WITH_MYSQL}"
+echo "CONFIGURE_ARGS+=${WITH_PGSQL}"
+echo "CONFIGURE_ARGS+=${WITH_VCHKPW}"
+echo "CONFIGURE_ARGS+=${WITH_IPV6}"
+echo "CONFIGURE_ARGS+=--with-transport='${WITH_TRANSPORT}'"
+echo "PLIST_SUB+= SUB_EXPECT='${SUB_EXPECT}'"
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}'"
+echo "PLIST_SUB+= SUB_UUCP='${SUB_UUCP}'"
[ -n "${PKGNAMESUFFIX}" ] && echo "PKGNAMESUFFIX= ${PKGNAMESUFFIX}"
exit 0
OpenPOWER on IntegriCloud