7 files changed, 8 insertions, 64 deletions

diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 7a8c67fae118..47b77cb11500 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -14,21 +14,17 @@ PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 400014
 PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/ \
 		ftp://ftp.pasta.cs.uit.no/pub/IPv6/misc/
 PATCHFILES=	cucipop-1.31-v6-20010223.diff.gz
 PATCH_DIST_STRIP=	-p1
-.endif
-
-#BUILD_DEPENDS=  ${PREFIX}/include/db2/db.h:${PORTSDIR}/databases/db2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cubic Circle's POP3 daemon (fully RFC1939 compliant)
 
+#BUILD_DEPENDS=  ${PREFIX}/include/db2/db.h:${PORTSDIR}/databases/db2
+
 MAN8=		cucipop.8 #makevpopdb.8
 PLIST_FILES=	libexec/cucipop
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/moztraybiff/Makefile b/mail/moztraybiff/Makefile
index 8c0ea2a195d3..8f15a200fe19 100644
--- a/mail/moztraybiff/Makefile
+++ b/mail/moztraybiff/Makefile
@@ -38,13 +38,7 @@ PLIST_DIRS=	share/${PORTNAME}
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-
 post-patch:
-.if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} -e "s|-fshort-wchar||" \
-		${WRKSRC}/components/Makefile
-.endif
 	@${REINPLACE_CMD} -e "s|^#!/bin/bash|#!/bin/sh|" \
 		${WRKSRC}/get-platform
 
@@ -57,4 +51,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index 4245a3bcc983..b492f78be4ce 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -106,7 +106,6 @@ post-install:
 .endif
 
 replace:
-.if ${OSVERSION} >= 400014
 	@${ECHO_MSG} "===> Activating smail in /etc/mail/mailer.conf"
 	${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
 	@${ECHO_CMD} "#" > /etc/mail/mailer.conf
@@ -117,38 +116,5 @@ replace:
 	@${ECHO_CMD} "send-mail	${PREFIX}/bin/smail" >> /etc/mail/mailer.conf
 	@${ECHO_CMD} "mailq		${PREFIX}/bin/smail" >> /etc/mail/mailer.conf
 	@${ECHO_CMD} "newaliases	${PREFIX}/bin/smail" >> /etc/mail/mailer.conf
-.else
-	@${ECHO_MSG} "===> Replacing sendmail programs"
-	if [ -e /usr/sbin/sendmail ]; then \
-		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.BAK; \
-		if [ -f /usr/sbin/sendmail.BAK ]; then \
-			${CHMOD} 0 /usr/sbin/sendmail.BAK; \
-		fi;\
-	fi
-	if [ -e ${PREFIX}/bin/smail ]; then \
-		${LN} -s ${PREFIX}/bin/smail /usr/sbin/sendmail; \
-	fi
-	if [ -f /usr/sbin/mailstats ]; then \
-		${CHMOD} 0 /usr/sbin/mailstats; \
-	fi
-	if [ -e /usr/bin/newaliases ]; then \
-		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.BAK; \
-		if [ -f /usr/bin/newaliases.BAK ]; then \
-			${CHMOD} 0 /usr/bin/newaliases.BAK; \
-		fi;\
-	fi
-	if [ -e ${PREFIX}/bin/newaliases ]; then \
-		${LN} -s ${PREFIX}/bin/newaliases /usr/bin/newaliases; \
-	fi
-	if [ -e /usr/bin/mailq ]; then \
-		${MV} -f /usr/bin/mailq /usr/bin/mailq.BAK; \
-		if [ -f /usr/bin/mailq.BAK ]; then \
-			${CHMOD} 0 /usr/bin/mailq.BAK; \
-		fi;\
-	fi
-	if [ -e ${PREFIX}/bin/mailq ]; then \
-		${LN} -s ${PREFIX}/bin/mailq /usr/bin/mailq; \
-	fi
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/smtptrapd/Makefile b/mail/smtptrapd/Makefile
index b128c7553b1f..a0c0ba34d8a5 100644
--- a/mail/smtptrapd/Makefile
+++ b/mail/smtptrapd/Makefile
@@ -17,16 +17,6 @@ USE_RC_SUBR=	smtptrapd.sh
 
 PLIST_FILES=	bin/smtptrapd
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
-
-CFLAGS+=	${PTHREAD_CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include/pthread/linuxthreads -llthread -llgcc_r
-.else
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-.endif
-
 do-build:
 	(cd ${WRKSRC} && ${CC} ${CFLAGS} -o smtptrapd smtptrapd.c)
 
@@ -34,4 +24,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/smtptrapd ${PREFIX}/bin/
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/solidpop3d/Makefile b/mail/solidpop3d/Makefile
index bd3744e31579..359dcafbfa50 100644
--- a/mail/solidpop3d/Makefile
+++ b/mail/solidpop3d/Makefile
@@ -22,9 +22,11 @@ CONFIGURE_ARGS=	--enable-pam --enable-apop --enable-bulletins \
 		--enable-last --enable-mapping --enable-nonip --enable-connect
 CONFIGURE_ENV=	LDFLAGS="-lmd"
 
+OPTIONS=	IPV6	"Enable IPv6 support"	On
+
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 400014
+.if defined(WITH_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index 3cec7155474c..657564770d92 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -26,10 +26,6 @@ CONFIGURE_ARGS=	--without-openssl
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500000
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-EAI_NODATA
-.endif
-
 CONFIGURE_ARGS+=--prefix=${PREFIX}/ \
 		--with-mailbin=${PREFIX}/sbin \
 		--with-mailbox=/var/mail \
diff --git a/mail/zmailer/files/extra-patch-EAI_NODATA b/mail/zmailer/files/patch-EAI_NODATA
index b42624c6e7fd..b42624c6e7fd 100644
--- a/mail/zmailer/files/extra-patch-EAI_NODATA
+++ b/mail/zmailer/files/patch-EAI_NODATA