o Add support for OpenBSD native /dev/radio (note that wmtune uses interface

which was commited into -current on December 5th)
o Remove the aztech and radiotrack flavors since both are supported by
  OpenBSD drivers
o Simplify config file (now there's no need to specify number of presets)
o Small fixes like strcpy -> strlcpy etc

Submitted by maintainer Vladimir Popov <pva48@mail.ru>.
This commit is contained in:
naddy 2001-12-20 21:18:02 +00:00
parent 7a84297a59
commit e5fea06b9f
7 changed files with 1912 additions and 275 deletions

View File

@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.3 2001/07/18 10:59:00 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2001/12/20 21:18:02 naddy Exp $
COMMENT= "premier dockable radio tuner"
ONLY_FOR_ARCHS= i386
DISTNAME= wmtune-1.1c
CATEGORIES= audio x11 x11/windowmaker
NEED_VERSION= 1.422
NEED_VERSION= 1.500
HOMEPAGE= http://soren.org/linux/wmtune/
@ -21,24 +19,15 @@ MASTER_SITES= ${HOMEPAGE}dl/
USE_X11= Yes
FLAVORS= aztech zoltrix radiotrack
FLAVOR?= aztech
FLAVORS= zoltrix
FLAVOR?=
.if ${FLAVOR:L} == "aztech"
CFLAGS+= -DAZTECH
.elif ${FLAVOR:L} == "zoltrix"
.if ${FLAVOR:L} == "zoltrix"
CFLAGS+= -DZOLTRIX
.elif ${FLAVOR:L} == "radiotrack"
CFLAGS+= -DRADIOTRACK
.else
ERRORS+= "Fatal: Conflicting flavor: ${FLAVOR}"
BINMODE= 4555
ONLY_FOR_ARCHS= i386
.endif
WRKDIST= ${WRKDIR}/wmtune-1.0.1-combined/
BINMODE= 4555
post-extract:
@cp files/wmtune.1 ${WRKDIST}
.include <bsd.port.mk>

View File

@ -1,20 +1,20 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2001/03/16 15:30:48 wilfried Exp $
--- Makefile.orig Mon Mar 1 12:01:17 1999
+++ Makefile Fri Mar 16 16:26:23 2001
@@ -1,21 +1,22 @@
$OpenBSD: patch-Makefile,v 1.2 2001/12/20 21:18:02 naddy Exp $
--- Makefile.orig Mon Mar 1 16:01:17 1999
+++ Makefile Fri Dec 7 14:49:42 2001
@@ -1,24 +1,21 @@
-RADIOCARD = ZOLTRIX # Can be RADIOTRACK, ZOLTRIX, KERNEL
-INCDIR = -I/usr/X11R6/include
-LIBDIR = -L/usr/X11R6/lib
-LIBS = -lXpm -lXext -lX11
+CFLAGS+= -I${X11BASE}/include
+LIBDIR = -L${X11BASE}/lib
+LIBS = -lXpm -lXext -lX11 -li386 # For OpenBSD/i386
OBJS = src/wmtune.o \
src/wmgeneral/wmgeneral.o \
LIBS = -lXpm -lXext -lX11
-OBJS = src/wmtune.o \
- src/wmgeneral/wmgeneral.o \
-
-.c.o:
- cc -c -O2 -Wall -D$(shell echo `uname -s`) $< -o $*.o $(INCDIR) -D$(RADIOCARD)
-
+OBJS = src/wmtune.o src/wmgeneral/wmgeneral.o
all: wmtune
+.c.o:
@ -33,4 +33,8 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2001/03/16 15:30:48 wilfried Exp $
+ ${BSD_INSTALL_DATA} sample.wmtunerc ${PREFIX}/share/examples/wmtune
clean:
for i in $(OBJS) ; do \
- for i in $(OBJS) ; do \
- rm -f $$i; \
- done
- rm -f wmtune
+ rm -f $(OBJS) wmtune

View File

@ -1,11 +1,23 @@
$OpenBSD: patch-sample_wmtunerc,v 1.1.1.1 2001/03/16 15:30:48 wilfried Exp $
--- sample.wmtunerc.orig Wed Feb 2 18:05:36 2000
+++ sample.wmtunerc Wed Feb 2 18:07:14 2000
@@ -3,6 +3,7 @@
$OpenBSD: patch-sample_wmtunerc,v 1.2 2001/12/20 21:18:02 naddy Exp $
--- sample.wmtunerc.orig Sat Oct 24 19:18:21 1998
+++ sample.wmtunerc Sat Dec 8 14:36:35 2001
@@ -1,17 +1,15 @@
# /etc/wmtunerc || ~/.wmtunerc
# Configuration file for WMTune
0x20c # hex IO address of your radio card, most likely 0x30f or 0x20f
-0x20c # hex IO address of your radio card, most likely 0x30f or 0x20f
+#0x20c # hex IO address of your radio card
# for zoltrix card 0x20c or 0x30c
+ # for aztech card 0x350 or 0x358
+ # Do not specify any port number for native port
# note: presets can be as long as 000.000 and will still be used; yet display
# up to the 100th will be trucated.
# note: the first preset will be the initial radio station upon initially
# turning the card on-- only following initial execution of the program.
-
-15 # number of presets to be read in list below (1-99)
-
# note: valid radio stations are ###.###
88.2 # preset 1, 5-FM

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,113 @@
$OpenBSD: patch-wmtune_1,v 1.1 2001/12/20 21:18:02 naddy Exp $
--- wmtune.1.orig Sat Dec 8 14:44:12 2001
+++ wmtune.1 Sat Dec 8 14:44:03 2001
@@ -0,0 +1,109 @@
+.\" $OpenBSD: patch-wmtune_1,v 1.1 2001/12/20 21:18:02 naddy Exp $
+.\"
+.Dd December 8, 2001
+.Dt WMTUNE 1
+.Sh NAME
+.Nm wmtune
+.Nd premier dockable radio tuner
+.Sh SYNOPSIS
+.Nm wmtune
+.Op Fl n
+.Op Fl f Ar filename
+.Op Fl t Ar hh:mm
+.Op Fl p Ar ##
+.Op Fl h
+.Sh DESCRIPTION
+The
+.Nm
+is a WindowMaker dock.app that controls AIMS Lab RadioTrack, Zoltrix,
+Aztech/PackardBell FM radio tuner cards and cards supported by OpenBSD (native
+mode).
+.Pp
+The
+.Ql +
+and
+.Ql \-
+buttons are for FINE tuning.
+.Pp
+The 2 buttons to the right of the FINE tuning buttons are the SCAN buttons.
+.Pp
+The 2 SCAN buttons also double as VOLUME UP/DOWN when using the RIGHT mouse
+button.
+.Pp
+In the bottom left there is a small two digit box in which the currently
+selected preset will be shown.
+The
+.Ql <
+and
+.Ql >
+arrow buttons to the left of the box allow to switch between
+presets easily and quickly.
+.Pp
+To the right of the above described things there is yet another button with
+a miniature ON/OFF logo.
+This is used to turn your radio card on/off.
+.Pp
+The button with the inscribed letter
+.Ql A
+allows you to control the internal alarm clock/delay timer.
+Upon pressing the
+.Ql A
+button you will be allowed to set the timer/delay to a time you wish the radio
+to turn on/off (depending on the current state of the radio) automatically.
+.Pp
+After pressing the
+.Ql A
+button the first time you may set the now displayed clock type panel to
+the desired setting using the SCAN buttons to set your timer in the 24 hour
+format (be aware in this state other buttons cease to work).
+You must press the
+.Ql A
+button again at which point the indicator light will turn on and the alarm
+will be set.
+Lastly, pressing the
+.Ql A
+button once more, will disengance the timer.
+.Sh OPTIONS
+.Bl -tag -width filename
+.It Fl f Ar filename
+Use
+.Ar filename
+as a radio device file (only for wmtune which uses native OpenBSD drivers).
+.It Fl n
+Turn radio on initially on startup.
+.It Fl t Ar hh:mm
+Set timer on startup, military time.
+.It Fl p Ar ##
+Set startup preset # listed in wmtunerc file.
+.It Fl h
+Display help screen.
+.Sh EXAMPLES
+.Dl wmtune -n -p 5
+.Dl wmtune -p 2 -t 14:35
+.Dl wmtune -n -t 00:00
+.Sh ENVIRONMENT
+The following environment variable affects the execution of
+.Nm wmtune
+in the OpenBSD native mode:
+.Bl -tag -width RADIODEVICE
+.It Ev RADIODEVICE
+The radio tuner device to use.
+.El
+.Sh FILES
+.Bl -tag -width /dev/wmtunerc
+.It /etc/wmtunerc
+global configuration file
+.It ~/.wmtunerc
+user configuration file
+.It /dev/radio
+default radio device in the native mode
+.El
+.Sh SEE ALSO
+.Xr radioctl 1 ,
+.Xr radio 4
+.Sh AUTHORS
+.Nm
+written by
+.An soren Aq soren@leiden.org ,
+the manpage written by
+.An Vladimir Popov Aq pva48@mail.ru

View File

@ -1,4 +1,4 @@
WMTune is a WindowMaker dock.app that controls AIMS Lab Radio-Track
Zoltrix and Aztech/PackardBell FM radio tuner cards.
WMTune is a WindowMaker dock.app that controls Zoltrix FM radio tuner cards
and any other cards supported under OpenBSD.
WWW: ${HOMEPAGE}