Simplify. Fix packaging on NetBSD.

4 files changed, 19 insertions, 18 deletions

diff --git a/sysutils/py-borg/Makefile b/sysutils/py-borg/Makefile
index 3c1298f53ce..eab0a81b81d 100644
--- a/sysutils/py-borg/Makefile
+++ b/sysutils/py-borg/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2015/08/22 14:47:55 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2015/08/28 11:25:51 wiz Exp $
 
-GITHUB_PROJECT=	borg
-DISTNAME=	0.24.0
-PKGNAME=	${PYPKGPREFIX}-${GITHUB_PROJECT}-${DISTNAME}
+DISTNAME=	borg-0.24.0
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=borgbackup/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
-WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${DISTNAME}
+GITHUB_PROJECT=	borg
 
 MAINTAINER=	bsiegert@NetBSD.org
 HOMEPAGE=	${MASTER_SITE_GITHUB:=borgbackup/borg/}
@@ -15,6 +13,8 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-msgpack>=0.4.6:../../devel/py-msgpack
 
+EGG_NAME=	borgbackup-${PKGVERSION_NOREV}
+
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 MAKE_ENV+=	BORG_OPENSSL_PREFIX=${SSLBASE:Q}
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
diff --git a/sysutils/py-borg/PLIST b/sysutils/py-borg/PLIST
index e081ceeed8e..20b8f2d8b2c 100644
--- a/sysutils/py-borg/PLIST
+++ b/sysutils/py-borg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/08/22 14:47:55 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/08/28 11:25:51 wiz Exp $
 bin/borg${PYVERSSUFFIX}
 ${PYSITELIB}/borg/__init__.py
 ${PYSITELIB}/borg/__main__.py
@@ -45,7 +45,6 @@ ${PYSITELIB}/borg/key.py
 ${PYSITELIB}/borg/locking.py
 ${PYSITELIB}/borg/lrucache.py
 ${PYSITELIB}/borg/platform.py
-${PYSITELIB}/borg/platform_darwin.so
 ${PYSITELIB}/borg/remote.py
 ${PYSITELIB}/borg/repository.py
 ${PYSITELIB}/borg/testsuite/__init__.py
@@ -88,9 +87,9 @@ ${PYSITELIB}/borg/testsuite/platform.py
 ${PYSITELIB}/borg/testsuite/repository.py
 ${PYSITELIB}/borg/testsuite/xattr.py
 ${PYSITELIB}/borg/xattr.py
-${PYSITELIB}/borgbackup-${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/borgbackup-${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/borgbackup-${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/borgbackup-${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/borgbackup-${EGG_INFODIR}/requires.txt
-${PYSITELIB}/borgbackup-${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
diff --git a/sysutils/py-borg/PLIST.Darwin b/sysutils/py-borg/PLIST.Darwin
new file mode 100644
index 00000000000..bee5b284392
--- /dev/null
+++ b/sysutils/py-borg/PLIST.Darwin
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2015/08/28 11:25:51 wiz Exp $
+${PYSITELIB}/borg/platform_darwin.so
diff --git a/sysutils/py-borg/distinfo b/sysutils/py-borg/distinfo
index 20805e6decc..f19cf89f43a 100644
--- a/sysutils/py-borg/distinfo
+++ b/sysutils/py-borg/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2015/08/22 14:47:55 bsiegert Exp $
+$NetBSD: distinfo,v 1.2 2015/08/28 11:25:51 wiz Exp $
 
-SHA1 (borg/0.24.0.tar.gz) = d811bc6f9a4b93afc19877969fffc885a70f0d3d
-RMD160 (borg/0.24.0.tar.gz) = ef3f1ff7ffc3b56412c292fae00b19992d490444
-Size (borg/0.24.0.tar.gz) = 123557 bytes
+SHA1 (borg-0.24.0.tar.gz) = d811bc6f9a4b93afc19877969fffc885a70f0d3d
+RMD160 (borg-0.24.0.tar.gz) = ef3f1ff7ffc3b56412c292fae00b19992d490444
+Size (borg-0.24.0.tar.gz) = 123557 bytes