Thu Jan 7 21:58:08 2021 UTC ()
pysolfc: set EGG_NAME to simplify PLIST


(wiz)
diff -r1.31 -r1.32 pkgsrc/games/pysolfc/Makefile
diff -r1.6 -r1.7 pkgsrc/games/pysolfc/PLIST
cvs diff -r1.31 -r1.32 pkgsrc/games/pysolfc/Makefile (expand / switch to unified diff)

--- pkgsrc/games/pysolfc/Makefile 2020/12/24 12:44:58 1.31
+++ pkgsrc/games/pysolfc/Makefile 2021/01/07 21:58:08 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.31 2020/12/24 12:44:58 mef Exp $ 1# $NetBSD: Makefile,v 1.32 2021/01/07 21:58:08 wiz Exp $
2 2
3DISTNAME= PySolFC-2.6.4 3DISTNAME= PySolFC-2.6.4
4PKGNAME= ${DISTNAME:tl} 4PKGNAME= ${DISTNAME:tl}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= games python 6CATEGORIES= games python
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pysolfc/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pysolfc/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://pysolfc.sourceforge.io/ 11HOMEPAGE= https://pysolfc.sourceforge.io/
12COMMENT= Over 1000 solitaire games 12COMMENT= Over 1000 solitaire games
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
@@ -23,26 +23,27 @@ DEPENDS+= ${PYPKGPREFIX}-game-[0-9]*:../ @@ -23,26 +23,27 @@ DEPENDS+= ${PYPKGPREFIX}-game-[0-9]*:../
23USE_TOOLS+= pax 23USE_TOOLS+= pax
24 24
25SUBST_CLASSES+= datadir 25SUBST_CLASSES+= datadir
26SUBST_STAGE.datadir= pre-configure 26SUBST_STAGE.datadir= pre-configure
27SUBST_MESSAGE.datadir= Use custom data dir. 27SUBST_MESSAGE.datadir= Use custom data dir.
28SUBST_FILES.datadir= pysollib/settings.py 28SUBST_FILES.datadir= pysollib/settings.py
29SUBST_SED.datadir= -e 's,@DATADIR@,${PREFIX}/share/PySolFC,' 29SUBST_SED.datadir= -e 's,@DATADIR@,${PREFIX}/share/PySolFC,'
30 30
31INSTALLATION_DIRS+= ${PKGMANDIR}/man6 31INSTALLATION_DIRS+= ${PKGMANDIR}/man6
32 32
33PLIST_SRC= PLIST ${WRKDIR}/PLIST.CS 33PLIST_SRC= PLIST ${WRKDIR}/PLIST.CS
34PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} 34PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
35 35
 36EGG_NAME= ${DISTNAME}
36 37
37post-install: 38post-install:
38 ${INSTALL_MAN} ${WRKSRC}/docs/pysol.6 \ 39 ${INSTALL_MAN} ${WRKSRC}/docs/pysol.6 \
39 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/pysol.py.6 40 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/pysol.py.6
40 ${INSTALL_MAN} ${WRKSRC}/docs/pysolfc.6 \ 41 ${INSTALL_MAN} ${WRKSRC}/docs/pysolfc.6 \
41 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/pysolfc.6 42 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/pysolfc.6
42 cd ${WRKDIR}/${CARDSETS_NAME} && \ 43 cd ${WRKDIR}/${CARDSETS_NAME} && \
43 ${PAX} -rw . ${DESTDIR}${PREFIX}/share/PySolFC/ && \ 44 ${PAX} -rw . ${DESTDIR}${PREFIX}/share/PySolFC/ && \
44 ${FIND} . -type f -print | ${SED} -e 's,^\.,share/PySolFC,' > ${WRKDIR}/PLIST.CS 45 ${FIND} . -type f -print | ${SED} -e 's,^\.,share/PySolFC,' > ${WRKDIR}/PLIST.CS
45 46
46.include "../../sysutils/desktop-file-utils/desktopdb.mk" 47.include "../../sysutils/desktop-file-utils/desktopdb.mk"
47.include "../../lang/python/distutils.mk" 48.include "../../lang/python/distutils.mk"
48.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/games/pysolfc/PLIST (expand / switch to unified diff)

--- pkgsrc/games/pysolfc/PLIST 2020/12/24 12:44:15 1.6
+++ pkgsrc/games/pysolfc/PLIST 2021/01/07 21:58:08 1.7
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1@comment $NetBSD: PLIST,v 1.6 2020/12/24 12:44:15 mef Exp $ 1@comment $NetBSD: PLIST,v 1.7 2021/01/07 21:58:08 wiz Exp $
2bin/pysol.py 2bin/pysol.py
3${PYSITELIB}/PySolFC-2.6.4-py${PYVERSSUFFIX}.egg-info 3${PYSITELIB}/${EGG_FILE}
4${PYSITELIB}/pysollib/__init__.py 4${PYSITELIB}/pysollib/__init__.py
5${PYSITELIB}/pysollib/__init__.pyc 5${PYSITELIB}/pysollib/__init__.pyc
6${PYSITELIB}/pysollib/__init__.pyo 6${PYSITELIB}/pysollib/__init__.pyo
7${PYSITELIB}/pysollib/acard.py 7${PYSITELIB}/pysollib/acard.py
8${PYSITELIB}/pysollib/acard.pyc 8${PYSITELIB}/pysollib/acard.pyc
9${PYSITELIB}/pysollib/acard.pyo 9${PYSITELIB}/pysollib/acard.pyo
10${PYSITELIB}/pysollib/actions.py 10${PYSITELIB}/pysollib/actions.py
11${PYSITELIB}/pysollib/actions.pyc 11${PYSITELIB}/pysollib/actions.pyc
12${PYSITELIB}/pysollib/actions.pyo 12${PYSITELIB}/pysollib/actions.pyo
13${PYSITELIB}/pysollib/app.py 13${PYSITELIB}/pysollib/app.py
14${PYSITELIB}/pysollib/app.pyc 14${PYSITELIB}/pysollib/app.pyc
15${PYSITELIB}/pysollib/app.pyo 15${PYSITELIB}/pysollib/app.pyo
16${PYSITELIB}/pysollib/configobj/__init__.py 16${PYSITELIB}/pysollib/configobj/__init__.py