CVS commit: pkgsrc/sysutils/py-borgbackup

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Feb 18 08:02:40 UTC 2022

Modified Files:
        pkgsrc/sysutils/py-borgbackup: Makefile PLIST
Removed Files:
        pkgsrc/sysutils/py-borgbackup: ALTERNATIVES

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/py-borgbackup/ALTERNATIVES
cvs rdiff -u -r1.36 -r1.37 pkgsrc/sysutils/py-borgbackup/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/py-borgbackup/PLIST

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

Modified files:

Index: pkgsrc/sysutils/py-borgbackup/Makefile
diff -u pkgsrc/sysutils/py-borgbackup/Makefile:1.36 pkgsrc/sysutils/py-borgbackup/Makefile:1.37
--- pkgsrc/sysutils/py-borgbackup/Makefile:1.36 Fri Jan 21 16:07:33 2022
+++ pkgsrc/sysutils/py-borgbackup/Makefile      Fri Feb 18 08:02:40 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2022/01/21 16:07:33 bsiegert Exp $
+# $NetBSD: Makefile,v 1.37 2022/02/18 08:02:40 wiz Exp $
 
 DISTNAME=      borgbackup-1.1.17
-PKGREVISION=   4
+PKGREVISION=   5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/borgbackup/}
@@ -16,6 +16,7 @@ BUILD_DEPENDS+=       ${PYPKGPREFIX}-setuptool
 DEPENDS+=      ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_SELF_CONFLICT=          yes
 
 USE_PKG_RESOURCES=     yes
 
@@ -26,10 +27,7 @@ MAKE_ENV+=   BORG_LIBB2_PREFIX=${BUILDLINK
 
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
-
 post-install:
-       cd ${DESTDIR}${PREFIX}/bin && ${MV} borg borg-${PYVERSSUFFIX} || ${TRUE}
-       cd ${DESTDIR}${PREFIX}/bin && ${MV} borgfs borgfs-${PYVERSSUFFIX} || ${TRUE}
        ${INSTALL_MAN} ${WRKSRC}/docs/man/*1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../archivers/lz4/buildlink3.mk"

Index: pkgsrc/sysutils/py-borgbackup/PLIST
diff -u pkgsrc/sysutils/py-borgbackup/PLIST:1.10 pkgsrc/sysutils/py-borgbackup/PLIST:1.11
--- pkgsrc/sysutils/py-borgbackup/PLIST:1.10    Fri Jan 21 16:07:33 2022
+++ pkgsrc/sysutils/py-borgbackup/PLIST Fri Feb 18 08:02:40 2022
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2022/01/21 16:07:33 bsiegert Exp $
-bin/borg-${PYVERSSUFFIX}
-bin/borgfs-${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.11 2022/02/18 08:02:40 wiz Exp $
+bin/borg
+bin/borgfs
 ${PYSITELIB}/borg/__init__.py
 ${PYSITELIB}/borg/__init__.pyc
 ${PYSITELIB}/borg/__init__.pyo