svn commit: r416816 - head/mail/spamd

[Olli Hauer]

Author: ohauer
Date: Sun Jun 12 17:57:38 2016
New Revision: 416816
URL: https://svnweb.freebsd.org/changeset/ports/416816

Log:
  - allow build with openssl / libressl from ports
  - convert PLIST_SUB into SUB_LIST
  - bump PORTREVISION
  - small Makefile tweaks
  
  PR:		210028
  Submitted by:	adamw@

Modified:
  head/mail/spamd/Makefile

Modified: head/mail/spamd/Makefile
==============================================================================
--- head/mail/spamd/Makefile	Sun Jun 12 17:35:31 2016	(r416815)
+++ head/mail/spamd/Makefile	Sun Jun 12 17:57:38 2016	(r416816)
@@ -3,7 +3,7 @@
 
 PORTNAME=	spamd
 PORTVERSION=	4.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	SF/freebsdspamd/spamd
 
@@ -13,6 +13,7 @@ COMMENT=	Traps spammers with a very slow
 LICENSE=	BSD2CLAUSE
 
 USE_RC_SUBR?=	obspamd obspamlogd
+USE_OPENSSL=	yes
 
 USERS=		_spamd
 GROUPS=		_spamd
@@ -29,7 +30,7 @@ PLIST_FILES=	%%ETCDIR%%/spamd.conf.sampl
 		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!
@@ -39,21 +40,21 @@ PLIST_SUB=	SPAMDUSER=${USERS} \
 # 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)
@@ -69,10 +70,10 @@ do-install:
 	${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>