CVS commit: pkgsrc/mail/getmail

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mail/getmail
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Tue, 31 Oct 2023 14:56:12 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Oct 31 14:56:12 UTC 2023

Modified Files:
        pkgsrc/mail/getmail: Makefile PLIST distinfo
        pkgsrc/mail/getmail/patches: patch-setup.py
Added Files:
        pkgsrc/mail/getmail: ALTERNATIVES

Log Message:
getmail: avoid conflicts with getmail6. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/getmail/ALTERNATIVES
cvs rdiff -u -r1.179 -r1.180 pkgsrc/mail/getmail/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/getmail/PLIST
cvs rdiff -u -r1.149 -r1.150 pkgsrc/mail/getmail/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/getmail/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/getmail/Makefile
diff -u pkgsrc/mail/getmail/Makefile:1.179 pkgsrc/mail/getmail/Makefile:1.180
--- pkgsrc/mail/getmail/Makefile:1.179  Mon Aug 14 05:24:46 2023
+++ pkgsrc/mail/getmail/Makefile        Tue Oct 31 14:56:12 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.179 2023/08/14 05:24:46 wiz Exp $
+# $NetBSD: Makefile,v 1.180 2023/10/31 14:56:12 schmonz Exp $
 
 DISTNAME=              getmail-5.16
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            mail
 MASTER_SITES=          ${HOMEPAGE}old-versions/
 
@@ -12,8 +12,20 @@ LICENSE=             gnu-gpl-v2
 
 USE_LANGUAGES=         # none
 
-REPLACE_PYTHON=                *.py getmailcore/*.py
-PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 4.53.0
+REPLACE_PYTHON=                *.py getmail5core/*.py
+PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 5.16
+
+SUBST_CLASSES+=                core
+SUBST_STAGE.core=      pre-configure
+SUBST_FILES.core=      * */*
+SUBST_SED.core=                -e 's|getmailcore|getmail5core|g'
+
+post-extract:
+       cd ${WRKSRC} && \
+       for f in getmail* docs/getmail*.1; do \
+               g=$$(echo $$f | sed -e 's|getmail|getmail5|'); \
+               ${MV} $$f $$g; \
+       done
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"

Index: pkgsrc/mail/getmail/PLIST
diff -u pkgsrc/mail/getmail/PLIST:1.15 pkgsrc/mail/getmail/PLIST:1.16
--- pkgsrc/mail/getmail/PLIST:1.15      Fri Jan 14 17:51:59 2022
+++ pkgsrc/mail/getmail/PLIST   Tue Oct 31 14:56:12 2023
@@ -1,69 +1,69 @@
-@comment $NetBSD: PLIST,v 1.15 2022/01/14 17:51:59 wiz Exp $
-bin/getmail
-bin/getmail-gmail-xoauth-tokens
-bin/getmail_fetch
-bin/getmail_maildir
-bin/getmail_mbox
-man/man1/getmail.1
-man/man1/getmail_fetch.1
-man/man1/getmail_maildir.1
-man/man1/getmail_mbox.1
-share/doc/getmail/BUGS
-share/doc/getmail/CHANGELOG
-share/doc/getmail/COPYING
-share/doc/getmail/README
-share/doc/getmail/THANKS
-share/doc/getmail/TODO
-share/doc/getmail/configuration.html
-share/doc/getmail/configuration.txt
-share/doc/getmail/documentation.html
-share/doc/getmail/documentation.txt
-share/doc/getmail/faq.html
-share/doc/getmail/faq.txt
-share/doc/getmail/getmaildocs.css
-share/doc/getmail/getmailrc-examples
-share/doc/getmail/troubleshooting.html
-share/doc/getmail/troubleshooting.txt
+@comment $NetBSD: PLIST,v 1.16 2023/10/31 14:56:12 schmonz Exp $
+bin/getmail5
+bin/getmail5-gmail-xoauth-tokens
+bin/getmail5_fetch
+bin/getmail5_maildir
+bin/getmail5_mbox
+man/man1/getmail5.1
+man/man1/getmail5_fetch.1
+man/man1/getmail5_maildir.1
+man/man1/getmail5_mbox.1
+share/doc/getmail5/BUGS
+share/doc/getmail5/CHANGELOG
+share/doc/getmail5/COPYING
+share/doc/getmail5/README
+share/doc/getmail5/THANKS
+share/doc/getmail5/TODO
+share/doc/getmail5/configuration.html
+share/doc/getmail5/configuration.txt
+share/doc/getmail5/documentation.html
+share/doc/getmail5/documentation.txt
+share/doc/getmail5/faq.html
+share/doc/getmail5/faq.txt
+share/doc/getmail5/getmaildocs.css
+share/doc/getmail5/getmailrc-examples
+share/doc/getmail5/troubleshooting.html
+share/doc/getmail5/troubleshooting.txt
 ${PYSITELIB}/${EGG_INFODIR}
