Index: head/comms/hamlib/Makefile =================================================================== --- head/comms/hamlib/Makefile (revision 222773) +++ head/comms/hamlib/Makefile (revision 222774) @@ -1,96 +1,43 @@ # New ports collection makefile for: hamlib # Date created: 30 April 2003 # Whom: Sebastian Yepes # # $FreeBSD$ # PORTNAME= hamlib -PORTVERSION= 1.2.7 +PORTVERSION= 1.2.8 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= db@FreeBSD.org 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 +MAN8= rpc.rigd.8 rpc.rotd.8 rigctld.8 rotctld.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} "" - +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 Property changes on: head/comms/hamlib/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.20 \ No newline at end of property +1.21 \ No newline at end of property Index: head/comms/hamlib/distinfo =================================================================== --- head/comms/hamlib/distinfo (revision 222773) +++ head/comms/hamlib/distinfo (revision 222774) @@ -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 Property changes on: head/comms/hamlib/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/comms/hamlib/files/patch-bindings_Makefile.in =================================================================== --- head/comms/hamlib/files/patch-bindings_Makefile.in (revision 222773) +++ head/comms/hamlib/files/patch-bindings_Makefile.in (revision 222774) @@ -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: Property changes on: head/comms/hamlib/files/patch-bindings_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/comms/hamlib/pkg-descr =================================================================== --- head/comms/hamlib/pkg-descr (revision 222773) +++ head/comms/hamlib/pkg-descr (revision 222774) @@ -1,10 +1,9 @@ The Ham Radio Control Libraries, Hamlib for short, is a development effort to provide a consistent interface for programmers wanting to incorporate radio control in their programs. Hamlib will allow authors of software logging programs, digital communications 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 Property changes on: head/comms/hamlib/pkg-descr ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/comms/hamlib/pkg-plist =================================================================== --- head/comms/hamlib/pkg-plist (revision 222773) +++ head/comms/hamlib/pkg-plist (revision 222774) @@ -1,131 +1,132 @@ bin/rigctl bin/rigctld bin/rigmem bin/rigsmtr bin/rigswr bin/rotctl +bin/rotctld include/hamlib/rig.h include/hamlib/rig_dll.h include/hamlib/rigclass.h 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 lib/hamlib-aor.a lib/hamlib-aor.la lib/hamlib-aor.so lib/hamlib-drake.a lib/hamlib-drake.la lib/hamlib-drake.so lib/hamlib-dummy.a lib/hamlib-dummy.la 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-gs232a.so +lib/hamlib-gs232a.la +lib/hamlib-gs232a.a lib/hamlib-icom.a lib/hamlib-icom.la lib/hamlib-icom.so lib/hamlib-jrc.a lib/hamlib-jrc.la lib/hamlib-jrc.so lib/hamlib-kachina.a lib/hamlib-kachina.la lib/hamlib-kachina.so lib/hamlib-kenwood.a lib/hamlib-kenwood.la lib/hamlib-kenwood.so lib/hamlib-kit.a lib/hamlib-kit.la 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 lib/hamlib-racal.a lib/hamlib-racal.la lib/hamlib-racal.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 lib/hamlib-rpcrig.a lib/hamlib-rpcrig.la 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-skanti.a lib/hamlib-skanti.la lib/hamlib-skanti.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 lib/hamlib-tuner.a lib/hamlib-tuner.la lib/hamlib-tuner.so lib/hamlib-uniden.a lib/hamlib-uniden.la lib/hamlib-uniden.so lib/hamlib-winradio.a lib/hamlib-winradio.la lib/hamlib-winradio.so lib/hamlib-wj.a lib/hamlib-wj.la 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 lib/libhamlib++.la lib/libhamlib.so lib/libhamlib.so.2 lib/libhamlib.a lib/libhamlib.la %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/Hamlib.so %%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 Property changes on: head/comms/hamlib/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property