You beat me to it.

ok armani@

2014-11-05 9:30 GMT+01:00 Alexandre Ratchov <a...@caoua.org>:

> On Wed, Oct 29, 2014 at 09:00:25PM +0000, Christian Weisgerber wrote:
> > On 2014-10-29, Jonathan Armani <d...@asystant.net> wrote:
> >
> > > audio/mixer.app
> > > audio/wmix
> > > audio/wmmixer (maybe worth keeping for wm user, does it work ?)
> > > audio/xmix
> > > audio/xmmix
> >
> > Yes, I'm in favor of removing them all.
> >
>
> Yes, Sir. ;)
>
> Index: devel/quirks/files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.197
> diff -u -p -u -p -r1.197 Quirks.pm
> --- devel/quirks/files/Quirks.pm        4 Nov 2014 19:21:45 -0000
>  1.197
> +++ devel/quirks/files/Quirks.pm        5 Nov 2014 08:19:59 -0000
> @@ -470,6 +470,11 @@ my $obsolete_reason = {
>         'esound' => 3,
>         'extace' => 3,
>         'gkrellmss' => 3,
> +       'mixer.app' => 0,
> +       'wmix' => 0,
> +       'wmmixer' => 0,
> +       'xmix' => 0,
> +       'xmmix' => 0,
>  };
>
>  # ->is_base_system($handle, $state):
> Index: audio/Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/Makefile,v
> retrieving revision 1.341
> diff -u -p -u -p -r1.341 Makefile
> --- audio/Makefile      4 Nov 2014 19:12:01 -0000       1.341
> +++ audio/Makefile      5 Nov 2014 08:19:59 -0000
> @@ -108,7 +108,6 @@
>       SUBDIR += midish
>       SUBDIR += mikmod
>       SUBDIR += milkytracker
> -     SUBDIR += mixer.app
>       SUBDIR += mkplaylist
>       SUBDIR += mono-taglib
>       SUBDIR += morseplayer
> @@ -256,8 +255,6 @@
>       SUBDIR += vorbis-tools
>       SUBDIR += vorbisgain
>       SUBDIR += wavpack
> -     SUBDIR += wmix
> -     SUBDIR += wmmixer
>       SUBDIR += wmmp
>       SUBDIR += wmmp3
>       SUBDIR += wmtune
> @@ -266,8 +263,6 @@
>       SUBDIR += xcdplayer
>       SUBDIR += xhippo
>       SUBDIR += xmcd
> -     SUBDIR += xmix
> -     SUBDIR += xmmix
>       SUBDIR += xmms
>       SUBDIR += xmms-flac
>       SUBDIR += xmms-fmradio
> Index: audio/mixer.app/Makefile
> ===================================================================
> RCS file: audio/mixer.app/Makefile
> diff -N audio/mixer.app/Makefile
> --- audio/mixer.app/Makefile    20 Apr 2014 10:00:21 -0000      1.22
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,26 +0,0 @@
> -# $OpenBSD: Makefile,v 1.22 2014/04/20 10:00:21 jasper Exp $
> -
> -COMMENT=               wm-dockapp; sound mixer
> -
> -DISTNAME=              Mixer.app-1.8.0
> -PKGNAME=               ${DISTNAME:L}
> -REVISION=              2
> -CATEGORIES=            audio x11 x11/windowmaker
> -
> -HOMEPAGE=              http://www.fukt.hk-r.se/~per/mixer/
> -
> -# GPL
> -PERMIT_PACKAGE_CDROM=  Yes
> -
> -WANTLIB=               X11 Xext Xpm c m ossaudio stdc++
> -
> -MASTER_SITES=          ${HOMEPAGE}
> -
> -NO_TEST=               Yes
> -
> -do-install:
> -       ${INSTALL_PROGRAM_DIR} ${PREFIX}/GNUstep/Apps/Mixer.app
> -       ${INSTALL_PROGRAM} ${WRKBUILD}/Mixer.app
> ${PREFIX}/GNUstep/Apps/Mixer.app/Mixer
> -       ${INSTALL_MAN} ${FILESDIR}/Mixer.1 ${PREFIX}/man/man1
> -
> -.include <bsd.port.mk>
> Index: audio/mixer.app/distinfo
> ===================================================================
> RCS file: audio/mixer.app/distinfo
> diff -N audio/mixer.app/distinfo
> --- audio/mixer.app/distinfo    5 Apr 2007 15:37:43 -0000       1.4
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -MD5 (Mixer.app-1.8.0.tar.gz) = 4sJ18WqRxSVS2eIiHhjSTA==
> -RMD160 (Mixer.app-1.8.0.tar.gz) = rimptsSj031I9eK5NqxiuBzALFI=
> -SHA1 (Mixer.app-1.8.0.tar.gz) = aLZE4rE/5KiUYc8oq2rrvK7cBVI=
> -SHA256 (Mixer.app-1.8.0.tar.gz) =
> IjwI2R/Xkw1ql86jdrmfsBGM3qEkBsfWLRfTgna03RU=
> -SIZE (Mixer.app-1.8.0.tar.gz) = 37884
> Index: audio/mixer.app/files/Mixer.1
> ===================================================================
> RCS file: audio/mixer.app/files/Mixer.1
> diff -N audio/mixer.app/files/Mixer.1
> --- audio/mixer.app/files/Mixer.1       28 Mar 2003 22:11:24 -0000      1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,43 +0,0 @@
> -.\" $OpenBSD: Mixer.1,v 1.2 2003/03/28 22:11:24 david Exp $
> -.Dd February 21, 2000
> -.Dt MIXER.APP 1
> -.Os
> -.Sh NAME
> -.Nm Mixer.app
> -.Sh SYNOPSIS
> -.Nm Mixer.app
> -.Sh Hints for Mixer.app
> -
> -.Sh Error led:
> -If the led on Mixer.app is red an error message has
> -been printed to stderr and something is not working
> -correctly. If the led is green everything is working ok.
> -
> -.Sh Mute:
> -Right click on a volume controller to mute the sound
> -source. The button will then have a red led in one corner.
> -Right click again to restore the volume. If a muted sound
> -source is modified by another application Mixer.app will
> -automaticaly release its muted state.
> -
> -.Sh Wheel mouse:
> -If you have a wheel mouse (where the wheel is configured as
> -Button4 and Button5) you can control the volume by just moving
> -the mouse over Mixer.app and roll the wheel up and down. Use
> -the command line option -w to specify which slider that should
> -react to the wheel movement.
> -
> -.Sh Label:
> -If you run multiple instances of Mixer.app you might want
> -to be able to tell them apart. This can easily be done
> -by setting a label to each one of them. By using the -l
> -option you can add a little text label at the bottom of
> -the mixer.
> -
> -.Sh Save volume settings:
> -Use the option -s or -S <file> if you want the volume
> -settings to be saved when Mixer.app exits, and then
> -loaded again when Mixer.app is started the next time.
> -When using -s the settings are saved in/loaded from
> -~/GNUstep/Defaults/Mixer. Use the -S <file> option
> -if you want to use a different file.
> Index: audio/mixer.app/patches/patch-Makefile
> ===================================================================
> RCS file: audio/mixer.app/patches/patch-Makefile
> diff -N audio/mixer.app/patches/patch-Makefile
> --- audio/mixer.app/patches/patch-Makefile      21 Mar 2001 13:45:27
> -0000      1.1
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.1 2001/03/21 13:45:27 wilfried Exp $
> ---- Makefile.orig      Sat Mar 17 22:30:34 2001
> -+++ Makefile   Wed Mar 21 14:39:35 2001
> -@@ -6,9 +6,9 @@ DESTDIR =
> - GNUSTEP_BINDIR = /usr/local/GNUstep/Apps/Mixer.app
> - X11_BINDIR = /usr/X11R6/bin
> -
> --CXX=c++
> --CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2
> -I/usr/X11R6/include
> --LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11
> -+#CXX=c++
> -+CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions
> -I${X11BASE}/include
> -+LDFLAGS += -L${X11BASE}/lib -lXpm -lXext -lX11 -lossaudio
> -
> - OBJECTS = Main.o Mixer.o Xpm.o
> -
> Index: audio/mixer.app/pkg/DESCR
> ===================================================================
> RCS file: audio/mixer.app/pkg/DESCR
> diff -N audio/mixer.app/pkg/DESCR
> --- audio/mixer.app/pkg/DESCR   15 Dec 2003 21:42:12 -0000      1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -A dockapp that controls the mixer for three volumes by default:
> -       * Master
> -       * CD
> -       * PCM
> Index: audio/mixer.app/pkg/PLIST
> ===================================================================
> RCS file: audio/mixer.app/pkg/PLIST
> diff -N audio/mixer.app/pkg/PLIST
> --- audio/mixer.app/pkg/PLIST   6 Aug 2004 14:37:27 -0000       1.3
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,6 +0,0 @@
> -@comment $OpenBSD: PLIST,v 1.3 2004/08/06 14:37:27 espie Exp $
> -GNUstep/
> -GNUstep/Apps/
> -GNUstep/Apps/Mixer.app/
> -GNUstep/Apps/Mixer.app/Mixer
> -@man man/man1/Mixer.1
> Index: audio/wmix/Makefile
> ===================================================================
> RCS file: audio/wmix/Makefile
> diff -N audio/wmix/Makefile
> --- audio/wmix/Makefile 8 Oct 2014 08:36:37 -0000       1.15
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,34 +0,0 @@
> -# $OpenBSD: Makefile,v 1.15 2014/10/08 08:36:37 dcoppa Exp $
> -
> -COMMENT=               wm-dockapp; audio mixer
> -
> -DISTNAME=              wmix-3.1
> -CATEGORIES=            audio x11 x11/windowmaker
> -
> -HOMEPAGE=              http://www.ne.jp/asahi/linux/timecop/
> -
> -# GPL
> -PERMIT_PACKAGE_CDROM=  Yes
> -
> -WANTLIB=               X11 Xext Xpm c m ossaudio
> -
> -MASTER_SITES=          ${HOMEPAGE}software/
> -
> -MAKE_ENV=              CC="${CC}"
> -NO_TEST =              Yes
> -
> -ALL_TARGET=            wmix
> -
> -DOCS=                  README
> -DOCDIR=                        ${PREFIX}/share/doc/wmix
> -SAMPLES=               sample.wmixrc
> -SAMPLE_DIR=            ${PREFIX}/share/examples/wmix
> -SUBST_VARS+=           SAMPLE_DIR
> -
> -post-install:
> -       ${INSTALL_DATA_DIR} ${DOCDIR} ${SAMPLE_DIR}
> -       cd ${WRKSRC} && \
> -               ${INSTALL_DATA} ${DOCS} ${DOCDIR} && \
> -               ${INSTALL_DATA} ${SAMPLES} ${SAMPLE_DIR}
> -
> -.include <bsd.port.mk>
> Index: audio/wmix/distinfo
> ===================================================================
> RCS file: audio/wmix/distinfo
> diff -N audio/wmix/distinfo
> --- audio/wmix/distinfo 8 Oct 2014 08:36:37 -0000       1.4
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -SHA256 (wmix-3.1.tar.gz) = SyoEJ2imhe2NMOan7WvU4TAiZlyddyVFZUyJ7BQ34yI=
> -SIZE (wmix-3.1.tar.gz) = 21344
> Index: audio/wmix/patches/patch-Makefile
> ===================================================================
> RCS file: audio/wmix/patches/patch-Makefile
> diff -N audio/wmix/patches/patch-Makefile
> --- audio/wmix/patches/patch-Makefile   24 Jan 2002 13:47:13 -0000
> 1.1.1.1
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,29 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.1.1.1 2002/01/24 13:47:13 wilfried Exp $
> ---- Makefile.orig      Fri May 25 12:09:12 2001
> -+++ Makefile   Thu Jan 24 14:35:07 2002
> -@@ -1,18 +1,15 @@
> --CC            = gcc
> --CFLAGS                = -O3 -W -Wall
> --LDFLAGS               = -L/usr/X11R6/lib
> -+CFLAGS                += -I${X11BASE}/include
> -+LDFLAGS               = -L${X11BASE}/lib
> - OBJECTS               = misc.o mixer-oss.o ui_x.o wmix.o
> -
> --# where to install this program (also for packaging stuff)
> --DESTDIR               =
> --PREFIX                = $(DESTDIR)/usr/X11R6
> --INSTALL               = -m 755
> --
> - wmix: $(OBJECTS)
> --      $(CC) -o $@ $(LDFLAGS) $(OBJECTS) -lXpm -lXext -lX11 -lm
> -+      $(CC) -o $@ $(LDFLAGS) $(OBJECTS) -lXpm -lXext -lX11 -lm -lossaudio
> -
> - clean:
> -       rm -rf *.o wmix *~
> -
> - install: wmix
> --      install $(INSTALL) wmix $(PREFIX)/bin
> -+      ${BSD_INSTALL_PROGRAM} wmix $(PREFIX)/bin
> -+      @gunzip wmix.1x.gz
> -+      @perl -pi -e 's/\.\././' wmix.1x
> -+      ${BSD_INSTALL_MAN} wmix.1x $(PREFIX)/man/man1/wmix.1
> Index: audio/wmix/patches/patch-mixer-oss_c
> ===================================================================
> RCS file: audio/wmix/patches/patch-mixer-oss_c
> diff -N audio/wmix/patches/patch-mixer-oss_c
> --- audio/wmix/patches/patch-mixer-oss_c        8 Oct 2014 08:36:37 -0000
>      1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-mixer-oss_c,v 1.2 2014/10/08 08:36:37 dcoppa Exp $
> ---- mixer-oss.c.orig   Thu May 13 02:27:04 2004
> -+++ mixer-oss.c        Wed Oct  8 10:23:15 2014
> -@@ -28,7 +28,7 @@
> - #include <string.h>
> - #include <assert.h>
> - #include <sys/ioctl.h>
> --#include <sys/soundcard.h>
> -+#include <soundcard.h>
> -
> - #include "include/common.h"
> - #include "include/misc.h"
> Index: audio/wmix/patches/patch-wmix_c
> ===================================================================
> RCS file: audio/wmix/patches/patch-wmix_c
> diff -N audio/wmix/patches/patch-wmix_c
> --- audio/wmix/patches/patch-wmix_c     8 Oct 2014 08:36:37 -0000       1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,36 +0,0 @@
> -$OpenBSD: patch-wmix_c,v 1.2 2014/10/08 08:36:37 dcoppa Exp $
> ---- wmix.c.orig        Thu May 13 02:30:53 2004
> -+++ wmix.c     Wed Oct  8 10:29:03 2014
> -@@ -24,21 +24,20 @@
> - #include <string.h>
> - #include <signal.h>
> - #include <string.h>
> --#include <getopt.h>
> - #include <unistd.h>
> -
> - #include <X11/X.h>
> - #include <X11/Xlib.h>
> - #include <X11/Xutil.h>
> -
> --#include <sys/soundcard.h>
> -+#include <soundcard.h>
> -
> - #include "include/common.h"
> - #include "include/mixer.h"
> - #include "include/misc.h"
> - #include "include/ui_x.h"
> -
> --#define VERSION "3.0"
> -+#define VERSION "3.1"
> -
> - static Display *display;
> - static char *display_name = NULL;
> -@@ -134,7 +133,7 @@ int main(int argc, char **argv)
> -     }
> -
> -     /* handle writing PID file, silently ignore if we can't do it */
> --    pid = calloc(1, strlen(home) + 10);
> -+    pid = calloc(1, strlen(home) + 11);
> -     sprintf(pid, "%s/.wmix.pid", home);
> -     fp = fopen(pid, "w");
> -     if (fp) {
> Index: audio/wmix/pkg/DESCR
> ===================================================================
> RCS file: audio/wmix/pkg/DESCR
> diff -N audio/wmix/pkg/DESCR
> --- audio/wmix/pkg/DESCR        15 Dec 2003 21:42:13 -0000      1.3
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -This is an audio mixer that can run within the Window Maker "Dock"
> -or Aftersteps Wharf. Fluxbox also supports this app.
> -
> -You can configure wmmixer by using a ~/.wmixrc file. You can find
> -a sample rc file in ${SAMPLE_DIR}.
> Index: audio/wmix/pkg/PLIST
> ===================================================================
> RCS file: audio/wmix/pkg/PLIST
> diff -N audio/wmix/pkg/PLIST
> --- audio/wmix/pkg/PLIST        8 Oct 2014 08:36:37 -0000       1.4
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,7 +0,0 @@
> -@comment $OpenBSD: PLIST,v 1.4 2014/10/08 08:36:37 dcoppa Exp $
> -@bin bin/wmix
> -@man man/man1/wmix.1
> -share/doc/wmix/
> -share/doc/wmix/README
> -share/examples/wmix/
> -share/examples/wmix/sample.wmixrc
> Index: audio/wmmixer/Makefile
> ===================================================================
> RCS file: audio/wmmixer/Makefile
> diff -N audio/wmmixer/Makefile
> --- audio/wmmixer/Makefile      10 Mar 2013 22:55:06 -0000      1.19
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,30 +0,0 @@
> -# $OpenBSD: Makefile,v 1.19 2013/03/10 22:55:06 espie Exp $
> -
> -COMMENT=               wm-dockapp; audio mixer
> -
> -DISTNAME=              wmmixer-1.0-beta1
> -PKGNAME=               wmmixer-1.0b1
> -REVISION=              3
> -CATEGORIES=            audio x11 x11/windowmaker
> -
> -# GPL
> -PERMIT_PACKAGE_CDROM=  Yes
> -
> -WANTLIB=               X11 Xau Xdmcp Xext Xpm c m ossaudio stdc++
> -
> -EXTRACT_SUFX=          .tgz
> -
> -NO_TEST=               Yes
> -CONFIGURE_STYLE=       imake noman
> -
> -WRKDIST=               ${WRKDIR}/wmmixer
> -
> -SAMPLE_DIR=            ${PREFIX}/share/examples/wmmixer
> -SUBST_VARS+=           SAMPLE_DIR
> -
> -do-install:
> -       ${INSTALL_PROGRAM} ${WRKBUILD}/wmmixer ${PREFIX}/bin
> -       ${INSTALL_DATA_DIR} ${SAMPLE_DIR}
> -       ${INSTALL_DATA} ${WRKSRC}/home.wmmixer
> ${SAMPLE_DIR}/dot.wmmixer.sample
> -
> -.include <bsd.port.mk>
> Index: audio/wmmixer/distinfo
> ===================================================================
> RCS file: audio/wmmixer/distinfo
> diff -N audio/wmmixer/distinfo
> --- audio/wmmixer/distinfo      5 Apr 2007 15:37:45 -0000       1.3
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -MD5 (wmmixer-1.0-beta1.tgz) = ggDAy5Tj5qD0do/CPSORrA==
> -RMD160 (wmmixer-1.0-beta1.tgz) = Xt6iHyFU684Bi3w02fBYkqyrFtQ=
> -SHA1 (wmmixer-1.0-beta1.tgz) = uGlUVeGnNkqjN/65JPBZ25pYVv4=
> -SHA256 (wmmixer-1.0-beta1.tgz) =
> fmXyx7FmrPcV40i3JOydFbdtq+NraXf9W+vTIF4bLgI=
> -SIZE (wmmixer-1.0-beta1.tgz) = 18801
> Index: audio/wmmixer/patches/patch-Imakefile
> ===================================================================
> RCS file: audio/wmmixer/patches/patch-Imakefile
> diff -N audio/wmmixer/patches/patch-Imakefile
> --- audio/wmmixer/patches/patch-Imakefile       27 Sep 2002 22:51:58
> -0000      1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-Imakefile,v 1.2 2002/09/27 22:51:58 naddy Exp $
> ---- Imakefile.orig     Sat Sep  5 17:11:33 1998
> -+++ Imakefile  Sat Sep 28 00:52:35 2002
> -@@ -1,5 +1,7 @@
> - #ifdef NetBSDArchitecture
> - OSSAUDIO = -lossaudio
> -+#elif defined OpenBSDArchitecture
> -+OSSAUDIO = -lossaudio
> - #else
> - OSSAUDIO =
> - #endif
> -@@ -10,4 +12,6 @@ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) $(OS
> - SRCS = wmmixer.cc
> - OBJS = wmmixer.o
> -
> --ComplexProgramTarget(wmmixer)
> -+wmmixer.man:
> -+
> -+ComplexCplusplusProgramTarget(wmmixer)
> Index: audio/wmmixer/patches/patch-mixctl_h
> ===================================================================
> RCS file: audio/wmmixer/patches/patch-mixctl_h
> diff -N audio/wmmixer/patches/patch-mixctl_h
> --- audio/wmmixer/patches/patch-mixctl_h        27 Sep 2002 22:51:58
> -0000      1.3
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,22 +0,0 @@
> -$OpenBSD: patch-mixctl_h,v 1.3 2002/09/27 22:51:58 naddy Exp $
> ---- mixctl.h.orig      Sat Sep  5 17:11:33 1998
> -+++ mixctl.h   Sat Sep 28 00:52:09 2002
> -@@ -21,6 +21,9 @@
> - #ifdef __FreeBSD__
> - #include <machine/soundcard.h>
> - #endif
> -+#ifdef __OpenBSD__
> -+#include <soundcard.h>
> -+#endif
> - #ifdef __linux__
> - #include <linux/soundcard.h>
> - #endif
> -@@ -31,7 +34,7 @@ public:
> -    MixCtl(char *dname){
> -       device=(char *)malloc(sizeof(char)*(strlen(dname)+1));
> -       strcpy(device,dname);
> --      if(mixfdopen=(mixfd=open(device,O_RDONLY | O_NONBLOCK))!=-1){
> -+      if(mixfdopen=(mixfd=open(device,O_RDWR | O_NONBLOCK))!=-1){
> -          nrdevices=SOUND_MIXER_NRDEVICES;
> -          char *devnames[]=SOUND_DEVICE_NAMES;
> -          char *devlabels[]=SOUND_DEVICE_LABELS;
> Index: audio/wmmixer/patches/patch-wmmixer_cc
> ===================================================================
> RCS file: audio/wmmixer/patches/patch-wmmixer_cc
> diff -N audio/wmmixer/patches/patch-wmmixer_cc
> --- audio/wmmixer/patches/patch-wmmixer_cc      27 Sep 2002 22:51:58
> -0000      1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,34 +0,0 @@
> -$OpenBSD: patch-wmmixer_cc,v 1.2 2002/09/27 22:51:58 naddy Exp $
> ---- wmmixer.cc.orig    Sat Sep  5 17:11:33 1998
> -+++ wmmixer.cc Sat Sep 28 00:53:31 2002
> -@@ -110,8 +110,8 @@ int rpttimer=0;
> - bool dragging=false;
> -
> - int channels=0;
> --int channel[20];
> --int icon[20]={0, 7, 8, 2, 1, 6, 4, 5, 3, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
> 9};
> -+int channel[25];
> -+int icon[25]={0, 7, 8, 2, 1, 6, 4, 5, 3, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
> 9, 9, 9, 9, 9, 9};
> -
> - MixCtl *mixctl;
> -
> -@@ -191,8 +191,8 @@ int main(int argc, char **argv)
> -       fprintf(stderr,"%s : Unable to open mixer device '%s'.\n", NAME,
> mixdev);
> -    else{
> -       for(int i=0;i<mixctl->getNrDevices();i++){
> --       if(i==20){
> --            fprintf(stderr,"%s : Sorry, can only use channels 0-19\n",
> NAME);
> -+       if(i==25){
> -+            fprintf(stderr,"%s : Sorry, can only use channels 0-24\n",
> NAME);
> -             break;
> -        }
> -          if(mixctl->getSupport(i)){
> -@@ -503,7 +503,7 @@ void readFile(){
> -    }
> - }
> -
> --void checkVol(bool forced=true){
> -+void checkVol(bool forced){
> -    mixctl->readVol(channel[curchannel], true);
> -    int nl=mixctl->readLeft(channel[curchannel]);
> -    int nr=mixctl->readRight(channel[curchannel]);
> Index: audio/wmmixer/pkg/DESCR
> ===================================================================
> RCS file: audio/wmmixer/pkg/DESCR
> diff -N audio/wmmixer/pkg/DESCR
> --- audio/wmmixer/pkg/DESCR     26 Oct 2001 22:21:44 -0000      1.3
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -This is an audio mixer that can run within the Window Maker "Dock"
> -or Aftersteps Wharf.
> -
> -You can configure wmmixer by using a ~/.wmmixer file, copy a sample
> -from ${SAMPLE_DIR}.
> Index: audio/wmmixer/pkg/PLIST
> ===================================================================
> RCS file: audio/wmmixer/pkg/PLIST
> diff -N audio/wmmixer/pkg/PLIST
> --- audio/wmmixer/pkg/PLIST     6 Aug 2004 14:37:28 -0000       1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -@comment $OpenBSD: PLIST,v 1.2 2004/08/06 14:37:28 espie Exp $
> -bin/wmmixer
> -share/examples/wmmixer/
> -share/examples/wmmixer/dot.wmmixer.sample
> Index: audio/xmix/Makefile
> ===================================================================
> RCS file: audio/xmix/Makefile
> diff -N audio/xmix/Makefile
> --- audio/xmix/Makefile 15 Oct 2013 20:38:05 -0000      1.32
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,27 +0,0 @@
> -# $OpenBSD: Makefile,v 1.32 2013/10/15 20:38:05 schwarze Exp $
> -
> -COMMENT=       X11-based audio mixer
> -DISTNAME=      xmix-2.1
> -REVISION=      4
> -CATEGORIES=    audio
> -
> -PERMIT_PACKAGE_CDROM=  Yes
> -
> -WANTLIB=       Xau Xdmcp ICE SM X11 Xaw Xext Xmu Xt c ossaudio
> -
> -MASTER_SITES=  ${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
> -PATCHFILES=    xmix-2.1.mixers.patch
> -
> -CONFIGURE_STYLE=       imake
> -
> -WRKDIST=       $(WRKDIR)/xmix
> -
> -NO_TEST=       Yes
> -
> -pre-build:
> -       @cp ${WRKSRC}/xmix.1 ${WRKSRC}/xmix.man
> -
> -pre-install:
> -       ${INSTALL_DATA} $(WRKSRC)/XMix ${PREFIX}/lib/X11/app-defaults
> -
> -.include <bsd.port.mk>
> Index: audio/xmix/distinfo
> ===================================================================
> RCS file: audio/xmix/distinfo
> diff -N audio/xmix/distinfo
> --- audio/xmix/distinfo 5 Apr 2007 15:37:45 -0000       1.3
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,10 +0,0 @@
> -MD5 (xmix-2.1.mixers.patch) = Jnhq3lndIvAXAL4ujSI5ww==
> -MD5 (xmix-2.1.tar.gz) = kha4R0b8ZhedzZNpaxOdaA==
> -RMD160 (xmix-2.1.mixers.patch) = u7xLRO1gPlQET8HHH6IPQ3PK6Bo=
> -RMD160 (xmix-2.1.tar.gz) = DxvBW4m/xlet6bEsud7LJI14CSU=
> -SHA1 (xmix-2.1.mixers.patch) = hrQjd0pq/NVqj4kxEIgj1wLbHqU=
> -SHA1 (xmix-2.1.tar.gz) = OQCWpUGkH/tHybV+5gKSEdMTk9M=
> -SHA256 (xmix-2.1.mixers.patch) =
> pkVWm0RN5Er3idaiwWdTALT4w+ZuRf7LdjHA1N7VWM8=
> -SHA256 (xmix-2.1.tar.gz) = Kgkyw6iojiCxJrvqLOqeT7g5UE2teT3Hv8Y2hfVY+vQ=
> -SIZE (xmix-2.1.mixers.patch) = 1684
> -SIZE (xmix-2.1.tar.gz) = 34835
> Index: audio/xmix/patches/patch-Imakefile
> ===================================================================
> RCS file: audio/xmix/patches/patch-Imakefile
> diff -N audio/xmix/patches/patch-Imakefile
> --- audio/xmix/patches/patch-Imakefile  24 Jan 2008 15:57:27 -0000      1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,23 +0,0 @@
> -$OpenBSD: patch-Imakefile,v 1.2 2008/01/24 15:57:27 merdely Exp $
> ---- Imakefile.orig     Tue Feb  1 21:54:35 1994
> -+++ Imakefile  Wed Jan 23 21:27:35 2008
> -@@ -2,7 +2,7 @@
> - # xmix Imakefile.
> - #
> - #CDEBUGFLAGS=-gstabs
> --CDEBUGFLAGS=-O
> -+#CDEBUGFLAGS=-O
> - #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
> -
> - SRCS1=        xmix.c
> -@@ -12,6 +12,8 @@ PROGRAMS = xmix
> -
> - all::  $(PROGRAMS)
> -
> --LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
> -+LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lossaudio
> -
> --NormalProgramTarget(xmix,$(OBJS1),,$(LOCAL_LIBRARIES),)
> -+PROGRAM = $(PROGRAMS)
> -+
> -+ComplexProgramTarget_1($(PROGRAM),$(LOCAL_LIBRARIES),)
> Index: audio/xmix/patches/patch-xmix_c
> ===================================================================
> RCS file: audio/xmix/patches/patch-xmix_c
> diff -N audio/xmix/patches/patch-xmix_c
> --- audio/xmix/patches/patch-xmix_c     26 Oct 2007 20:28:51 -0000      1.1
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-xmix_c,v 1.1 2007/10/26 20:28:51 ajacoutot Exp $
> ---- xmix.c.orig        Fri Oct 26 22:14:51 2007
> -+++ xmix.c     Fri Oct 26 22:14:51 2007
> -@@ -76,8 +76,8 @@ to Rick! I'll call this version V2.1
> - #include "circle_off.bit"
> - #include "square_empty.bit"
> - #include "square_with_x.bit"
> --
> --#include <linux/soundcard.h>
> -+#include <sys/ioctl.h>
> -+#include <soundcard.h>
> -
> - #define SOUND_FULL_SCALE 100.0
> - #define MAX_SOUND_VOL 95
> Index: audio/xmix/patches/patch-xmix_man
> ===================================================================
> RCS file: audio/xmix/patches/patch-xmix_man
> diff -N audio/xmix/patches/patch-xmix_man
> --- audio/xmix/patches/patch-xmix_man   26 Oct 2007 20:28:51 -0000      1.1
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -$OpenBSD: patch-xmix_man,v 1.1 2007/10/26 20:28:51 ajacoutot Exp $
> ---- xmix.man.orig      Fri Oct 26 22:14:51 2007
> -+++ xmix.man   Fri Oct 26 22:14:51 2007
> -@@ -0,0 +1 @@
> -+
> Index: audio/xmix/pkg/DESCR
> ===================================================================
> RCS file: audio/xmix/pkg/DESCR
> diff -N audio/xmix/pkg/DESCR
> --- audio/xmix/pkg/DESCR        6 Sep 1999 19:01:07 -0000       1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1 +0,0 @@
> -X11-based audio mixer
> Index: audio/xmix/pkg/PLIST
> ===================================================================
> RCS file: audio/xmix/pkg/PLIST
> diff -N audio/xmix/pkg/PLIST
> --- audio/xmix/pkg/PLIST        11 Oct 2013 20:39:19 -0000      1.5
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -@comment $OpenBSD: PLIST,v 1.5 2013/10/11 20:39:19 naddy Exp $
> -@bin bin/xmix
> -lib/X11/app-defaults/XMix
> -@man man/man1/xmix.1
> Index: audio/xmmix/Makefile
> ===================================================================
> RCS file: audio/xmmix/Makefile
> diff -N audio/xmmix/Makefile
> --- audio/xmmix/Makefile        11 Oct 2013 21:20:54 -0000      1.37
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,28 +0,0 @@
> -# $OpenBSD: Makefile,v 1.37 2013/10/11 21:20:54 naddy Exp $
> -
> -COMMENT=       Motif-based audio mixer
> -VERSION=       1.2.2
> -DISTNAME=      xmmix-${VERSION}
> -REVISION=      5
> -CATEGORIES=    audio
> -HOMEPAGE=      http://www.ibiblio.org/tkan/xmmix/
> -
> -PERMIT_PACKAGE_CDROM=  Yes
> -
> -WANTLIB=       ICE SM Xau Xdmcp X11 Xext Xt c m ossaudio Xm
> -
> -MASTER_SITES=  http://www.ibiblio.org/tkan/download/xmmix/${VERSION}/src/
> -
> -CONFIGURE_STYLE=       imake
> -LIB_DEPENDS+=          x11/openmotif
> -
> -MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'
> -
> -WRKDIST=       ${WRKDIR}/xmmix-1.2
> -NO_TEST=       Yes
> -
> -post-install:
> -       @ perl -pi -e 's,\@PREFIX@,${TRUEPREFIX},;' \
> -           ${PREFIX}/lib/X11/app-defaults/XMmix
> -
> -.include <bsd.port.mk>
> Index: audio/xmmix/distinfo
> ===================================================================
> RCS file: audio/xmmix/distinfo
> diff -N audio/xmmix/distinfo
> --- audio/xmmix/distinfo        5 Apr 2007 15:37:45 -0000       1.3
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -MD5 (xmmix-1.2.2.tar.gz) = WmVW7JqEiI1+d7pZwhKIQw==
> -RMD160 (xmmix-1.2.2.tar.gz) = BfXKaBGEjwuGqdyU5tlDoHzaC6g=
> -SHA1 (xmmix-1.2.2.tar.gz) = nsRFANzLpj73qdUPZqz7bkXQhxQ=
> -SHA256 (xmmix-1.2.2.tar.gz) = Fu7fsVC+Zq6xXYIsySNiWLlozmYfhUmQWfcJoOwNs/0=
> -SIZE (xmmix-1.2.2.tar.gz) = 33496
> Index: audio/xmmix/patches/patch-Imakefile
> ===================================================================
> RCS file: audio/xmmix/patches/patch-Imakefile
> diff -N audio/xmmix/patches/patch-Imakefile
> --- audio/xmmix/patches/patch-Imakefile 20 Dec 2009 21:03:48 -0000      1.3
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> ---- Imakefile.orig     Sun Jul 14 13:48:56 1996
> -+++ Imakefile  Wed Jan 16 20:42:52 2002
> -@@ -43,8 +43,9 @@
> -  * #include "Motif.tmpl"
> -  * #include "Motif.rules"
> -  */
> --LOCAL_LIBRARIES= XmClientLibs
> -+LOCAL_LIBRARIES= ${MOTIFLIB} -lm ${XTOOLLIB} ${XLIB} -lossaudio
> -
> -+CCOPTIONS= -DHLPPREFIX=\"$(PREFIX)\"
> -
> - /*
> -  * C Source files
> Index: audio/xmmix/patches/patch-XMmix_ad
> ===================================================================
> RCS file: audio/xmmix/patches/patch-XMmix_ad
> diff -N audio/xmmix/patches/patch-XMmix_ad
> --- audio/xmmix/patches/patch-XMmix_ad  17 Jan 2002 15:18:07 -0000      1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-XMmix_ad,v 1.2 2002/01/17 15:18:07 naddy Exp $
> ---- XMmix.ad.orig      Sun Jul 14 13:48:58 1996
> -+++ XMmix.ad   Mon Jan 14 15:01:05 2002
> -@@ -26,7 +26,7 @@
> - !*
> -
> - ! This points to the on-line help file
> --XMmix*helpPath:
>  /usr/lib/X11/xmmix.hlp
> -+XMmix*helpPath:                                       @PREFIX@
> /lib/X11/xmmix.hlp
> -
> - ! This points to a mixer settings file that is automatically loaded
> - ! upon startup.  If set to /dev/null, then no file will be auto-loaded.
> Index: audio/xmmix/patches/patch-appenv_h
> ===================================================================
> RCS file: audio/xmmix/patches/patch-appenv_h
> diff -N audio/xmmix/patches/patch-appenv_h
> --- audio/xmmix/patches/patch-appenv_h  14 Jan 2002 13:47:22 -0000      1.1
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-appenv_h,v 1.1 2002/01/14 13:47:22 naddy Exp $
> ---- appenv.h.orig      Sun Jul 14 19:48:59 1996
> -+++ appenv.h   Mon Jan 14 14:41:27 2002
> -@@ -59,7 +59,13 @@ static char *_appenv_h_ident_ = "@(#)app
> - #include <sys/types.h>
> - #include <sys/stat.h>
> - #include <sys/ioctl.h>
> -+#if defined(__NetBSD__) || defined(__OpenBSD__)
> -+#include <soundcard.h>
> -+/* Ensure we SIGIO */
> -+#undef _POSIX_SOURCE
> -+#else
> - #include <sys/soundcard.h>
> -+#endif
> - #include <stdlib.h>
> - #include <stdio.h>
> - #include <errno.h>
> Index: audio/xmmix/patches/patch-main_c
> ===================================================================
> RCS file: audio/xmmix/patches/patch-main_c
> diff -N audio/xmmix/patches/patch-main_c
> --- audio/xmmix/patches/patch-main_c    17 Jan 2002 15:18:07 -0000      1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-main_c,v 1.2 2002/01/17 15:18:07 naddy Exp $
> ---- main.c.orig        Thu Nov  7 17:01:43 1996
> -+++ main.c     Thu Jan 17 16:14:05 2002
> -@@ -95,7 +95,7 @@ usage(int argc, char **argv)
> -  * main
> -  *    The main function
> -  */
> --void
> -+int
> - main(int argc, char **argv)
> - {
> -       XtAppContext    app;
> -@@ -159,7 +159,7 @@ main(int argc, char **argv)
> -       post_realize_config(&widgets);
> -
> -       /* Register callback routines */
> --      register_callbacks(&widgets);
> -+      register_callbacks(&widgets, app);
> -
> -       /* Initialize screen controls */
> -       mx_start(&widgets);
> Index: audio/xmmix/patches/patch-mixer_c
> ===================================================================
> RCS file: audio/xmmix/patches/patch-mixer_c
> diff -N audio/xmmix/patches/patch-mixer_c
> --- audio/xmmix/patches/patch-mixer_c   14 Jan 2002 13:47:22 -0000      1.1
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,87 +0,0 @@
> -$OpenBSD: patch-mixer_c,v 1.1 2002/01/14 13:47:22 naddy Exp $
> ---- mixer.c.orig       Thu Nov  7 11:00:26 1996
> -+++ mixer.c    Sun Jan 13 20:18:56 2002
> -@@ -104,6 +104,14 @@ STATIC ctlinfo_t  ctlsav;         /* Saved state
> -  ***********************/
> -
> -
> -+#if defined(__NetBSD__) || defined(__OpenBSD__)
> -+void
> -+mxchg(int sig)
> -+{
> -+      deliverSIGIO();
> -+}
> -+#endif
> -+
> - /*
> -  * do_ioctl
> -  *    Perform ioctl command.  If file is not yet open or if we
> -@@ -681,11 +689,13 @@ mx_init_drv(void)
> -       /* Query sound driver version */
> -       if ((fp = fopen("/dev/sndstat", "r")) == NULL) {
> -               if (!app_data.demo) {
> -+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
> -                       fprintf(errfp, "%s: %s: %s\n",
> -                               PROGNAME,
> -                               "Cannot open /dev/sndstat",
> -                               "assuming pre-3.0 sound driver.");
> -                       maxdevs = MAXDEVS_V2;
> -+#endif
> -               }
> -               return;
> -       }
> -@@ -800,7 +810,7 @@ mx_init_hw(widgets_t *m)
> -       /* Open device */
> -       sprintf(errmsg, "%s: Cannot open device %s",
> -               PROGNAME, app_data.device);
> --      if ((dev_fd = open(app_data.device, O_RDONLY)) < 0) {
> -+      if ((dev_fd = open(app_data.device, O_RDWR)) < 0) {
> -               perror(errmsg);
> -               exit_flag = TRUE;
> -       }
> -@@ -915,6 +925,7 @@ void
> - mx_start(widgets_t *m)
> - {
> -       char    msg[256];
> -+      int one = 1;
> -
> -       if (app_data.autoload != NULL && app_data.autoload[0] != '\0' &&
> -           strcmp(app_data.autoload, "/dev/null") != 0) {
> -@@ -930,6 +941,14 @@ mx_start(widgets_t *m)
> -               }
> -       }
> -
> -+#if defined(__NetBSD__) || defined(__OpenBSD__)
> -+      signal(SIGIO, mxchg);
> -+      ioctl(dev_fd, FIOASYNC, &one);
> -+#endif
> -+
> -+      /* Query hardware mixer settings */
> -+      mx_queryhw(&widgets);
> -+
> -       /* Update screen controls to match current status */
> -       mx_updctl(m);
> - }
> -@@ -1531,6 +1550,22 @@ mx_focuschg(Widget w, XtPointer client_d
> -       if (p->reason != XmCR_FOCUS || form == (Widget) NULL)
> -               return;
> -
> -+      /* Query hardware mixer settings */
> -+      mx_queryhw(&widgets);
> -+
> -+      /* Update screen controls */
> -+      mx_updctl(&widgets);
> -+}
> -+
> -+
> -+/*
> -+ * mx_change
> -+ *    Mixer device has changed
> -+ */
> -+/*ARGSUSED*/
> -+void
> -+mx_change(XtPointer client_data)
> -+{
> -       /* Query hardware mixer settings */
> -       mx_queryhw(&widgets);
> -
> Index: audio/xmmix/patches/patch-mixer_h
> ===================================================================
> RCS file: audio/xmmix/patches/patch-mixer_h
> diff -N audio/xmmix/patches/patch-mixer_h
> --- audio/xmmix/patches/patch-mixer_h   14 Jan 2002 13:47:22 -0000      1.1
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-mixer_h,v 1.1 2002/01/14 13:47:22 naddy Exp $
> ---- mixer.h.orig       Sun Jul 14 19:49:04 1996
> -+++ mixer.h    Mon Jan 14 14:41:27 2002
> -@@ -78,6 +78,7 @@ extern void  mx_about(Widget, XtPointer,
> - extern void   mx_fsok_btn(Widget, XtPointer, XtPointer);
> - extern void   mx_fscancel_btn(Widget, XtPointer, XtPointer);
> - extern void   mx_focuschg(Widget, XtPointer, XtPointer);
> -+extern void   mx_change(XtPointer);
> -
> - #endif        /* __MIXER_H__ */
> -
> Index: audio/xmmix/patches/patch-resource_h
> ===================================================================
> RCS file: audio/xmmix/patches/patch-resource_h
> diff -N audio/xmmix/patches/patch-resource_h
> --- audio/xmmix/patches/patch-resource_h        17 Jan 2002 15:18:07
> -0000      1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> ---- resource.h.orig    Sun Jul 14 13:49:07 1996
> -+++ resource.h Wed Jan 16 20:24:43 2002
> -@@ -63,7 +63,7 @@ STATIC XtResource    resources[] = {
> -               XmcdNhelpPath, XmcdCHelpPath,
> -               XmRString, sizeof(String),
> -               XtOffsetOf(appdata_t, helppath), XmRImmediate,
> --              (XtPointer) "/usr/lib/X11/xmmix.hlp",
> -+              (XtPointer) HLPPREFIX"/lib/X11/xmmix.hlp",
> -       },
> -       {
> -               XmcdNautoLoadOnStartUp, XmcdCAutoLoadOnStartUp,
> Index: audio/xmmix/patches/patch-widget_c
> ===================================================================
> RCS file: audio/xmmix/patches/patch-widget_c
> diff -N audio/xmmix/patches/patch-widget_c
> --- audio/xmmix/patches/patch-widget_c  14 Jan 2002 13:47:22 -0000      1.1
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,39 +0,0 @@
> -$OpenBSD: patch-widget_c,v 1.1 2002/01/14 13:47:22 naddy Exp $
> ---- widget.c.orig      Sun Jul 14 19:49:09 1996
> -+++ widget.c   Mon Jan 14 14:41:27 2002
> -@@ -973,6 +973,10 @@ post_realize_config(widgets_t *m)
> -       delw = XmInternAtom(display, "WM_DELETE_WINDOW", False);
> - }
> -
> -+static XtSignalId sigid;
> -+void deliverSIGIO() {
> -+      XtNoticeSignal(sigid);
> -+}
> -
> - /*
> -  * register_callbacks
> -@@ -985,7 +989,7 @@ post_realize_config(widgets_t *m)
> -  *    Nothing
> -  */
> - void
> --register_callbacks(widgets_t *m)
> -+register_callbacks(widgets_t *m, XtAppContext app)
> - {
> -       int     i;
> -
> -@@ -1126,6 +1130,15 @@ register_callbacks(widgets_t *m)
> -               XmNfocusCallback,
> -               (XtCallbackProc) mx_focuschg, (XtPointer) m->form
> -       );
> -+
> -+#if defined(__NetBSD__) || defined(__OpenBSD__)
> -+      /*
> -+       * Mixer SIGIO change callback
> -+       */
> -+      sigid = XtAppAddSignal(app,
> -+              (XtSignalCallbackProc) mx_change, (XtPointer) 0
> -+      );
> -+#endif
> -
> -       /*
> -        * Install WM_DELETE_WINDOW handler
> Index: audio/xmmix/patches/patch-widget_h
> ===================================================================
> RCS file: audio/xmmix/patches/patch-widget_h
> diff -N audio/xmmix/patches/patch-widget_h
> --- audio/xmmix/patches/patch-widget_h  14 Jan 2002 13:47:22 -0000      1.1
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-widget_h,v 1.1 2002/01/14 13:47:22 naddy Exp $
> ---- widget.h.orig      Sun Jul 14 19:49:10 1996
> -+++ widget.h   Mon Jan 14 14:41:27 2002
> -@@ -119,7 +119,7 @@ typedef struct {
> - extern void   widget_init(widgets_t *);
> - extern void   create_widgets(widgets_t *);
> - extern void   post_realize_config(widgets_t *);
> --extern void   register_callbacks(widgets_t *);
> -+extern void   register_callbacks(widgets_t *, XtAppContext);
> -
> - #endif /* __WIDGET_H__ */
> -
> Index: audio/xmmix/pkg/DESCR
> ===================================================================
> RCS file: audio/xmmix/pkg/DESCR
> diff -N audio/xmmix/pkg/DESCR
> --- audio/xmmix/pkg/DESCR       15 Dec 2003 21:42:13 -0000      1.4
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -Xmmix is a premium audio mixer utility for the X window system using the
> -Motif graphical user interface. It operates the input and output mixer
> -section of the sound hardware on PCs and workstations.
> Index: audio/xmmix/pkg/PLIST
> ===================================================================
> RCS file: audio/xmmix/pkg/PLIST
> diff -N audio/xmmix/pkg/PLIST
> --- audio/xmmix/pkg/PLIST       11 Oct 2013 20:39:20 -0000      1.6
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,6 +0,0 @@
> -@comment $OpenBSD: PLIST,v 1.6 2013/10/11 20:39:20 naddy Exp $
> -@pkgpath audio/xmmix,lesstif
> -@bin bin/xmmix
> -lib/X11/app-defaults/XMmix
> -lib/X11/xmmix.hlp
> -@man man/man1/xmmix.1
>
>

Reply via email to