cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to tlf-1.2.1 to unbreak

Browse Source
This commit is contained in:
sthen 2014-11-04 10:58:21 +00:00
parent 6000df552c
commit 581f67f312
9 changed files with 96 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
comms/tlf/Makefile
View File

@ -1,52 +1,38 @@
# $OpenBSD: Makefile,v 1.11 2014/11/04 07:41:10 ratchov Exp $
# $OpenBSD: Makefile,v 1.12 2014/11/04 10:58:21 sthen Exp $
COMMENT= radio contest logger
DISTNAME= tlf-0.9.30
REVISION= 2
DISTNAME= tlf-1.2.1
CATEGORIES= comms hamradio
HOMEPAGE= http://home.iae.nl/users/reinc/TLF-0.2.html
MASTER_SITES= http://sharon.esrac.ele.tue.nl/pub/linux/ham/tlf/ \
http://www.wwns.com/tlf/
MASTER_SITES= https://github.com/Tlf/tlf/archive/
WRKDIST= ${WRKDIR}/tlf-${DISTNAME}
CONFIGURE_STYLE=autoheader gnu
# License: GPL
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= hamlib>=2 ncurses pthread sndio c m
WANTLIB= glib-2.0 hamlib>=2 ncurses panel pthread sndio c m
MODULES+= devel/gettext
SOME_LD_FLAGS= -lsndio
SOME_CPP_FLAGS=
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.11
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
AUTOCONF_VER= 2.59
AUTOMAKE_VER= 1.9
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-hamlib
LIB_DEPENDS= comms/hamlib \
devel/glib2
BUILD_DEPENDS= devel/automake/${AUTOMAKE_VER} \
devel/autoconf/${AUTOCONF_VER}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-lsndio -L${LOCALBASE}/lib"
CONFIGURE_ARGS+=--enable-hamlib
LIB_DEPENDS= comms/hamlib
SOME_CPP_FLAGS += -I${LOCALBASE}/include
SOME_LD_FLAGS += -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${SOME_CPP_FLAGS}" \
LDFLAGS="${SOME_LD_FLAGS}" \
AUTOMAKE_VERSION=${AUTOMAKE_VER} \
AUTOCONF_VERSION=${AUTOCONF_VER}
USE_GROFF = Yes
pre-configure:
cd $(WRKSRC) && env AUTOCONF_VERSION=$(AUTOCONF_VER) \
AUTOMAKE_VERSION=$(AUTOMAKE_VER) aclocal
cd $(WRKSRC) && env AUTOCONF_VERSION=$(AUTOCONF_VER) \
AUTOMAKE_VERSION=$(AUTOMAKE_VER) automake --add-missing
cd $(WRKSRC) && env AUTOCONF_VERSION=$(AUTOCONF_VER) \
AUTOMAKE_VERSION=$(AUTOMAKE_VER) autoconf
cd $(WRKSRC) && env AUTOCONF_VERSION=$(AUTOCONF_VER) \
AUTOMAKE_VERSION=$(AUTOMAKE_VER) autoheader
post-patch:
cd ${WRKSRC}; \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf --install
.include <bsd.port.mk>

7
comms/tlf/distinfo
View File

@ -1,5 +1,2 @@
MD5 (tlf-0.9.30.tar.gz) = /I+usj16VMlus6lizE2eTg==
RMD160 (tlf-0.9.30.tar.gz) = 17lS+iAtvhowYfZTsetpjqNhiOY=
SHA1 (tlf-0.9.30.tar.gz) = EeXWlMG3PHRrDRWz6XXwX9Vbd1Q=
SHA256 (tlf-0.9.30.tar.gz) = yB+f0hJouuG8p7PuzQkhaIXhsbhCjUsdUK84bANt5O4=
SIZE (tlf-0.9.30.tar.gz) = 390608
SHA256 (tlf-1.2.1.tar.gz) = 2s4Yq9+T11SsxHqXvvmszFQiNI6SqmVKJoSrqge8VCU=
SIZE (tlf-1.2.1.tar.gz) = 393567

