diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/smail/Makefile | 97 | ||||
| -rw-r--r-- | mail/smail/distinfo | 6 | ||||
| -rw-r--r-- | mail/smail/files/EDITME | 2 | ||||
| -rw-r--r-- | mail/smail/files/freebsd5.in (renamed from mail/smail/files/freebsd2.0) | 42 | ||||
| -rw-r--r-- | mail/smail/files/patch-conf_lib_mkdepend.sh | 13 | ||||
| -rw-r--r-- | mail/smail/files/patch-util-Makefile | 42 | ||||
| -rw-r--r-- | mail/smail/pkg-plist | 10 | ||||
| -rw-r--r-- | mail/smail/scripts/configure | 6 |
8 files changed, 162 insertions, 56 deletions
diff --git a/mail/smail/Makefile b/mail/smail/Makefile index f7858e7ced7f..4245a3bcc983 100644 --- a/mail/smail/Makefile +++ b/mail/smail/Makefile @@ -6,38 +6,105 @@ # PORTNAME= smail -PORTVERSION= 3.2.0.114 +PORTVERSION= 3.2.0.121 CATEGORIES= mail -MASTER_SITES= ftp://ftp.uu.net/networking/mail/smail/OLD/ \ - ftp://ftp.planix.com/pub/Smail/OLD/ \ - ftp://ftp.fu-berlin.de/unix/mail/smail/OLD/ +MASTER_SITES= ftp://ftp.planix.com/pub/Smail/%SUBDIR%/ \ + ftp://ftp.fu-berlin.de/unix/mail/smail/%SUBDIR%/ +MASTER_SITE_SUBDIR= . OLD MAINTAINER= ports@FreeBSD.org COMMENT= A program used for receiving and delivering mail -CONFLICTS= bsmtp-* - BUILD_DEPENDS= ${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident +LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre -CONFLICTS= courier-0.* postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* zmailer-2.* -INSTALL_TARGET= install installman +CONFLICTS= bsmtp-1.* courier-0.* postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* zmailer-2.* +.if !defined(NO_INSTALL_MANPAGES) MAN1= pathto.1 uuwho.1 uupath.1 MAN5= smailconf.5 smail.5 smaildrct.5 smailmeth.5 smailqual.5 \ - smailrtrs.5 smailrtry.5 smailtrns.5 + smailrtrs.5 smailrtry.5 smailtrns.5 aliases.5 MAN8= pathalias.8 mkdbm.8 mkline.8 mksort.8 mkaliases.8 smail.8 \ mkpath.8 pathmerge.8 checkerr.8 getmap.8 mkhpath.8 savelog.8 \ mkuuwho.8 mailq.8 sendmail.8 runq.8 rmail.8 rsmtp.8 smtpd.8 \ - newaliases.8 smailbug.8 unfreezemail.8 bouncemail.8 + newaliases.8 smailbug.8 unfreezemail.8 bouncemail.8 logsumm.8 +.endif -post-install: - @${ECHO_MSG} "If you want to replace sendmail with links to smail, type" - @${ECHO_MSG} "the following command as \"root\":" - @${ECHO_MSG} "" - @${ECHO_MSG} " make replace" +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -lident -lwrap -lpcre + +CYRUS_USER?= cyrus +CYRUS_GROUP?= cyrus +CYRUS_DELIVER_PATH?= ${LOCALBASE}/cyrus/bin/deliver + +OPTIONS= CYRUS22 "Use mail/cyrus-imapd22 as local transport" off \ + CYRUS23 "Use mail/cyrus-imapd23 as local transport" off \ + REPLACE_CONF "Replace /etc/mail/mailer.conf" off .include <bsd.port.pre.mk> +.if defined(WITH_CYRUS22) && defined(WITH_CYRUS23) +IGNORE= WITH_CYRUS22 and WITH_CYRUS23 are mutually exclusive. Please run make options again +.endif + +.if defined(WITH_CYRUS22) +CYRUS_PORT= ${PORTSDIR}/mail/cyrus-imapd22 +.else +CYRUS_PORT= ${PORTSDIR}/mail/cyrus-imapd23 +.endif + +.if defined(WITH_CYRUS22) || defined(WITH_CYRUS23) +RUN_DEPENDS+= cyrus/bin/deliver:${CYRUS_PORT} +CYRUS_IMAPD= USE_CYRUS_IMAPD +PLIST_SUB+= CYRUS_DELIVER="" +.else +PLIST_SUB+= CYRUS_DELIVER="@comment " +.endif + +.if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64" +ARCH_TYPE=64bit +.else +ARCH_TYPE=32bit +.endif + +do-configure: + @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ + -e 's|%%MANPREFIX%%|${MANPREFIX}|g' \ + -e 's|%%CFLAGS%%|${CFLAGS}|g' \ + -e 's|%%CPPFLAGS%%|${CPPFLAGS}|g' \ + -e 's|%%LDFLAGS%%|${LDFLAGS}|g' \ + -e 's|%%LIBS%%|${LIBS}|g' \ + -e 's|%%ARCH_TYPE%%|${ARCH_TYPE}|g' \ + -e 's|%%CYRUS_IMAPD%%|${CYRUS_IMAPD}|g' \ + ${FILESDIR}/freebsd5.in > ${WRKSRC}/conf/os/freebsd5 + @${ECHO_CMD} OS_TYPE=freebsd5 > ${WRKSRC}/conf/EDITME + @${ECHO_CMD} STRIP=yes >> ${WRKSRC}/conf/EDITME + @${ECHO_CMD} CYRUS_USER="${CYRUS_USER}" >> ${WRKSRC}/conf/EDITME + @${ECHO_CMD} CYRUS_GROUP="${CYRUS_GROUP}" >> ${WRKSRC}/conf/EDITME + @${ECHO_CMD} CYRUS_DELIVER_PATH="${CYRUS_DELIVER_PATH}" >> ${WRKSRC}/conf/EDITME + @${LN} -sf ${WRKSRC}/conf/Make.local-BSD ${WRKSRC}/conf/Make.local + @${REINPLACE_CMD} -e 's|defs install|defs|g' \ + ${WRKSRC}/man/Makefile + @${ECHO_CMD} >> ${WRKSRC}/man/Makefile + @${ECHO_CMD} install: >> ${WRKSRC}/man/Makefile + +pre-install: + @${MKDIR} ${PREFIX}/etc/smail + +post-install: +.if defined(WITH_REPLACE_CONF) + @make replace +.endif + +.if defined(WITH_CYRUS22) || defined(WITH_CYRUS23) + @cd ${WRKSRC}/util && make install-cyrus-bins +.endif + +.if !defined(NO_INSTALL_MANPAGES) + @cd ${WRKSRC}/man && make installman +.endif + replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating smail in /etc/mail/mailer.conf" diff --git a/mail/smail/distinfo b/mail/smail/distinfo index 565f19df7350..ec7a2c6890af 100644 --- a/mail/smail/distinfo +++ b/mail/smail/distinfo @@ -1,3 +1,3 @@ -MD5 (smail-3.2.0.114.tar.gz) = e7e42019fbaebbcab6ec73d76b662fef -SHA256 (smail-3.2.0.114.tar.gz) = 5f0a9fc7bb45dc868e893db06c6d30131006d3cd98bb79d6437e8624fb1d7024 -SIZE (smail-3.2.0.114.tar.gz) = 849729 +MD5 (smail-3.2.0.121.tar.gz) = 0637d2753221ab98e65460a823e1d417 +SHA256 (smail-3.2.0.121.tar.gz) = 7c81c9ee7d52fee5b1d7d1c3cebe19ca36b3a5c553859c8db3f5625f4a415322 +SIZE (smail-3.2.0.121.tar.gz) = 1833218 diff --git a/mail/smail/files/EDITME b/mail/smail/files/EDITME deleted file mode 100644 index 8a30852c1815..000000000000 --- a/mail/smail/files/EDITME +++ /dev/null @@ -1,2 +0,0 @@ -OS_TYPE=freebsd2.0 -STRIP=yes diff --git a/mail/smail/files/freebsd2.0 b/mail/smail/files/freebsd5.in index 03c2e066b875..e7c05c1e4f2a 100644 --- a/mail/smail/files/freebsd2.0 +++ b/mail/smail/files/freebsd5.in @@ -1,4 +1,4 @@ -# FreeBSD 2.x +# FreeBSD 5.x . $ROOT/conf/os/bsd4.4-lite @@ -14,29 +14,29 @@ OSNAMES="FREEBSD:$OSNAMES" # # MAN1_EXT=1 -MAN1=!!PREFIX!!/man/man1 +MAN1=%%MANPREFIX%%/man/man1 MAN5_EXT=5 -MAN5=!!PREFIX!!/man/man5 +MAN5=%%MANPREFIX%%/man/man5 MAN8_EXT=8 -MAN8=!!PREFIX!!/man/man8 +MAN8=%%MANPREFIX%%/man/man8 # SMAIL_BIN_DIR - location for uupath, etc. -SMAIL_BIN_DIR=!!PREFIX!!/bin +SMAIL_BIN_DIR=%%PREFIX%%/bin # SMAIL_NAME - to replace sendmail completely -SMAIL_NAME=!!PREFIX!!/sbin/sendmail +SMAIL_NAME=%%PREFIX%%/sbin/sendmail # OTHER_SMAIL_NAMES - to replace sendmail completely -OTHER_SMAIL_NAMES=!!PREFIX!!/bin/mailq:!!PREFIX!!/bin/rmail:!!PREFIX!!/bin/rsmtp +OTHER_SMAIL_NAMES=%%PREFIX%%/bin/mailq:%%PREFIX%%/bin/rmail:%%PREFIX%%/bin/rsmtp # NEWALIASES - to replace sendmail completely -NEWALIASES=!!PREFIX!!/bin/newaliases +NEWALIASES=%%PREFIX%%/bin/newaliases # LIB_DIR - config files -LIB_DIR=!!PREFIX!!/etc/smail +LIB_DIR=%%PREFIX%%/etc/smail # UTIL_BIN_DIR - programs -UTIL_BIN_DIR=!!PREFIX!!/libexec/smail +UTIL_BIN_DIR=%%PREFIX%%/libexec/smail # Enable rfc1413 (ident protocol) and ESMTP sending support (EHLO) HAVE=$HAVE:EHLO:RFC1413:LIBWRAP @@ -63,19 +63,27 @@ REWRITE_FILE=rewrite REWRITE_TYPE=lsearch # CPPFLAGS - interesting flags for the cpp, and cc commands -CPPFLAGS="-I. -I.. -I../src -I/usr/local/include -I!!PREFIX!!/include" +CPPFLAGS="-I. -I.. -I../src %%CPPFLAGS%%" -CFLAGS="$CFLAGS -I!!PREFIX!!/include" +CFLAGS="%%CFLAGS%%" # LDFLAGS - flags to pass to the loader -LDFLAGS="-L/usr/local/lib -L!!PREFIX!!/lib" +LDFLAGS="%%LDFLAGS%%" # LIBS - libraries to include in binaries -LIBS="-lident -lwrap" +LIBS="%%LIBS%%" # OSLIBS - we don't have libresolv -# I doubt that the change to smail-3.2.0.110/conf/os/bsd4.4 is the right way -# to do it. OSLIBS="-lcrypt" -MISC_DEFINES="$MISC_DEFINES:USE_TARGET_DOMAIN:NO_FORWARDTO_FILE:USE_LSEARCH_REGEXCMP:USE_STRICT_MX" +SPOOL_DIRS=/var/spool/smail +TMP_DIR=/var/spool/smail/tmp +LOG_DIR=/var/log/smail +UNSHAR_MAP_DIR=/var/spool/uumaps +NEWS_SPOOL_DIR=/var/spool/news +UUWHO_FILE=/var/spool/smail/uuwho + +MISC_DEFINES="$MISC_DEFINES:USE_TARGET_DOMAIN:NO_FORWARDTO_FILE:USE_LSEARCH_REGEXCMP:USE_STRICT_MX:%%CYRUS_IMAPD%%" + +# Architecture type +ARCH_TYPE=%%ARCH_TYPE%% diff --git a/mail/smail/files/patch-conf_lib_mkdepend.sh b/mail/smail/files/patch-conf_lib_mkdepend.sh deleted file mode 100644 index d3b5483761d0..000000000000 --- a/mail/smail/files/patch-conf_lib_mkdepend.sh +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- conf/lib/mkdepend.sh.orig Tue Dec 31 01:45:53 2002 -+++ conf/lib/mkdepend.sh Tue Dec 31 01:48:30 2002 -@@ -60,6 +60,7 @@ - # the compiler with the sun 3 produces extra garbage after - # the quoted filename. - sed -n 's/^#[ ]*[0-9]*[ ]*"\(.*\)"[ 0-9]*$/\1/p' | -+ grep -v '^<.*>$' | # remove GCC3 <built-in> etc - sed 's%^\./%%' | # remove ./ prefixes - # next remove - sort | uniq | diff --git a/mail/smail/files/patch-util-Makefile b/mail/smail/files/patch-util-Makefile new file mode 100644 index 000000000000..238e60556395 --- /dev/null +++ b/mail/smail/files/patch-util-Makefile @@ -0,0 +1,42 @@ +--- util/Makefile.orig Tue Jul 12 18:45:55 2005 ++++ util/Makefile Fri Mar 9 12:47:33 2007 +@@ -35,13 +35,14 @@ + LOCAL_SRC=addr.c field.c parse.c ascii.c string.c match.c list.c log.c config.c alloc.c hash.c pwcache.c sysdep.c + LOCAL_OBJ=addr.o field.o parse.o ascii.o string.o match.o list.o log.o config.o alloc.o hash.o pwcache.o sysdep.o + LOCAL_LIB=libsmail.a +-SH_TARGETS=checkerr cyrus-deliver-noquota getmap init logsumm mkaliases mkcyrusoqlist mkpath \ ++SH_TARGETS=checkerr getmap init logsumm mkaliases mkpath \ + mkuuwho mkhpath bouncemail savelog smailbug unfreezemail + C_TARGETS=mkline mksort dcasehost mkdbm pathmerge gleem unsharmap + UTIL_TARGETS=${SH_TARGETS} ${C_TARGETS} + # this may not always be sane or necessary.... +-BIN_TARGETS=bouncemail cyrus-deliver-noquota mkaliases mkcyrusoqlist smailbug unfreezemail +-TARGETS=${UTIL_TARGETS} ${BIN_TARGETS} ++BIN_TARGETS=bouncemail mkaliases smailbug unfreezemail ++CYRUS_BIN_TARGETS=cyrus-deliver-noquota mkcyrusoqlist ++TARGETS=${UTIL_TARGETS} ${BIN_TARGETS} ${CYRUS_BIN_TARGETS} + STRIP_TARGETS=mkline mksort dcasehost mkdbm pathmerge gleem unsharmap + OBJ=mkline.o mksort.o dcasehost.o mkdbm.o pathmerge.o \ + gleem.o unsharmap.o +@@ -110,6 +111,21 @@ + fi; \ + done; \ + esac ++ ++install-cyrus-bins: all ++ @. ./${DEFS_SH}; \ ++ case "$$DONT_INSTALL" in \ ++ ?*) echo Testing ... install ignored; exit 0;; \ ++ esac; \ ++ ${XEXEC} ${SHELL} ${INSTM} -m 0555 $$UTIL_BIN_DIR ${CYRUS_BIN_TARGETS}; \ ++ for i in ${CYRUS_BIN_TARGETS} ; do \ ++ case $$UTIL_BIN_DIR in \ ++ "$$SMAIL_BIN_DIR") xx="";; \ ++ *) xx=$$SMAIL_BIN_DIR/$$i;; \ ++ esac; \ ++ ${XEXEC} ${SHELL} ${INST} -m 0555 $$l_flag -d $$UTIL_BIN_DIR $$i $$i $$xx; \ ++ done; \ ++ + + install-libs: ${DEFS_SH} + @. ./${DEFS_SH}; \ diff --git a/mail/smail/pkg-plist b/mail/smail/pkg-plist index 9081e7d556ec..9fc65d0ce207 100644 --- a/mail/smail/pkg-plist +++ b/mail/smail/pkg-plist @@ -1,6 +1,8 @@ bin/bouncemail +%%CYRUS_DELIVER%%bin/cyrus-deliver-noquota bin/mailq bin/mkaliases +%%CYRUS_DELIVER%%bin/mkcyrusoqlist bin/newaliases bin/pathto bin/rmail @@ -13,6 +15,8 @@ bin/unfreezemail bin/uupath bin/uuwho etc/smail/COPYING +etc/smail/dead-mail.egrep +etc/smail/dead-mail.senders etc/smail/forcepaths etc/smail/forcesmtp @exec mkdir -p %D/etc/smail/maps @@ -22,14 +26,20 @@ etc/smail/rewrite libexec/smail/bouncemail libexec/smail/bouncemail.O libexec/smail/checkerr +%%CYRUS_DELIVER%%libexec/smail/cyrus-deliver-noquota +%%CYRUS_DELIVER%%libexec/smail/cyrus-deliver-noquota.O libexec/smail/dcasehost libexec/smail/getmap libexec/smail/getopt libexec/smail/gleem +libexec/smail/init libexec/smail/logsumm +libexec/smail/logsumm.awk libexec/smail/makedb libexec/smail/mkaliases libexec/smail/mkaliases.O +%%CYRUS_DELIVER%%libexec/smail/mkcyrusoqlist +%%CYRUS_DELIVER%%libexec/smail/mkcyrusoqlist.O libexec/smail/mkdbm libexec/smail/mkhpath libexec/smail/mkline diff --git a/mail/smail/scripts/configure b/mail/smail/scripts/configure deleted file mode 100644 index f860b9f0e029..000000000000 --- a/mail/smail/scripts/configure +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -sed <${FILESDIR}/EDITME >${WRKSRC}/conf/EDITME s+!!PREFIX!!+$PREFIX+g -sed <${FILESDIR}/freebsd2.0 >${WRKSRC}/conf/os/freebsd2.0 s+!!PREFIX!!+$PREFIX+g |