-${PYSITELIB}/getmailcore/__init__.py
-${PYSITELIB}/getmailcore/__init__.pyc
-${PYSITELIB}/getmailcore/__init__.pyo
-${PYSITELIB}/getmailcore/_pop3ssl.py
-${PYSITELIB}/getmailcore/_pop3ssl.pyc
-${PYSITELIB}/getmailcore/_pop3ssl.pyo
-${PYSITELIB}/getmailcore/_retrieverbases.py
-${PYSITELIB}/getmailcore/_retrieverbases.pyc
-${PYSITELIB}/getmailcore/_retrieverbases.pyo
-${PYSITELIB}/getmailcore/baseclasses.py
-${PYSITELIB}/getmailcore/baseclasses.pyc
-${PYSITELIB}/getmailcore/baseclasses.pyo
-${PYSITELIB}/getmailcore/compatibility.py
-${PYSITELIB}/getmailcore/compatibility.pyc
-${PYSITELIB}/getmailcore/compatibility.pyo
-${PYSITELIB}/getmailcore/constants.py
-${PYSITELIB}/getmailcore/constants.pyc
-${PYSITELIB}/getmailcore/constants.pyo
-${PYSITELIB}/getmailcore/destinations.py
-${PYSITELIB}/getmailcore/destinations.pyc
-${PYSITELIB}/getmailcore/destinations.pyo
-${PYSITELIB}/getmailcore/exceptions.py
-${PYSITELIB}/getmailcore/exceptions.pyc
-${PYSITELIB}/getmailcore/exceptions.pyo
-${PYSITELIB}/getmailcore/filters.py
-${PYSITELIB}/getmailcore/filters.pyc
-${PYSITELIB}/getmailcore/filters.pyo
-${PYSITELIB}/getmailcore/imap_utf7.py
-${PYSITELIB}/getmailcore/imap_utf7.pyc
-${PYSITELIB}/getmailcore/imap_utf7.pyo
-${PYSITELIB}/getmailcore/logging.py
-${PYSITELIB}/getmailcore/logging.pyc
-${PYSITELIB}/getmailcore/logging.pyo
-${PYSITELIB}/getmailcore/message.py
-${PYSITELIB}/getmailcore/message.pyc
-${PYSITELIB}/getmailcore/message.pyo
-${PYSITELIB}/getmailcore/retrievers.py
-${PYSITELIB}/getmailcore/retrievers.pyc
-${PYSITELIB}/getmailcore/retrievers.pyo
-${PYSITELIB}/getmailcore/utilities.py
-${PYSITELIB}/getmailcore/utilities.pyc
-${PYSITELIB}/getmailcore/utilities.pyo
+${PYSITELIB}/getmail5core/__init__.py
+${PYSITELIB}/getmail5core/__init__.pyc
+${PYSITELIB}/getmail5core/__init__.pyo
+${PYSITELIB}/getmail5core/_pop3ssl.py
+${PYSITELIB}/getmail5core/_pop3ssl.pyc
+${PYSITELIB}/getmail5core/_pop3ssl.pyo
+${PYSITELIB}/getmail5core/_retrieverbases.py
+${PYSITELIB}/getmail5core/_retrieverbases.pyc
+${PYSITELIB}/getmail5core/_retrieverbases.pyo
+${PYSITELIB}/getmail5core/baseclasses.py
+${PYSITELIB}/getmail5core/baseclasses.pyc
+${PYSITELIB}/getmail5core/baseclasses.pyo
+${PYSITELIB}/getmail5core/compatibility.py
+${PYSITELIB}/getmail5core/compatibility.pyc
+${PYSITELIB}/getmail5core/compatibility.pyo
+${PYSITELIB}/getmail5core/constants.py
+${PYSITELIB}/getmail5core/constants.pyc
+${PYSITELIB}/getmail5core/constants.pyo
+${PYSITELIB}/getmail5core/destinations.py
+${PYSITELIB}/getmail5core/destinations.pyc
+${PYSITELIB}/getmail5core/destinations.pyo
+${PYSITELIB}/getmail5core/exceptions.py
+${PYSITELIB}/getmail5core/exceptions.pyc
+${PYSITELIB}/getmail5core/exceptions.pyo
+${PYSITELIB}/getmail5core/filters.py
+${PYSITELIB}/getmail5core/filters.pyc
+${PYSITELIB}/getmail5core/filters.pyo
+${PYSITELIB}/getmail5core/imap_utf7.py
+${PYSITELIB}/getmail5core/imap_utf7.pyc
+${PYSITELIB}/getmail5core/imap_utf7.pyo
+${PYSITELIB}/getmail5core/logging.py
+${PYSITELIB}/getmail5core/logging.pyc
+${PYSITELIB}/getmail5core/logging.pyo
+${PYSITELIB}/getmail5core/message.py
+${PYSITELIB}/getmail5core/message.pyc
+${PYSITELIB}/getmail5core/message.pyo
+${PYSITELIB}/getmail5core/retrievers.py
+${PYSITELIB}/getmail5core/retrievers.pyc
+${PYSITELIB}/getmail5core/retrievers.pyo
+${PYSITELIB}/getmail5core/utilities.py
+${PYSITELIB}/getmail5core/utilities.pyc
+${PYSITELIB}/getmail5core/utilities.pyo

