From 50d3a2c1002c333cbf57fa8720be75660a4b2c9f Mon Sep 17 00:00:00 2001 From: Diane Bruce Date: Wed, 12 Nov 2008 16:29:14 +0000 Subject: - Update to 1.2.8 - Clean up port. --- comms/hamlib/Makefile | 79 +++++---------------------- comms/hamlib/distinfo | 6 +- comms/hamlib/files/patch-bindings_Makefile.in | 71 ++---------------------- comms/hamlib/pkg-descr | 1 - comms/hamlib/pkg-plist | 31 ++++++----- 5 files changed, 38 insertions(+), 150 deletions(-) (limited to 'comms') diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile index b451db561fb6..a1a8299fcaed 100644 --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -6,7 +6,7 @@ # PORTNAME= hamlib -PORTVERSION= 1.2.7 +PORTVERSION= 1.2.8 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,80 +17,27 @@ COMMENT= Shared libraries for Amateur Radio Equipment Control Applications BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 -USE_GNOME= pkgconfig gnomehack +USE_GNOME= pkgconfig gnomehack libxml2 USE_PERL5= yes +USE_TCL= yes USE_PYTHON= yes USE_AUTOTOOLS= autoconf:262 libtool:15 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-perl-binding --with-python=${PYTHON_CMD} -PLIST_SUB= VER=${PORTVERSION} +CONFIGURE_ARGS= --with-perl-binding --with-python=${PYTHON_CMD} \ + --with-tcl=${TCL_LIBDIR} --with-tcl-binding \ + --with-python-binding --without-with-rigmatrix +PLIST_SUB= VER=${PORTVERSION} TCL_VER=${TCL_VER} MAN1= rigctl.1 rigmem.1 rigswr.1 rotctl.1 rigsmtr.1 -MAN8= rpc.rigd.8 rpc.rotd.8 rigctld.8 - -OPTIONS = PYTHON "Define if you want PYTHON bindings" OFF \ - TCL "Define if you want TCL bindings" OFF \ - XML "Define if you want XML" OFF \ - RIGMATRIX "Define if you want rigmatrix support" OFF - -.include - -.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+= tcl84.1:${PORTSDIR}/lang/tcl84 -CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl8.4 --with-tcl-binding -PLIST_SUB+= TCL="" -.else -CONFIGURE_ARGS+= --without-tcl-binding -PLIST_SUB+= TCL="@comment " -.endif - -.if defined(WITH_PYTHON) -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 -CONFIGURE_ARGS+= --with-rigmatrix -PLIST_SUB+= RIGMATRIX="" -.else -CONFIGURE_ARGS+= --without-with-rigmatrix -PLIST_SUB+= RIGMATRIX="@comment " -.endif - -.if defined(WITH_GNURADIO) -CONFIGURE_ARGS+= --with-gnuradio -PLIST_SUB+= GNURADIO="" -.else -CONFIGURE_ARGS+= --without-gnuradio -PLIST_SUB+= GNURADIO="@comment " -.endif - -.if defined(WITH_TCL) && defined(WITH_PYTHON) -PLIST_SUB+= PYTHON_TCL="" -.else -PLIST_SUB+= PYTHON_TCL="@comment " -.endif - -pre-everything:: - @${MAKE} showconfig - @${ECHO_MSG} "Use make config to set or unset above options" - @${ECHO_MSG} "" +MAN8= rpc.rigd.8 rpc.rotd.8 rigctld.8 rotctld.8 +post-patch: + ${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' \ + -e 's|%%TCL_LIBDIR%%|${TCL_LIBDIR}/hamlib|g' \ + ${WRKSRC}/bindings/Makefile.in post-build: ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' \ ${WRKSRC}/bindings/Hamlib-pl.mk -.include +.include diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo index 7727549ff8b9..417afe3dd1f1 100644 --- a/comms/hamlib/distinfo +++ b/comms/hamlib/distinfo @@ -1,3 +1,3 @@ -MD5 (hamlib-1.2.7.tar.gz) = adf561c007f8a3a1affecd58fccd67df -SHA256 (hamlib-1.2.7.tar.gz) = 7812125153cee5dea7d0b36f21647a4ef7074c5e3ed80a4037daaa9170e390ea -SIZE (hamlib-1.2.7.tar.gz) = 1536743 +MD5 (hamlib-1.2.8.tar.gz) = 74eaf1be4cf1cbdecee54808c6930788 +SHA256 (hamlib-1.2.8.tar.gz) = be81153a6e2830234d62818c8aa5658b1410b538a3676686a3f1373f03036b81 +SIZE (hamlib-1.2.8.tar.gz) = 1577532 diff --git a/comms/hamlib/files/patch-bindings_Makefile.in b/comms/hamlib/files/patch-bindings_Makefile.in index 818c9e895de3..67d8c9b1d289 100644 --- a/comms/hamlib/files/patch-bindings_Makefile.in +++ b/comms/hamlib/files/patch-bindings_Makefile.in @@ -1,79 +1,20 @@ ---- bindings/Makefile.in.orig Thu Feb 22 14:24:58 2007 -+++ bindings/Makefile.in Thu Feb 22 14:24:59 2007 +--- bindings/Makefile.in.orig 2008-11-07 19:43:46.000000000 -0500 ++++ bindings/Makefile.in 2008-11-09 10:57:50.000000000 -0500 @@ -273,7 +273,7 @@ - prefix = @prefix@ program_transform_name = @program_transform_name@ + psdir = @psdir@ pyexecdir = @pyexecdir@ -pythondir = $(prefix)/lib/python -+pythondir = @pyexecdir@ ++pythondir = %%PYTHON_SITELIBDIR%% sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ subdirs = @subdirs@ -@@ -286,13 +286,13 @@ +@@ -289,7 +289,7 @@ ########################################## # Tcl binding tcl_ltlib = hamlibtcl.la -tcldir = $(prefix)/lib/tcl -+tcldir = $(TCL_BIN_DIR) ++tcldir = %%TCL_LIBDIR%% PKG_VER = 1.0 DLL = hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@ nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c - hamlibtcl_la_LDFLAGS = -no-undefined -module -release $(PKG_VER) -avoid-version @TCL_LIB_SPEC@ - hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la --hamlibtcl_ladir = $(tcldir) -+hamlibtcl_ladir = $(tcldir)/hamlib - hamlibtcl_la_DATA = pkgIndex.tcl - - ########################################## -@@ -305,7 +305,8 @@ - python_PYTHON = Hamlib.py - - ########################################## --lib_LTLIBRARIES = $(tcl_ltlib) $(python_ltlib) -+#lib_LTLIBRARIES = $(tcl_ltlib) $(python_ltlib) -+lib_LTLIBRARIES = @BINDING_LIB_TARGETS@ - EXTRA_DIST = hamlib.swg ignore.swg rig.swg rotator.swg \ - Makefile.PL perltest.pl tcltest.tcl pytest.py - -@@ -424,6 +425,7 @@ - -rm -f libtool - uninstall-info-am: - install-pythonPYTHON: $(python_PYTHON) -+install-py: - @$(NORMAL_INSTALL) - test -z "$(pythondir)" || $(mkdir_p) "$(DESTDIR)$(pythondir)" - @list='$(python_PYTHON)'; dlist=''; for p in $$list; do\ -@@ -452,6 +454,7 @@ - rm -f "$(DESTDIR)$(pythondir)/$${f}o"; \ - done - install-hamlibtcl_laDATA: $(hamlibtcl_la_DATA) -+install-tcl: install-libLTLIBRARIES - @$(NORMAL_INSTALL) - test -z "$(hamlibtcl_ladir)" || $(mkdir_p) "$(DESTDIR)$(hamlibtcl_ladir)" - @list='$(hamlibtcl_la_DATA)'; for p in $$list; do \ -@@ -554,7 +557,8 @@ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done - install: $(BUILT_SOURCES) -- $(MAKE) $(AM_MAKEFLAGS) install-am -+# $(MAKE) $(AM_MAKEFLAGS) install-am -+ $(MAKE) $(AM_MAKEFLAGS) $(BINDING_INSTALL_EXEC) - install-exec: install-exec-am - install-data: install-data-am - uninstall: uninstall-am -@@ -700,7 +704,6 @@ - check-tcl: all-tcl - TCLLIBPATH=$(builddir)/.libs $(srcdir)/tcltest.tcl || echo "Tcl test failed" 1>&2 - --install-tcl: - clean-tcl: - distclean-tcl: clean-tcl - uninstall-tcl: -@@ -715,7 +718,6 @@ - check-py: all-py - $(srcdir)/pytest.py || echo "Python test failed" 1>&2 - --install-py: - clean-py: - distclean-py: - uninstall-py: diff --git a/comms/hamlib/pkg-descr b/comms/hamlib/pkg-descr index 82992c011733..5922ccf7c985 100644 --- a/comms/hamlib/pkg-descr +++ b/comms/hamlib/pkg-descr @@ -6,5 +6,4 @@ programs, or those wanting to develop the ultimate radio control software to concentrate on the user interface and the basic function of the program rather than radio control. - WWW: http://sourceforge.net/projects/hamlib diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist index 68f55f7d77ec..36ec5fa7ae70 100644 --- a/comms/hamlib/pkg-plist +++ b/comms/hamlib/pkg-plist @@ -4,6 +4,7 @@ bin/rigmem bin/rigsmtr bin/rigswr bin/rotctl +bin/rotctld include/hamlib/rig.h include/hamlib/rig_dll.h include/hamlib/rigclass.h @@ -11,9 +12,9 @@ include/hamlib/riglist.h include/hamlib/rotator.h include/hamlib/rotclass.h include/hamlib/rotlist.h -%%PYTHON_TCL%%lib/_Hamlib.a -%%PYTHON_TCL%%lib/_Hamlib.la -%%PYTHON_TCL%%lib/_Hamlib.so +lib/_Hamlib.a +lib/_Hamlib.la +lib/_Hamlib.so lib/hamlib-alinco.a lib/hamlib-alinco.la lib/hamlib-alinco.so @@ -35,6 +36,9 @@ lib/hamlib-flexradio.so lib/hamlib-fodtrack.a lib/hamlib-fodtrack.la lib/hamlib-fodtrack.so +lib/hamlib-gs232a.so +lib/hamlib-gs232a.la +lib/hamlib-gs232a.a lib/hamlib-icom.a lib/hamlib-icom.la lib/hamlib-icom.so @@ -53,9 +57,6 @@ lib/hamlib-kit.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 @@ -101,11 +102,11 @@ lib/hamlib-wj.so lib/hamlib-yaesu.a lib/hamlib-yaesu.la lib/hamlib-yaesu.so -%%TCL%%lib/hamlibtcl-1.0.so -%%TCL%%lib/hamlibtcl.a -%%TCL%%lib/hamlibtcl.la -%%TCL%%lib/hamlibtcl.so -%%TCL%%lib/tcl8.4/hamlib/pkgIndex.tcl +lib/hamlibtcl-1.0.so +lib/hamlibtcl.a +lib/hamlibtcl.la +lib/hamlibtcl.so +lib/tcl%%TCL_VER%%/hamlib/pkgIndex.tcl lib/libhamlib++.so lib/libhamlib++.so.2 lib/libhamlib++.a @@ -119,13 +120,13 @@ lib/libhamlib.la %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/Hamlib.bs %%SITE_PERL%%/%%PERL_ARCH%%/Hamlib.pm %%SITE_PERL%%/mach/perltest.pl -%%PYTHON%%%%PYTHON_SITELIBDIR%%/Hamlib.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/Hamlib.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/Hamlib.pyo +%%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 -%%TCL%%@dirrm lib/tcl8.4/hamlib +@dirrm lib/tcl%%TCL_VER%%/hamlib @dirrm %%SITE_PERL%%/mach/auto/Hamlib @dirrm include/hamlib -- cgit v1.2.3