From f3c20d2c3e6c0f1bfb054b8db734b483346f7314 Mon Sep 17 00:00:00 2001 From: gdt Date: Sun, 14 Feb 2016 13:24:03 +0000 Subject: Update to 3.0.1. Packaging changes: Drop MAKE_JOBS_SAFE=no; it seems to build fine with -j4. Clean up workarounds for resolved issues. Drop rpc conditional, because upstream removed rpc entirely Upstream changes: Many bug fixes and new radios. Drop RPC. Rototill build system. Add readline support (not packaged yet). Change to single library instead of many. --- ham/hamlib/Makefile | 24 +++++------------------ ham/hamlib/PLIST | 48 ++++----------------------------------------- ham/hamlib/distinfo | 12 +++++------- ham/hamlib/patches/patch-ac | 22 --------------------- ham/hamlib/patches/patch-ad | 22 --------------------- 5 files changed, 14 insertions(+), 114 deletions(-) delete mode 100644 ham/hamlib/patches/patch-ac delete mode 100644 ham/hamlib/patches/patch-ad (limited to 'ham/hamlib') diff --git a/ham/hamlib/Makefile b/ham/hamlib/Makefile index 267f7b423dc..390e73eb4da 100644 --- a/ham/hamlib/Makefile +++ b/ham/hamlib/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2015/06/12 10:50:14 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2016/02/14 13:24:03 gdt Exp $ # -DISTNAME= hamlib-1.2.15.3 -PKGREVISION= 3 +DISTNAME= hamlib-3.0.1 CATEGORIES= ham MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hamlib/} @@ -11,35 +10,22 @@ HOMEPAGE= http://hamlib.sourceforge.net/ COMMENT= API for digital communications equipment LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 -# As of 2012-11-02, there seems to be no good reason to set this. -MAKE_JOBS_SAFE= no - USE_LANGUAGES= c c++ USE_TOOLS+= gmake GNU_CONFIGURE= yes +INFO_FILES= yes USE_LIBTOOL= yes +# \todo Consider language bindings. CONFIGURE_ARGS+=--without-tcl-binding \ --without-perl-binding \ --without-python-binding .include "../../mk/bsd.prefs.mk" -PLIST_VARS+= rpc - -.if ${OS_VARIANT} == "SmartOS" -CONFIGURE_ARGS+= --without-rpc-backends -.else -PLIST.rpc= yes -.endif - -# The configure script is broken. It even requires a Python interpreter -# when none is needed. -CONFIGURE_ENV+= PYTHON=/nonexistent - TEST_TARGET= check -INSTALLATION_DIRS= include/hamlib +# \todo Consider adding readline. .include "../../devel/libltdl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/ham/hamlib/PLIST b/ham/hamlib/PLIST index 41db9c4abad..cc8a756d136 100644 --- a/ham/hamlib/PLIST +++ b/ham/hamlib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2014/01/10 11:14:44 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.15 2016/02/14 13:24:03 gdt Exp $ bin/rigctl bin/rigctld bin/rigmem @@ -13,45 +13,7 @@ include/hamlib/riglist.h include/hamlib/rotator.h include/hamlib/rotclass.h include/hamlib/rotlist.h -lib/hamlib/hamlib-adat.la -lib/hamlib/hamlib-alinco.la -lib/hamlib/hamlib-amsat.la -lib/hamlib/hamlib-aor.la -lib/hamlib/hamlib-ars.la -lib/hamlib/hamlib-celestron.la -lib/hamlib/hamlib-drake.la -lib/hamlib/hamlib-dummy.la -lib/hamlib/hamlib-easycomm.la -lib/hamlib/hamlib-flexradio.la -lib/hamlib/hamlib-fodtrack.la -lib/hamlib/hamlib-gs232a.la -lib/hamlib/hamlib-heathkit.la -lib/hamlib/hamlib-icom.la -lib/hamlib/hamlib-jrc.la -lib/hamlib/hamlib-kachina.la -lib/hamlib/hamlib-kenwood.la -lib/hamlib/hamlib-kit.la -lib/hamlib/hamlib-lowe.la -lib/hamlib/hamlib-m2.la -lib/hamlib/hamlib-pcr.la -lib/hamlib/hamlib-prm80.la -lib/hamlib/hamlib-racal.la -lib/hamlib/hamlib-rft.la -lib/hamlib/hamlib-rotorez.la -${PLIST.rpc}lib/hamlib/hamlib-rpcrig.la -${PLIST.rpc}lib/hamlib/hamlib-rpcrot.la -lib/hamlib/hamlib-rs.la -lib/hamlib/hamlib-sartek.la -lib/hamlib/hamlib-skanti.la -lib/hamlib/hamlib-spid.la -lib/hamlib/hamlib-tapr.la -lib/hamlib/hamlib-tentec.la -lib/hamlib/hamlib-ts7400.la -lib/hamlib/hamlib-tuner.la -lib/hamlib/hamlib-uniden.la -lib/hamlib/hamlib-winradio.la -lib/hamlib/hamlib-wj.la -lib/hamlib/hamlib-yaesu.la +info/hamlib.info lib/libhamlib++.la lib/libhamlib.la lib/pkgconfig/hamlib.pc @@ -62,8 +24,6 @@ man/man1/rigswr.1 man/man1/rotctl.1 man/man8/rigctld.8 man/man8/rotctld.8 -${PLIST.rpc}man/man8/rpc.rigd.8 -${PLIST.rpc}man/man8/rpc.rotd.8 -${PLIST.rpc}sbin/rpc.rigd -${PLIST.rpc}sbin/rpc.rotd share/aclocal/hamlib.m4 +share/doc/hamlib/Hamlib_design.png +share/doc/hamlib/hamlib.html diff --git a/ham/hamlib/distinfo b/ham/hamlib/distinfo index e9d30977691..104db957072 100644 --- a/ham/hamlib/distinfo +++ b/ham/hamlib/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.18 2015/11/02 23:57:24 agc Exp $ +$NetBSD: distinfo,v 1.19 2016/02/14 13:24:03 gdt Exp $ -SHA1 (hamlib-1.2.15.3.tar.gz) = 15ab404ea37e5627abea89f9e051d393966918ba -RMD160 (hamlib-1.2.15.3.tar.gz) = 62abf92bf53dedd06f4aff3a49342108fb02c8d5 -SHA512 (hamlib-1.2.15.3.tar.gz) = 88f9cb8d82d813ac02944def0adf6eada0e4ed1407f60e344d51172462d51ab0c3ddd9cbf9ef8cbd61efba6c4158a77acb7c23b886e174c9a082bf1dd11f5baa -Size (hamlib-1.2.15.3.tar.gz) = 1675879 bytes -SHA1 (patch-ac) = 6637c3973904e64f4d34e41b02736086f45bc264 -SHA1 (patch-ad) = 10de5555c2aa1eb52e3ec8352781dc01fe937134 +SHA1 (hamlib-3.0.1.tar.gz) = 2263b77775b6bf86e0c9b0ac22d4df60119dfffe +RMD160 (hamlib-3.0.1.tar.gz) = 1636e379e35786eb8d2385679fdc387d60817e4c +SHA512 (hamlib-3.0.1.tar.gz) = c71d76343092da03dd3bd8470494fe9bd2789597ab3c83a5c98e007c94016c59de21cdbfb461fa6093e27ca8f300cfed65b4ba7e579b3070c6ed0bf6a4de38b2 +Size (hamlib-3.0.1.tar.gz) = 2074254 bytes diff --git a/ham/hamlib/patches/patch-ac b/ham/hamlib/patches/patch-ac deleted file mode 100644 index 3da8dadc3d3..00000000000 --- a/ham/hamlib/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2012/08/07 12:21:54 gdt Exp $ - -This patch was added in 2003, to "make this work with rpcgen that -exports _rpcsvcdirty incorrectly". - -It is not known to be reported upstream. - ---- rpcrig/rpcrigd.c.orig 2012-01-08 02:53:57.000000000 +0000 -+++ rpcrig/rpcrigd.c -@@ -43,6 +43,12 @@ - - #include - -+#ifdef __NetBSD__ -+#include -+#if (__NetBSD_Version__ < 106210000) -+int _rpcsvcdirty; -+#endif -+#endif - - - /* diff --git a/ham/hamlib/patches/patch-ad b/ham/hamlib/patches/patch-ad deleted file mode 100644 index 27d3c76964f..00000000000 --- a/ham/hamlib/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2012/08/07 12:21:54 gdt Exp $ - -This patch was added in 2003, to "make this work with rpcgen that -exports _rpcsvcdirty incorrectly". - -It is not known to be reported upstream. - ---- rpcrot/rpcrotd.c.orig 2012-01-08 02:54:30.000000000 +0000 -+++ rpcrot/rpcrotd.c -@@ -43,6 +43,12 @@ - - #include - -+#ifdef __NetBSD__ -+#include -+#if (__NetBSD_Version__ < 106210000) -+int _rpcsvcdirty; -+#endif -+#endif - - /* - * Prototypes -- cgit v1.2.3