Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Mar 2016 00:38:29 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r412084 - in head/mail/py-ppolicy: . files
Message-ID:  <201603290038.u2T0cTnn082849@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Mar 29 00:38:28 2016
New Revision: 412084
URL: https://svnweb.freebsd.org/changeset/ports/412084

Log:
  - Add NO_ARCH
  - Switch to options helpers
  - Regenerate patches with `make makepatch`

Modified:
  head/mail/py-ppolicy/Makefile
  head/mail/py-ppolicy/files/patch-ppolicy.tap

Modified: head/mail/py-ppolicy/Makefile
==============================================================================
--- head/mail/py-ppolicy/Makefile	Tue Mar 29 00:38:12 2016	(r412083)
+++ head/mail/py-ppolicy/Makefile	Tue Mar 29 00:38:28 2016	(r412084)
@@ -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/__
 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>

Modified: head/mail/py-ppolicy/files/patch-ppolicy.tap
==============================================================================
--- head/mail/py-ppolicy/files/patch-ppolicy.tap	Tue Mar 29 00:38:12 2016	(r412083)
+++ head/mail/py-ppolicy/files/patch-ppolicy.tap	Tue Mar 29 00:38:28 2016	(r412084)
@@ -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 = {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603290038.u2T0cTnn082849>