diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile index 8d60223144c..181f595f267 100644 --- a/audio/wmmixer/Makefile +++ b/audio/wmmixer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2002/09/17 14:35:03 wilfried Exp $ +# $OpenBSD: Makefile,v 1.11 2002/09/27 22:51:58 naddy Exp $ COMMENT= 'wm-dockapp; audio mixer' @@ -18,7 +18,7 @@ EXTRACT_SUFX= .tgz USE_X11= Yes NO_REGRESS= Yes -CONFIGURE_STYLE= imake +CONFIGURE_STYLE= imake noman WRKDIST= ${WRKDIR}/wmmixer diff --git a/audio/wmmixer/patches/patch-Imakefile b/audio/wmmixer/patches/patch-Imakefile index 7d28e9c9cbd..09ed5a8fb31 100644 --- a/audio/wmmixer/patches/patch-Imakefile +++ b/audio/wmmixer/patches/patch-Imakefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Imakefile,v 1.1.1.1 2001/02/06 11:54:55 wilfried Exp $ +$OpenBSD: patch-Imakefile,v 1.2 2002/09/27 22:51:58 naddy Exp $ --- Imakefile.orig Sat Sep 5 17:11:33 1998 -+++ Imakefile Mon Feb 5 19:08:41 2001 ++++ Imakefile Sat Sep 28 00:52:35 2002 @@ -1,5 +1,7 @@ #ifdef NetBSDArchitecture OSSAUDIO = -lossaudio @@ -9,9 +9,11 @@ $OpenBSD: patch-Imakefile,v 1.1.1.1 2001/02/06 11:54:55 wilfried Exp $ #else OSSAUDIO = #endif -@@ -10,4 +12,4 @@ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) $(OS +@@ -10,4 +12,6 @@ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) $(OS SRCS = wmmixer.cc OBJS = wmmixer.o -ComplexProgramTarget(wmmixer) -+ComplexProgramTargetNoMan(wmmixer) ++wmmixer.man: ++ ++ComplexCplusplusProgramTarget(wmmixer) diff --git a/audio/wmmixer/patches/patch-mixctl_h b/audio/wmmixer/patches/patch-mixctl_h index 14eb38928fc..6455209997e 100644 --- a/audio/wmmixer/patches/patch-mixctl_h +++ b/audio/wmmixer/patches/patch-mixctl_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-mixctl_h,v 1.2 2002/04/11 19:12:58 tdeval Exp $ +$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 Mon Feb 5 19:08:10 2001 ++++ mixctl.h Sat Sep 28 00:52:09 2002 @@ -21,6 +21,9 @@ #ifdef __FreeBSD__ #include @@ -11,7 +11,7 @@ $OpenBSD: patch-mixctl_h,v 1.2 2002/04/11 19:12:58 tdeval Exp $ #ifdef __linux__ #include #endif -@@ -31,7 +34,7 @@ +@@ -31,7 +34,7 @@ public: MixCtl(char *dname){ device=(char *)malloc(sizeof(char)*(strlen(dname)+1)); strcpy(device,dname); diff --git a/audio/wmmixer/patches/patch-wmmixer_cc b/audio/wmmixer/patches/patch-wmmixer_cc index 7163f5527d9..451ab21abce 100644 --- a/audio/wmmixer/patches/patch-wmmixer_cc +++ b/audio/wmmixer/patches/patch-wmmixer_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-wmmixer_cc,v 1.1.1.1 2001/02/06 11:54:55 wilfried Exp $ +$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 Mon Feb 5 19:29:21 2001 ++++ wmmixer.cc Sat Sep 28 00:53:31 2002 @@ -110,8 +110,8 @@ int rpttimer=0; bool dragging=false; @@ -23,3 +23,12 @@ $OpenBSD: patch-wmmixer_cc,v 1.1.1.1 2001/02/06 11:54:55 wilfried Exp $ 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]);