update to hamlib 1.2.15.3, don't use groff, and avoid installing useless

.a/.la for modules
This commit is contained in:
sthen 2013-04-20 14:58:01 +00:00
parent be1f5c1da4
commit b97760e20c
12 changed files with 98 additions and 204 deletions

View File

@ -1,23 +1,22 @@
# $OpenBSD: Makefile,v 1.28 2013/03/21 08:45:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.29 2013/04/20 14:58:01 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= radio/rotator control library
COMMENT-python= python bindings for hamlib
COMMENT-tcl= tcl bindings for hamlib
VERSION= 1.2.6
VERSION= 1.2.15.3
DISTNAME= hamlib-${VERSION}
PKGNAME-main= hamlib-${VERSION}
REVISION-main = 9
PKGNAME-python= hamlib-python-${VERSION}
REVISION-python = 10
PKGNAME-tcl= hamlib-tcl-${VERSION}
REVISION-tcl = 9
CATEGORIES= comms hamradio
CATEGORIES= comms hamradio
MULTI_PACKAGES= -main -python -tcl
SHARED_LIBS= hamlib 2.5 \
hamlib++ 2.5
SHARED_LIBS += hamlib 3.0 # 2.16
SHARED_LIBS += hamlib++ 3.0 # 2.16
HOMEPAGE= http://hamlib.sourceforge.net/
@ -28,10 +27,12 @@ MODULES= lang/python \
# GPLv2/LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
cWANTLIB = ltdl m usb usb-1.0
WANTLIB-main = ${cWANTLIB} c stdc++ z xml2 pthread ${MODLIBICONV_WANTLIB}
WANTLIB-python = ${cWANTLIB} hamlib ${MODPY_WANTLIB}
WANTLIB-tcl = ${cWANTLIB} hamlib ${MODTCL_WANTLIB}
LIBTOOL_FLAGS= --tag=disable-static
cWANTLIB= ltdl m pthread usb usb-1.0
WANTLIB-main= ${cWANTLIB} c stdc++ z xml2 ${MODLIBICONV_WANTLIB}
WANTLIB-python= ${cWANTLIB} hamlib ${MODPY_WANTLIB}
WANTLIB-tcl= ${cWANTLIB} hamlib ${MODTCL_WANTLIB}
LIB_DEPENDS-main= textproc/libxml \
devel/libusb-compat \
@ -49,15 +50,17 @@ RUN_DEPENDS-tcl= ${MODTCL_RUN_DEPENDS}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hamlib/}
USE_GROFF = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-cxx-binding \
CONFIGURE_ARGS= --with-cxx-binding \
--with-perl-binding \
--with-rpc-backends \
--with-tcl-binding \
--enable-tcl-binding \
--with-python-binding \
--without-rigmatrix \
--with-tcl=${MODTCL_LIBDIR}
CONFIGURE_ENV= CPPFLAGS+="-I${LOCALBASE}/include"
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
post-install:
rm -f ${PREFIX}/lib/hamlib/*.la
.include <bsd.port.mk>

View File

@ -1,5 +1,2 @@
MD5 (hamlib-1.2.6.tar.gz) = S7BYz7nxPqqJSLQeR5VlmQ==
RMD160 (hamlib-1.2.6.tar.gz) = 3kSE7AhiYy1TrDkF5h+YM6AlR9o=
SHA1 (hamlib-1.2.6.tar.gz) = ecju71HPGtSVWMaY7fez62OL/XY=
SHA256 (hamlib-1.2.6.tar.gz) = IwvFGFUht7V2Fnfpaz2inDSeFtB0+IsQfrTJu3F6bKQ=
SIZE (hamlib-1.2.6.tar.gz) = 1473299
SHA256 (hamlib-1.2.15.3.tar.gz) = ospFSeT9mdblYA41Try1dQJhGqY8aSHBuKglKJgz914=
SIZE (hamlib-1.2.15.3.tar.gz) = 1675879

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1 2011/12/09 13:10:56 jasper Exp $
--- Makefile.in.orig Fri Dec 9 13:50:19 2011
+++ Makefile.in Fri Dec 9 13:50:46 2011
@@ -50,7 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-inc
$(top_srcdir)/macros/gr_swig.m4 \
$(top_srcdir)/macros/lf_warnings.m4 \
$(top_srcdir)/macros/libtool.m4 \
- $(top_srcdir)/macros/libxml2.m4 $(top_srcdir)/macros/ltdl.m4 \
+ $(top_srcdir)/macros/libxml2.m4 \
$(top_srcdir)/macros/perl.m4 $(top_srcdir)/macros/pkg.m4 \
$(top_srcdir)/macros/python.m4 $(top_srcdir)/macros/tcl.m4 \
$(top_srcdir)/configure.ac
@@ -278,12 +278,12 @@ EXTRA_DIST = PLAN TODO LICENSE hamlib.m4 hamlib.pc.in
# BINDINGS_LIST subdirs are no more built
-SUBDIRS = macros include lib libltdl src @BACKEND_LIST@ @ROT_BACKEND_LIST@ \
+SUBDIRS = macros include lib src @BACKEND_LIST@ @ROT_BACKEND_LIST@ \
@BINDINGS@ tests doc
# tcl, perl, and kylix subdir are no more distributed
-DIST_SUBDIRS = macros include lib libltdl src c++ bindings tests doc \
+DIST_SUBDIRS = macros include lib src c++ bindings tests doc \
icom kenwood aor yaesu dummy pcr alinco uniden tentec kachina jrc \
rpcrig winradio easycomm fodtrack rpcrot gnuradio drake rotorez \
microtune flexradio sartek lowe rft tapr kit skanti wj racal tuner

View File

@ -1,32 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2011/12/09 13:10:56 jasper Exp $
--- configure.orig Fri Dec 22 15:20:36 2006
+++ configure Fri Dec 9 14:04:54 2011
@@ -465,7 +465,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subdirs_all="$ac_subdirs_all libltdl"
+ac_subdirs_all="$ac_subdirs_all"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE ABI_VERSION hamlibdocdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP LN_S RPMBUILD EGREP LIBOBJS NET_LIBS MATH_LIBS ALLOCA INCLTDL LIBLTDL build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL subdirs WINLDFLAGS XML2_CONFIG XML_CPPFLAGS XML_LIBS RIGMATRIX PERL_INC_DIR TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_SPEC TCL_INCLUDE_SPEC TCL_SHLIB_SUFFIX PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYTHON_CPPFLAGS PYTHON_LDFLAGS PYTHON_SITE_PKG PYTHON_EXTRA_LIBS PKG_CONFIG GNURADIO_CFLAGS GNURADIO_LIBS PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS USRP_CFLAGS USRP_LIBS LIBUSB_CFLAGS LIBUSB_LIBS cf_with_rpcgen BACKEND_LIST BACKENDLNK BACKENDEPS ROT_BACKEND_LIST ROT_BACKENDLNK ROT_BACKENDEPS cf_with_bindings SWIG BINDINGS BINDING_ALL BINDING_CHECK BINDING_CLEAN BINDING_DISTCLEAN BINDING_DISTCHECK BINDING_INSTALL_EXEC BINDING_UNINSTALL BINDING_LIST INCLUDES LTLIBOBJS'
ac_subst_files=''
@@ -10009,8 +10009,8 @@ echo "$as_me: error: this package needs a convenience
"") enable_ltdl_convenience=yes
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
- LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la
- LTDLINCL='-I${top_srcdir}/''libltdl'
+ LIBLTDL='-lltdl'
+ LTDLINCL='-I${prefix}/''include/'
# For backwards non-gettext consistent compatibility...
INCLTDL="$LTDLINCL"
@@ -27753,7 +27753,7 @@ done
-subdirs="$subdirs libltdl"
+subdirs="$subdirs"
case "$host_os" in

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-rpcrig_rpcrigd_c,v 1.1.1.1 2007/05/28 17:07:27 jason Exp $
--- rpcrig/rpcrigd.c.orig Tue Nov 1 10:09:56 2005
+++ rpcrig/rpcrigd.c Tue Nov 1 10:10:23 2005
@@ -45,7 +45,9 @@
$OpenBSD: patch-rpcrig_rpcrigd_c,v 1.2 2013/04/20 14:58:01 sthen Exp $
--- rpcrig/rpcrigd.c.orig Thu Nov 1 21:27:27 2012
+++ rpcrig/rpcrigd.c Sun Apr 14 22:00:44 2013
@@ -43,7 +43,9 @@
#include <hamlib/rig.h>
@ -10,5 +10,5 @@ $OpenBSD: patch-rpcrig_rpcrigd_c,v 1.1.1.1 2007/05/28 17:07:27 jason Exp $
+int _rpcsvcdirty;
+#endif
/*
/*
* Prototypes

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-rpcrot_rpcrot_proc_c,v 1.1 2009/02/18 11:02:23 jasper Exp $
$OpenBSD: patch-rpcrot_rpcrot_proc_c,v 1.2 2013/04/20 14:58:01 sthen Exp $
Fix 64-bit issues.
--- rpcrot/rpcrot_proc.c.orig Wed Feb 18 11:55:21 2009
+++ rpcrot/rpcrot_proc.c Wed Feb 18 11:56:01 2009
@@ -25,6 +25,7 @@
--- rpcrot/rpcrot_proc.c.orig Thu Nov 1 21:27:27 2012
+++ rpcrot/rpcrot_proc.c Sun Apr 14 22:00:44 2013
@@ -24,6 +24,7 @@
#include "config.h"
#endif

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-rpcrot_rpcrotd_c,v 1.1.1.1 2007/05/28 17:07:27 jason Exp $
--- rpcrot/rpcrotd.c.orig Tue Nov 1 10:09:40 2005
+++ rpcrot/rpcrotd.c Tue Nov 1 10:10:30 2005
@@ -45,6 +45,9 @@
$OpenBSD: patch-rpcrot_rpcrotd_c,v 1.2 2013/04/20 14:58:01 sthen Exp $
--- rpcrot/rpcrotd.c.orig Thu Nov 1 21:27:27 2012
+++ rpcrot/rpcrotd.c Sun Apr 14 22:00:44 2013
@@ -43,6 +43,9 @@
#include <hamlib/rotator.h>
@ -9,5 +9,5 @@ $OpenBSD: patch-rpcrot_rpcrotd_c,v 1.1.1.1 2007/05/28 17:07:27 jason Exp $
+int _rpcsvcdirty;
+#endif
/*
/*
* Prototypes

View File

@ -1,33 +0,0 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1.1.1 2007/05/28 17:07:27 jason Exp $
lib/hamlib-alinco.so
lib/hamlib-aor.so
lib/hamlib-drake.so
lib/hamlib-dummy.so
lib/hamlib-easycomm.so
lib/hamlib-flexradio.so
lib/hamlib-fodtrack.so
lib/hamlib-icom.so
lib/hamlib-jrc.so
lib/hamlib-kachina.so
lib/hamlib-kenwood.so
lib/hamlib-kit.so
lib/hamlib-lowe.so
lib/hamlib-microtune.so
lib/hamlib-pcr.so
lib/hamlib-racal.so
lib/hamlib-rft.so
lib/hamlib-rotorez.so
lib/hamlib-rpcrig.so
lib/hamlib-rpcrot.so
lib/hamlib-sartek.so
lib/hamlib-skanti.so
lib/hamlib-tapr.so
lib/hamlib-tentec.so
lib/hamlib-tuner.so
lib/hamlib-uniden.so
lib/hamlib-winradio.so
lib/hamlib-wj.so
lib/hamlib-yaesu.so
@lib lib/libhamlib++.so.${LIBhamlib++_VERSION}
@lib lib/libhamlib.so.${LIBhamlib_VERSION}
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Hamlib/Hamlib.so

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared-python,v 1.1.1.1 2007/05/28 17:07:27 jason Exp $
lib/_Hamlib.so

View File

@ -1,9 +1,11 @@
@comment $OpenBSD: PLIST-main,v 1.2 2008/10/01 22:33:19 sthen Exp $
%%SHARED%%
@comment $OpenBSD: PLIST-main,v 1.3 2013/04/20 14:58:01 sthen Exp $
@bin bin/rigctl
@bin bin/rigctld
@bin bin/rigmem
@bin bin/rigsmtr
@bin bin/rigswr
@bin bin/rotctl
@bin bin/rotctld
include/hamlib/
include/hamlib/rig.h
include/hamlib/rig_dll.h
@ -12,82 +14,68 @@ include/hamlib/riglist.h
include/hamlib/rotator.h
include/hamlib/rotclass.h
include/hamlib/rotlist.h
lib/hamlib-alinco.a
lib/hamlib-alinco.la
lib/hamlib-aor.a
lib/hamlib-aor.la
lib/hamlib-drake.a
lib/hamlib-drake.la
lib/hamlib-dummy.a
lib/hamlib-dummy.la
lib/hamlib-easycomm.a
lib/hamlib-easycomm.la
lib/hamlib-flexradio.a
lib/hamlib-flexradio.la
lib/hamlib-fodtrack.a
lib/hamlib-fodtrack.la
lib/hamlib-icom.a
lib/hamlib-icom.la
lib/hamlib-jrc.a
lib/hamlib-jrc.la
lib/hamlib-kachina.a
lib/hamlib-kachina.la
lib/hamlib-kenwood.a
lib/hamlib-kenwood.la
lib/hamlib-kit.a
lib/hamlib-kit.la
lib/hamlib-lowe.a
lib/hamlib-lowe.la
lib/hamlib-microtune.a
lib/hamlib-microtune.la
lib/hamlib-pcr.a
lib/hamlib-pcr.la
lib/hamlib-racal.a
lib/hamlib-racal.la
lib/hamlib-rft.a
lib/hamlib-rft.la
lib/hamlib-rotorez.a
lib/hamlib-rotorez.la
lib/hamlib-rpcrig.a
lib/hamlib-rpcrig.la
lib/hamlib-rpcrot.a
lib/hamlib-rpcrot.la
lib/hamlib-sartek.a
lib/hamlib-sartek.la
lib/hamlib-skanti.a
lib/hamlib-skanti.la
lib/hamlib-tapr.a
lib/hamlib-tapr.la
lib/hamlib-tentec.a
lib/hamlib-tentec.la
lib/hamlib-tuner.a
lib/hamlib-tuner.la
lib/hamlib-uniden.a
lib/hamlib-uniden.la
lib/hamlib-winradio.a
lib/hamlib-winradio.la
lib/hamlib-wj.a
lib/hamlib-wj.la
lib/hamlib-yaesu.a
lib/hamlib-yaesu.la
lib/libhamlib++.a
lib/hamlib/
lib/hamlib/hamlib-adat.so
lib/hamlib/hamlib-alinco.so
lib/hamlib/hamlib-amsat.so
lib/hamlib/hamlib-aor.so
lib/hamlib/hamlib-ars.so
lib/hamlib/hamlib-celestron.so
lib/hamlib/hamlib-drake.so
lib/hamlib/hamlib-dummy.so
lib/hamlib/hamlib-easycomm.so
lib/hamlib/hamlib-flexradio.so
lib/hamlib/hamlib-fodtrack.so
lib/hamlib/hamlib-gs232a.so
lib/hamlib/hamlib-heathkit.so
lib/hamlib/hamlib-icom.so
lib/hamlib/hamlib-jrc.so
lib/hamlib/hamlib-kachina.so
lib/hamlib/hamlib-kenwood.so
lib/hamlib/hamlib-kit.so
lib/hamlib/hamlib-lowe.so
lib/hamlib/hamlib-m2.so
lib/hamlib/hamlib-pcr.so
lib/hamlib/hamlib-prm80.so
lib/hamlib/hamlib-racal.so
lib/hamlib/hamlib-rft.so
lib/hamlib/hamlib-rotorez.so
lib/hamlib/hamlib-rpcrig.so
lib/hamlib/hamlib-rpcrot.so
lib/hamlib/hamlib-rs.so
lib/hamlib/hamlib-sartek.so
lib/hamlib/hamlib-skanti.so
lib/hamlib/hamlib-spid.so
lib/hamlib/hamlib-tapr.so
lib/hamlib/hamlib-tentec.so
lib/hamlib/hamlib-ts7400.so
lib/hamlib/hamlib-tuner.so
lib/hamlib/hamlib-uniden.so
lib/hamlib/hamlib-winradio.so
lib/hamlib/hamlib-wj.so
lib/hamlib/hamlib-yaesu.so
lib/libhamlib++.la
lib/libhamlib.a
@lib lib/libhamlib++.so.${LIBhamlib++_VERSION}
lib/libhamlib.la
@lib lib/libhamlib.so.${LIBhamlib_VERSION}
lib/pkgconfig/hamlib.pc
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.10.0/perllocal.pod
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.16.3/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.16.3/perllocal.pod
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Hamlib.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Hamlib/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Hamlib/Hamlib.bs
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Hamlib/Hamlib.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/perltest.pl
@man man/man1/rigctl.1
@man man/man1/rigmem.1
@man man/man1/rigsmtr.1
@man man/man1/rigswr.1
@man man/man1/rotctl.1
@man man/man8/rigctld.8
@man man/man8/rotctld.8
@man man/man8/rpc.rigd.8
@man man/man8/rpc.rotd.8
@bin sbin/rpc.rigd

View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST-python,v 1.1.1.1 2007/05/28 17:07:27 jason Exp $
%%SHARED%%
lib/_Hamlib.a
lib/_Hamlib.la
lib/python/
lib/python/Hamlib.py
lib/python/Hamlib.pyc
lib/python/Hamlib.pyo
@comment $OpenBSD: PLIST-python,v 1.2 2013/04/20 14:58:01 sthen Exp $
lib/python${MODPY_VERSION}/
lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/Hamlib.py
lib/python${MODPY_VERSION}/site-packages/Hamlib.pyc
lib/python${MODPY_VERSION}/site-packages/Hamlib.pyo
lib/python${MODPY_VERSION}/site-packages/_Hamlib.la
lib/python${MODPY_VERSION}/site-packages/_Hamlib.so

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST-tcl,v 1.1.1.1 2007/05/28 17:07:27 jason Exp $
%%SHARED%%
lib/hamlibtcl.a
@comment $OpenBSD: PLIST-tcl,v 1.2 2013/04/20 14:58:01 sthen Exp $
lib/hamlibtcl-1.0.so
lib/hamlibtcl.la
lib/hamlibtcl.so
lib/tcl/
lib/tcl/pkgIndex.tcl