kpriv
/
pkgsrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getmail6: avoid conflicts with getmail. Bump PKGREVISION.

This commit is contained in:
schmonz 2023-10-31 14:55:36 +00:00
parent f864a65f47
commit 63991cae28
5 changed files with 139 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/getmail6/ALTERNATIVES Normal file
View File

@ -0,0 +1,6 @@
bin/getmail @PREFIX@/bin/getmail6
bin/getmail-gmail-xoauth-tokens @PREFIX@/bin/getmail6-gmail-xoauth-tokens
bin/getmail_fetch @PREFIX@/bin/getmail6_fetch
bin/getmail_maildir @PREFIX@/bin/getmail6_maildir
bin/getmail_mbox @PREFIX@/bin/getmail6_mbox
bin/getmails @PREFIX@/bin/getmail6s

28
mail/getmail6/Makefile
View File

@ -1,15 +1,10 @@
# $NetBSD: Makefile,v 1.1 2023/10/31 01:54:45 sekiya Exp $
# $NetBSD: Makefile,v 1.2 2023/10/31 14:55:36 schmonz Exp $
DISTNAME= getmail6-${GETMAIL6_VERSION}
#PKGREVISION= 1
DISTNAME= getmail6-6.18.13
PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_GITHUB:=getmail6/}
GITHUB_TYPE= tag
GITHUB_TAG= refs/tags/v${GETMAIL6_VERSION}
GETMAIL6_VERSION= 6.18.13
WRKSRC= ${WRKDIR}/${DISTNAME}
GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= sekiya@NetBSD.org
HOMEPAGE= https://getmail6.org/
@ -18,8 +13,19 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= # none
REPLACE_PYTHON= *.py getmailcore/*.py
PLIST_SUBST+= GETMAIL6_VERSION="${GETMAIL6_VERSION}"
REPLACE_PYTHON= *.py getmail6core/*.py
SUBST_CLASSES+= core
SUBST_STAGE.core= pre-configure
SUBST_FILES.core= * */*
SUBST_SED.core= -e 's|getmailcore|getmail6core|g'
post-extract:
cd ${WRKSRC} && \
for f in getmail* docs/getmail*.1; do \
g=$$(echo $$f | sed -e 's|getmail|getmail6|'); \
${MV} $$f $$g; \
done
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"

126
mail/getmail6/PLIST
View File

@ -1,67 +1,67 @@
@comment $NetBSD: PLIST,v 1.1 2023/10/31 01:54:45 sekiya Exp $
bin/getmail
bin/getmail-gmail-xoauth-tokens
bin/getmail_fetch
bin/getmail_maildir
bin/getmail_mbox
bin/getmails
share/doc/getmail-${GETMAIL6_VERSION}/BUGS
share/doc/getmail-${GETMAIL6_VERSION}/CHANGELOG
share/doc/getmail-${GETMAIL6_VERSION}/COPYING
share/doc/getmail-${GETMAIL6_VERSION}/README
share/doc/getmail-${GETMAIL6_VERSION}/THANKS
share/doc/getmail-${GETMAIL6_VERSION}/configuration.html
share/doc/getmail-${GETMAIL6_VERSION}/configuration.txt
share/doc/getmail-${GETMAIL6_VERSION}/documentation.html
share/doc/getmail-${GETMAIL6_VERSION}/documentation.txt
share/doc/getmail-${GETMAIL6_VERSION}/faq.html
share/doc/getmail-${GETMAIL6_VERSION}/faq.txt
share/doc/getmail-${GETMAIL6_VERSION}/getmaildocs.css
share/doc/getmail-${GETMAIL6_VERSION}/getmailrc-examples
share/doc/getmail-${GETMAIL6_VERSION}/troubleshooting.html
share/doc/getmail-${GETMAIL6_VERSION}/troubleshooting.txt
man/man1/getmail.1
man/man1/getmail_fetch.1
man/man1/getmail_maildir.1
man/man1/getmail_mbox.1
man/man1/getmails.1
@comment $NetBSD: PLIST,v 1.2 2023/10/31 14:55:36 schmonz Exp $
bin/getmail6
bin/getmail6-gmail-xoauth-tokens
bin/getmail6_fetch
bin/getmail6_maildir
bin/getmail6_mbox
bin/getmail6s
man/man1/getmail6.1
man/man1/getmail6_fetch.1
man/man1/getmail6_maildir.1
man/man1/getmail6_mbox.1
man/man1/getmail6s.1
share/doc/getmail6/BUGS
share/doc/getmail6/CHANGELOG
share/doc/getmail6/COPYING
share/doc/getmail6/README
share/doc/getmail6/THANKS
share/doc/getmail6/configuration.html
share/doc/getmail6/configuration.txt
share/doc/getmail6/documentation.html
share/doc/getmail6/documentation.txt
share/doc/getmail6/faq.html
share/doc/getmail6/faq.txt
share/doc/getmail6/getmaildocs.css
share/doc/getmail6/getmailrc-examples
share/doc/getmail6/troubleshooting.html
share/doc/getmail6/troubleshooting.txt
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/getmailcore/__init__.py
${PYSITELIB}/getmailcore/__init__.pyc
${PYSITELIB}/getmailcore/__init__.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/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}/getmail6core/__init__.py
${PYSITELIB}/getmail6core/__init__.pyc
${PYSITELIB}/getmail6core/__init__.pyo
${PYSITELIB}/getmail6core/_retrieverbases.py
${PYSITELIB}/getmail6core/_retrieverbases.pyc
${PYSITELIB}/getmail6core/_retrieverbases.pyo
${PYSITELIB}/getmail6core/baseclasses.py
${PYSITELIB}/getmail6core/baseclasses.pyc
${PYSITELIB}/getmail6core/baseclasses.pyo
${PYSITELIB}/getmail6core/constants.py
${PYSITELIB}/getmail6core/constants.pyc
${PYSITELIB}/getmail6core/constants.pyo
${PYSITELIB}/getmail6core/destinations.py
${PYSITELIB}/getmail6core/destinations.pyc
${PYSITELIB}/getmail6core/destinations.pyo
${PYSITELIB}/getmail6core/exceptions.py
${PYSITELIB}/getmail6core/exceptions.pyc
${PYSITELIB}/getmail6core/exceptions.pyo
${PYSITELIB}/getmail6core/filters.py
${PYSITELIB}/getmail6core/filters.pyc
${PYSITELIB}/getmail6core/filters.pyo
${PYSITELIB}/getmail6core/imap_utf7.py
${PYSITELIB}/getmail6core/imap_utf7.pyc
${PYSITELIB}/getmail6core/imap_utf7.pyo
${PYSITELIB}/getmail6core/logging.py
${PYSITELIB}/getmail6core/logging.pyc
${PYSITELIB}/getmail6core/logging.pyo
${PYSITELIB}/getmail6core/message.py
${PYSITELIB}/getmail6core/message.pyc
${PYSITELIB}/getmail6core/message.pyo
${PYSITELIB}/getmail6core/retrievers.py
${PYSITELIB}/getmail6core/retrievers.pyc
${PYSITELIB}/getmail6core/retrievers.pyo
${PYSITELIB}/getmail6core/utilities.py
${PYSITELIB}/getmail6core/utilities.pyc
${PYSITELIB}/getmail6core/utilities.pyo

