From e446c37414cb92799998c02150727ef4b9780cff Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Fri, 29 Sep 2017 21:59:48 +0000
Subject: py-regex: set EGGNAME instead of hardcoding egg names in PLIST

Fix some other pkglint warnings while here.
---
 textproc/py-regex/DESCR    |  4 ++--
 textproc/py-regex/Makefile |  7 +++++--
 textproc/py-regex/PLIST    | 10 +++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'textproc')

diff --git a/textproc/py-regex/DESCR b/textproc/py-regex/DESCR
index 1391af3ecd2..4404ad8b1b8 100644
--- a/textproc/py-regex/DESCR
+++ b/textproc/py-regex/DESCR
@@ -1,2 +1,2 @@
-This regex implementation is backwards-compatible with the standard ‘re’
-module, but offers additional functionality.
+This regex implementation is backwards-compatible with the standard
+'re' module, but offers additional functionality.
diff --git a/textproc/py-regex/Makefile b/textproc/py-regex/Makefile
index aeaa2c9a13f..a45f444d6c3 100644
--- a/textproc/py-regex/Makefile
+++ b/textproc/py-regex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/09/29 13:49:25 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/29 21:59:48 wiz Exp $
 
 DISTNAME=	regex-2017.07.28
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=r/regex/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://bitbucket.org/mrabarnett/mrab-regex
-COMMENT=	Alternative regular expression module, to replace re.
+COMMENT=	Alternative regular expression module, to replace re
 LICENSE=	python-software-foundation
 
 .include "../../lang/python/pyversion.mk"
@@ -18,6 +18,9 @@ TESTDIR=${WRKSRC}/Python3
 TESTDIR=${WRKSRC}/Python2
 .endif
 
+EGG_NAME=	regex-2017.7.28
+
+# needs 'make install' first
 do-test:
 	cd ${TESTDIR} && ${PYTHONBIN} test_regex.py
 
diff --git a/textproc/py-regex/PLIST b/textproc/py-regex/PLIST
index d264cdd46a3..066f32f01fe 100644
--- a/textproc/py-regex/PLIST
+++ b/textproc/py-regex/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2017/09/29 13:49:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/09/29 21:59:48 wiz Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/_regex.so
 ${PYSITELIB}/_regex_core.py
 ${PYSITELIB}/_regex_core.pyc
 ${PYSITELIB}/_regex_core.pyo
-${PYSITELIB}/regex-2017.7.28-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/regex-2017.7.28-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/regex-2017.7.28-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/regex-2017.7.28-py${PYVERSSUFFIX}.egg-info/top_level.txt
 ${PYSITELIB}/regex.py
 ${PYSITELIB}/regex.pyc
 ${PYSITELIB}/regex.pyo
-- 
cgit v1.2.3