11
comms/tlf/patches/patch-doc_Makefile_am
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-doc_Makefile_am,v 1.1.1.1 2007/05/30 05:55:56 jason Exp $
--- doc/Makefile.am.orig Wed Nov 23 00:46:53 2005
+++ doc/Makefile.am Wed Nov 23 00:47:05 2005
@@ -3,5 +3,5 @@ EXTRA_DIST = README
CLEANFILES = *~
install-data-local:
- $(mkinstalldirs) $(pkgdatadir)/doc
- install -m 0644 README $(pkgdatadir)/doc
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc
+ install -m 0644 README $(DESTDIR)$(pkgdatadir)/doc

41
comms/tlf/patches/patch-rules_Makefile_am
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-rules_Makefile_am,v 1.1.1.1 2007/05/30 05:55:56 jason Exp $
--- rules/Makefile.am.orig Wed Nov 23 00:47:24 2005
+++ rules/Makefile.am Wed Nov 23 00:48:15 2005
@@ -6,20 +6,20 @@ SUBDIRS =
CLEANFILES = *~
install-data-local:
- $(mkinstalldirs) $(pkgdatadir)/rules
- install -m 0644 arrldx_dx $(pkgdatadir)/rules
- install -m 0644 arrldx_usa $(pkgdatadir)/rules
- install -m 0644 arrlfd $(pkgdatadir)/rules
- install -m 0644 arrlss $(pkgdatadir)/rules
- install -m 0644 cqww $(pkgdatadir)/rules
- install -m 0644 dxped $(pkgdatadir)/rules
- install -m 0644 eusprint $(pkgdatadir)/rules
- install -m 0644 lzdx $(pkgdatadir)/rules
- install -m 0644 pacc_pa $(pkgdatadir)/rules
- install -m 0644 pacc_dx $(pkgdatadir)/rules
- install -m 0644 qso $(pkgdatadir)/rules
- install -m 0644 spdx_dx $(pkgdatadir)/rules
- install -m 0644 spdx_sp $(pkgdatadir)/rules
- install -m 0644 ssa_mt $(pkgdatadir)/rules
- install -m 0644 template $(pkgdatadir)/rules
- install -m 0644 wpx $(pkgdatadir)/rules
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 arrldx_dx $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 arrldx_usa $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 arrlfd $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 arrlss $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 cqww $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 dxped $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 eusprint $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 lzdx $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 pacc_pa $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 pacc_dx $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 qso $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 spdx_dx $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 spdx_sp $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 ssa_mt $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 template $(DESTDIR)$(pkgdatadir)/rules
+ install -m 0644 wpx $(DESTDIR)$(pkgdatadir)/rules

12
comms/tlf/patches/patch-scripts_Makefile_am
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-scripts_Makefile_am,v 1.1.1.1 2007/05/30 05:55:56 jason Exp $
--- scripts/Makefile.am.orig Wed Nov 23 00:49:56 2005
+++ scripts/Makefile.am Wed Nov 23 00:50:08 2005
@@ -3,7 +3,7 @@ EXTRA_DIST = soundlog
CLEANFILES = *~
install-exec-local:
- install soundlog $(bindir)
+ install soundlog $(DESTDIR)$(bindir)
uninstall:
rm -f $(bindir)/soundlog

