- Update to 1.2.10

- Add port docs

6 files changed, 55 insertions, 80 deletions

diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 46742dfab8b7..3d559a680b83 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hamlib
-PORTVERSION=	1.2.9
+PORTVERSION=	1.2.10
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -24,7 +24,7 @@ USE_AUTOTOOLS=	autoconf:262 libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-perl-binding --with-python=${PYTHON_CMD} \
-		--with-tcl=${TCL_LIBDIR} --with-tcl-binding \
+		--enable-tcl-binding --with-tcl=${TCL_LIBDIR} \
 		--with-python-binding --without-with-rigmatrix
 PLIST_SUB=	VER=${PORTVERSION} TCL_VER=${TCL_VER}
 
@@ -39,4 +39,19 @@ post-build:
 	${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' \
 		${WRKSRC}/bindings/Hamlib-pl.mk
 
+post-install:
+.if	!defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for d in ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB \
+	${WRKSRC}/ChangeLog ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE \
+	${WRKSRC}/NEWS ${WRKSRC}/PLAN ${WRKSRC}/README \
+	${WRKSRC}/README.betatester ${WRKSRC}/README.win32 \
+	${WRKSRC}/THANKS
+	${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
+.endfor
+	@${ECHO}
+	@${ECHO} "docs installed in ${DOCSDIR}"
+	@${ECHO}
+.endif
+
 .include <bsd.port.mk>
diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo
index 17a286597739..794bf31f94db 100644
--- a/comms/hamlib/distinfo
+++ b/comms/hamlib/distinfo
@@ -1,3 +1,3 @@
-MD5 (hamlib-1.2.9.tar.gz) = 9515288826284d6c8dd569354dacc8e0
-SHA256 (hamlib-1.2.9.tar.gz) = ba75e64e1b6d5ffaa41e2063e475eca5b35ad68cb4ee6e888e0fc73bd6fa9fba
-SIZE (hamlib-1.2.9.tar.gz) = 1611457
+MD5 (hamlib-1.2.10.tar.gz) = 29f0d30779a8ffe0444eb523a6ad8344
+SHA256 (hamlib-1.2.10.tar.gz) = 9b50825666519b0b86469f1988a0de09ce2ffc08fa221f9aa40d18c7b7f6c651
+SIZE (hamlib-1.2.10.tar.gz) = 1799309
diff --git a/comms/hamlib/files/patch-bindings_Makefile.in b/comms/hamlib/files/patch-bindings_Makefile.in
index 51f5a14e1393..71c1531c5d16 100644
--- a/comms/hamlib/files/patch-bindings_Makefile.in
+++ b/comms/hamlib/files/patch-bindings_Makefile.in
@@ -1,6 +1,6 @@
---- bindings/Makefile.in.orig	2009-02-25 14:18:37.000000000 -0500
-+++ bindings/Makefile.in	2009-02-25 19:53:13.000000000 -0500
-@@ -268,7 +268,7 @@
+--- 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 @@
  program_transform_name = @program_transform_name@
  psdir = @psdir@
  pyexecdir = @pyexecdir@
@@ -9,12 +9,12 @@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
-@@ -287,7 +287,7 @@
- ##########################################
- # Tcl binding
- tcl_ltlib = hamlibtcl.la
--tcldir = $(prefix)/lib/tcl
-+tcldir = %%TCL_LIBDIR%%
- PKG_VER = 1.0
- DLL = hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
- nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
+@@ -329,7 +329,7 @@
+ 	Hamlib.bs hamlibpy_wrap.c Hamlib.py *.pyc
+ AM_CFLAGS = -fno-strict-aliasing
+ @ENABLE_TCL_TRUE@tcl_ltlib = hamlibtcl.la
+-@ENABLE_TCL_TRUE@tcldir = $(prefix)/lib/tcl
++@ENABLE_TCL_TRUE@tcldir = %%TCL_LIBDIR%%
+ @ENABLE_TCL_TRUE@PKG_VER = 1.0
+ @ENABLE_TCL_TRUE@DLL = hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
+ @ENABLE_TCL_TRUE@nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
diff --git a/comms/hamlib/files/patch-libltdl_configure b/comms/hamlib/files/patch-libltdl_configure
deleted file mode 100644
index 81c4b4842694..000000000000
--- a/comms/hamlib/files/patch-libltdl_configure
+++ /dev/null
@@ -1,46 +0,0 @@
---- libltdl/configure.orig	Thu Feb 22 14:24:59 2007
-+++ libltdl/configure	Thu Feb 22 14:24:59 2007
-@@ -8189,8 +8189,8 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
-+#  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-elf
-   case $version_type in
-     freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -11897,8 +11897,8 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
-+#  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-elf
-   case $version_type in
-     freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -15050,8 +15050,8 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
-+#  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-elf
-   case $version_type in
-     freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -17412,8 +17412,8 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
-+#  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-elf
-   case $version_type in
-     freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
diff --git a/comms/hamlib/files/patch-macros_libtools.m4 b/comms/hamlib/files/patch-macros_libtools.m4
deleted file mode 100644
index 28b9a2d99737..000000000000
--- a/comms/hamlib/files/patch-macros_libtools.m4
+++ /dev/null
@@ -1,13 +0,0 @@
---- macros/libtool.m4.orig	Sun Apr  3 16:25:10 2005
-+++ macros/libtool.m4	Thu Feb 22 14:24:59 2007
-@@ -1300,8 +1300,8 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
-+#  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-elf
-   case $version_type in
-     freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist
index 8e4d96e5aa89..5b942a809d9f 100644
--- a/comms/hamlib/pkg-plist
+++ b/comms/hamlib/pkg-plist
@@ -78,12 +78,18 @@ lib/hamlib-rpcrig.so
 lib/hamlib-rpcrot.a
 lib/hamlib-rpcrot.la
 lib/hamlib-rpcrot.so
+lib/hamlib-rs.a
+lib/hamlib-rs.la
+lib/hamlib-rs.so
 lib/hamlib-sartek.a
 lib/hamlib-sartek.la
 lib/hamlib-sartek.so
 lib/hamlib-skanti.a
 lib/hamlib-skanti.la
 lib/hamlib-skanti.so
+lib/hamlib-spid.a
+lib/hamlib-spid.la
+lib/hamlib-spid.so
 lib/hamlib-tapr.a
 lib/hamlib-tapr.la
 lib/hamlib-tapr.so
@@ -118,6 +124,10 @@ lib/libhamlib.so
 lib/libhamlib.so.2
 lib/libhamlib.a
 lib/libhamlib.la
+libdata/pkgconfig/hamlib.pc
+sbin/rpc.rigd
+sbin/rpc.rotd
+share/aclocal/hamlib.m4
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/Hamlib.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/Hamlib.bs
@@ -126,10 +136,19 @@ lib/libhamlib.la
 %%PYTHON_SITELIBDIR%%/Hamlib.py
 %%PYTHON_SITELIBDIR%%/Hamlib.pyc
 %%PYTHON_SITELIBDIR%%/Hamlib.pyo
-libdata/pkgconfig/hamlib.pc
-sbin/rpc.rigd
-sbin/rpc.rotd
-share/aclocal/hamlib.m4
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/PLAN
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.betatester
+%%PORTDOCS%%%%DOCSDIR%%/README.win32
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
 @dirrm lib/tcl%%TCL_VER%%/hamlib
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib
 @dirrm include/hamlib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%