10 files changed, 8 insertions, 52 deletions

diff --git a/mail/abook/Makefile b/mail/abook/Makefile
index 3587b399eb71..aacf3d991354 100644
--- a/mail/abook/Makefile
+++ b/mail/abook/Makefile
@@ -35,7 +35,7 @@ PORTDOCS=	ANNOUNCE AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000 || exists(${LOCALBASE}/lib/libreadline.so.5)
+.if exists(${LOCALBASE}/lib/libreadline.so.5)
 LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
 .endif
 
diff --git a/mail/annoyance-filter/Makefile b/mail/annoyance-filter/Makefile
index 7dcd2f63c7ef..a5d925ee82fe 100644
--- a/mail/annoyance-filter/Makefile
+++ b/mail/annoyance-filter/Makefile
@@ -21,13 +21,7 @@ GNU_CONFIGURE=		yes
 MAN1=		annoyance-filter.1
 DOCS=		COPYING INSTALL README *.pdf
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-CFLAGS+=	-I. ${CPPFLAGS}
-.else
-CFLAGS+=	${CPPFLAGS}
-.endif
+CFLAGS=		${CPPFLAGS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
@@ -38,4 +32,4 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index a597357b3801..c4a983116ade 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -163,17 +163,10 @@ post-install:
 	cd ${WRKSRC} && ( ${GMAKE} install-configure ; cd - )
 
 	@${ECHO_MSG} "In case you use authpam, you should put the following lines"
-.if ${OSVERSION} >= 500000
 	@${ECHO_MSG} "in your /etc/pam.d/imap"
 	@${ECHO_MSG} "auth    required    pam_unix.so         try_first_pass"
 	@${ECHO_MSG} "account required    pam_unix.so         try_first_pass"
 	@${ECHO_MSG} "session required    pam_permit.so"
-.else
-	@${ECHO_MSG} "in your /etc/pam.conf"
-	@${ECHO_MSG} "imap    auth    required    pam_unix.so         try_first_pass"
-	@${ECHO_MSG} "imap    account required    pam_unix.so         try_first_pass"
-	@${ECHO_MSG} "imap    session required    pam_permit.so"
-.endif
 
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You will have to run ${DATADIR}/mkimapdcert to create"
diff --git a/mail/cyrus2courier/Makefile b/mail/cyrus2courier/Makefile
index 5d5b74d1dad8..a887f07a57b9 100644
--- a/mail/cyrus2courier/Makefile
+++ b/mail/cyrus2courier/Makefile
@@ -22,13 +22,6 @@ ALL_TARGET=	build
 
 PLIST_FILES=	bin/cyrus2courier
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} '/^CFLAGS*/d; /^LDFLAGS*/d; /^CC*/d' \
 		${WRKSRC}/src/Makefile.FreeBSD
@@ -36,4 +29,4 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index cd31a1680fac..cf08e7a82a07 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -43,7 +43,7 @@ GCONF_SCHEMAS=	apps_exchange_addressbook-${VERSION}.schemas
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \
+.if !defined(NO_KERBEROS) && \
 	exists(/usr/lib/libkrb5.so)
 CONFIGURE_ARGS+=	--with-krb5=/usr
 .else
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 197352bad809..e973873501eb 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -91,7 +91,7 @@ PLIST_SUB+=	DBUS=""
 PLIST_SUB+=	DBUS="@comment "
 .endif
 
-.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \
+.if !defined(NO_KERBEROS) && \
 	exists(/usr/lib/libkrb5.so)
 CONFIGURE_ARGS+=	--with-krb5=/usr
 .else
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 2dc072cf3894..963fe6362454 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -114,26 +114,12 @@ pre-configure:
 
 	@${ECHO_CMD} ""
 
-.if ${OSVERSION} >= 500000
 .if defined(KRB5_HOME)
 	@${ECHO_CMD} "Using Kerberos V support in ${KRB5_HOME}."
 .else
 	@${ECHO_CMD} "Use KRB5_HOME=<directory> to enable Kerberos V support in <directory> (usually /usr)."
 .endif
 
-.else
-# FreeBSD 4
-.if defined(MAKE_KERBEROS4)
-.if exists(/usr/lib/libkrb.a)
-	@${ECHO_CMD} "Enabling Kerberos IV support in /usr."
-.else
-	@${ECHO_CMD} "Kerberos IV is not installed on your system."
-.endif
-.else
-	@${ECHO_CMD} "Use -DMAKE_KERBEROS4 to enable Kerberos IV support."
-.endif
-.endif
-
 .if defined(WITH_GSSAPI)
 .if defined(KRB5_HOME)
 	@${ECHO_CMD} "Enabling GSSAPI support in ${KRB5_HOME}."
diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile
index 9d2b2dfc47f2..db7e5c9515c7 100644
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@@ -44,6 +44,8 @@ PLIST_SUB+=	NOLOGIN=${NOLOGIN_CMD}
 EXTRA_SBIN=	libcheck/noroot libconf/tree libmta/statit \
 		libmta/t-hostname checks/t-getgroup
 
+NOLOGIN_CMD?=	/usr/sbin/nologin
+
 # Options to define Features:
 # META1_WITHOUT_TLS=yes
 # META1_WITHOUT_SASL=yes
@@ -181,10 +183,4 @@ UID!=	${ID} -u
 post-build:	test
 .endif
 
-.if ${OSVERSION} < 500000
-NOLOGIN_CMD?=	/sbin/nologin
-.else
-NOLOGIN_CMD?=	/usr/sbin/nologin
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/mail/pecl-esmtp/Makefile b/mail/pecl-esmtp/Makefile
index c4b6dc49f8a0..45765205637a 100644
--- a/mail/pecl-esmtp/Makefile
+++ b/mail/pecl-esmtp/Makefile
@@ -25,10 +25,6 @@ OPTIONS=	RE2C	"Enable re2c to regenerate PHP parsers"	on
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		does not build on FreeBSD 4.x
-.endif
-
 .if defined(WITH_RE2C)
 BUILD_DEPENDS+=	re2c:${PORTSDIR}/devel/re2c
 .endif
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index 6e7c96531b4d..015cb01e5ae9 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -64,11 +64,9 @@ pre-configure:
 		${WRKSRC}/docs/docs.html ${WRKSRC}/docs/docs.txt
 
 xpost-configure:
-.if ${OSVERSION} > 500000
 	${REINPLACE_CMD} \
 		-e "s| install-ipfwmtad | |" \
 		${WRKSRC}/Makefile
-.endif
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/spamilter.sh \