CVS commit: pkgsrc/audio/moss

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Feb 28 10:06:34 UTC 2022

Modified Files:
        pkgsrc/audio/moss: Makefile PLIST

Log Message:
moss: convert to egg.mk


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/audio/moss/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/moss/PLIST

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

Modified files:

Index: pkgsrc/audio/moss/Makefile
diff -u pkgsrc/audio/moss/Makefile:1.36 pkgsrc/audio/moss/Makefile:1.37
--- pkgsrc/audio/moss/Makefile:1.36     Fri Dec  4 20:44:58 2020
+++ pkgsrc/audio/moss/Makefile  Mon Feb 28 10:06:34 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2020/12/04 20:44:58 nia Exp $
+# $NetBSD: Makefile,v 1.37 2022/02/28 10:06:34 wiz Exp $
 
 DISTNAME=      moss-0.1.13
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    audio
 MASTER_SITES=  http://kldp.net/frs/download.php/1580/
 
@@ -15,12 +15,14 @@ DEPENDS+=   ${PYPKGPREFIX}-vorbis>=1.3:../
 
 PYTHON_VERSIONS_ACCEPTED=      27 # py-ogg, py-vorbis
 
-REPLACE_PYTHON=        ${WRKSRC}/*.py
+REPLACE_PYTHON=        *.py
 
 RCD_SCRIPTS=   moss
 CONF_FILES=    ${PREFIX}/share/moss/moss.conf.sample   \
                ${PKG_SYSCONFDIR}/moss.conf
 
+BUILD_DEFS+=   VARBASE
+
 SUBST_CLASSES+=                path
 SUBST_MESSAGE.path=    Fixing hardcoded paths.
 SUBST_STAGE.path=      pre-configure
@@ -30,8 +32,6 @@ SUBST_SED.path+=      -e 's,$${PREFIX}/share,
 
 FILES_SUBST+=  INTERPRETER=${PYTHONBIN:Q}
 
-PYDISTUTILSPKG=        yes
-
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/moss/PLIST
diff -u pkgsrc/audio/moss/PLIST:1.6 pkgsrc/audio/moss/PLIST:1.7
--- pkgsrc/audio/moss/PLIST:1.6 Tue Mar 11 14:04:58 2014
+++ pkgsrc/audio/moss/PLIST     Mon Feb 28 10:06:34 2022
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2014/03/11 14:04:58 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/02/28 10:06:34 wiz Exp $
 bin/moss
+${PYSITELIB}/${EGG_INFODIR}
 ${PYSITELIB}/moss/__init__.py
 ${PYSITELIB}/moss/__init__.pyc
 ${PYSITELIB}/moss/__init__.pyo
@@ -12,12 +13,12 @@ ${PYSITELIB}/moss/htmltmpl.pyo
 ${PYSITELIB}/moss/live.py
 ${PYSITELIB}/moss/live.pyc
 ${PYSITELIB}/moss/live.pyo
-${PYSITELIB}/moss/moss.py
-${PYSITELIB}/moss/moss.pyc
-${PYSITELIB}/moss/moss.pyo
 ${PYSITELIB}/moss/mkpasswd.py
 ${PYSITELIB}/moss/mkpasswd.pyc
 ${PYSITELIB}/moss/mkpasswd.pyo
+${PYSITELIB}/moss/moss.py
+${PYSITELIB}/moss/moss.pyc
+${PYSITELIB}/moss/moss.pyo
 ${PYSITELIB}/moss/template.py
 ${PYSITELIB}/moss/template.pyc
 ${PYSITELIB}/moss/template.pyo