Tue Oct 31 14:56:12 2023 UTC ()
getmail: avoid conflicts with getmail6. Bump PKGREVISION.


(schmonz)
diff -r0 -r1.1 pkgsrc/mail/getmail/ALTERNATIVES
diff -r1.179 -r1.180 pkgsrc/mail/getmail/Makefile
diff -r1.15 -r1.16 pkgsrc/mail/getmail/PLIST
diff -r1.149 -r1.150 pkgsrc/mail/getmail/distinfo
diff -r1.1 -r1.2 pkgsrc/mail/getmail/patches/patch-setup.py
File Added: pkgsrc/mail/getmail/ALTERNATIVES
bin/getmail @PREFIX@/bin/getmail5
bin/getmail-gmail-xoauth-tokens @PREFIX@/bin/getmail5-gmail-xoauth-tokens
bin/getmail_fetch @PREFIX@/bin/getmail5_fetch
bin/getmail_maildir @PREFIX@/bin/getmail5_maildir
bin/getmail_mbox @PREFIX@/bin/getmail5_mbox
cvs diff -r1.179 -r1.180 pkgsrc/mail/getmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/getmail/Makefile 2023/08/14 05:24:46 1.179
+++ pkgsrc/mail/getmail/Makefile 2023/10/31 14:56:12 1.180
@@ -1,20 +1,32 @@ @@ -1,20 +1,32 @@
1# $NetBSD: Makefile,v 1.179 2023/08/14 05:24:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.180 2023/10/31 14:56:12 schmonz Exp $
2 2
3DISTNAME= getmail-5.16 3DISTNAME= getmail-5.16
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ${HOMEPAGE}old-versions/ 6MASTER_SITES= ${HOMEPAGE}old-versions/
7 7
8MAINTAINER= schmonz@NetBSD.org 8MAINTAINER= schmonz@NetBSD.org
9HOMEPAGE= http://pyropus.ca/software/getmail/ 9HOMEPAGE= http://pyropus.ca/software/getmail/
10COMMENT= Secure, flexible, reliable fetchmail replacement 10COMMENT= Secure, flexible, reliable fetchmail replacement
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_LANGUAGES= # none 13USE_LANGUAGES= # none
14 14
15REPLACE_PYTHON= *.py getmailcore/*.py 15REPLACE_PYTHON= *.py getmail5core/*.py
16PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 4.53.0 16PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 5.16
 17
 18SUBST_CLASSES+= core
 19SUBST_STAGE.core= pre-configure
 20SUBST_FILES.core= * */*
 21SUBST_SED.core= -e 's|getmailcore|getmail5core|g'
 22
 23post-extract:
 24 cd ${WRKSRC} && \
 25 for f in getmail* docs/getmail*.1; do \
 26 g=$$(echo $$f | sed -e 's|getmail|getmail5|'); \
 27 ${MV} $$f $$g; \
 28 done
