CVS commit: pkgsrc/audio/picard

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan 17 06:28:29 UTC 2020

Modified Files:
        pkgsrc/audio/picard: Makefile PLIST

Log Message:
picard: switch to egg.mk to fix build when py-setuptools isn't already installed


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/audio/picard/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/picard/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/picard/Makefile
diff -u pkgsrc/audio/picard/Makefile:1.41 pkgsrc/audio/picard/Makefile:1.42
--- pkgsrc/audio/picard/Makefile:1.41   Thu Jan 16 01:31:54 2020
+++ pkgsrc/audio/picard/Makefile        Fri Jan 17 06:28:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2020/01/16 01:31:54 nia Exp $
+# $NetBSD: Makefile,v 1.42 2020/01/17 06:28:29 wiz Exp $
 
 DISTNAME=      picard-2.2.3
 CATEGORIES=    audio
@@ -24,7 +24,7 @@ CONFIGURE_SCRIPT=     setup.py
 CONFIGURE_ARGS+=       config
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/picard/PLIST
diff -u pkgsrc/audio/picard/PLIST:1.10 pkgsrc/audio/picard/PLIST:1.11
--- pkgsrc/audio/picard/PLIST:1.10      Thu Jan 16 01:31:54 2020
+++ pkgsrc/audio/picard/PLIST   Fri Jan 17 06:28:29 2020
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.10 2020/01/16 01:31:54 nia Exp $
+@comment $NetBSD: PLIST,v 1.11 2020/01/17 06:28:29 wiz Exp $
 bin/picard
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/picard/__init__.py
 ${PYSITELIB}/picard/__init__.pyo
 ${PYSITELIB}/picard/__init__.pyc