pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/ham/chirp



Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Aug 28 10:37:41 UTC 2023

Modified Files:
        pkgsrc/ham/chirp: DESCR Makefile PLIST distinfo
        pkgsrc/ham/chirp/patches: patch-chirp_platform.py
Removed Files:
        pkgsrc/ham/chirp/patches: patch-chirp_ui_mainapp.py patch-setup.py

Log Message:
ham/chirp: Update to 20230823 and switch to py3 branch

Upstream has had a python3 branch for a long time, which uses
wxWidgets.  The "chirp-daily" py2 branch with py-gtk2 is unmaintained,
and the "chirp-next" py3 branch is the recommended version.  This
commit switches to that branch, but there is no major version change
because upstream uses just dates for all tarballs.  Besides the python
version and toolkit change, installed program names change.

As always there are bugfixes, minor improvements and support for
additional radios.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/ham/chirp/DESCR
cvs rdiff -u -r1.59 -r1.60 pkgsrc/ham/chirp/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/ham/chirp/PLIST
cvs rdiff -u -r1.32 -r1.33 pkgsrc/ham/chirp/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/ham/chirp/patches/patch-chirp_platform.py
cvs rdiff -u -r1.1 -r0 pkgsrc/ham/chirp/patches/patch-chirp_ui_mainapp.py
cvs rdiff -u -r1.2 -r0 pkgsrc/ham/chirp/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/ham/chirp/DESCR
diff -u pkgsrc/ham/chirp/DESCR:1.2 pkgsrc/ham/chirp/DESCR:1.3
--- pkgsrc/ham/chirp/DESCR:1.2  Tue Aug 25 13:45:52 2020
+++ pkgsrc/ham/chirp/DESCR      Mon Aug 28 10:37:40 2023
@@ -1,6 +1,6 @@
+This is the gtk3 version of chirp, which is the version recommended by
+upstream.
+
 CHIRP is a free, open-source tool for programming your amateur radio.
 It supports a large number of manufacturers and models, as well as
 provides a way to interface with multiple data sources and formats.
-
-This package provides the stable version preferred by upstream,
-sometimes called "chirp-daily" in other contexts.

Index: pkgsrc/ham/chirp/Makefile
diff -u pkgsrc/ham/chirp/Makefile:1.59 pkgsrc/ham/chirp/Makefile:1.60
--- pkgsrc/ham/chirp/Makefile:1.59      Mon Aug 14 05:24:38 2023
+++ pkgsrc/ham/chirp/Makefile   Mon Aug 28 10:37:40 2023
@@ -1,55 +1,52 @@
-# $NetBSD: Makefile,v 1.59 2023/08/14 05:24:38 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2023/08/28 10:37:40 gdt Exp $
 
-DISTNAME=      chirp-daily-20221217
-PKGNAME=       ${DISTNAME:S/-daily//}
-PKGREVISION=   4
+VERSION=       20230823
+DISTNAME=      chirp-${VERSION}
 CATEGORIES=    ham
-MASTER_SITES=  https://trac.chirp.danplanet.com/chirp_daily/daily-${PKGVERSION_NOREV}/
+MASTER_SITES=  https://trac.chirp.danplanet.com/chirp_next/next-${VERSION}/
 # Chirp does not have what would normally called releasees.  They have
 # "daily builds" which are like releases except that:
-#   they are called chirp-daily instead of chirp
+#   they are called chirp-next instead of chirp
 #   they have YYYYMMDD version numbers
 #   they don't have the usual release testing
+# They do have a history of stability.
 # Upstream says
 #    they will not go back to regular version numbers
-#    the preferred name is chirp, not chirp-daily
+#    the preferred name is chirp, not chirp-next or chipr-daily
 # via
 #   https://chirp.danplanet.com/issues/8067
 #   https://chirp.danplanet.com/news/15
+#   discussions on their mailinglist
 
-MAINTAINER=    dbj%NetBSD.org@localhost
-#MAINTAINER+=  gdt%NetBSD.org@localhost
-HOMEPAGE=      https://chirp.danplanet.com/projects/chirp/wiki/Home
+MAINTAINER=    gdt%NetBSD.org@localhost
+#MAINTAINER+=  dbj%NetBSD.org@localhost
+HOMEPAGE=      https://chirp.danplanet.com/
 COMMENT=       Tool for programming Amateur Radio HTs
 LICENSE=       gnu-gpl-v3
 
 USE_LANGUAGES= #none
-REPLACE_PYTHON=        *.py chirp/*.py chirp/ui/*.py
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+.include "../../lang/python/pyversion.mk"
+
+# setup.py:install_requires
 DEPENDS+=      ${PYPKGPREFIX}-serial>=2.7:../../comms/py-serial
+DEPENDS+=      ${PYPKGPREFIX}-requests>=2.0:../../devel/py-requests
+DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-future>=0.18.0:../../devel/py-future
+.if ${PYTHON_VERSION} < 310
+DEPENDS+=      ${PYPKGPREFIX}-importlib-resources>=1.4.0:../../devel/py-importlib-resources
+.endif
+DEPENDS+=      ${PYPKGPREFIX}-yattag>=1.15.1:../../textproc/py-yattag
 
-PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
-EGG_NAME=      chirp-daily_${PKGVERSION_NOREV}
+# setup.py:extras_require
+DEPENDS+=      ${PYPKGPREFIX}-wxPython>=4:../../x11/py-wxPython
 
 .include "../../mk/bsd.prefs.mk"
 
-SUBST_CLASSES+=                        fix-manpaths
-SUBST_STAGE.fix-manpaths=      pre-configure
-SUBST_MESSAGE.fix-manpaths=    Fixing man paths
-SUBST_FILES.fix-manpaths=      setup.py
-SUBST_SED.fix-manpaths=                -e 's,share/man/man1,${PKGMANDIR}/man1,g'
-
-SUBST_CLASSES+=                        fix-sharepaths
-SUBST_STAGE.fix-sharepaths=    pre-configure
-SUBST_MESSAGE.fix-sharepaths=  Fixing /usr/share paths
-SUBST_FILES.fix-sharepaths=    chirp/platform.py
-SUBST_SED.fix-sharepaths=      -e 's,/usr/share,${PREFIX}/share,g'
-
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
-.include "../../textproc/py-libxml2/buildlink3.mk"
-.include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/ham/chirp/PLIST
diff -u pkgsrc/ham/chirp/PLIST:1.18 pkgsrc/ham/chirp/PLIST:1.19
--- pkgsrc/ham/chirp/PLIST:1.18 Wed Dec  7 14:02:20 2022
+++ pkgsrc/ham/chirp/PLIST      Mon Aug 28 10:37:40 2023
@@ -1,7 +1,12 @@
-@comment $NetBSD: PLIST,v 1.18 2022/12/07 14:02:20 gdt Exp $
-bin/chirpw
-bin/rpttool
-${PYSITELIB}/${EGG_INFODIR}
+@comment $NetBSD: PLIST,v 1.19 2023/08/28 10:37:40 gdt Exp $
+bin/chirp
+bin/chirpc
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/chirp/__init__.py
 ${PYSITELIB}/chirp/__init__.pyc
 ${PYSITELIB}/chirp/__init__.pyo
@@ -32,15 +37,18 @@ ${PYSITELIB}/chirp/bitwise_grammar.pyo
 ${PYSITELIB}/chirp/chirp_common.py
 ${PYSITELIB}/chirp/chirp_common.pyc
 ${PYSITELIB}/chirp/chirp_common.pyo
+${PYSITELIB}/chirp/cli/__init__.py
+${PYSITELIB}/chirp/cli/__init__.pyc
+${PYSITELIB}/chirp/cli/__init__.pyo
+${PYSITELIB}/chirp/cli/main.py
+${PYSITELIB}/chirp/cli/main.pyc
+${PYSITELIB}/chirp/cli/main.pyo
 ${PYSITELIB}/chirp/detect.py
 ${PYSITELIB}/chirp/detect.pyc
 ${PYSITELIB}/chirp/detect.pyo
 ${PYSITELIB}/chirp/directory.py
 ${PYSITELIB}/chirp/directory.pyc
 ${PYSITELIB}/chirp/directory.pyo
-${PYSITELIB}/chirp/dmrmarc.py
-${PYSITELIB}/chirp/dmrmarc.pyc
-${PYSITELIB}/chirp/dmrmarc.pyo
 ${PYSITELIB}/chirp/drivers/__init__.py
 ${PYSITELIB}/chirp/drivers/__init__.pyc
 ${PYSITELIB}/chirp/drivers/__init__.pyo
@@ -89,6 +97,9 @@ ${PYSITELIB}/chirp/drivers/boblov_x3plus
 ${PYSITELIB}/chirp/drivers/btech.py
 ${PYSITELIB}/chirp/drivers/btech.pyc
 ${PYSITELIB}/chirp/drivers/btech.pyo
+${PYSITELIB}/chirp/drivers/fake.py
+${PYSITELIB}/chirp/drivers/fake.pyc
+${PYSITELIB}/chirp/drivers/fake.pyo
 ${PYSITELIB}/chirp/drivers/fd268.py
 ${PYSITELIB}/chirp/drivers/fd268.pyc
 ${PYSITELIB}/chirp/drivers/fd268.pyo
@@ -176,6 +187,9 @@ ${PYSITELIB}/chirp/drivers/gmrsv2.pyo
 ${PYSITELIB}/chirp/drivers/h777.py
 ${PYSITELIB}/chirp/drivers/h777.pyc
 ${PYSITELIB}/chirp/drivers/h777.pyo
+${PYSITELIB}/chirp/drivers/hf90.py
+${PYSITELIB}/chirp/drivers/hf90.pyc
+${PYSITELIB}/chirp/drivers/hf90.pyo
 ${PYSITELIB}/chirp/drivers/hg_uv98.py
 ${PYSITELIB}/chirp/drivers/hg_uv98.pyc
 ${PYSITELIB}/chirp/drivers/hg_uv98.pyo
@@ -236,6 +250,9 @@ ${PYSITELIB}/chirp/drivers/ict7h.pyo
 ${PYSITELIB}/chirp/drivers/ict8.py
 ${PYSITELIB}/chirp/drivers/ict8.pyc
 ${PYSITELIB}/chirp/drivers/ict8.pyo
+${PYSITELIB}/chirp/drivers/icv80.py
+${PYSITELIB}/chirp/drivers/icv80.pyc
+${PYSITELIB}/chirp/drivers/icv80.pyo
 ${PYSITELIB}/chirp/drivers/icv86.py
 ${PYSITELIB}/chirp/drivers/icv86.pyc
 ${PYSITELIB}/chirp/drivers/icv86.pyo
@@ -245,9 +262,6 @@ ${PYSITELIB}/chirp/drivers/icw32.pyo
 ${PYSITELIB}/chirp/drivers/icx8x.py
 ${PYSITELIB}/chirp/drivers/icx8x.pyc
 ${PYSITELIB}/chirp/drivers/icx8x.pyo
-${PYSITELIB}/chirp/drivers/icx8x_ll.py
-${PYSITELIB}/chirp/drivers/icx8x_ll.pyc
-${PYSITELIB}/chirp/drivers/icx8x_ll.pyo
 ${PYSITELIB}/chirp/drivers/icx90.py
 ${PYSITELIB}/chirp/drivers/icx90.pyc
 ${PYSITELIB}/chirp/drivers/icx90.pyo
@@ -275,6 +289,12 @@ ${PYSITELIB}/chirp/drivers/idrp.pyo
 ${PYSITELIB}/chirp/drivers/iradio_uv_5118.py
 ${PYSITELIB}/chirp/drivers/iradio_uv_5118.pyc
 ${PYSITELIB}/chirp/drivers/iradio_uv_5118.pyo
+${PYSITELIB}/chirp/drivers/iradio_uv_5118plus.py
+${PYSITELIB}/chirp/drivers/iradio_uv_5118plus.pyc
+${PYSITELIB}/chirp/drivers/iradio_uv_5118plus.pyo
+${PYSITELIB}/chirp/drivers/kenwood_d7.py
+${PYSITELIB}/chirp/drivers/kenwood_d7.pyc
+${PYSITELIB}/chirp/drivers/kenwood_d7.pyo
 ${PYSITELIB}/chirp/drivers/kenwood_hmk.py
 ${PYSITELIB}/chirp/drivers/kenwood_hmk.pyc
 ${PYSITELIB}/chirp/drivers/kenwood_hmk.pyo
@@ -299,6 +319,9 @@ ${PYSITELIB}/chirp/drivers/kguv8e.pyo
 ${PYSITELIB}/chirp/drivers/kguv920pa.py
 ${PYSITELIB}/chirp/drivers/kguv920pa.pyc
 ${PYSITELIB}/chirp/drivers/kguv920pa.pyo
+${PYSITELIB}/chirp/drivers/kguv980p.py
+${PYSITELIB}/chirp/drivers/kguv980p.pyc
+${PYSITELIB}/chirp/drivers/kguv980p.pyo
 ${PYSITELIB}/chirp/drivers/kguv9dplus.py
 ${PYSITELIB}/chirp/drivers/kguv9dplus.pyc
 ${PYSITELIB}/chirp/drivers/kguv9dplus.pyo
@@ -314,6 +337,9 @@ ${PYSITELIB}/chirp/drivers/leixen.pyo
 ${PYSITELIB}/chirp/drivers/lt725uv.py
 ${PYSITELIB}/chirp/drivers/lt725uv.pyc
 ${PYSITELIB}/chirp/drivers/lt725uv.pyo
+${PYSITELIB}/chirp/drivers/mml_jc8810.py
+${PYSITELIB}/chirp/drivers/mml_jc8810.pyc
+${PYSITELIB}/chirp/drivers/mml_jc8810.pyo
 ${PYSITELIB}/chirp/drivers/mursv1.py
 ${PYSITELIB}/chirp/drivers/mursv1.pyc
 ${PYSITELIB}/chirp/drivers/mursv1.pyo
@@ -329,15 +355,15 @@ ${PYSITELIB}/chirp/drivers/radioddity_r2
 ${PYSITELIB}/chirp/drivers/radtel_t18.py
 ${PYSITELIB}/chirp/drivers/radtel_t18.pyc
 ${PYSITELIB}/chirp/drivers/radtel_t18.pyo
-${PYSITELIB}/chirp/drivers/repeaterbook.py
-${PYSITELIB}/chirp/drivers/repeaterbook.pyc
-${PYSITELIB}/chirp/drivers/repeaterbook.pyo
 ${PYSITELIB}/chirp/drivers/retevis_rb15.py
 ${PYSITELIB}/chirp/drivers/retevis_rb15.pyc
 ${PYSITELIB}/chirp/drivers/retevis_rb15.pyo
 ${PYSITELIB}/chirp/drivers/retevis_rb17p.py
 ${PYSITELIB}/chirp/drivers/retevis_rb17p.pyc
 ${PYSITELIB}/chirp/drivers/retevis_rb17p.pyo
+${PYSITELIB}/chirp/drivers/retevis_rb28.py
+${PYSITELIB}/chirp/drivers/retevis_rb28.pyc
+${PYSITELIB}/chirp/drivers/retevis_rb28.pyo
 ${PYSITELIB}/chirp/drivers/retevis_rt1.py
 ${PYSITELIB}/chirp/drivers/retevis_rt1.pyc
 ${PYSITELIB}/chirp/drivers/retevis_rt1.pyo
@@ -362,12 +388,12 @@ ${PYSITELIB}/chirp/drivers/retevis_rt87.
 ${PYSITELIB}/chirp/drivers/retevis_rt98.py
 ${PYSITELIB}/chirp/drivers/retevis_rt98.pyc
 ${PYSITELIB}/chirp/drivers/retevis_rt98.pyo
-${PYSITELIB}/chirp/drivers/rfinder.py
-${PYSITELIB}/chirp/drivers/rfinder.pyc
-${PYSITELIB}/chirp/drivers/rfinder.pyo
 ${PYSITELIB}/chirp/drivers/rh5r_v2.py
 ${PYSITELIB}/chirp/drivers/rh5r_v2.pyc
 ${PYSITELIB}/chirp/drivers/rh5r_v2.pyo
+${PYSITELIB}/chirp/drivers/tdh8.py
+${PYSITELIB}/chirp/drivers/tdh8.pyc
+${PYSITELIB}/chirp/drivers/tdh8.pyo
 ${PYSITELIB}/chirp/drivers/tdxone_tdq8a.py
 ${PYSITELIB}/chirp/drivers/tdxone_tdq8a.pyc
 ${PYSITELIB}/chirp/drivers/tdxone_tdq8a.pyo
@@ -416,6 +442,9 @@ ${PYSITELIB}/chirp/drivers/thuv1f.pyo
 ${PYSITELIB}/chirp/drivers/tk270.py
 ${PYSITELIB}/chirp/drivers/tk270.pyc
 ${PYSITELIB}/chirp/drivers/tk270.pyo
+${PYSITELIB}/chirp/drivers/tk3140.py
+${PYSITELIB}/chirp/drivers/tk3140.pyc
+${PYSITELIB}/chirp/drivers/tk3140.pyo
 ${PYSITELIB}/chirp/drivers/tk760.py
 ${PYSITELIB}/chirp/drivers/tk760.pyc
 ${PYSITELIB}/chirp/drivers/tk760.pyo
@@ -425,6 +454,9 @@ ${PYSITELIB}/chirp/drivers/tk760g.pyo
 ${PYSITELIB}/chirp/drivers/tk8102.py
 ${PYSITELIB}/chirp/drivers/tk8102.pyc
 ${PYSITELIB}/chirp/drivers/tk8102.pyo
+${PYSITELIB}/chirp/drivers/tk8160.py
+${PYSITELIB}/chirp/drivers/tk8160.pyc
+${PYSITELIB}/chirp/drivers/tk8160.pyo
 ${PYSITELIB}/chirp/drivers/tk8180.py
 ${PYSITELIB}/chirp/drivers/tk8180.pyc
 ${PYSITELIB}/chirp/drivers/tk8180.pyo
@@ -461,6 +493,9 @@ ${PYSITELIB}/chirp/drivers/uv6r.pyo
 ${PYSITELIB}/chirp/drivers/uvb5.py
 ${PYSITELIB}/chirp/drivers/uvb5.pyc
 ${PYSITELIB}/chirp/drivers/uvb5.pyo
+${PYSITELIB}/chirp/drivers/uvk5.py
+${PYSITELIB}/chirp/drivers/uvk5.pyc
+${PYSITELIB}/chirp/drivers/uvk5.pyo
 ${PYSITELIB}/chirp/drivers/vgc.py
 ${PYSITELIB}/chirp/drivers/vgc.pyc
 ${PYSITELIB}/chirp/drivers/vgc.pyo
@@ -500,15 +535,26 @@ ${PYSITELIB}/chirp/drivers/wouxun_common
 ${PYSITELIB}/chirp/drivers/yaesu_clone.py
 ${PYSITELIB}/chirp/drivers/yaesu_clone.pyc
 ${PYSITELIB}/chirp/drivers/yaesu_clone.pyo
-${PYSITELIB}/chirp/elib_intl.py
-${PYSITELIB}/chirp/elib_intl.pyc
-${PYSITELIB}/chirp/elib_intl.pyo
 ${PYSITELIB}/chirp/errors.py
 ${PYSITELIB}/chirp/errors.pyc
 ${PYSITELIB}/chirp/errors.pyo
 ${PYSITELIB}/chirp/import_logic.py
 ${PYSITELIB}/chirp/import_logic.pyc
 ${PYSITELIB}/chirp/import_logic.pyo
+${PYSITELIB}/chirp/locale/de/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/el/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/en_US/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/es/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/fr/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/hu/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/it/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/nl/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/pl/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/pt_BR/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/ru/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/tr_TR/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/uk_UA/LC_MESSAGES/CHIRP.mo
+${PYSITELIB}/chirp/locale/zh_CN/LC_MESSAGES/CHIRP.mo
 ${PYSITELIB}/chirp/logger.py
 ${PYSITELIB}/chirp/logger.pyc
 ${PYSITELIB}/chirp/logger.pyo
@@ -521,104 +567,98 @@ ${PYSITELIB}/chirp/platform.pyo
 ${PYSITELIB}/chirp/pyPEG.py
 ${PYSITELIB}/chirp/pyPEG.pyc
 ${PYSITELIB}/chirp/pyPEG.pyo
-${PYSITELIB}/chirp/radioreference.py
-${PYSITELIB}/chirp/radioreference.pyc
-${PYSITELIB}/chirp/radioreference.pyo
 ${PYSITELIB}/chirp/settings.py
 ${PYSITELIB}/chirp/settings.pyc
 ${PYSITELIB}/chirp/settings.pyo
-${PYSITELIB}/chirp/ui/__init__.py
-${PYSITELIB}/chirp/ui/__init__.pyc
-${PYSITELIB}/chirp/ui/__init__.pyo
-${PYSITELIB}/chirp/ui/bandplans.py
-${PYSITELIB}/chirp/ui/bandplans.pyc
-${PYSITELIB}/chirp/ui/bandplans.pyo
-${PYSITELIB}/chirp/ui/bankedit.py
-${PYSITELIB}/chirp/ui/bankedit.pyc
-${PYSITELIB}/chirp/ui/bankedit.pyo
-${PYSITELIB}/chirp/ui/clone.py
-${PYSITELIB}/chirp/ui/clone.pyc
-${PYSITELIB}/chirp/ui/clone.pyo
-${PYSITELIB}/chirp/ui/cloneprog.py
-${PYSITELIB}/chirp/ui/cloneprog.pyc
-${PYSITELIB}/chirp/ui/cloneprog.pyo
-${PYSITELIB}/chirp/ui/common.py
-${PYSITELIB}/chirp/ui/common.pyc
-${PYSITELIB}/chirp/ui/common.pyo
-${PYSITELIB}/chirp/ui/config.py
-${PYSITELIB}/chirp/ui/config.pyc
-${PYSITELIB}/chirp/ui/config.pyo
-${PYSITELIB}/chirp/ui/dstaredit.py
-${PYSITELIB}/chirp/ui/dstaredit.pyc
-${PYSITELIB}/chirp/ui/dstaredit.pyo
-${PYSITELIB}/chirp/ui/editorset.py
-${PYSITELIB}/chirp/ui/editorset.pyc
-${PYSITELIB}/chirp/ui/editorset.pyo
-${PYSITELIB}/chirp/ui/fips.py
-${PYSITELIB}/chirp/ui/fips.pyc
-${PYSITELIB}/chirp/ui/fips.pyo
-${PYSITELIB}/chirp/ui/importdialog.py
-${PYSITELIB}/chirp/ui/importdialog.pyc
-${PYSITELIB}/chirp/ui/importdialog.pyo
-${PYSITELIB}/chirp/ui/inputdialog.py
-${PYSITELIB}/chirp/ui/inputdialog.pyc
-${PYSITELIB}/chirp/ui/inputdialog.pyo
-${PYSITELIB}/chirp/ui/mainapp.py
-${PYSITELIB}/chirp/ui/mainapp.pyc
-${PYSITELIB}/chirp/ui/mainapp.pyo
-${PYSITELIB}/chirp/ui/memdetail.py
-${PYSITELIB}/chirp/ui/memdetail.pyc
-${PYSITELIB}/chirp/ui/memdetail.pyo
-${PYSITELIB}/chirp/ui/memedit.py
-${PYSITELIB}/chirp/ui/memedit.pyc
-${PYSITELIB}/chirp/ui/memedit.pyo
-${PYSITELIB}/chirp/ui/miscwidgets.py
-${PYSITELIB}/chirp/ui/miscwidgets.pyc
-${PYSITELIB}/chirp/ui/miscwidgets.pyo
-${PYSITELIB}/chirp/ui/radiobrowser.py
-${PYSITELIB}/chirp/ui/radiobrowser.pyc
-${PYSITELIB}/chirp/ui/radiobrowser.pyo
-${PYSITELIB}/chirp/ui/reporting.py
-${PYSITELIB}/chirp/ui/reporting.pyc
-${PYSITELIB}/chirp/ui/reporting.pyo
-${PYSITELIB}/chirp/ui/settingsedit.py
-${PYSITELIB}/chirp/ui/settingsedit.pyc
-${PYSITELIB}/chirp/ui/settingsedit.pyo
-${PYSITELIB}/chirp/ui/shiftdialog.py
-${PYSITELIB}/chirp/ui/shiftdialog.pyc
-${PYSITELIB}/chirp/ui/shiftdialog.pyo
+${PYSITELIB}/chirp/share/chirp.desktop
+${PYSITELIB}/chirp/share/chirp.ico
+${PYSITELIB}/chirp/share/chirp.png
+${PYSITELIB}/chirp/share/chirp.svg
+${PYSITELIB}/chirp/share/chirpw.1
+${PYSITELIB}/chirp/share/plus-icon.png
+${PYSITELIB}/chirp/share/welcome_screen.png
+${PYSITELIB}/chirp/sources/__init__.py
+${PYSITELIB}/chirp/sources/__init__.pyc
+${PYSITELIB}/chirp/sources/__init__.pyo
+${PYSITELIB}/chirp/sources/base.py
+${PYSITELIB}/chirp/sources/base.pyc
+${PYSITELIB}/chirp/sources/base.pyo
+${PYSITELIB}/chirp/sources/dmrmarc.py
+${PYSITELIB}/chirp/sources/dmrmarc.pyc
+${PYSITELIB}/chirp/sources/dmrmarc.pyo
+${PYSITELIB}/chirp/sources/przemienniki.py
+${PYSITELIB}/chirp/sources/przemienniki.pyc
+${PYSITELIB}/chirp/sources/przemienniki.pyo
+${PYSITELIB}/chirp/sources/radioreference.py
+${PYSITELIB}/chirp/sources/radioreference.pyc
+${PYSITELIB}/chirp/sources/radioreference.pyo
+${PYSITELIB}/chirp/sources/repeaterbook.py
+${PYSITELIB}/chirp/sources/repeaterbook.pyc
+${PYSITELIB}/chirp/sources/repeaterbook.pyo
+${PYSITELIB}/chirp/stock_configs/AU NZ UHF Citizens Band.csv
+${PYSITELIB}/chirp/stock_configs/DE Freenet Frequencies.csv
+${PYSITELIB}/chirp/stock_configs/EU LPD and PMR Channels.csv
+${PYSITELIB}/chirp/stock_configs/FR Marine VHF Channels.csv
+${PYSITELIB}/chirp/stock_configs/PL Calling Frequencies and Simplex.csv
+${PYSITELIB}/chirp/stock_configs/SE Jaktradio 155MHz.csv
+${PYSITELIB}/chirp/stock_configs/SE NO KDR444.csv
+${PYSITELIB}/chirp/stock_configs/UK Business Radio Simple Light Frequencies.csv
+${PYSITELIB}/chirp/stock_configs/US 60 meter channels (Center).csv
+${PYSITELIB}/chirp/stock_configs/US 60 meter channels (Dial).csv
+${PYSITELIB}/chirp/stock_configs/US CA Railroad Channels.csv
+${PYSITELIB}/chirp/stock_configs/US Calling Frequencies.csv
+${PYSITELIB}/chirp/stock_configs/US FRS and GMRS Channels.csv
+${PYSITELIB}/chirp/stock_configs/US MURS Channels.csv
+${PYSITELIB}/chirp/stock_configs/US Marine VHF Channels.csv
+${PYSITELIB}/chirp/stock_configs/US NOAA Weather Alert.csv
 ${PYSITELIB}/chirp/util.py
 ${PYSITELIB}/chirp/util.pyc
 ${PYSITELIB}/chirp/util.pyo
-man/man1/chirpw.1
-share/applications/chirp.desktop
-share/chirp/locale/de/LC_MESSAGES/CHIRP.mo
-share/chirp/locale/en_US/LC_MESSAGES/CHIRP.mo
-share/chirp/locale/es_ES/LC_MESSAGES/CHIRP.mo
-share/chirp/locale/fr/LC_MESSAGES/CHIRP.mo
-share/chirp/locale/hu/LC_MESSAGES/CHIRP.mo
-share/chirp/locale/it/LC_MESSAGES/CHIRP.mo
-share/chirp/locale/nl/LC_MESSAGES/CHIRP.mo
-share/chirp/locale/pl/LC_MESSAGES/CHIRP.mo
-share/chirp/locale/pt_BR/LC_MESSAGES/CHIRP.mo
-share/chirp/locale/ru/LC_MESSAGES/CHIRP.mo
-share/chirp/locale/tr_TR/LC_MESSAGES/CHIRP.mo
-share/chirp/locale/uk_UA/LC_MESSAGES/CHIRP.mo
-share/chirp/locale/zh_CN/LC_MESSAGES/CHIRP.mo
-share/chirp/stock_configs/DE Freenet Frequencies.csv
-share/chirp/stock_configs/EU LPD and PMR Channels.csv
-share/chirp/stock_configs/FR Marine VHF Channels.csv
-share/chirp/stock_configs/KDR444.csv
-share/chirp/stock_configs/NOAA Weather Alert.csv
-share/chirp/stock_configs/SE Jaktradio 155MHz.csv
-share/chirp/stock_configs/UK Business Radio Simple Light Frequencies.csv
-share/chirp/stock_configs/US 60 meter channels (Center).csv
-share/chirp/stock_configs/US 60 meter channels (Dial).csv
-share/chirp/stock_configs/US CA Railroad Channels.csv
-share/chirp/stock_configs/US Calling Frequencies.csv
-share/chirp/stock_configs/US FRS and GMRS Channels.csv
-share/chirp/stock_configs/US MURS Channels.csv
-share/chirp/stock_configs/US Marine VHF Channels.csv
-share/doc/chirp/COPYING
-share/pixmaps/chirp.png
-
+${PYSITELIB}/chirp/wxui/__init__.py
+${PYSITELIB}/chirp/wxui/__init__.pyc
+${PYSITELIB}/chirp/wxui/__init__.pyo
+${PYSITELIB}/chirp/wxui/__main__.py
+${PYSITELIB}/chirp/wxui/__main__.pyc
+${PYSITELIB}/chirp/wxui/__main__.pyo
+${PYSITELIB}/chirp/wxui/bankedit.py
+${PYSITELIB}/chirp/wxui/bankedit.pyc
+${PYSITELIB}/chirp/wxui/bankedit.pyo
+${PYSITELIB}/chirp/wxui/clone.py
+${PYSITELIB}/chirp/wxui/clone.pyc
+${PYSITELIB}/chirp/wxui/clone.pyo
+${PYSITELIB}/chirp/wxui/common.py
+${PYSITELIB}/chirp/wxui/common.pyc
+${PYSITELIB}/chirp/wxui/common.pyo
+${PYSITELIB}/chirp/wxui/config.py
+${PYSITELIB}/chirp/wxui/config.pyc
+${PYSITELIB}/chirp/wxui/config.pyo
+${PYSITELIB}/chirp/wxui/developer.py
+${PYSITELIB}/chirp/wxui/developer.pyc
+${PYSITELIB}/chirp/wxui/developer.pyo
+${PYSITELIB}/chirp/wxui/fips.py
+${PYSITELIB}/chirp/wxui/fips.pyc
+${PYSITELIB}/chirp/wxui/fips.pyo
+${PYSITELIB}/chirp/wxui/main.py
+${PYSITELIB}/chirp/wxui/main.pyc
+${PYSITELIB}/chirp/wxui/main.pyo
+${PYSITELIB}/chirp/wxui/memedit.py
+${PYSITELIB}/chirp/wxui/memedit.pyc
+${PYSITELIB}/chirp/wxui/memedit.pyo
+${PYSITELIB}/chirp/wxui/printing.py
+${PYSITELIB}/chirp/wxui/printing.pyc
+${PYSITELIB}/chirp/wxui/printing.pyo
+${PYSITELIB}/chirp/wxui/query_sources.py
+${PYSITELIB}/chirp/wxui/query_sources.pyc
+${PYSITELIB}/chirp/wxui/query_sources.pyo
+${PYSITELIB}/chirp/wxui/radioinfo.py
+${PYSITELIB}/chirp/wxui/radioinfo.pyc
+${PYSITELIB}/chirp/wxui/radioinfo.pyo
+${PYSITELIB}/chirp/wxui/radiothread.py
+${PYSITELIB}/chirp/wxui/radiothread.pyc
+${PYSITELIB}/chirp/wxui/radiothread.pyo
+${PYSITELIB}/chirp/wxui/report.py
+${PYSITELIB}/chirp/wxui/report.pyc
+${PYSITELIB}/chirp/wxui/report.pyo
+${PYSITELIB}/chirp/wxui/settingsedit.py
+${PYSITELIB}/chirp/wxui/settingsedit.pyc
+${PYSITELIB}/chirp/wxui/settingsedit.pyo

Index: pkgsrc/ham/chirp/distinfo
diff -u pkgsrc/ham/chirp/distinfo:1.32 pkgsrc/ham/chirp/distinfo:1.33
--- pkgsrc/ham/chirp/distinfo:1.32      Sat Dec 17 16:41:50 2022
+++ pkgsrc/ham/chirp/distinfo   Mon Aug 28 10:37:40 2023
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.32 2022/12/17 16:41:50 gdt Exp $
+$NetBSD: distinfo,v 1.33 2023/08/28 10:37:40 gdt Exp $
 
-BLAKE2s (chirp-daily-20221217.tar.gz) = df029a774cb4f23a5a786df413c8c32e31b0c2c714d3a9e497a1524477561542
-SHA512 (chirp-daily-20221217.tar.gz) = 3037d330617e1ef7880eefba4db1fb3ce19414c8d77b616233e586469fe8ef97ad5b87fed43deca1a7196fe4bcaf5d9b72e2c87593918b29af038e0eab939474
-Size (chirp-daily-20221217.tar.gz) = 1126192 bytes
-SHA1 (patch-chirp_platform.py) = f8c0f7ffb0fa08b2b3a591a9ccdf4efca7838646
-SHA1 (patch-chirp_ui_mainapp.py) = 4e201ed531a34800687fa1dcaa18c8406c22d925
-SHA1 (patch-setup.py) = 28302403b4cd397b9654aeead4ab7910164312c2
+BLAKE2s (chirp-20230823.tar.gz) = fb88dac55ef86d73858fc98e252d15732f4258c344ca394c447055f6d64a0d15
+SHA512 (chirp-20230823.tar.gz) = 029846d4ec64894681ff6e1edda80d4b964623e88b95d59b362cc66b11f6d04cc636725c1ee2ffa6701b5537173a51b6bb2c0d4012a2d46c56b07a0c75655154
+Size (chirp-20230823.tar.gz) = 1752116 bytes
+SHA1 (patch-chirp_platform.py) = ba7e65bb2f797f1ed9a6dc767ab02cde8b6ed61d

Index: pkgsrc/ham/chirp/patches/patch-chirp_platform.py
diff -u pkgsrc/ham/chirp/patches/patch-chirp_platform.py:1.2 pkgsrc/ham/chirp/patches/patch-chirp_platform.py:1.3
--- pkgsrc/ham/chirp/patches/patch-chirp_platform.py:1.2        Tue Aug 25 13:45:53 2020
+++ pkgsrc/ham/chirp/patches/patch-chirp_platform.py    Mon Aug 28 10:37:40 2023
@@ -1,23 +1,19 @@
-$NetBSD: patch-chirp_platform.py,v 1.2 2020/08/25 13:45:53 gdt Exp $
+$NetBSD: patch-chirp_platform.py,v 1.3 2023/08/28 10:37:40 gdt Exp $
 
-This software contains darwin specific tweaks which do not apply to pkgsrc
+Don't look for share other than in the right place.
+\todo File upstream.
+\todo Make upstream respect a configured share dir.
 
---- chirp/platform.py.orig     2017-10-12 18:01:04.000000000 +1100
-+++ chirp/platform.py  2020-07-03 15:33:43.225703607 +1000
-@@ -283,16 +283,6 @@
- 
-         Platform.__init__(self, basepath)
- 
--        # This is a hack that needs to be properly fixed by importing the
--        # latest changes to this module from d-rats.  In the interest of
--        # time, however, I'll throw it here
--        if sys.platform == "darwin":
--            if "DISPLAY" not in os.environ:
--                LOG.info("Forcing DISPLAY for MacOS")
--                os.environ["DISPLAY"] = ":0"
--
--            os.environ["PANGO_RC_FILE"] = "../Resources/etc/pango/pangorc"
--
-     def default_dir(self):
-         return os.path.abspath(os.getenv("HOME"))
- 
+--- chirp/platform.py.orig     2023-02-23 10:01:01.000000000 +0000
++++ chirp/platform.py
+@@ -117,10 +117,7 @@ class Platform:
+         """Searches for files installed to a share/ prefix."""
+         execpath = self.executable_path()
+         share_candidates = [
+-            os.path.join(execpath, "share"),
+             os.path.join(sys.prefix, "share"),
+-            "/usr/local/share",
+-            "/usr/share",
+         ]
+         pkgshare_candidates = [os.path.join(i, "chirp")
+                                for i in share_candidates]



Home | Main Index | Thread Index | Old Index