From d775cd38016f2fa5f2c435937f086a3aeb47140e Mon Sep 17 00:00:00 2001
From: Makoto Fujiwara <makoto@ki.nu>
Date: Mon, 13 Apr 2020 08:10:34 +0900
Subject: [PATCH] (ham/gnuradio-core) Some updates, but no yet,  py37-qwt-qt5
 is not ready

---
 gnuradio-core/Makefile        | 8 ++++++++
 gnuradio-core/Makefile.common | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnuradio-core/Makefile b/gnuradio-core/Makefile
index b87e496388..93797236f4 100644
--- a/gnuradio-core/Makefile
+++ b/gnuradio-core/Makefile
@@ -20,6 +20,14 @@ PLIST_SRC=	${PKGDIR}/PLIST ${PKGDIR}/PLIST.oss
 # set default as minimum
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 
+# --------------------------------
+# some mech. overwrite
+#        * PYTHON_VERSION_DEFAULT = 37
+# to
+#        * PYPACKAGE = python38
+PYPKGPREFIX=	py37
+# --------------------------------
+
 # Take care CONF_FILES stuff (The same code in Nocore.mk)
 #post-install:
 #	${MV} ${DESTDIR}${PREFIX}/etc/gnuradio/conf.d/* \
diff --git a/gnuradio-core/Makefile.common b/gnuradio-core/Makefile.common
index e139b59915..3aa20bb3f6 100644
--- a/gnuradio-core/Makefile.common
+++ b/gnuradio-core/Makefile.common
@@ -44,7 +44,7 @@ USE_LANGUAGES=	c c++
 USE_TOOLS=	perl gmake cmake pkg-config
 USE_CMAKE=	yes
 
-DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
+DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah3
 DEPENDS+=	${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 # gr_filter_design in gnuradio-core ask for:
@@ -133,7 +133,7 @@ do-install:
 
 .include	"../../audio/gsm/buildlink3.mk"
 .include	"../../audio/jack/buildlink3.mk"
-.include	"../../audio/portaudio-devel/buildlink3.mk"
+.include	"../../audio/portaudio/buildlink3.mk"
 
 .include	"../../devel/boost-headers/buildlink3.mk"
 .include	"../../devel/boost-libs/buildlink3.mk"