- Update to 1.2.11

- Adds a few more radios

5 files changed, 41 insertions, 13 deletions

diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 3d559a680b83..92dfab6dd950 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hamlib
-PORTVERSION=	1.2.10
+PORTVERSION=	1.2.11
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -35,6 +35,8 @@ post-patch:
 	${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' \
 		-e 's|%%TCL_LIBDIR%%|${TCL_LIBDIR}/hamlib|g' \
 		${WRKSRC}/bindings/Makefile.in
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/src/Makefile.in
 post-build:
 	${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' \
 		${WRKSRC}/bindings/Hamlib-pl.mk
diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo
index 794bf31f94db..e8186c9232ba 100644
--- a/comms/hamlib/distinfo
+++ b/comms/hamlib/distinfo
@@ -1,3 +1,3 @@
-MD5 (hamlib-1.2.10.tar.gz) = 29f0d30779a8ffe0444eb523a6ad8344
-SHA256 (hamlib-1.2.10.tar.gz) = 9b50825666519b0b86469f1988a0de09ce2ffc08fa221f9aa40d18c7b7f6c651
-SIZE (hamlib-1.2.10.tar.gz) = 1799309
+MD5 (hamlib-1.2.11.tar.gz) = 1070bba54fb1fb1d538bda6605c07a6c
+SHA256 (hamlib-1.2.11.tar.gz) = 9687a94a6cb9cee7e3daa12630f36a7ce64c9024d58fb3880b4842253fa26147
+SIZE (hamlib-1.2.11.tar.gz) = 1846225
diff --git a/comms/hamlib/files/patch-bindings_Makefile.in b/comms/hamlib/files/patch-bindings_Makefile.in
index 71c1531c5d16..5a50b677b722 100644
--- a/comms/hamlib/files/patch-bindings_Makefile.in
+++ b/comms/hamlib/files/patch-bindings_Makefile.in
@@ -1,16 +1,16 @@
---- bindings/Makefile.in.orig	2009-11-02 17:21:43.000000000 -0500
-+++ bindings/Makefile.in	2009-11-02 19:57:15.000000000 -0500
-@@ -307,7 +307,7 @@
+--- bindings/Makefile.in.orig	2010-05-31 17:50:12.000000000 -0400
++++ bindings/Makefile.in	2010-06-09 14:38:22.000000000 -0400
+@@ -318,7 +318,7 @@
  program_transform_name = @program_transform_name@
  psdir = @psdir@
  pyexecdir = @pyexecdir@
--pythondir = $(prefix)/lib/python
+-pythondir = @pythondir@
 +pythondir = %%PYTHON_SITELIBDIR%%
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
-@@ -329,7 +329,7 @@
- 	Hamlib.bs hamlibpy_wrap.c Hamlib.py *.pyc
+@@ -340,7 +340,7 @@
+ 	hamlibperl_wrap.c Hamlib.pm Hamlib.bs
  AM_CFLAGS = -fno-strict-aliasing
  @ENABLE_TCL_TRUE@tcl_ltlib = hamlibtcl.la
 -@ENABLE_TCL_TRUE@tcldir = $(prefix)/lib/tcl
diff --git a/comms/hamlib/files/patch-src_Makefile.in b/comms/hamlib/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..380c3cab02f3
--- /dev/null
+++ b/comms/hamlib/files/patch-src_Makefile.in
@@ -0,0 +1,20 @@
+--- src/Makefile.in.orig	2010-06-09 15:54:55.000000000 -0400
++++ src/Makefile.in	2010-06-09 15:57:22.000000000 -0400
+@@ -100,7 +100,7 @@
+ libhamlib_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libhamlib_la_CFLAGS) \
+ 	$(CFLAGS) $(libhamlib_la_LDFLAGS) $(LDFLAGS) -o $@
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include -I/usr/local/include
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+@@ -178,7 +178,7 @@
+ LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
+ LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = -L%%LOCALBASE%%/lib
+ LIBTOOL = @LIBTOOL@
+ LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
+ LIBUSB_LIBS = @LIBUSB_LIBS@
diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist
index 5b942a809d9f..cf05fe8f39ff 100644
--- a/comms/hamlib/pkg-plist
+++ b/comms/hamlib/pkg-plist
@@ -12,15 +12,15 @@ include/hamlib/riglist.h
 include/hamlib/rotator.h
 include/hamlib/rotclass.h
 include/hamlib/rotlist.h
-lib/_Hamlib.a
-lib/_Hamlib.la
-lib/_Hamlib.so
 lib/hamlib-alinco.a
 lib/hamlib-alinco.la
 lib/hamlib-alinco.so
 lib/hamlib-aor.a
 lib/hamlib-aor.la
 lib/hamlib-aor.so
+lib/hamlib-ars.a
+lib/hamlib-ars.la
+lib/hamlib-ars.so
 lib/hamlib-drake.a
 lib/hamlib-drake.la
 lib/hamlib-drake.so
@@ -60,6 +60,9 @@ lib/hamlib-kit.so
 lib/hamlib-lowe.a
 lib/hamlib-lowe.la
 lib/hamlib-lowe.so
+lib/hamlib-m2.a
+lib/hamlib-m2.la
+lib/hamlib-m2.so
 lib/hamlib-pcr.a
 lib/hamlib-pcr.la
 lib/hamlib-pcr.so
@@ -133,6 +136,9 @@ share/aclocal/hamlib.m4
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/Hamlib.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/Hamlib.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/perltest.pl
+%%PYTHON_SITELIBDIR%%/_Hamlib.so
+%%PYTHON_SITELIBDIR%%/_Hamlib.la
+%%PYTHON_SITELIBDIR%%/_Hamlib.a
 %%PYTHON_SITELIBDIR%%/Hamlib.py
 %%PYTHON_SITELIBDIR%%/Hamlib.pyc
 %%PYTHON_SITELIBDIR%%/Hamlib.pyo