26
comms/tlf/patches/patch-share_Makefile_am
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-share_Makefile_am,v 1.2 2014/11/04 07:41:10 ratchov Exp $
--- share/Makefile.am.orig Wed Apr 5 09:16:51 2006
+++ share/Makefile.am Fri Oct 31 19:10:21 2014
@@ -4,14 +4,14 @@ EXTRA_DIST = callmaster cty.dat logcfg.dat arrlsection
spdxmults ssamults
install-data-local:
- install -m 0644 callmaster $(pkgdatadir)
- install -m 0644 cty.dat $(pkgdatadir)
- install -m 0644 logcfg.dat $(pkgdatadir)
- install -m 0644 arrlsections $(pkgdatadir)
- install -m 0644 ea_sections $(pkgdatadir)
- install -m 0644 paccmults $(pkgdatadir)
- install -m 0644 spdxmults $(pkgdatadir)
- install -m 0644 ssamults $(pkgdatadir)
+ install -m 0644 callmaster $(DESTDIR)$(pkgdatadir)
+ install -m 0644 cty.dat $(DESTDIR)$(pkgdatadir)
+ install -m 0644 logcfg.dat $(DESTDIR)$(pkgdatadir)
+ install -m 0644 arrlsections $(DESTDIR)$(pkgdatadir)
+ install -m 0644 ea_sections $(DESTDIR)$(pkgdatadir)
+ install -m 0644 paccmults $(DESTDIR)$(pkgdatadir)
+ install -m 0644 spdxmults $(DESTDIR)$(pkgdatadir)
+ install -m 0644 ssamults $(DESTDIR)$(pkgdatadir)
uninstall:
rm -rf $(pkgdatadir)

