Index: head/mail/spamd/Makefile
===================================================================
--- head/mail/spamd/Makefile	(revision 416815)
+++ head/mail/spamd/Makefile	(revision 416816)
@@ -1,78 +1,79 @@
 # Created by: Max Laier <max@love2party.net>
 # $FreeBSD$
 
 PORTNAME=	spamd
 PORTVERSION=	4.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	SF/freebsdspamd/spamd
 
 MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	Traps spammers with a very slow smtp-login and return 4xx error
 
 LICENSE=	BSD2CLAUSE
 
 USE_RC_SUBR?=	obspamd obspamlogd
+USE_OPENSSL=	yes
 
 USERS=		_spamd
 GROUPS=		_spamd
 
 PORTDOCS=	ipfw-spamd.txt spamdb.txt
 
 PLIST_FILES=	%%ETCDIR%%/spamd.conf.sample \
 		libexec/spamlogd \
 		sbin/spamd-setup \
 		sbin/spamdb \
 		man/man5/spamd.conf.5.gz \
 		man/man8/spamd-setup.8.gz \
 		man/man8/spamd.8.gz \
 		man/man8/spamdb.8.gz \
 		man/man8/spamlogd.8.gz
 
-PLIST_SUB=	SPAMDUSER=${USERS} \
+SUB_LIST=	SPAMDUSER=${USERS} \
 		SPAMDGROUP=${GROUPS}
 
 # If you are a CPANEL user the this option is for you!
 # CPANEL sends periodic a 'kill -TERM spamd' to the SpamAssassin spamd, and
 # this kills also the OpenBSD spamd daemon.
 # With this option spamd will be installed as obspamd, and the rc script will
 # be adjusted. Man page and pid file will not be renamed!
 .if !defined(CPANEL)
 PLIST_FILES+=	libexec/spamd
-PLIST_SUB+=	SPAMDBIN=spamd
+SUB_LIST+=	SPAMDBIN=spamd
 .else
 PLIST_FILES+=	libexec/obspamd
-PLIST_SUB+=	SPAMDBIN=obspamd
+SUB_LIST+=	SPAMDBIN=obspamd
 .endif
 
 SUB_FILES=	pkg-install \
 		pkg-message
 
-SUB_LIST=	PREFIX=${PREFIX} \
-		${PLIST_SUB}
-
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
+CFLAGS+=	-I${OPENSSLINC}
+LDFLAGS+=	-L${OPENSSLLIB}
+
 do-install:
 .if !defined(CPANEL)
 	${INSTALL_PROGRAM} ${WRKSRC}/spamd/spamd ${STAGEDIR}${PREFIX}/libexec
 .else
 	${INSTALL_PROGRAM} ${WRKSRC}/spamd/spamd ${STAGEDIR}${PREFIX}/libexec/obspamd
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/spamlogd/spamlogd ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/spamd-setup/spamd-setup ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/spamdb/spamdb ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/etc/spamd.conf.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/spamd/spamd.8 ${STAGEDIR}${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/spamd-setup/spamd-setup.8 ${STAGEDIR}${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/spamdb/spamdb.8 ${STAGEDIR}${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/spamlogd/spamlogd.8 ${STAGEDIR}${PREFIX}/man/man8
-	${INSTALL} -d ${STAGEDIR}${ETCDIR}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/spamd.conf ${STAGEDIR}${ETCDIR}/spamd.conf.sample
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>