From ae24fb7b8943db127beeb2a4a1e84e024175b06d Mon Sep 17 00:00:00 2001
From: amdmi3 <amdmi3@FreeBSD.org>
Date: Tue, 29 Mar 2016 00:38:28 +0000
Subject: - Add NO_ARCH - Switch to options helpers - Regenerate patches with
 `make makepatch`

---
 mail/py-ppolicy/Makefile                | 27 +++++++++++----------------
 mail/py-ppolicy/files/patch-ppolicy.tap |  6 +++---
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/mail/py-ppolicy/Makefile b/mail/py-ppolicy/Makefile
index e631257..6af2dc9 100644
--- a/mail/py-ppolicy/Makefile
+++ b/mail/py-ppolicy/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	mail python
 MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~vokac/activities/ppolicy/download/%SUBDIR%/ \
 		http://www.chifeng.name/dist/ppolicy/%SUBDIR%/
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PPolicy is tool for extending Postfix checking capabilities
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython
@@ -16,28 +16,25 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython
 USES=		python twisted
 USE_PYTHON=	distutils autoplist
 NO_BUILD=	yes
+NO_ARCH=	yes
 USE_RC_SUBR=	ppolicyd
-DOCSDIR?=	${PREFIX}/share/doc/py-${PORTNAME}
 
-SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	GEOIP LDAP MYSQL DOCS
 OPTIONS_DEFAULT=	GEOIP LDAP
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGEOIP}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/GeoIP.so:${PORTSDIR}/net/py-GeoIP
-.endif
-.if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
-.endif
-.if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:${PORTSDIR}/net/py-ldap
-.endif
+GEOIP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/GeoIP.so:${PORTSDIR}/net/py-GeoIP
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
+LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:${PORTSDIR}/net/py-ldap
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/ppolicy.conf ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/ppolicy.tap ${STAGEDIR}${PREFIX}/sbin
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/MODULES ${STAGEDIR}${DOCSDIR}
@@ -45,7 +42,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/TESTS ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ppolicy.sql ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ppolicy.conf ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/ppolicy.tap ${STAGEDIR}${PREFIX}/sbin
 
 .include <bsd.port.mk>
diff --git a/mail/py-ppolicy/files/patch-ppolicy.tap b/mail/py-ppolicy/files/patch-ppolicy.tap
index 3cbff03..89d55db 100644
--- a/mail/py-ppolicy/files/patch-ppolicy.tap
+++ b/mail/py-ppolicy/files/patch-ppolicy.tap
@@ -1,6 +1,6 @@
---- ppolicy.tap.orig	2008-11-27 09:31:42.000000000 +0000
-+++ ppolicy.tap	2008-11-27 09:32:20.000000000 +0000
-@@ -20,7 +20,7 @@
+--- ppolicy.tap.orig	2007-08-20 12:53:28 UTC
++++ ppolicy.tap
+@@ -20,7 +20,7 @@ from twisted.internet import reactor, pr
  
  # default config
  config = {
-- 
cgit v1.1