From owner-freebsd-ports@FreeBSD.ORG Wed Feb 22 19:38:15 2006 Return-Path: X-Original-To: ports@FreeBSD.org Delivered-To: freebsd-ports@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0ED6816A420; Wed, 22 Feb 2006 19:38:15 +0000 (GMT) (envelope-from db@db.net) Received: from heceta.db.net (heceta.db.net [142.46.199.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE0FA43D45; Wed, 22 Feb 2006 19:38:14 +0000 (GMT) (envelope-from db@db.net) Received: from db by heceta.db.net with local (Exim 4.24; FreeBSD 4.8) id 1FBzoT-0004nI-T2; Wed, 22 Feb 2006 14:38:13 -0500 To: FreeBSD-gnats-submit@freebsd.org From: Diane Bruce X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: Sender: Diane Bruce Date: Wed, 22 Feb 2006 14:38:13 -0500 Cc: ports@FreeBSD.org Subject: [PATCH] comms/hamlib: update to 1.2.4 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Feb 2006 19:38:15 -0000 >Submitter-Id: current-users >Originator: Diane Bruce >Organization: >Confidential: no >Synopsis: [PATCH] comms/hamlib: update to 1.2.4 >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: FreeBSD 4.11-RELEASE-p9 i386 >Environment: System: FreeBSD heceta.db.net 4.11-RELEASE-p9 FreeBSD 4.11-RELEASE-p9 #4: Tue May 17 16:07:52 EDT 2005 >Description: - Update to 1.2.4 - take maintainership Added file(s): - files/patch-bindings_Makefile.in - files/patch-configure.ac - files/patch-src_parallel.c Removed file(s): - files/patch-include-config.h.in Port maintainer (ports@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- hamlib-1.2.4.patch begins here --- diff -ruN --exclude=CVS /usr/ports/comms/hamlib/Makefile /usr/home/db/hamlib/Makefile --- /usr/ports/comms/hamlib/Makefile Wed Feb 15 22:28:49 2006 +++ /usr/home/db/hamlib/Makefile Wed Feb 22 14:25:37 2006 @@ -6,17 +6,18 @@ # PORTNAME= hamlib -PORTVERSION= 1.2.2 +PORTVERSION= 1.2.4 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= db@db.net COMMENT= Shared libraries for Amateur Radio Equipment Control Applications USE_PERL5= yes -USE_AUTOTOOLS= libtool:15:inc +USE_AUTOTOOLS= autoconf:259 +USE_AUTOTOOLS+= libtool:15:inc USE_GNOME= pkgconfig gnomehack INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" @@ -24,11 +25,18 @@ MAN1= rigctl.1 rigmem.1 rigswr.1 rotctl.1 MAN8= rpc.rigd.8 rpc.rotd.8 -.if defined(WITH_PYTHON) -USE_PYTHON= yes -.endif +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 + +PORT_DBDIR?= /var/db/ports +LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} +OPTIONSFILE?= ${PORT_DBDIR}/${LATEST_LINK}/options -.include +.if exists(${OPTIONSFILE}) +.include "${OPTIONSFILE}" +.endif .if defined(WITH_XML) USE_GNOME+= libxml2 @@ -48,8 +56,10 @@ .endif .if defined(WITH_PYTHON) +USE_PYTHON = yes +LIB_DEPENDS+= python2.4:${PORTSDIR}/lang/python BUILD_DEPENDS+= swig1.3:${PORTSDIR}/devel/swig13 -CONFIGURE_ARGS+= --with-python-binding +CONFIGURE_ARGS+= --with-python=${LOCALBASE}/lib/python2.4 --with-python-binding PLIST_SUB+= PYTHON="" .else CONFIGURE_ARGS+= --without-python-binding @@ -73,26 +83,15 @@ LIST_SUB+= GNURADIO="@comment " .endif +.include + pre-everything:: -.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 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" -.endif -#.if !defined(WITH_GNURADIO) -# @${ECHO_MSG} "WITH_GNURADIO=yes for GNURadio support" -#.endif + @${MAKE} showconfig + @${ECHO_MSG} "Use make config to set or unset above options" @${ECHO_MSG} "" + +post-build: + ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' \ + ${WRKSRC}/bindings/Hamlib-pl.mk .include diff -ruN --exclude=CVS /usr/ports/comms/hamlib/distinfo /usr/home/db/hamlib/distinfo --- /usr/ports/comms/hamlib/distinfo Wed Feb 15 22:28:49 2006 +++ /usr/home/db/hamlib/distinfo Wed Feb 22 14:16:53 2006 @@ -1,3 +1,3 @@ -MD5 (hamlib-1.2.2.tar.gz) = 62a9140f12d071a1c9f077a948d21f8f -SHA256 (hamlib-1.2.2.tar.gz) = ddcdc3d109126ac3da4e0b40a4be0091bbf695ee7e49adceada5a18c21dfd521 -SIZE (hamlib-1.2.2.tar.gz) = 1359213 +MD5 (hamlib-1.2.4.tar.gz) = f49f961fd8d895aec7bd247d5fd5b772 +SHA256 (hamlib-1.2.4.tar.gz) = d6e0f170e0ce4fda05302402bbb019325e0b043c8b172c071d22cd5a7bf17132 +SIZE (hamlib-1.2.4.tar.gz) = 1423048 diff -ruN --exclude=CVS /usr/ports/comms/hamlib/files/patch-bindings_Makefile.in /usr/home/db/hamlib/files/patch-bindings_Makefile.in --- /usr/ports/comms/hamlib/files/patch-bindings_Makefile.in Wed Dec 31 19:00:00 1969 +++ /usr/home/db/hamlib/files/patch-bindings_Makefile.in Wed Feb 22 13:22:23 2006 @@ -0,0 +1,80 @@ +--- bindings/Makefile.in.orig Wed Feb 22 03:38:30 2006 ++++ bindings/Makefile.in Wed Feb 22 13:21:48 2006 +@@ -203,7 +203,7 @@ + program_transform_name = @program_transform_name@ + pyexecdir = @pyexecdir@ + +-pythondir = $(prefix)/lib/python ++pythondir = @pyexecdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + subdirs = @subdirs@ +@@ -219,7 +219,7 @@ + # Tcl binding + tcl_ltlib = hamlibtcl.la + +-tcldir = $(prefix)/lib/tcl ++tcldir = $(TCL_BIN_DIR) + + PKG_VER = 1.0 + DLL = hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@ +@@ -228,7 +228,7 @@ + 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 + + +@@ -246,7 +246,8 @@ + + + ########################################## +-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 +@@ -396,6 +397,7 @@ + uninstall-info-am: + pythonPYTHON_INSTALL = $(INSTALL_DATA) + install-pythonPYTHON: $(python_PYTHON) ++install-py: + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pythondir) + @list='$(python_PYTHON)'; dlist=''; for p in $$list; do\ +@@ -419,6 +421,7 @@ + done + hamlibtcl_laDATA_INSTALL = $(INSTALL_DATA) + install-hamlibtcl_laDATA: $(hamlibtcl_la_DATA) ++install-tcl: install-libLTLIBRARIES + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(hamlibtcl_ladir) + @list='$(hamlibtcl_la_DATA)'; for p in $$list; do \ +@@ -530,7 +533,7 @@ + installdirs: + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pythondir) $(DESTDIR)$(hamlibtcl_ladir) + install: $(BUILT_SOURCES) +- $(MAKE) $(AM_MAKEFLAGS) install-am ++ $(MAKE) $(AM_MAKEFLAGS) $(BINDING_INSTALL_EXEC) + install-exec: install-exec-am + install-data: install-data-am + uninstall: uninstall-am +@@ -673,7 +676,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: +@@ -688,7 +690,6 @@ + check-py: all-py + $(srcdir)/pytest.py || echo "Python test failed" 1>&2 + +-install-py: + clean-py: + distclean-py: + uninstall-py: diff -ruN --exclude=CVS /usr/ports/comms/hamlib/files/patch-configure.ac /usr/home/db/hamlib/files/patch-configure.ac --- /usr/ports/comms/hamlib/files/patch-configure.ac Wed Dec 31 19:00:00 1969 +++ /usr/home/db/hamlib/files/patch-configure.ac Wed Feb 22 03:35:59 2006 @@ -0,0 +1,35 @@ +--- configure.ac.orig Sun Apr 3 18:44:29 2005 ++++ configure.ac Wed Feb 22 03:35:46 2006 +@@ -215,6 +215,7 @@ + BINDING_INSTALL_EXEC="" + BINDING_UNINSTALL="" + BINDING_LIST="" ++BINDING_LIB_TARGETS="" + + dnl Check if cxx-binding not wanted, default is to build it + +@@ -293,6 +294,7 @@ + BINDING_DISTCLEAN="${BINDING_DISTCLEAN} distclean-tcl" + BINDING_INSTALL_EXEC="${BINDING_INSTALL_EXEC} install-tcl" + BINDING_UNINSTALL="${BINDING_UNINSTALL} uninstall-tcl" ++ BINDING_LIB_TARGETS="${BINDING_LIB_TARGETS} \$(tcl_ltlib)" + fi + AC_SUBST(TCL_LIB_SPEC) + AC_SUBST(TCL_INCLUDE_SPEC) +@@ -319,6 +321,7 @@ + BINDING_DISTCLEAN="${BINDING_DISTCLEAN} distclean-py" + BINDING_INSTALL_EXEC="${BINDING_INSTALL_EXEC} install-py" + BINDING_UNINSTALL="${BINDING_UNINSTALL} uninstall-py" ++ BINDING_LIB_TARGETS="${BINDING_LIB_TARGETS} \$(python_ltlib)" + fi + + +@@ -424,7 +427,7 @@ + AC_SUBST(BINDING_INSTALL_EXEC) + AC_SUBST(BINDING_UNINSTALL) + AC_SUBST(BINDING_LIST) +- ++AC_SUBST(BINDING_LIB_TARGETS) + + AC_SUBST(INCLUDES) + diff -ruN --exclude=CVS /usr/ports/comms/hamlib/files/patch-include-config.h.in /usr/home/db/hamlib/files/patch-include-config.h.in --- /usr/ports/comms/hamlib/files/patch-include-config.h.in Mon Dec 13 12:08:30 2004 +++ /usr/home/db/hamlib/files/patch-include-config.h.in Wed Dec 31 19:00:00 1969 @@ -1,19 +0,0 @@ ---- include/config.h.in.orig Mon Aug 23 23:12:37 2004 -+++ include/config.h.in Thu Oct 21 23:25:45 2004 -@@ -394,16 +394,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 -ruN --exclude=CVS /usr/ports/comms/hamlib/files/patch-src_parallel.c /usr/home/db/hamlib/files/patch-src_parallel.c --- /usr/ports/comms/hamlib/files/patch-src_parallel.c Wed Dec 31 19:00:00 1969 +++ /usr/home/db/hamlib/files/patch-src_parallel.c Wed Feb 15 21:33:58 2006 @@ -0,0 +1,34 @@ +--- src/parallel.c.orig Wed Feb 15 21:26:04 2006 ++++ src/parallel.c Wed Feb 15 21:32:08 2006 +@@ -60,6 +60,7 @@ + #ifdef HAVE_LINUX_PPDEV_H + #include + #include ++#endif + + /* + * These control port bits are active low. +@@ -75,7 +76,6 @@ + */ + #define SP_ACTIVE_LOW_BITS 0x80 + +-#endif + + + #ifdef HAVE_DEV_PPBUS_PPI_H +@@ -266,11 +266,11 @@ + *status = sta ^ SP_ACTIVE_LOW_BITS; + return ret == 0 ? RIG_OK : -RIG_EIO; + #elif defined(HAVE_DEV_PPBUS_PPI_H) +- int status; ++ int ret; + unsigned char sta; +- status = ioctl(port->fd, PPIGSTATUS, &sta); +- *control = sta ^ SP_ACTIVE_LOW_BITS; +- return status == 0 ? RIG_OK : -RIG_EIO; ++ ret = ioctl(port->fd, PPIGSTATUS, &sta); ++ *status = sta ^ SP_ACTIVE_LOW_BITS; ++ return ret == 0 ? RIG_OK : -RIG_EIO; + #elif defined(WIN32) + unsigned char ret; + unsigned int dummy; diff -ruN --exclude=CVS /usr/ports/comms/hamlib/pkg-plist /usr/home/db/hamlib/pkg-plist --- /usr/ports/comms/hamlib/pkg-plist Mon Dec 13 12:08:30 2004 +++ /usr/home/db/hamlib/pkg-plist Wed Feb 22 13:19:59 2006 @@ -54,6 +54,9 @@ 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 @@ -78,12 +81,18 @@ 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 @@ -91,22 +100,28 @@ %%TCL%%lib/hamlibtcl.a %%TCL%%lib/hamlibtcl.la %%TCL%%lib/hamlibtcl.so -lib/libhamlib++-1.2.2.so -lib/libhamlib++-1.2.2.so.2 +%%TCL%%lib/tcl8.4/hamlib/pkgIndex.tcl +lib/libhamlib++-1.2.4.so +lib/libhamlib++-1.2.4.so.2 lib/libhamlib++.a lib/libhamlib++.la lib/libhamlib++.so -lib/libhamlib-1.2.2.so -lib/libhamlib-1.2.2.so.2 +lib/libhamlib-1.2.4.so +lib/libhamlib-1.2.4.so.2 lib/libhamlib.a lib/libhamlib.la lib/libhamlib.so -%%PYTHON%%lib/python/Hamlib.py -%%PYTHON%%lib/python/Hamlib.pyc -%%PYTHON%%lib/python/Hamlib.pyo -%%TCL%%lib/tcl/pkgIndex.tcl +%%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 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/Hamlib.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/Hamlib.pyc +%%PYTHON%%%%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 %%SITE_PERL%%/mach/auto/Hamlib @dirrm include/hamlib --- hamlib-1.2.4.patch ends here ---