Simplification of the Makefile

diff --git a/py-whichcraft/Makefile b/py-whichcraft/Makefile
index cea4c4f46562ba7c0cd3d08b9d1aa8749b2b0366..53251a3becf6d5f409ccdeaa8844298af860c965 100644 (file)
--- a/py-whichcraft/Makefile
+++ b/py-whichcraft/Makefile
@@ -1,12 +1,11 @@
 # $NetBSD$
 
+DISTNAME=      whichcraft-0.1.1
 GITHUB_PROJECT=        whichcraft
-DISTNAME=      0.1.1
-PKGNAME=       ${PYPKGPREFIX}-${GITHUB_PROJECT}-${DISTNAME}
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=pydanny/}
 EXTRACT_SUFX=  .zip
-DIST_SUBDIR=   ${GITHUB_PROJECT}
 
 MAINTAINER=    gde@llew.me
 HOMEPAGE=      ${MASTER_SITE_GITHUB:=pydanny/whichcraft/}
@@ -17,7 +16,7 @@ DEPENDS+=     ${PYPKGPREFIX}-wheel>=0.23.0:../../wip/py-wheel
 
 USE_LANGUAGES= # none
 
-WRKSRC=        ${WRKDIR}/${GITHUB_PROJECT}-${DISTNAME}
+WRKSRC=        ${WRKDIR}/${DISTNAME}
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/egg.mk"

diff --git a/py-whichcraft/PLIST b/py-whichcraft/PLIST
index f036fe40845cf10f18f3c5d9f1448907a7f6455b..013fc1822352c747da3c73ce159e324023c99548 100644 (file)
--- a/py-whichcraft/PLIST
+++ b/py-whichcraft/PLIST
@@ -1,9 +1,10 @@
 @comment $NetBSD$
-${PYSITELIB}/whichcraft-${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/whichcraft-${EGG_INFODIR}/not-zip-safe
-${PYSITELIB}/whichcraft-${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/whichcraft-${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/whichcraft-${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/pbr.json
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/whichcraft.py
 ${PYSITELIB}/whichcraft.pyc
 ${PYSITELIB}/whichcraft.pyo

diff --git a/py-whichcraft/distinfo b/py-whichcraft/distinfo
index fadb8aa2a475c1125644f6ff79e73db0ad78f5d3..f495c78aea28b1b8e963863ec39783488c1e429f 100644 (file)
--- a/py-whichcraft/distinfo
+++ b/py-whichcraft/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-SHA1 (whichcraft/0.1.1.zip) = fa4a0baeff0d571465d234923d95e34c9ad8906c
-RMD160 (whichcraft/0.1.1.zip) = 962d885c521b42b886eb96265566cc6217a41762
-Size (whichcraft/0.1.1.zip) = 11314 bytes
+SHA1 (whichcraft-0.1.1.zip) = fa4a0baeff0d571465d234923d95e34c9ad8906c
+RMD160 (whichcraft-0.1.1.zip) = 962d885c521b42b886eb96265566cc6217a41762
+Size (whichcraft-0.1.1.zip) = 11314 bytes