CVS commit: pkgsrc/devel/py-cheetah

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Feb  1 19:56:22 UTC 2020

Modified Files:
        pkgsrc/devel/py-cheetah: Makefile PLIST

Log Message:
py-cheetah: add PYVERSSUFFIX to binarites; cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/py-cheetah/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-cheetah/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-cheetah/Makefile
diff -u pkgsrc/devel/py-cheetah/Makefile:1.25 pkgsrc/devel/py-cheetah/Makefile:1.26
--- pkgsrc/devel/py-cheetah/Makefile:1.25       Mon Sep  2 13:19:38 2019
+++ pkgsrc/devel/py-cheetah/Makefile    Sat Feb  1 19:56:21 2020
@@ -1,28 +1,18 @@
-# $NetBSD: Makefile,v 1.25 2019/09/02 13:19:38 adam Exp $
+# $NetBSD: Makefile,v 1.26 2020/02/01 19:56:21 adam Exp $
 
 DISTNAME=      Cheetah-2.4.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
-CATEGORIES=    devel
+PKGREVISION=   2
+CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=C/Cheetah/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.cheetahtemplate.org/
+HOMEPAGE=      https://www.cheetahtemplate.org/
 COMMENT=       Python-powered template engine and code-generator
 
 CONFLICTS=     Cheetah-[0-9]*
 DEPENDS+=      ${PYPKGPREFIX}-markdown>=2.0.1:../../textproc/py-markdown
 
-USE_LANGUAGES=         c
-
-PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 2.4.4
-
-REPLACE_PYTHON+=       SetupTools.py
-REPLACE_PYTHON+=       bin/cheetah
-REPLACE_PYTHON+=       bin/cheetah-analyze
-REPLACE_PYTHON+=       bin/cheetah-compile
-REPLACE_PYTHON+=       cheetah/CheetahWrapper.py
-REPLACE_PYTHON+=       cheetah/Compiler.py
 REPLACE_PYTHON+=       cheetah/DirectiveAnalyzer.py
 REPLACE_PYTHON+=       cheetah/ImportHooks.py
 REPLACE_PYTHON+=       cheetah/NameMapper.py
@@ -42,7 +32,14 @@ REPLACE_PYTHON+=     cheetah/Tests/Template.
 REPLACE_PYTHON+=       cheetah/Tests/Test.py
 REPLACE_PYTHON+=       cheetah/Tests/Unicode.py
 REPLACE_PYTHON+=       cheetah/Utils/Misc.py
-REPLACE_PYTHON+=       setup.py
+
+PYTHON_VERSIONS_ACCEPTED=      27 # for 3.x, use py-cheetah3
+
+post-install:
+       cd ${DESTDIR}${PREFIX}/bin && \
+       ${MV} cheetah cheetah-${PYVERSSUFFIX} && \
+       ${MV} cheetah-analyze cheetah-analyze-${PYVERSSUFFIX} && \
+       ${MV} cheetah-compile cheetah-compile-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"

Index: pkgsrc/devel/py-cheetah/PLIST
diff -u pkgsrc/devel/py-cheetah/PLIST:1.5 pkgsrc/devel/py-cheetah/PLIST:1.6
--- pkgsrc/devel/py-cheetah/PLIST:1.5   Fri Apr  8 12:54:20 2011
+++ pkgsrc/devel/py-cheetah/PLIST       Sat Feb  1 19:56:21 2020
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2011/04/08 12:54:20 adam Exp $
-bin/cheetah
-bin/cheetah-analyze
-bin/cheetah-compile
+@comment $NetBSD: PLIST,v 1.6 2020/02/01 19:56:21 adam Exp $
+bin/cheetah-${PYVERSSUFFIX}
+bin/cheetah-analyze-${PYVERSSUFFIX}
+bin/cheetah-compile-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt