Hi,

comms/hamlib is too old to try building jtdx FT8 decoder.
here is the diff to bump up hamlib-4.4 but this has some problems.

- python binding is still for python2
- comms/tlf and comms/xlog needs update due to compile error
  (no problems for fldigi and gpsk31)

if there is good idea to solve them, please tell me.

Regards,
-- 
SASANO Takayoshi (JG1UAA) <[email protected]>

Index: Makefile
===================================================================
RCS file: /cvs/ports/comms/hamlib/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile    22 Nov 2021 13:55:54 -0000      1.43
+++ Makefile    2 Jan 2022 07:16:21 -0000
@@ -4,23 +4,19 @@ COMMENT-main= radio/rotator control libr
 COMMENT-python=        python bindings for hamlib
 COMMENT-tcl=   tcl bindings for hamlib
 
-VERSION=       1.2.15.3
+VERSION=       4.4
 DISTNAME=      hamlib-${VERSION}
 CATEGORIES=    comms hamradio
-REVISION-main= 6
-REVISION-python=1
-REVISION-tcl=  2
 
 MULTI_PACKAGES=        -main -python -tcl
 
-SHARED_LIBS += hamlib               3.0      # 2.16
-SHARED_LIBS += hamlib++             3.0      # 2.16
+SHARED_LIBS += hamlib               3.0      # 4.4
+SHARED_LIBS += hamlib++             3.0      # 4.4
 
 HOMEPAGE=      http://hamlib.sourceforge.net/
 
 MODULES=       lang/python \
                lang/tcl
-MODPY_VERSION =        ${MODPY_DEFAULT_VERSION_2}
 
 # GPLv2/LGPLv2.1
 PERMIT_PACKAGE=        Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/comms/hamlib/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo    20 Apr 2013 14:58:01 -0000      1.3
+++ distinfo    2 Jan 2022 07:16:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (hamlib-1.2.15.3.tar.gz) = ospFSeT9mdblYA41Try1dQJhGqY8aSHBuKglKJgz914=
-SIZE (hamlib-1.2.15.3.tar.gz) = 1675879
+SHA256 (hamlib-4.4.tar.gz) = i/AQewcfUvCFh/OOLe6KeEjeE0NDWzJvj2bZXh+KJIc=
+SIZE (hamlib-4.4.tar.gz) = 2401399
Index: patches/patch-rpcrig_rpcrigd_c
===================================================================
RCS file: patches/patch-rpcrig_rpcrigd_c
diff -N patches/patch-rpcrig_rpcrigd_c
--- patches/patch-rpcrig_rpcrigd_c      20 Apr 2013 14:58:01 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-rpcrig_rpcrigd_c,v 1.2 2013/04/20 14:58:01 sthen Exp $
---- rpcrig/rpcrigd.c.orig      Thu Nov  1 21:27:27 2012
-+++ rpcrig/rpcrigd.c   Sun Apr 14 22:00:44 2013
-@@ -43,7 +43,9 @@
- 
- #include <hamlib/rig.h>
- 
--
-+#ifdef __OpenBSD__
-+int _rpcsvcdirty;
-+#endif
- 
- /*
-  * Prototypes
Index: patches/patch-rpcrot_rpcrot_proc_c
===================================================================
RCS file: patches/patch-rpcrot_rpcrot_proc_c
diff -N patches/patch-rpcrot_rpcrot_proc_c
--- patches/patch-rpcrot_rpcrot_proc_c  20 Apr 2013 14:58:01 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-rpcrot_rpcrot_proc_c,v 1.2 2013/04/20 14:58:01 sthen Exp $
-
-Fix 64-bit issues.
-
---- rpcrot/rpcrot_proc.c.orig  Thu Nov  1 21:27:27 2012
-+++ rpcrot/rpcrot_proc.c       Sun Apr 14 22:00:44 2013
-@@ -24,6 +24,7 @@
- #include "config.h"
- #endif
- 
-+#include <string.h>
- 
- #include <rpc/rpc.h>
- #include "rpcrot.h"
Index: patches/patch-rpcrot_rpcrotd_c
===================================================================
RCS file: patches/patch-rpcrot_rpcrotd_c
diff -N patches/patch-rpcrot_rpcrotd_c
--- patches/patch-rpcrot_rpcrotd_c      20 Apr 2013 14:58:01 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-rpcrot_rpcrotd_c,v 1.2 2013/04/20 14:58:01 sthen Exp $
---- rpcrot/rpcrotd.c.orig      Thu Nov  1 21:27:27 2012
-+++ rpcrot/rpcrotd.c   Sun Apr 14 22:00:44 2013
-@@ -43,6 +43,9 @@
- 
- #include <hamlib/rotator.h>
- 
-+#ifdef __OpenBSD__
-+int _rpcsvcdirty;
-+#endif
- 
- /*
-  * Prototypes
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/comms/hamlib/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main      14 Jun 2014 10:34:44 -0000      1.4
+++ pkg/PLIST-main      2 Jan 2022 07:16:21 -0000
@@ -1,12 +1,19 @@
 @comment $OpenBSD: PLIST-main,v 1.4 2014/06/14 10:34:44 sthen Exp $
+@bin bin/ampctl
+@bin bin/ampctld
 @bin bin/rigctl
+@bin bin/rigctlcom
 @bin bin/rigctld
 @bin bin/rigmem
 @bin bin/rigsmtr
 @bin bin/rigswr
+@bin bin/rigtestlibusb
 @bin bin/rotctl
 @bin bin/rotctld
 include/hamlib/
+include/hamlib/ampclass.h
+include/hamlib/amplifier.h
+include/hamlib/amplist.h
 include/hamlib/rig.h
 include/hamlib/rig_dll.h
 include/hamlib/rigclass.h
@@ -14,70 +21,49 @@ include/hamlib/riglist.h
 include/hamlib/rotator.h
 include/hamlib/rotclass.h
 include/hamlib/rotlist.h
-lib/hamlib/
-lib/hamlib/hamlib-adat.so
-lib/hamlib/hamlib-alinco.so
-lib/hamlib/hamlib-amsat.so
-lib/hamlib/hamlib-aor.so
-lib/hamlib/hamlib-ars.so
-lib/hamlib/hamlib-celestron.so
-lib/hamlib/hamlib-drake.so
-lib/hamlib/hamlib-dummy.so
-lib/hamlib/hamlib-easycomm.so
-lib/hamlib/hamlib-flexradio.so
-lib/hamlib/hamlib-fodtrack.so
-lib/hamlib/hamlib-gs232a.so
-lib/hamlib/hamlib-heathkit.so
-lib/hamlib/hamlib-icom.so
-lib/hamlib/hamlib-jrc.so
-lib/hamlib/hamlib-kachina.so
-lib/hamlib/hamlib-kenwood.so
-lib/hamlib/hamlib-kit.so
-lib/hamlib/hamlib-lowe.so
-lib/hamlib/hamlib-m2.so
-lib/hamlib/hamlib-pcr.so
-lib/hamlib/hamlib-prm80.so
-lib/hamlib/hamlib-racal.so
-lib/hamlib/hamlib-rft.so
-lib/hamlib/hamlib-rotorez.so
-lib/hamlib/hamlib-rpcrig.so
-lib/hamlib/hamlib-rpcrot.so
-lib/hamlib/hamlib-rs.so
-lib/hamlib/hamlib-sartek.so
-lib/hamlib/hamlib-skanti.so
-lib/hamlib/hamlib-spid.so
-lib/hamlib/hamlib-tapr.so
-lib/hamlib/hamlib-tentec.so
-lib/hamlib/hamlib-ts7400.so
-lib/hamlib/hamlib-tuner.so
-lib/hamlib/hamlib-uniden.so
-lib/hamlib/hamlib-winradio.so
-lib/hamlib/hamlib-wj.so
-lib/hamlib/hamlib-yaesu.so
 lib/libhamlib++.la
 @lib lib/libhamlib++.so.${LIBhamlib++_VERSION}
 lib/libhamlib.la
 @lib lib/libhamlib.so.${LIBhamlib_VERSION}
 lib/pkgconfig/hamlib.pc
-@comment libdata/perl5/${MACHINE_ARCH}-openbsd/
 @comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.16.3/
 @comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.16.3/perllocal.pod
+lib/python${MODPY_VERSION}/
+lib/python${MODPY_VERSION}/site-packages/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}Hamlib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}Hamlib.${MODPY_PYC_MAGIC_TAG}pyc
+@comment libdata/perl5/${MACHINE_ARCH}-openbsd/
+libdata/perl5/${MACHINE_ARCH}-openbsd/perllocal.pod
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Hamlib.pm
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Hamlib/
 @comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Hamlib/Hamlib.bs
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Hamlib/Hamlib.so
+@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Hamlib/Hamlib.so
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/perltest.pl
+@man man/man1/ampctl.1
+@man man/man1/ampctld.1
 @man man/man1/rigctl.1
+@man man/man1/rigctlcom.1
+@man man/man1/rigctld.1
 @man man/man1/rigmem.1
 @man man/man1/rigsmtr.1
 @man man/man1/rigswr.1
 @man man/man1/rotctl.1
-@man man/man8/rigctld.8
-@man man/man8/rotctld.8
-@man man/man8/rpc.rigd.8
-@man man/man8/rpc.rotd.8
-@bin sbin/rpc.rigd
-@bin sbin/rpc.rotd
+@man man/man1/rotctld.1
+@man man/man7/hamlib-primer.7
+@man man/man7/hamlib-utilities.7
+@man man/man7/hamlib.7
 share/aclocal/hamlib.m4
+share/doc/hamlib/
+share/doc/hamlib/COPYING
+share/doc/hamlib/COPYING.LIB
+share/doc/hamlib/ChangeLog
+share/doc/hamlib/LICENSE
+share/doc/hamlib/README
+share/doc/hamlib/README.betatester
+share/doc/hamlib/README.developer
+share/doc/hamlib/examples/
+share/doc/hamlib/examples/perltest.pl
+share/doc/hamlib/examples/py3test.py
Index: pkg/PLIST-python
===================================================================
RCS file: /cvs/ports/comms/hamlib/pkg/PLIST-python,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-python
--- pkg/PLIST-python    20 Apr 2013 14:58:01 -0000      1.2
+++ pkg/PLIST-python    2 Jan 2022 07:16:21 -0000
@@ -1,8 +1,4 @@
 @comment $OpenBSD: PLIST-python,v 1.2 2013/04/20 14:58:01 sthen Exp $
-lib/python${MODPY_VERSION}/
-lib/python${MODPY_VERSION}/site-packages/
 lib/python${MODPY_VERSION}/site-packages/Hamlib.py
-lib/python${MODPY_VERSION}/site-packages/Hamlib.pyc
-lib/python${MODPY_VERSION}/site-packages/Hamlib.pyo
 lib/python${MODPY_VERSION}/site-packages/_Hamlib.la
-lib/python${MODPY_VERSION}/site-packages/_Hamlib.so
+@so lib/python${MODPY_VERSION}/site-packages/_Hamlib.so
Index: pkg/PLIST-tcl
===================================================================
RCS file: /cvs/ports/comms/hamlib/pkg/PLIST-tcl,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-tcl
--- pkg/PLIST-tcl       15 May 2018 11:02:50 -0000      1.3
+++ pkg/PLIST-tcl       2 Jan 2022 07:16:21 -0000
@@ -1,5 +1 @@
 @comment $OpenBSD: PLIST-tcl,v 1.3 2018/05/15 11:02:50 espie Exp $
-lib/hamlibtcl-1.0.so
-lib/hamlibtcl.la
-lib/hamlibtcl.so
-lib/tcl/pkgIndex.tcl

Reply via email to