Tue Aug 23 21:49:56 2022 UTC ()
*: switch to appropriate py-dns version


(wiz)
diff -r1.26 -r1.27 pkgsrc/chat/py-xmpppy/Makefile
diff -r1.96 -r1.97 pkgsrc/mail/mailman/Makefile
diff -r1.7 -r1.8 pkgsrc/mail/py-email_validator/Makefile
diff -r1.16 -r1.17 pkgsrc/mail/py-spf/Makefile
diff -r1.3 -r1.4 pkgsrc/net/dnc/Makefile
diff -r1.6 -r1.7 pkgsrc/net/py-ldapdomaindump/Makefile
diff -r1.20 -r1.21 pkgsrc/security/sshfp/Makefile
cvs diff -r1.26 -r1.27 pkgsrc/chat/py-xmpppy/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/py-xmpppy/Makefile 2022/04/10 18:49:25 1.26
+++ pkgsrc/chat/py-xmpppy/Makefile 2022/08/23 21:49:55 1.27
@@ -1,39 +1,41 @@ @@ -1,39 +1,41 @@
1# $NetBSD: Makefile,v 1.26 2022/04/10 18:49:25 gdt Exp $ 1# $NetBSD: Makefile,v 1.27 2022/08/23 21:49:55 wiz Exp $
2 2
3DISTNAME= xmpppy-0.7.1 3DISTNAME= xmpppy-0.7.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= chat python 5CATEGORIES= chat python
6MASTER_SITES= ${MASTER_SITE_GITHUB:=xmpppy/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=xmpppy/}
7GITHUB_PROJECT= xmpppy 7GITHUB_PROJECT= xmpppy
8 8
9MAINTAINER= gdt@NetBSD.org 9MAINTAINER= gdt@NetBSD.org
10HOMEPAGE= http://xmpppy.sourceforge.net/ 10HOMEPAGE= http://xmpppy.sourceforge.net/
11COMMENT= XMPP (Jabber) library for Python 11COMMENT= XMPP (Jabber) library for Python
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns 
15DEPENDS+= ${PYPKGPREFIX}-expat>=0nb4:../../textproc/py-expat 14DEPENDS+= ${PYPKGPREFIX}-expat>=0nb4:../../textproc/py-expat
16 15
17USE_LANGUAGES= # none 16USE_LANGUAGES= # none
18 17
 18PYTHON_VERSIONED_DEPENDENCIES= dns
 19