4
mail/getmail6/distinfo
View File

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.1 2023/10/31 01:54:45 sekiya Exp $
$NetBSD: distinfo,v 1.2 2023/10/31 14:55:36 schmonz Exp $
BLAKE2s (getmail6-6.18.13.tar.gz) = dd4523d32fa36b0d87a76e1175f448a77b4ff925ae8ed2e1140bcaa07540941b
SHA512 (getmail6-6.18.13.tar.gz) = 437c057d6e3d499a2e11be82d4e69aafc24d74d42fb1fa51de06fccd33d6e9e1ef7bba20ae5fc070a80dd656f184386083d462f65b05dafcf516d7dc0b2138a0
Size (getmail6-6.18.13.tar.gz) = 213033 bytes
SHA1 (patch-setup.py) = 68ac253a4d0f2b3ffe0effef547f9257e39d7695
SHA1 (patch-setup.py) = 3e463ceca2d98a88f84cae3dca0172bf6af6a48e

58
mail/getmail6/patches/patch-setup.py
View File

@ -1,15 +1,59 @@
$NetBSD: patch-setup.py,v 1.1 2023/10/31 01:54:45 sekiya Exp $
$NetBSD: patch-setup.py,v 1.2 2023/10/31 14:55:36 schmonz Exp $
Fix mandir per pkgsrc
Use standard pkgsrc paths. Avoid conflicting with getmail.
--- setup.py~ 2023-10-31 10:46:37.492574240 +0900
+++ setup.py 2023-10-31 10:46:56.670550748 +0900
@@ -39,7 +39,7 @@
DOCDIR = os.path.join('share','doc','getmail-%s' % __version__)
--- setup.py.orig 2023-08-22 15:38:27.000000000 +0000
+++ setup.py
@@ -36,10 +36,10 @@ for (pos, arg) in enumerate(args):
# hack hack hack hack hack hack hack
datadir = args[pos + 1]
-DOCDIR = os.path.join('share','doc','getmail-%s' % __version__)
+DOCDIR = os.path.join('share','doc','getmail6')
GETMAILDOCDIR = os.path.join(datadir or prefix, DOCDIR)
-MANDIR = os.path.join('share','man','man1')
+MANDIR = os.path.join('man','man1')
+MANDIR = os.path.join(os.environ["PKGMANDIR"],'man1')
GETMAILMANDIR = os.path.join( datadir or prefix, MANDIR)
if '--show-default-install-dirs' in args:
@@ -79,15 +79,15 @@ setup(
'Topic :: Utilities',
],
packages=[
- 'getmailcore'
+ 'getmail6core'
],
scripts=[
- 'getmail',
- 'getmails',
- 'getmail_fetch',
- 'getmail_maildir',
- 'getmail_mbox',
- 'getmail-gmail-xoauth-tokens',
+ 'getmail6',
+ 'getmail6s',
+ 'getmail6_fetch',
+ 'getmail6_maildir',
+ 'getmail6_mbox',
+ 'getmail6-gmail-xoauth-tokens',
],
data_files=[
(DOCDIR, [
@@ -108,11 +108,11 @@ setup(
'docs/troubleshooting.txt',
]),
(MANDIR, [
- 'docs/getmails.1',
- 'docs/getmail.1',
- 'docs/getmail_fetch.1',
- 'docs/getmail_maildir.1',
- 'docs/getmail_mbox.1',
+ 'docs/getmail6s.1',
+ 'docs/getmail6.1',
+ 'docs/getmail6_fetch.1',
+ 'docs/getmail6_maildir.1',
+ 'docs/getmail6_mbox.1',
]),
],
)