- Update to 1.2.0

PR:		ports/63013, ports/65758
Submitted by:	Sebastian Yepes F. [ESN] <esn@x123.info> (maintainer)
		Carl Makin <carl@stagecraft.cx>

4 files changed, 99 insertions, 31 deletions

diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 746200b1f41c..528bcf5fc895 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	hamlib
-PORTVERSION=	1.1.4
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,24 +17,48 @@ COMMENT=	Shared libraries for Amateur Radio Equipment Control Applications
 
 USE_PERL5=	yes
 USE_LIBTOOL_VER=	13
+USE_GNOME=	pkgconfig gnomehack
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--with-perl-binding
 
-MAN1=		rigctl.1 rotctl.1
+MAN1=		rigctl.1 rigmem.1 rotctl.1
 MAN8=		rpc.rigd.8 rpc.rotd.8
 
+.if defined(WITH_PYTHON)
+USE_PYTHON=	yes
+.endif
+
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_XML)
+USE_GNOME+=	libxml2
+PLIST_SUB+=	XML=""
+.else
+CONFIGURE_ARGS+=	--disable-xmltest
+PLIST_SUB+=	XML="@comment "
+.endif
+
 .if defined(WITH_TCL)
-LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
-CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl8.3
+LIB_DEPENDS+=	tcl84.1:${PORTSDIR}/lang/tcl84
+CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl8.4 --with-tcl-binding
 PLIST_SUB+=	TCL=""
 .else
-CONFIGURE_ARGS+=	--without-with-tcl --without-with-tcl-binding
+CONFIGURE_ARGS+=	--without-tcl-binding
 PLIST_SUB+=	TCL="@comment "
 .endif
 
+.if defined(WITH_PYTHON)
+BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
+CONFIGURE_ARGS+=	--with-python-binding
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=	--without-python-binding
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
 .if defined(WITH_RIGMATRIX)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
+LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
 CONFIGURE_ARGS+=	--with-rigmatrix
 PLIST_SUB+=	RIGMATRIX=""
 .else
@@ -47,34 +70,30 @@ PLIST_SUB+=	RIGMATRIX="@comment "
 CONFIGURE_ARGS+=	--with-gnuradio
 PLIST_SUB+=	GNURADIO=""
 .else
-CONFIGURE_ARGS+=	--without-with-gnuradio
-PLIST_SUB+=	GNURADIO="@comment "
-.endif
-
-.if defined(WITH_MICROTUNE)
-CONFIGURE_ARGS+=	--with-microtune
-PLIST_SUB+=	MICROTUNE=""
-.else
-CONFIGURE_ARGS+=	--without-with-microtune
-PLIST_SUB+=	MICROTUNE="@comment "
+CONFIGURE_ARGS+=	--without-gnuradio
+LIST_SUB+=	GNURADIO="@comment "
 .endif
 
 pre-everything::
-.if !defined(WITH_TCL) || !defined(WITH_RIGMATRIX)
+.if !defined(WITH_TCL) || !defined(WITH_PYTHON) || !defined(WITH_RIGMATRIX)
 	@${ECHO_MSG} "You can specify the following command lines:"
 	@${ECHO_MSG} ""
 .endif
+.if !defined(WITH_XML)
+	@${ECHO_MSG} "WITH_XML=yes		for XML support"
+.endif
 .if !defined(WITH_TCL)
-	@${ECHO_MSG} "WITH_TCL=yes for TCL support"
+	@${ECHO_MSG} "WITH_TCL=yes		for TCL Binding support"
+.endif
+.if !defined(WITH_PYTHON)
+	@${ECHO_MSG} "WITH_PYTHON=yes		for PYTHON Binding support"
 .endif
 .if !defined(WITH_RIGMATRIX)
-	@${ECHO_MSG} "WITH_RIGMATRIX=yes for RigMatrix support"
+	@${ECHO_MSG} "WITH_RIGMATRIX=yes	for RigMatrix support"
 .endif
 #.if !defined(WITH_GNURADIO)
-#	@${ECHO_MSG} "WITH_GNURADIO=yes for GNURadio support"
-#.endif
-#.if !defined(WITH_MICROTUNE)
-#	@${ECHO_MSG} "WITH_MICROTUNE=yes for MicroTune support"
+#	@${ECHO_MSG} "WITH_GNURADIO=yes		for GNURadio support"
 #.endif
+	@${ECHO_MSG} ""
 
 .include <bsd.port.post.mk>
diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo
index 0c9dd3d7b993..48f40fc4f47f 100644
--- a/comms/hamlib/distinfo
+++ b/comms/hamlib/distinfo
@@ -1,2 +1,2 @@
-MD5 (hamlib-1.1.4.tar.gz) = 237ade25307979c3a7226a53e3b06a84
-SIZE (hamlib-1.1.4.tar.gz) = 1246501
+MD5 (hamlib-1.2.0.tar.gz) = 3f683a2eb8c2bb29499b028ef9f43aed
+SIZE (hamlib-1.2.0.tar.gz) = 1300085
diff --git a/comms/hamlib/files/patch-include-config.h.in b/comms/hamlib/files/patch-include-config.h.in
new file mode 100644
index 000000000000..0864d6cb07ab
--- /dev/null
+++ b/comms/hamlib/files/patch-include-config.h.in
@@ -0,0 +1,19 @@
+--- include/config.h.in.orig	Mon Apr 19 22:16:14 2004
++++ include/config.h.in	Mon Apr 19 22:16:43 2004
+@@ -388,16 +388,6 @@
+ extern "C" {
+ #endif
+
+-#ifndef HAVE_GETOPT
+-int getopt (int argc, char * const argv[], const char * optstring);
+-extern char * optarg;
+-extern int optind, opterr, optopt;
+-#endif
+-#ifndef HAVE_GETOPT_LONG
+-int getopt_long (int argc, char * const argv[], const char * optstring,
+-			const struct option * longopts, int * longindex);
+-#endif
+-
+ #ifndef HAVE_USLEEP
+ int usleep(unsigned long usec);	/* SUSv2 */
+ #endif
diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist
index b21aced4114c..75ce56509ae4 100644
--- a/comms/hamlib/pkg-plist
+++ b/comms/hamlib/pkg-plist
@@ -1,4 +1,5 @@
 bin/rigctl
+bin/rigmem
 bin/rotctl
 include/hamlib/rig.h
 include/hamlib/rig_dll.h
@@ -22,6 +23,12 @@ lib/hamlib-dummy.so
 lib/hamlib-easycomm.a
 lib/hamlib-easycomm.la
 lib/hamlib-easycomm.so
+lib/hamlib-flexradio.a
+lib/hamlib-flexradio.la
+lib/hamlib-flexradio.so
+lib/hamlib-fodtrack.a
+lib/hamlib-fodtrack.la
+lib/hamlib-fodtrack.so
 lib/hamlib-icom.a
 lib/hamlib-icom.la
 lib/hamlib-icom.so
@@ -34,9 +41,18 @@ lib/hamlib-kachina.so
 lib/hamlib-kenwood.a
 lib/hamlib-kenwood.la
 lib/hamlib-kenwood.so
+lib/hamlib-lowe.a
+lib/hamlib-lowe.la
+lib/hamlib-lowe.so
+lib/hamlib-microtune.a
+lib/hamlib-microtune.la
+lib/hamlib-microtune.so
 lib/hamlib-pcr.a
 lib/hamlib-pcr.la
 lib/hamlib-pcr.so
+lib/hamlib-rft.a
+lib/hamlib-rft.la
+lib/hamlib-rft.so
 lib/hamlib-rotorez.a
 lib/hamlib-rotorez.la
 lib/hamlib-rotorez.so
@@ -46,6 +62,12 @@ lib/hamlib-rpcrig.so
 lib/hamlib-rpcrot.a
 lib/hamlib-rpcrot.la
 lib/hamlib-rpcrot.so
+lib/hamlib-sartek.a
+lib/hamlib-sartek.la
+lib/hamlib-sartek.so
+lib/hamlib-tapr.a
+lib/hamlib-tapr.la
+lib/hamlib-tapr.so
 lib/hamlib-tentec.a
 lib/hamlib-tentec.la
 lib/hamlib-tentec.so
@@ -55,17 +77,25 @@ lib/hamlib-uniden.so
 lib/hamlib-yaesu.a
 lib/hamlib-yaesu.la
 lib/hamlib-yaesu.so
-lib/libhamlib++-1.1.4.so
-lib/libhamlib++-1.1.4.so.1
+%%TCL%%lib/hamlibtcl-1.0.so
+%%TCL%%lib/hamlibtcl.a
+%%TCL%%lib/hamlibtcl.la
+%%TCL%%lib/hamlibtcl.so
+lib/libhamlib++-1.2.0.so
+lib/libhamlib++-1.2.0.so.2
 lib/libhamlib++.a
 lib/libhamlib++.la
 lib/libhamlib++.so
-lib/libhamlib-1.1.4.so
-lib/libhamlib-1.1.4.so.1
+lib/libhamlib-1.2.0.so
+lib/libhamlib-1.2.0.so.2
 lib/libhamlib.a
 lib/libhamlib.la
 lib/libhamlib.so
-lib/pkgconfig/hamlib.pc
+libdata/pkgconfig/hamlib.pc
+%%PYTHON%%lib/python/Hamlib.py
+%%PYTHON%%lib/python/Hamlib.pyc
+%%PYTHON%%lib/python/Hamlib.pyo
+%%TCL%%lib/tcl/pkgIndex.tcl
 sbin/rpc.rigd
 sbin/rpc.rotd
 share/aclocal/hamlib.m4