17 29
18.include "../../lang/python/application.mk" 30.include "../../lang/python/application.mk"
19.include "../../lang/python/egg.mk" 31.include "../../lang/python/egg.mk"
20.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/mail/getmail/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/getmail/PLIST 2022/01/14 17:51:59 1.15
+++ pkgsrc/mail/getmail/PLIST 2023/10/31 14:56:12 1.16
@@ -1,69 +1,69 @@ @@ -1,69 +1,69 @@
1@comment $NetBSD: PLIST,v 1.15 2022/01/14 17:51:59 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.16 2023/10/31 14:56:12 schmonz Exp $
2bin/getmail 2bin/getmail5
3bin/getmail-gmail-xoauth-tokens 3bin/getmail5-gmail-xoauth-tokens
4bin/getmail_fetch 4bin/getmail5_fetch
5bin/getmail_maildir 5bin/getmail5_maildir
6bin/getmail_mbox 6bin/getmail5_mbox
7man/man1/getmail.1 7man/man1/getmail5.1
8man/man1/getmail_fetch.1 8man/man1/getmail5_fetch.1
9man/man1/getmail_maildir.1 9man/man1/getmail5_maildir.1
10man/man1/getmail_mbox.1 10man/man1/getmail5_mbox.1
11share/doc/getmail/BUGS 11share/doc/getmail5/BUGS
12share/doc/getmail/CHANGELOG 12share/doc/getmail5/CHANGELOG
13share/doc/getmail/COPYING 13share/doc/getmail5/COPYING
14share/doc/getmail/README 14share/doc/getmail5/README
15share/doc/getmail/THANKS 15share/doc/getmail5/THANKS
16share/doc/getmail/TODO 16share/doc/getmail5/TODO
17share/doc/getmail/configuration.html 17share/doc/getmail5/configuration.html
18share/doc/getmail/configuration.txt 18share/doc/getmail5/configuration.txt
19share/doc/getmail/documentation.html 19share/doc/getmail5/documentation.html
20share/doc/getmail/documentation.txt 20share/doc/getmail5/documentation.txt
21share/doc/getmail/faq.html 21share/doc/getmail5/faq.html
22share/doc/getmail/faq.txt 22share/doc/getmail5/faq.txt
23share/doc/getmail/getmaildocs.css 23share/doc/getmail5/getmaildocs.css
24share/doc/getmail/getmailrc-examples 24share/doc/getmail5/getmailrc-examples
25share/doc/getmail/troubleshooting.html 25share/doc/getmail5/troubleshooting.html
26share/doc/getmail/troubleshooting.txt 26share/doc/getmail5/troubleshooting.txt
27${PYSITELIB}/${EGG_INFODIR} 27${PYSITELIB}/${EGG_INFODIR}
28${PYSITELIB}/getmailcore/__init__.py 28${PYSITELIB}/getmail5core/__init__.py
29${PYSITELIB}/getmailcore/__init__.pyc 29${PYSITELIB}/getmail5core/__init__.pyc
30${PYSITELIB}/getmailcore/__init__.pyo 30${PYSITELIB}/getmail5core/__init__.pyo
31${PYSITELIB}/getmailcore/_pop3ssl.py 31${PYSITELIB}/getmail5core/_pop3ssl.py
32${PYSITELIB}/getmailcore/_pop3ssl.pyc 32${PYSITELIB}/getmail5core/_pop3ssl.pyc
33${PYSITELIB}/getmailcore/_pop3ssl.pyo 33${PYSITELIB}/getmail5core/_pop3ssl.pyo
34${PYSITELIB}/getmailcore/_retrieverbases.py 34${PYSITELIB}/getmail5core/_retrieverbases.py
35${PYSITELIB}/getmailcore/_retrieverbases.pyc 35${PYSITELIB}/getmail5core/_retrieverbases.pyc
36${PYSITELIB}/getmailcore/_retrieverbases.pyo 36${PYSITELIB}/getmail5core/_retrieverbases.pyo
37${PYSITELIB}/getmailcore/baseclasses.py 37${PYSITELIB}/getmail5core/baseclasses.py
38${PYSITELIB}/getmailcore/baseclasses.pyc 38${PYSITELIB}/getmail5core/baseclasses.pyc
39${PYSITELIB}/getmailcore/baseclasses.pyo 39${PYSITELIB}/getmail5core/baseclasses.pyo
40${PYSITELIB}/getmailcore/compatibility.py 40${PYSITELIB}/getmail5core/compatibility.py
41${PYSITELIB}/getmailcore/compatibility.pyc 41${PYSITELIB}/getmail5core/compatibility.pyc
42${PYSITELIB}/getmailcore/compatibility.pyo 42${PYSITELIB}/getmail5core/compatibility.pyo
43${PYSITELIB}/getmailcore/constants.py 43${PYSITELIB}/getmail5core/constants.py
44${PYSITELIB}/getmailcore/constants.pyc 44${PYSITELIB}/getmail5core/constants.pyc
45${PYSITELIB}/getmailcore/constants.pyo 45${PYSITELIB}/getmail5core/constants.pyo
46${PYSITELIB}/getmailcore/destinations.py 46${PYSITELIB}/getmail5core/destinations.py
47${PYSITELIB}/getmailcore/destinations.pyc 47${PYSITELIB}/getmail5core/destinations.pyc
48${PYSITELIB}/getmailcore/destinations.pyo 48${PYSITELIB}/getmail5core/destinations.pyo
49${PYSITELIB}/getmailcore/exceptions.py 49${PYSITELIB}/getmail5core/exceptions.py
50${PYSITELIB}/getmailcore/exceptions.pyc 50${PYSITELIB}/getmail5core/exceptions.pyc
51${PYSITELIB}/getmailcore/exceptions.pyo 51${PYSITELIB}/getmail5core/exceptions.pyo
52${PYSITELIB}/getmailcore/filters.py 52${PYSITELIB}/getmail5core/filters.py
53${PYSITELIB}/getmailcore/filters.pyc 53${PYSITELIB}/getmail5core/filters.pyc
54${PYSITELIB}/getmailcore/filters.pyo 54${PYSITELIB}/getmail5core/filters.pyo
55${PYSITELIB}/getmailcore/imap_utf7.py 55${PYSITELIB}/getmail5core/imap_utf7.py
56${PYSITELIB}/getmailcore/imap_utf7.pyc 56${PYSITELIB}/getmail5core/imap_utf7.pyc
57${PYSITELIB}/getmailcore/imap_utf7.pyo 57${PYSITELIB}/getmail5core/imap_utf7.pyo
58${PYSITELIB}/getmailcore/logging.py 58${PYSITELIB}/getmail5core/logging.py
59${PYSITELIB}/getmailcore/logging.pyc 59${PYSITELIB}/getmail5core/logging.pyc
60${PYSITELIB}/getmailcore/logging.pyo 60${PYSITELIB}/getmail5core/logging.pyo
61${PYSITELIB}/getmailcore/message.py 61${PYSITELIB}/getmail5core/message.py
62${PYSITELIB}/getmailcore/message.pyc 62${PYSITELIB}/getmail5core/message.pyc
63${PYSITELIB}/getmailcore/message.pyo 63${PYSITELIB}/getmail5core/message.pyo
64${PYSITELIB}/getmailcore/retrievers.py 64${PYSITELIB}/getmail5core/retrievers.py
65${PYSITELIB}/getmailcore/retrievers.pyc 65${PYSITELIB}/getmail5core/retrievers.pyc
66${PYSITELIB}/getmailcore/retrievers.pyo 66${PYSITELIB}/getmail5core/retrievers.pyo
67${PYSITELIB}/getmailcore/utilities.py 67${PYSITELIB}/getmail5core/utilities.py
68${PYSITELIB}/getmailcore/utilities.pyc 68${PYSITELIB}/getmail5core/utilities.pyc
69${PYSITELIB}/getmailcore/utilities.pyo 69${PYSITELIB}/getmail5core/utilities.pyo
cvs diff -r1.149 -r1.150 pkgsrc/mail/getmail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/getmail/distinfo 2021/11/28 19:51:20 1.149
+++ pkgsrc/mail/getmail/distinfo 2023/10/31 14:56:12 1.150
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.149 2021/11/28 19:51:20 schmonz Exp $ 1$NetBSD: distinfo,v 1.150 2023/10/31 14:56:12 schmonz Exp $
2 2
3BLAKE2s (getmail-5.16.tar.gz) = 0fa18a9909646d2eeefc09b94ad63d91897fbda955d685fc656c8c97675860eb 3BLAKE2s (getmail-5.16.tar.gz) = 0fa18a9909646d2eeefc09b94ad63d91897fbda955d685fc656c8c97675860eb
4SHA512 (getmail-5.16.tar.gz) = f47e86645de10f28b28c8ad5c800cebcf33f9a8de2a832b186009f8fc0d548e2a3d529da8aa5a7f1ae4885a8c713ca83a40453b35f3ffe267530c644f907a621 4SHA512 (getmail-5.16.tar.gz) = f47e86645de10f28b28c8ad5c800cebcf33f9a8de2a832b186009f8fc0d548e2a3d529da8aa5a7f1ae4885a8c713ca83a40453b35f3ffe267530c644f907a621
5Size (getmail-5.16.tar.gz) = 180577 bytes 5Size (getmail-5.16.tar.gz) = 180577 bytes
6SHA1 (patch-setup.py) = ea623975b21dee995eeb3d6dd83c69ee339338f2 6SHA1 (patch-setup.py) = 661eb064cba3dbe8b11a4f6f2fed5e63d200874c
cvs diff -r1.1 -r1.2 pkgsrc/mail/getmail/patches/patch-setup.py (expand / switch to unified diff)