108
comms/tlf/patches/patch-src_audio_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_audio_c,v 1.1 2014/11/04 07:41:10 ratchov Exp $
--- src/audio.c.orig Wed Apr 5 09:16:50 2006
+++ src/audio.c Fri Oct 31 19:49:46 2014
@@ -31,12 +31,48 @@
$OpenBSD: patch-src_audio_c,v 1.2 2014/11/04 10:58:21 sthen Exp $
--- src/audio.c.orig Thu May 15 12:59:25 2014
+++ src/audio.c Mon Nov 3 21:02:56 2014
@@ -32,13 +32,48 @@
extern char sc_device[];
@ -13,97 +13,97 @@ $OpenBSD: patch-src_audio_c,v 1.1 2014/11/04 07:41:10 ratchov Exp $
#define ABUFSIZE 4000
void init_audio() {
void init_audio()
{
+#ifdef HAVE_SNDIO
+ struct sio_par par;
+ if ((ahdl = sio_open(SIO_DEVANY, SIO_REC, 0)) == NULL)
+ struct sio_par par;
+
+ if ((ahdl = sio_open(SIO_DEVANY, SIO_REC, 0)) == NULL)
+ {
+ fprintf(stderr, "Failed to open audio device\n");
+ exit(1);
+ }
+
+ sio_initpar(&par);
+ par.bits = 8;
+ par.sig = 0;
+ par.rchan = 1;
+ par.rate = 8000;
+ if (!sio_setpar(ahdl, &par) || !sio_getpar(ahdl, &par))
+ sio_initpar(&par);
+ par.bits = 8;
+ par.sig = 0;
+ par.rchan = 1;
+ par.rate = 8000;
+ if (!sio_setpar(ahdl, &par) || !sio_getpar(ahdl, &par))
+ {
+ fprintf(stderr, "Couldn't set audio parameters\n");
+ exit(1);
+ }
+
+ if (par.bits != 8 || par.sig || par.rchan != 1 || par.rate != 8000)
+ if (par.bits != 8 || par.sig || par.rchan != 1 || par.rate != 8000)
+ {
+ fprintf(stderr, "Unsupported audio parameters\n");
+ exit(1);
+ }
+
+ if (!sio_start(ahdl))
+ if (!sio_start(ahdl))
+ {
+ fprintf(stderr, "Couldn't start audio device\n");
+ exit(1);
+ }
+
+#else
char afile[40]; /* Audio device name */
int sndfmt; /* Encoding of audio from */
int channels; /* Number of channels to record */
@@ -73,11 +109,15 @@ int afd;
perror("8000 sps");
exit(errno);
char afile[40]; /* Audio device name */
int sndfmt; /* Encoding of audio from */
int channels; /* Number of channels to record */
@@ -71,12 +106,16 @@ void init_audio()
perror("8000 sps");
exit(errno);
}
+#endif
}
int close_audio() {
int close_audio()
{
-
+#ifdef HAVE_SNDIO
+ sio_close (ahdl);
+ sio_close (ahdl);
+#else
close (afd);
close(afd);
+#endif
return (0);
return (0);
}
@@ -113,7 +153,23 @@ else testvalue = 0;
return (testvalue);
@@ -132,6 +171,23 @@ int rescale(int testvalue)
return (testvalue);
}
+#ifdef HAVE_SNDIO
+void read_abuf(unsigned char *p) {
+ size_t todo, n;
+ todo = ABUFSIZE;
+ while (todo > 0) {
+ n = sio_read(ahdl, p, todo);
+ if (n == 0) {
+ fprintf(stderr, "Failed to read from audio device\n");
+ exit(1);
+ }
+ p += n;
+ todo -= n;
+ size_t todo, n;
+
+ todo = ABUFSIZE;
+ while (todo > 0) {
+ n = sio_read(ahdl, p, todo);
+ if (n == 0) {
+ fprintf(stderr, "Failed to read from audio device\n");
+ exit(1);
+ }
+ p += n;
+ todo -= n;
+ }
+}
+#endif
+
float get_audio_sample(void) {
float get_audio_sample(void)
{
int rc=0; /* Return value from subs */
@@ -125,11 +181,15 @@ float get_audio_sample(void) {
int i, k;
@@ -144,10 +200,14 @@ float get_audio_sample(void)
int i, k;
for (k=0; k < 4; k++) {
for (k = 0; k < 4; k++) {
+#ifdef HAVE_SNDIO
+ read_abuf(abuf);
+ read_abuf(abuf);
+#else
if ((rc = read(afd, abuf, ABUFSIZE)) == -1)
{
perror("audio read");
exit(errno);
}
if ((rc = read(afd, abuf, ABUFSIZE)) == -1) {
perror("audio read");
exit(errno);
}
+#endif
for (i=0; i < rc; i++) // calculate average
{
for (i = 0; i < rc; i++) // calculate average
{

2
comms/tlf/patches/patch-src_audio_h
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_audio_h,v 1.1 2014/11/04 07:41:10 ratchov Exp $
$OpenBSD: patch-src_audio_h,v 1.2 2014/11/04 10:58:21 sthen Exp $
--- src/audio.h.orig Fri Oct 31 18:10:24 2014
+++ src/audio.h Fri Oct 31 18:55:16 2014
@@ -28,7 +28,11 @@

21
comms/tlf/pkg/PLIST
View File

@ -1,24 +1,36 @@
@comment $OpenBSD: PLIST,v 1.2 2007/05/30 21:54:17 jason Exp $
@comment $OpenBSD: PLIST,v 1.3 2014/11/04 10:58:21 sthen Exp $
bin/play_vk
bin/soundlog
bin/tlf
@bin bin/tlf
@man man/man1/tlf.1
share/doc/tlf/
share/doc/tlf/FAQ
share/doc/tlf/New_Bandmap.txt
share/doc/tlf/README
share/doc/tlf/README.cabrillo
share/doc/tlf/README.ssb
share/tlf/
share/tlf/arrl10m_mults
share/tlf/arrldx_mults
share/tlf/arrlsections
share/tlf/cabrillo.fmt
share/tlf/callmaster
share/tlf/cty.dat
share/tlf/doc/
share/tlf/doc/README
share/tlf/ea_sections
share/tlf/help.txt
share/tlf/logcfg.dat
share/tlf/paccmults
share/tlf/rules/
share/tlf/rules/arrl10m_dx
share/tlf/rules/arrldx_dx
share/tlf/rules/arrldx_usa
share/tlf/rules/arrlfd
share/tlf/rules/arrlss
share/tlf/rules/contest
share/tlf/rules/cqww
share/tlf/rules/dxped
share/tlf/rules/eusprint
share/tlf/rules/focmarathon
share/tlf/rules/lzdx
share/tlf/rules/pacc_dx
share/tlf/rules/pacc_pa
@ -26,6 +38,7 @@ share/tlf/rules/qso
share/tlf/rules/spdx_dx
share/tlf/rules/spdx_sp
share/tlf/rules/ssa_mt
share/tlf/rules/stewperry
share/tlf/rules/template
share/tlf/rules/wpx
share/tlf/spdxmults