Index: pkgsrc/mail/getmail/distinfo
diff -u pkgsrc/mail/getmail/distinfo:1.149 pkgsrc/mail/getmail/distinfo:1.150
--- pkgsrc/mail/getmail/distinfo:1.149  Sun Nov 28 19:51:20 2021
+++ pkgsrc/mail/getmail/distinfo        Tue Oct 31 14:56:12 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.149 2021/11/28 19:51:20 schmonz Exp $
+$NetBSD: distinfo,v 1.150 2023/10/31 14:56:12 schmonz Exp $
 
 BLAKE2s (getmail-5.16.tar.gz) = 0fa18a9909646d2eeefc09b94ad63d91897fbda955d685fc656c8c97675860eb
 SHA512 (getmail-5.16.tar.gz) = f47e86645de10f28b28c8ad5c800cebcf33f9a8de2a832b186009f8fc0d548e2a3d529da8aa5a7f1ae4885a8c713ca83a40453b35f3ffe267530c644f907a621
 Size (getmail-5.16.tar.gz) = 180577 bytes
-SHA1 (patch-setup.py) = ea623975b21dee995eeb3d6dd83c69ee339338f2
+SHA1 (patch-setup.py) = 661eb064cba3dbe8b11a4f6f2fed5e63d200874c

Index: pkgsrc/mail/getmail/patches/patch-setup.py
diff -u pkgsrc/mail/getmail/patches/patch-setup.py:1.1 pkgsrc/mail/getmail/patches/patch-setup.py:1.2
--- pkgsrc/mail/getmail/patches/patch-setup.py:1.1      Sun Jul 16 00:16:43 2017
+++ pkgsrc/mail/getmail/patches/patch-setup.py  Tue Oct 31 14:56:12 2023
@@ -1,15 +1,15 @@
-$NetBSD: patch-setup.py,v 1.1 2017/07/16 00:16:43 schmonz Exp $
+$NetBSD: patch-setup.py,v 1.2 2023/10/31 14:56:12 schmonz Exp $
 
-Use standard pkgsrc paths, and don't install RPM spec file.
+Use standard pkgsrc paths. Avoid conflicting with getmail6.
 
---- setup.py.orig      2007-11-23 16:26:55.000000000 +0000
+--- setup.py.orig      2021-10-31 22:19:59.000000000 +0000
 +++ setup.py
 @@ -39,13 +39,12 @@ GETMAILDOCDIR = os.path.join(
      datadir or prefix,
      'share',
      'doc',
 -    'getmail-%s' % __version__
-+    'getmail'
++    'getmail5'
  )
  
  GETMAILMANDIR = os.path.join(
@@ -20,7 +20,25 @@ Use standard pkgsrc paths, and don't ins
      'man1'
  )
  
-@@ -100,7 +99,6 @@ setup(
+@@ -89,19 +88,18 @@ setup(
+         'Topic :: Utilities',
+     ],
+     packages=[
+-        'getmailcore'
++        'getmail5core'
+     ],
+     scripts=[
+-        'getmail',
+-        'getmail_fetch',
+-        'getmail_maildir',
+-        'getmail_mbox',
+-        'getmail-gmail-xoauth-tokens',
++        'getmail5',
++        'getmail5_fetch',
++        'getmail5_maildir',
++        'getmail5_mbox',
++        'getmail5-gmail-xoauth-tokens',
+     ],
      data_files=[
          (GETMAILDOCDIR, [
              './README',
@@ -28,3 +46,18 @@ Use standard pkgsrc paths, and don't ins
              'docs/BUGS',
              'docs/COPYING',
              'docs/CHANGELOG',
+@@ -119,10 +117,10 @@ setup(
+             'docs/troubleshooting.txt',
+         ]),
+         (GETMAILMANDIR, [
+-            'docs/getmail.1',
+-            'docs/getmail_fetch.1',
+-            'docs/getmail_maildir.1',
+-            'docs/getmail_mbox.1',
++            'docs/getmail5.1',
++            'docs/getmail5_fetch.1',
++            'docs/getmail5_maildir.1',
++            'docs/getmail5_mbox.1',
+         ]),
+     ],
+ )

Added files:

Index: pkgsrc/mail/getmail/ALTERNATIVES
diff -u /dev/null pkgsrc/mail/getmail/ALTERNATIVES:1.1
--- /dev/null   Tue Oct 31 14:56:12 2023
+++ pkgsrc/mail/getmail/ALTERNATIVES    Tue Oct 31 14:56:12 2023
@@ -0,0 +1,5 @@
+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

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index