Hi, wip update to latest version. Latest version requires python3, so some python3 flavours are needed. I added a python3 flavor to mail/py-spf but both flavours have files in common (bin/spfquery) that conflicts. What's the correct way to manage them ?
Cheers & Thanks Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/py-spf/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 16 Nov 2015 11:30:21 -0000 1.18
+++ Makefile 22 Apr 2017 22:03:01 -0000
@@ -4,7 +4,7 @@ COMMENT= Sender-Policy-Framework queries
MODPY_EGG_VERSION=2.0.12
DISTNAME= pyspf-${MODPY_EGG_VERSION}
-REVISION= 0
+REVISION= 1
PKGNAME= py-spf-${MODPY_EGG_VERSION}
CATEGORIES= mail
@@ -19,14 +19,32 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
MODULES= lang/python
+FLAVORS = python3
+FLAVOR ?=
+
+.if ${FLAVOR:Mpython3}
+BUILD_DEPENDS= net/py3-dns
+.else
BUILD_DEPENDS= net/py-dns
+.endif
+.if ${FLAVOR:Mpython3}
+RUN_DEPENDS= mail/py-authres,python3 \
+ net/py3-dns
+.else
RUN_DEPENDS= mail/py-authres \
net/py-dns
+.endif
+.if ${FLAVOR:Mpython3}
+TEST_DEPENDS=${FULLPKGNAME}:${BUILD_PKGPATH},${FLAVOUR} \
+ textproc/py-yaml,python3 \
+ net/py-ipaddr,python3
+.else
TEST_DEPENDS=${FULLPKGNAME}:${BUILD_PKGPATH} \
textproc/py-yaml \
net/py-ipaddr
+.endif
do-test:
@cd ${WRKSRC}/test && ${MODPY_BIN} testspf.py
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/mail/py-spf/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 27 Oct 2008 20:17:40 -0000 1.3
+++ pkg/PLIST 27 Apr 2017 14:41:49 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2008/10/27 20:17:40 jasper Exp $
bin/spfquery.py
bin/type99.py
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}spf.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyspf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/spf.py
-lib/python${MODPY_VERSION}/site-packages/spf.pyc
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/py-authres/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 16 Nov 2015 11:29:05 -0000 1.8
+++ Makefile 22 Apr 2017 14:11:41 -0000
@@ -4,6 +4,7 @@ COMMENT = module for RFC 5451 Authentica
MODPY_EGG_VERSION = 0.800
DISTNAME = authres-${MODPY_EGG_VERSION}
+REVISION = 0
PKGNAME = py-${DISTNAME}
CATEGORIES = mail
@@ -15,6 +16,9 @@ PERMIT_PACKAGE_CDROM = Yes
MODPY_PI = Yes
MODULES = lang/python
+
+FLAVORS = python3
+FLAVOR ?=
NO_TEST = Yes
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/mail/py-authres/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 16 Nov 2015 11:29:05 -0000 1.4
+++ pkg/PLIST 22 Apr 2017 14:13:17 -0000
@@ -2,21 +2,22 @@
lib/python${MODPY_VERSION}/site-packages/authres/
lib/python${MODPY_VERSION}/site-packages/authres-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/authres/__init__.py
-lib/python${MODPY_VERSION}/site-packages/authres/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/authres/__main__.py
-lib/python${MODPY_VERSION}/site-packages/authres/__main__.pyc
+lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}dkim_adsp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}dkim_b.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}dmarc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}rrvs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}smime.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/authres/${MODPY_PYCACHE}vbr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/authres/core.py
-lib/python${MODPY_VERSION}/site-packages/authres/core.pyc
lib/python${MODPY_VERSION}/site-packages/authres/dkim_adsp.py
-lib/python${MODPY_VERSION}/site-packages/authres/dkim_adsp.pyc
lib/python${MODPY_VERSION}/site-packages/authres/dkim_b.py
-lib/python${MODPY_VERSION}/site-packages/authres/dkim_b.pyc
lib/python${MODPY_VERSION}/site-packages/authres/dmarc.py
-lib/python${MODPY_VERSION}/site-packages/authres/dmarc.pyc
lib/python${MODPY_VERSION}/site-packages/authres/rrvs.py
-lib/python${MODPY_VERSION}/site-packages/authres/rrvs.pyc
lib/python${MODPY_VERSION}/site-packages/authres/smime.py
-lib/python${MODPY_VERSION}/site-packages/authres/smime.pyc
lib/python${MODPY_VERSION}/site-packages/authres/tests
lib/python${MODPY_VERSION}/site-packages/authres/vbr.py
-lib/python${MODPY_VERSION}/site-packages/authres/vbr.pyc
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/py-policyd-spf/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 29 Dec 2015 10:47:13 -0000 1.17
+++ Makefile 22 Apr 2017 21:49:01 -0000
@@ -2,8 +2,8 @@
COMMENT= external SPF policy checker for postfix
-VER= 1.3
-P= 2
+VER= 2.0
+P= 1
MODPY_EGG_VERSION=${VER}.${P}
DISTNAME= pypolicyd-spf-${MODPY_EGG_VERSION}
PKGNAME= py-policyd-spf-${MODPY_EGG_VERSION}
@@ -19,11 +19,12 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://launchpad.net/pypolicyd-spf/${VER}/${MODPY_EGG_VERSION}/+download/
MODULES= lang/python
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
-BUILD_DEPENDS= mail/py-spf
-RUN_DEPENDS= mail/py-spf \
- net/py-dns \
- net/py-ipaddr
+BUILD_DEPENDS= mail/py-spf,python3
+RUN_DEPENDS= mail/py-spf,python3 \
+ net/py-dns,python3 \
+ net/py-ipaddr,python3
NO_TEST= Yes
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/mail/py-policyd-spf/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 29 Dec 2015 10:47:13 -0000 1.6
+++ distinfo 22 Apr 2017 13:43:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (pypolicyd-spf-1.3.2.tar.gz) = cXTEaibJw1sNZt26ghsCsNwt+dH2vwydpx3NYHlbKWY=
-SIZE (pypolicyd-spf-1.3.2.tar.gz) = 32973
+SHA256 (pypolicyd-spf-2.0.1.tar.gz) = kSSGXDQ0tA7L5udh0FA5tnDUA+BNJzbz/7vIeI9H0Sc=
+SIZE (pypolicyd-spf-2.0.1.tar.gz) = 38086
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/mail/py-policyd-spf/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 4 Oct 2013 09:37:43 -0000 1.5
+++ pkg/PLIST 11 Dec 2016 07:58:20 -0000
@@ -1,17 +1,18 @@
@comment $OpenBSD: PLIST,v 1.5 2013/10/04 09:37:43 giovanni Exp $
bin/policyd-spf
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}policydspfsupp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}policydspfuser.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/policydspfsupp.py
-lib/python${MODPY_VERSION}/site-packages/policydspfsupp.pyc
lib/python${MODPY_VERSION}/site-packages/policydspfuser.py
-lib/python${MODPY_VERSION}/site-packages/policydspfuser.pyc
lib/python${MODPY_VERSION}/site-packages/pypolicyd_spf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
@man man/man1/policyd-spf.1
@man man/man5/policyd-spf.conf.5
@man man/man5/policyd-spf.peruser.5
@sample ${SYSCONFDIR}/python-policyd-spf/
-share/doc/${MODPY_PY_PREFIX}policyd-spf/
-share/doc/${MODPY_PY_PREFIX}policyd-spf/README.per_user_whitelisting
-share/examples/${MODPY_PY_PREFIX}policyd-spf/
-share/examples/${MODPY_PY_PREFIX}policyd-spf/policyd-spf.conf
+share/doc/py-policyd-spf/
+share/doc/py-policyd-spf/README.per_user_whitelisting
+share/examples/py-policyd-spf/
+share/examples/py-policyd-spf/policyd-spf.conf
@sample ${SYSCONFDIR}/python-policyd-spf/policyd-spf.conf
-share/examples/${MODPY_PY_PREFIX}policyd-spf/policyd-spf.conf.commented
+share/examples/py-policyd-spf/policyd-spf.conf.commented
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/net/py-ipaddr/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 27 Aug 2016 08:24:21 -0000 1.4
+++ Makefile 22 Apr 2017 22:17:47 -0000
@@ -2,9 +2,15 @@
COMMENT = Python IP address manipulation library
+V = 2.1.11.2017.02.09
MODPY_EGG_VERSION = 2.1.11
-DISTNAME = ipaddr-${MODPY_EGG_VERSION}
+DISTNAME = ipaddr-${V}
PKGNAME = py-${DISTNAME}
+
+GH_ACCOUNT = google
+GH_PROJECT = ipaddr-py
+GH_COMMIT = 134e5664df17a4e362ba1a4050f3b7c268a9d68a
+
CATEGORIES = net
HOMEPAGE = https://github.com/google/ipaddr-py
@@ -13,7 +19,9 @@ HOMEPAGE = https://github.com/google/ipa
PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/python
-MODPY_PI = Yes
+
+FLAVORS = python3
+FLAVOR ?=
do-test:
${MODPY_BIN} ${WRKSRC}/ipaddr_test.py
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/net/py-ipaddr/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 27 Aug 2016 08:24:21 -0000 1.2
+++ distinfo 22 Apr 2017 22:17:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (ipaddr-2.1.11.tar.gz) = G1VbiogAE0/a/jK30MtS9b2/3Qk3B8PdSExepZ8dmLc=
-SIZE (ipaddr-2.1.11.tar.gz) = 29046
+SHA256 (ipaddr-2.1.11.2017.02.09.tar.gz) = +5Rd/Anp85oTDiIIeZmtUNoCfDaJ2VhNasa//gsWFAQ=
+SIZE (ipaddr-2.1.11.2017.02.09.tar.gz) = 33913
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/net/py-ipaddr/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 4 Oct 2013 09:20:14 -0000 1.1.1.1
+++ pkg/PLIST 22 Apr 2017 22:18:02 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/10/04 09:20:14 giovanni Exp $
-lib/python${MODPY_VERSION}/site-packages/ipaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ipaddr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ipaddr-trunk-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/ipaddr.py
-lib/python${MODPY_VERSION}/site-packages/ipaddr.pyc
py3-dns-3.0.2.tgz
Description: application/compressed-tar