--- pkgsrc/mail/getmail/patches/patch-setup.py 2017/07/16 00:16:43 1.1
+++ pkgsrc/mail/getmail/patches/patch-setup.py 2023/10/31 14:56:12 1.2
@@ -1,30 +1,63 @@ @@ -1,30 +1,63 @@
1$NetBSD: patch-setup.py,v 1.1 2017/07/16 00:16:43 schmonz Exp $ 1$NetBSD: patch-setup.py,v 1.2 2023/10/31 14:56:12 schmonz Exp $
2 2
3Use standard pkgsrc paths, and don't install RPM spec file. 3Use standard pkgsrc paths. Avoid conflicting with getmail6.
4 4
5--- setup.py.orig 2007-11-23 16:26:55.000000000 +0000 5--- setup.py.orig 2021-10-31 22:19:59.000000000 +0000
6+++ setup.py 6+++ setup.py
7@@ -39,13 +39,12 @@ GETMAILDOCDIR = os.path.join( 7@@ -39,13 +39,12 @@ GETMAILDOCDIR = os.path.join(
8 datadir or prefix, 8 datadir or prefix,
9 'share', 9 'share',
10 'doc', 10 'doc',
11- 'getmail-%s' % __version__ 11- 'getmail-%s' % __version__
12+ 'getmail' 12+ 'getmail5'
13 ) 13 )
14  14
15 GETMAILMANDIR = os.path.join( 15 GETMAILMANDIR = os.path.join(
16 datadir or prefix, 16 datadir or prefix,
17- 'share', 17- 'share',
18- 'man', 18- 'man',
19+ os.environ["PKGMANDIR"], 19+ os.environ["PKGMANDIR"],
20 'man1' 20 'man1'
21 ) 21 )
22  22
23@@ -100,7 +99,6 @@ setup( 23@@ -89,19 +88,18 @@ setup(
 24 'Topic :: Utilities',
 25 ],
 26 packages=[
 27- 'getmailcore'
 28+ 'getmail5core'
 29 ],
 30 scripts=[
 31- 'getmail',
 32- 'getmail_fetch',
 33- 'getmail_maildir',
 34- 'getmail_mbox',
 35- 'getmail-gmail-xoauth-tokens',
 36+ 'getmail5',
 37+ 'getmail5_fetch',
 38+ 'getmail5_maildir',
 39+ 'getmail5_mbox',
 40+ 'getmail5-gmail-xoauth-tokens',
 41 ],
24 data_files=[ 42 data_files=[
25 (GETMAILDOCDIR, [ 43 (GETMAILDOCDIR, [
26 './README', 44 './README',
27- './getmail.spec', 45- './getmail.spec',
28 'docs/BUGS', 46 'docs/BUGS',
29 'docs/COPYING', 47 'docs/COPYING',
30 'docs/CHANGELOG', 48 'docs/CHANGELOG',
 49@@ -119,10 +117,10 @@ setup(
 50 'docs/troubleshooting.txt',
 51 ]),
 52 (GETMAILMANDIR, [
 53- 'docs/getmail.1',
 54- 'docs/getmail_fetch.1',
 55- 'docs/getmail_maildir.1',
 56- 'docs/getmail_mbox.1',
 57+ 'docs/getmail5.1',
 58+ 'docs/getmail5_fetch.1',
 59+ 'docs/getmail5_maildir.1',
 60+ 'docs/getmail5_mbox.1',
 61 ]),
 62 ],
 63 )