pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/py-borgbackup py-borgbackup: remove ALTERNATIVES



details:   https://anonhg.NetBSD.org/pkgsrc/rev/83aab7e73eab
branches:  trunk
changeset: 374287:83aab7e73eab
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Feb 18 08:02:40 2022 +0000

description:
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.

diffstat:

 sysutils/py-borgbackup/ALTERNATIVES |  2 --
 sysutils/py-borgbackup/Makefile     |  8 +++-----
 sysutils/py-borgbackup/PLIST        |  6 +++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diffs (51 lines):

diff -r a162d2f55297 -r 83aab7e73eab sysutils/py-borgbackup/ALTERNATIVES
--- a/sysutils/py-borgbackup/ALTERNATIVES       Fri Feb 18 07:44:18 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-bin/borg @PREFIX@/bin/borg-@PYVERSSUFFIX@
-bin/borgfs @PREFIX@/bin/borgfs-@PYVERSSUFFIX@
diff -r a162d2f55297 -r 83aab7e73eab sysutils/py-borgbackup/Makefile
--- a/sysutils/py-borgbackup/Makefile   Fri Feb 18 07:44:18 2022 +0000
+++ b/sysutils/py-borgbackup/Makefile   Fri Feb 18 08:02:40 2022 +0000
@@ -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 @@
 DEPENDS+=      ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_SELF_CONFLICT=          yes
 
 USE_PKG_RESOURCES=     yes
 
@@ -26,10 +27,7 @@
 
 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"
diff -r a162d2f55297 -r 83aab7e73eab sysutils/py-borgbackup/PLIST
--- a/sysutils/py-borgbackup/PLIST      Fri Feb 18 07:44:18 2022 +0000
+++ b/sysutils/py-borgbackup/PLIST      Fri Feb 18 08:02:40 2022 +0000
@@ -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



Home | Main Index | Thread Index | Old Index