Fri Feb 18 08:02:40 2022 UTC ()
py-borgbackup: remove ALTERNATIVES

The current ALTERNATIVES/post-install was not enough to make this package
avoid a self-conflict (due to the man pages). Since this is an application
that which no other packages depend upon, there is no need to have it
installed for multiple python versions at the same time, so simplify
this.

Bump PKGREVISION.


(wiz)
diff -r1.3 -r0 pkgsrc/sysutils/py-borgbackup/ALTERNATIVES
diff -r1.36 -r1.37 pkgsrc/sysutils/py-borgbackup/Makefile
diff -r1.10 -r1.11 pkgsrc/sysutils/py-borgbackup/PLIST

File Deleted: pkgsrc/sysutils/py-borgbackup/Attic/ALTERNATIVES

cvs diff -r1.36 -r1.37 pkgsrc/sysutils/py-borgbackup/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/py-borgbackup/Makefile 2022/01/21 16:07:33 1.36
+++ pkgsrc/sysutils/py-borgbackup/Makefile 2022/02/18 08:02:40 1.37
@@ -1,41 +1,39 @@ @@ -1,41 +1,39 @@
1# $NetBSD: Makefile,v 1.36 2022/01/21 16:07:33 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.37 2022/02/18 08:02:40 wiz Exp $
2 2
3DISTNAME= borgbackup-1.1.17 3DISTNAME= borgbackup-1.1.17
4PKGREVISION= 4 4PKGREVISION= 5
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
6CATEGORIES= sysutils python 6CATEGORIES= sysutils python
7MASTER_SITES= ${MASTER_SITE_PYPI:=b/borgbackup/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=b/borgbackup/}
8 8
9MAINTAINER= bsiegert@NetBSD.org 9MAINTAINER= bsiegert@NetBSD.org
10HOMEPAGE= https://github.com/borgbackup/borg 10HOMEPAGE= https://github.com/borgbackup/borg
11COMMENT= Deduplicating backup program with compression and encryption 11COMMENT= Deduplicating backup program with compression and encryption
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14 14
15BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm 15BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
16DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging 16DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
17 17
18PYTHON_VERSIONS_INCOMPATIBLE= 27 18PYTHON_VERSIONS_INCOMPATIBLE= 27
 19PYTHON_SELF_CONFLICT= yes
19 20
20USE_PKG_RESOURCES= yes 21USE_PKG_RESOURCES= yes
21 22
22MAKE_ENV+= BORG_OPENSSL_PREFIX=${SSLBASE:Q} 23MAKE_ENV+= BORG_OPENSSL_PREFIX=${SSLBASE:Q}
23MAKE_ENV+= BORG_LZ4_PREFIX=${BUILDLINK_PREFIX.lz4} 24MAKE_ENV+= BORG_LZ4_PREFIX=${BUILDLINK_PREFIX.lz4}
24MAKE_ENV+= BORG_LIBZSTD_PREFIX=${BUILDLINK_PREFIX.zstd} 25MAKE_ENV+= BORG_LIBZSTD_PREFIX=${BUILDLINK_PREFIX.zstd}
25MAKE_ENV+= BORG_LIBB2_PREFIX=${BUILDLINK_PREFIX.libb2} 26MAKE_ENV+= BORG_LIBB2_PREFIX=${BUILDLINK_PREFIX.libb2}
26 27
27INSTALLATION_DIRS+= ${PKGMANDIR}/man1 28INSTALLATION_DIRS+= ${PKGMANDIR}/man1
28 29
29 
30post-install: 30post-install:
31 cd ${DESTDIR}${PREFIX}/bin && ${MV} borg borg-${PYVERSSUFFIX} || ${TRUE} 
32 cd ${DESTDIR}${PREFIX}/bin && ${MV} borgfs borgfs-${PYVERSSUFFIX} || ${TRUE} 
33 ${INSTALL_MAN} ${WRKSRC}/docs/man/*1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 31 ${INSTALL_MAN} ${WRKSRC}/docs/man/*1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
34 32
35.include "../../archivers/lz4/buildlink3.mk" 33.include "../../archivers/lz4/buildlink3.mk"
36.include "../../archivers/zstd/buildlink3.mk" 34.include "../../archivers/zstd/buildlink3.mk"
37.include "../../security/libb2/buildlink3.mk" 35.include "../../security/libb2/buildlink3.mk"
38.include "../../security/openssl/buildlink3.mk" 36.include "../../security/openssl/buildlink3.mk"
39.include "../../devel/py-cython/buildlink3.mk" 37.include "../../devel/py-cython/buildlink3.mk"
40.include "../../lang/python/egg.mk" 38.include "../../lang/python/egg.mk"
41.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"

cvs diff -r1.10 -r1.11 pkgsrc/sysutils/py-borgbackup/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/py-borgbackup/PLIST 2022/01/21 16:07:33 1.10
+++ pkgsrc/sysutils/py-borgbackup/PLIST 2022/02/18 08:02:40 1.11
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1@comment $NetBSD: PLIST,v 1.10 2022/01/21 16:07:33 bsiegert Exp $ 1@comment $NetBSD: PLIST,v 1.11 2022/02/18 08:02:40 wiz Exp $
2bin/borg-${PYVERSSUFFIX} 2bin/borg
3bin/borgfs-${PYVERSSUFFIX} 3bin/borgfs
4${PYSITELIB}/borg/__init__.py 4${PYSITELIB}/borg/__init__.py
5${PYSITELIB}/borg/__init__.pyc 5${PYSITELIB}/borg/__init__.pyc
6${PYSITELIB}/borg/__init__.pyo 6${PYSITELIB}/borg/__init__.pyo
7${PYSITELIB}/borg/__main__.py 7${PYSITELIB}/borg/__main__.py
8${PYSITELIB}/borg/__main__.pyc 8${PYSITELIB}/borg/__main__.pyc
9${PYSITELIB}/borg/__main__.pyo 9${PYSITELIB}/borg/__main__.pyo
10${PYSITELIB}/borg/_version.py 10${PYSITELIB}/borg/_version.py
11${PYSITELIB}/borg/_version.pyc 11${PYSITELIB}/borg/_version.pyc
12${PYSITELIB}/borg/_version.pyo 12${PYSITELIB}/borg/_version.pyo
13${PYSITELIB}/borg/algorithms/__init__.py 13${PYSITELIB}/borg/algorithms/__init__.py
14${PYSITELIB}/borg/algorithms/__init__.pyc 14${PYSITELIB}/borg/algorithms/__init__.pyc
15${PYSITELIB}/borg/algorithms/__init__.pyo 15${PYSITELIB}/borg/algorithms/__init__.pyo
16${PYSITELIB}/borg/algorithms/checksums.so 16${PYSITELIB}/borg/algorithms/checksums.so