19USE_PKG_RESOURCES= yes 20USE_PKG_RESOURCES= yes
20 21
21DOCDIR= ${PREFIX}/share/doc/py-xmpppy 22DOCDIR= ${PREFIX}/share/doc/py-xmpppy
22EXDIR= ${PREFIX}/share/examples/py-xmpppy 23EXDIR= ${PREFIX}/share/examples/py-xmpppy
23 24
24INSTALLATION_DIRS+= ${DOCDIR} ${EXDIR} 25INSTALLATION_DIRS+= ${DOCDIR} ${EXDIR}
25 26
26post-install: 27post-install:
27 ${INSTALL_SCRIPT_DIR} ${DESTDIR}${EXDIR} 28 ${INSTALL_SCRIPT_DIR} ${DESTDIR}${EXDIR}
28 ${INSTALL_SCRIPT} ${WRKSRC}/docs/examples/*.py \ 29 ${INSTALL_SCRIPT} ${WRKSRC}/docs/examples/*.py \
29 ${DESTDIR}${EXDIR} 30 ${DESTDIR}${EXDIR}
30 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} 31 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
31 ${INSTALL_DATA} ${WRKSRC}/docs/*.html \ 32 ${INSTALL_DATA} ${WRKSRC}/docs/*.html \
32 ${DESTDIR}${DOCDIR} 33 ${DESTDIR}${DOCDIR}
33 ${INSTALL_DATA} ${WRKSRC}/docs/*.png \ 34 ${INSTALL_DATA} ${WRKSRC}/docs/*.png \
34 ${DESTDIR}${DOCDIR} 35 ${DESTDIR}${DOCDIR}
35 ${INSTALL_DATA} ${WRKSRC}/docs/*.css \ 36 ${INSTALL_DATA} ${WRKSRC}/docs/*.css \
36 ${DESTDIR}${DOCDIR} 37 ${DESTDIR}${DOCDIR}
37 38
 39.include "../../lang/python/versioned_dependencies.mk"
38.include "../../lang/python/egg.mk" 40.include "../../lang/python/egg.mk"
39.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.96 -r1.97 pkgsrc/mail/mailman/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mailman/Makefile 2022/06/30 11:18:34 1.96
+++ pkgsrc/mail/mailman/Makefile 2022/08/23 21:49:55 1.97
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.96 2022/06/30 11:18:34 nia Exp $ 1# $NetBSD: Makefile,v 1.97 2022/08/23 21:49:55 wiz Exp $
2 2
3DISTNAME= mailman-2.1.35 3DISTNAME= mailman-2.1.35
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= mail www 5CATEGORIES= mail www
6MASTER_SITES= https://launchpad.net/mailman/2.1/2.1.35/+download/ 6MASTER_SITES= https://launchpad.net/mailman/2.1/2.1.35/+download/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.list.org/ 10HOMEPAGE= https://www.list.org/
11COMMENT= The GNU Mailing List Manager 11COMMENT= The GNU Mailing List Manager
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns 14DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns1
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17 17
18PKG_SYSCONFSUBDIR?= httpd 18PKG_SYSCONFSUBDIR?= httpd
19MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 19MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
20MESSAGE_SUBST+= DOCDIR=${DOCDIR} 20MESSAGE_SUBST+= DOCDIR=${DOCDIR}
21 21
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23GNU_CONFIGURE_PREFIX= ${EXECDIR} 23GNU_CONFIGURE_PREFIX= ${EXECDIR}
24 24
25MAKE_FLAGS+= DIRSETGID=${TRUE:Q} 25MAKE_FLAGS+= DIRSETGID=${TRUE:Q}
26EXECDIR= ${PREFIX}/lib/mailman 26EXECDIR= ${PREFIX}/lib/mailman
27MAILMAN_DATADIR?= ${VARBASE}/db/mailman 27MAILMAN_DATADIR?= ${VARBASE}/db/mailman
cvs diff -r1.7 -r1.8 pkgsrc/mail/py-email_validator/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/py-email_validator/Makefile 2022/01/05 15:41:13 1.7
+++ pkgsrc/mail/py-email_validator/Makefile 2022/08/23 21:49:56 1.8
@@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
1# $NetBSD: Makefile,v 1.7 2022/01/05 15:41:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.8 2022/08/23 21:49:56 wiz Exp $
2 2
3DISTNAME= email_validator-1.1.3 3DISTNAME= email_validator-1.1.3
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= mail python 6CATEGORIES= mail python
7MASTER_SITES= ${MASTER_SITE_PYPI:=e/email-validator/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=e/email-validator/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/JoshData/python-email-validator 10HOMEPAGE= https://github.com/JoshData/python-email-validator
11COMMENT= Robust email syntax and deliverability validation library 11COMMENT= Robust email syntax and deliverability validation library
12LICENSE= cc0-1.0-universal 12LICENSE= cc0-1.0-universal
13 13
14DEPENDS+= ${PYPKGPREFIX}-dns>=1.15.0:../../net/py-dns 
15DEPENDS+= ${PYPKGPREFIX}-idna>=2.0.0:../../www/py-idna 14DEPENDS+= ${PYPKGPREFIX}-idna>=2.0.0:../../www/py-idna
16 15
 16PYTHON_VERSIONED_DEPENDENCIES= dns
 17
17USE_LANGUAGES= # none 18USE_LANGUAGES= # none
18 19
19USE_PKG_RESOURCES= yes 20USE_PKG_RESOURCES= yes
20 21
21post-install: 22post-install:
22 cd ${DESTDIR}${PREFIX}/bin && \ 23 cd ${DESTDIR}${PREFIX}/bin && \
23 ${MV} email_validator email_validator-${PYVERSSUFFIX} || ${TRUE} 24 ${MV} email_validator email_validator-${PYVERSSUFFIX} || ${TRUE}
24 25
 26.include "../../lang/python/versioned_dependencies.mk"
25.include "../../lang/python/egg.mk" 27.include "../../lang/python/egg.mk"
26.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/mail/py-spf/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/py-spf/Makefile 2022/01/09 11:58:15 1.16
+++ pkgsrc/mail/py-spf/Makefile 2022/08/23 21:49:56 1.17
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: Makefile,v 1.16 2022/01/09 11:58:15 wiz Exp $ 1# $NetBSD: Makefile,v 1.17 2022/08/23 21:49:56 wiz Exp $
2 2
3DISTNAME= pyspf-2.0.14 3DISTNAME= pyspf-2.0.14
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= mail python 6CATEGORIES= mail python
7MASTER_SITES= ${MASTER_SITE_PYPI:=p/pyspf/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=p/pyspf/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/sdgathman/pyspf 10HOMEPAGE= https://github.com/sdgathman/pyspf
11COMMENT= SPF (Sender Policy Framework) implemented in Python 11COMMENT= SPF (Sender Policy Framework) implemented in Python
12LICENSE= python-software-foundation 12LICENSE= python-software-foundation
13 13
14DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns 
15TEST_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml 14TEST_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
16 15
 16PYTHON_VERSIONED_DEPENDENCIES= dns
 17
17.include "../../lang/python/pyversion.mk" 18.include "../../lang/python/pyversion.mk"
18.if ${_PYTHON_VERSION} == 27 19.if ${_PYTHON_VERSION} == 27
19DEPENDS+= ${PYPKGPREFIX}-ipaddr-[0-9]*:../../devel/py-ipaddr 20DEPENDS+= ${PYPKGPREFIX}-ipaddr-[0-9]*:../../devel/py-ipaddr
20.endif 21.endif
21 22
22USE_LANGUAGES= # none 23USE_LANGUAGES= # none
23 24
24post-install: 25post-install:
25.for bin in spfquery.py type99.py 26.for bin in spfquery.py type99.py
26 cd ${DESTDIR}${PREFIX}/bin && \ 27 cd ${DESTDIR}${PREFIX}/bin && \
27 ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE} 28 ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
28.endfor 29.endfor
29 30
30do-test: 31do-test:
31 cd ${WRKSRC}/test && ${PYTHONBIN} testspf.py 32 cd ${WRKSRC}/test && ${PYTHONBIN} testspf.py
32 33
 34.include "../../lang/python/versioned_dependencies.mk"
33.include "../../lang/python/egg.mk" 35.include "../../lang/python/egg.mk"
34.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/net/dnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/dnc/Makefile 2022/06/30 11:18:40 1.3
+++ pkgsrc/net/dnc/Makefile 2022/08/23 21:49:56 1.4
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: Makefile,v 1.3 2022/06/30 11:18:40 nia Exp $ 1# $NetBSD: Makefile,v 1.4 2022/08/23 21:49:56 wiz Exp $
2 2
3GITHUB_PROJECT= dnc 3GITHUB_PROJECT= dnc
4DISTNAME= dnc-0.2.0 4DISTNAME= dnc-0.2.0
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_GITHUB:=fcambus/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=fcambus/}
8GITHUB_RELEASE= ${PKGVERSION_NOREV} 8GITHUB_RELEASE= ${PKGVERSION_NOREV}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/fcambus/dnc/ 11HOMEPAGE= https://github.com/fcambus/dnc/
12COMMENT= CLI tool to check domain names configuration 12COMMENT= CLI tool to check domain names configuration
13LICENSE= 2-clause-bsd 13LICENSE= 2-clause-bsd
14 14
15USE_LANGUAGES= # none 15USE_LANGUAGES= # none
16 16
17DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns 
18DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL 17DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
19DEPENDS+= ${PYPKGPREFIX}-prettytable-[0-9]*:../../textproc/py-prettytable 18DEPENDS+= ${PYPKGPREFIX}-prettytable-[0-9]*:../../textproc/py-prettytable
20 19
 20PYTHON_VERSIONED_DEPENDENCIES= dns
 21
21NO_BUILD= yes 22NO_BUILD= yes
22 23
23REPLACE_PYTHON= dnc 24REPLACE_PYTHON= dnc
24 25
25AUTO_MKDIRS= yes 26AUTO_MKDIRS= yes
26INSTALLATION_DIRS+= ${PKGMANDIR}/man1 27INSTALLATION_DIRS+= ${PKGMANDIR}/man1
27 28
28do-install: 29do-install:
29 ${RUN}${INSTALL_SCRIPT} ${WRKSRC}/dnc ${DESTDIR}${PREFIX}/bin 30 ${RUN}${INSTALL_SCRIPT} ${WRKSRC}/dnc ${DESTDIR}${PREFIX}/bin
30 ${RUN}${INSTALL_MAN} ${WRKSRC}/dnc.1 \ 31 ${RUN}${INSTALL_MAN} ${WRKSRC}/dnc.1 \
31 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 32 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
32 33
 34.include "../../lang/python/versioned_dependencies.mk"
33.include "../../lang/python/application.mk" 35.include "../../lang/python/application.mk"
34.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/net/py-ldapdomaindump/Makefile (expand / switch to unified diff)

--- pkgsrc/net/py-ldapdomaindump/Makefile 2022/01/04 20:54:28 1.6
+++ pkgsrc/net/py-ldapdomaindump/Makefile 2022/08/23 21:49:56 1.7
@@ -1,27 +1,29 @@ @@ -1,27 +1,29 @@
1# $NetBSD: Makefile,v 1.6 2022/01/04 20:54:28 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2022/08/23 21:49:56 wiz Exp $
2 2
3DISTNAME= ldapdomaindump-0.9.3 3DISTNAME= ldapdomaindump-0.9.3
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= net python 6CATEGORIES= net python
7MASTER_SITES= ${MASTER_SITE_PYPI:=l/ldapdomaindump/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=l/ldapdomaindump/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/dirkjanm/ldapdomaindump 10HOMEPAGE= https://github.com/dirkjanm/ldapdomaindump
11COMMENT= Collection of Python classes for working with network protocols 11COMMENT= Collection of Python classes for working with network protocols
12LICENSE= mit 12LICENSE= mit
13 13
14DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns 
15DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future 14DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
16DEPENDS+= ${PYPKGPREFIX}-ldap3>=2.6:../../databases/py-ldap3 15DEPENDS+= ${PYPKGPREFIX}-ldap3>=2.6:../../databases/py-ldap3
17 16
18USE_LANGUAGES= # none 17USE_LANGUAGES= # none
19 18
 19PYTHON_VERSIONED_DEPENDENCIES= dns
 20
20post-install: 21post-install:
21.for bin in ldapdomaindump ldd2bloodhound ldd2pretty 22.for bin in ldapdomaindump ldd2bloodhound ldd2pretty
22 cd ${DESTDIR}${PREFIX}/bin && \ 23 cd ${DESTDIR}${PREFIX}/bin && \
23 ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE} 24 ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
24.endfor 25.endfor
25 26
 27.include "../../lang/python/versioned_dependencies.mk"
26.include "../../lang/python/egg.mk" 28.include "../../lang/python/egg.mk"
27.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/security/sshfp/Makefile (expand / switch to unified diff)

--- pkgsrc/security/sshfp/Makefile 2022/06/30 11:18:48 1.20
+++ pkgsrc/security/sshfp/Makefile 2022/08/23 21:49:56 1.21
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.20 2022/06/30 11:18:48 nia Exp $ 1# $NetBSD: Makefile,v 1.21 2022/08/23 21:49:56 wiz Exp $
2 2
3DISTNAME= sshfp-1.2.2 3DISTNAME= sshfp-1.2.2
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= security net 5CATEGORIES= security net
6MASTER_SITES= ${MASTER_SITE_GITHUB:=xelerance/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=xelerance/}
7 7
8MAINTAINER= agc@NetBSD.org 8MAINTAINER= agc@NetBSD.org
9HOMEPAGE= https://github.com/xelerance/sshfp 9HOMEPAGE= https://github.com/xelerance/sshfp
10COMMENT= Print ssh host key fingerprint resource records 10COMMENT= Print ssh host key fingerprint resource records
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13DEPENDS+= ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse 13DEPENDS+= ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
14DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns 14DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns1
15DEPENDS+= ${PYPKGPREFIX}-ipcalc-[0-9]*:../../net/py-ipcalc 15DEPENDS+= ${PYPKGPREFIX}-ipcalc-[0-9]*:../../net/py-ipcalc
16 16
17NO_BUILD= yes 17NO_BUILD= yes
18INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 18INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
19REPLACE_PYTHON+= dane 19REPLACE_PYTHON+= dane
20REPLACE_PYTHON+= sshfp 20REPLACE_PYTHON+= sshfp
21 21
22PYTHON_VERSIONS_ACCEPTED= 27 22PYTHON_VERSIONS_ACCEPTED= 27
23 23
24do-install: 24do-install:
25 ${INSTALL_SCRIPT} ${WRKSRC}/dane ${DESTDIR}${PREFIX}/bin/dane 25 ${INSTALL_SCRIPT} ${WRKSRC}/dane ${DESTDIR}${PREFIX}/bin/dane
26 ${INSTALL_SCRIPT} ${WRKSRC}/sshfp ${DESTDIR}${PREFIX}/bin/sshfp 26 ${INSTALL_SCRIPT} ${WRKSRC}/sshfp ${DESTDIR}${PREFIX}/bin/sshfp
27 ${INSTALL_MAN} ${WRKSRC}/dane.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 27 ${INSTALL_MAN} ${WRKSRC}/dane.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1