5 files changed, 118 insertions, 0 deletions

diff --git a/audio/xmixer/files/patch-aa b/audio/xmixer/files/patch-aa
new file mode 100644
index 000000000000..98a2fd7643bb
--- /dev/null
+++ b/audio/xmixer/files/patch-aa
@@ -0,0 +1,36 @@
+--- Makefile.in.orig	Sat Aug 21 15:25:07 1999
++++ Makefile.in	Wed Oct 27 06:02:28 1999
+@@ -33,16 +33,18 @@
+ 	mkfb.pl < XMixer.ad > fallback.h
+ 
+ gui_gtk.o: gui_gtk.c
+-	$(CC) $(CFLAGS) $(INCS) `gtk-config --cflags` -c $<
++	$(CC) $(CFLAGS) $(INCS) `gtk12-config --cflags` -c $<
+ 
+ %.o:	%.c
+ 	$(CC) $(CFLAGS) $(INCS) -c $<
+ 
++all:	gmixer xmixer
++
+ xmixer: Xw/libXw.a $(OBJS)
+ 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ gmixer: $(G_OBJS)
+-	$(LD) $(LDFLAGS) -o $@ $(G_OBJS) `gtk-config --libs`
++	$(LD) $(LDFLAGS) -o $@ $(G_OBJS) `gtk12-config --libs`
+ 
+ Xw/libXw.a:
+ 	cd Xw && make libXw.a
+@@ -51,9 +53,9 @@
+ 	lynx -dump http://www/~rasca/xmixer/index.html | sed "s%//www/%//home.pages.de/%" > README
+ 
+ install: $(PROGS)
+-	install -o bin xmixer $(bindir)
+-	install xmixer.man $(mandir)/xmixer.1
+-	install -o bin gmixer $(bindir)
++	install -c -o bin xmixer $(bindir)
++	install -c xmixer.man $(mandir)/xmixer.1
++	install -c -o bin gmixer $(bindir)
+ 
+ install.lib: libmixer.a
+ 	install libsmixer.a $(LIBDIR)
diff --git a/audio/xmixer/files/patch-ab b/audio/xmixer/files/patch-ab
new file mode 100644
index 000000000000..ff41943f5d59
--- /dev/null
+++ b/audio/xmixer/files/patch-ab
@@ -0,0 +1,28 @@
+--- configure.in.orig	Sat Aug 21 05:46:55 1999
++++ configure.in	Tue Oct 26 23:48:36 1999
+@@ -17,21 +17,21 @@
+ AC_PATH_X
+ AC_PATH_XTRA
+ LDFLAGS="$LDFLAGS -L$x_libraries/"
+-CFLAGS="$CFLAGS -I$x_includes/"
++CFLAGS="$CFLAGS -I$x_includes/ -I/usr/X11R6/include/gtk12/"
+ 
+ AC_CHECK_LIB(Xt, XtVaSetValues)
+ AC_CHECK_LIB(Xaw, XawPanedGetNumSub)
+ 
+ __cflags=$CFLAGS
+-CFLAGS="$CFLAGS `gtk-config --cflags`"
++CFLAGS="$CFLAGS `gtk12-config --cflags`"
+ __libs=$LIBS
+-LIBS="$LIBS `gtk-config --libs`"
++LIBS="$LIBS `gtk12-config --libs`"
+ AC_CHECK_LIB(gdk, gdk_init)
+ AC_CHECK_LIB(gtk, gtk_main)
+ CFLAGS=$__cflags
+ LIBS=$__libs
+ 
+-__gtk=`gtk-config --version`
++__gtk=`gtk12-config --version`
+ case "$__gtk" in
+ 	1.2*)
+ 	x_progs="xmixer gmixer"
diff --git a/audio/xmixer/files/patch-ad b/audio/xmixer/files/patch-ad
new file mode 100644
index 000000000000..143f3e07bcc1
--- /dev/null
+++ b/audio/xmixer/files/patch-ad
@@ -0,0 +1,16 @@
+--- main.c.orig	Sat Aug 21 15:26:37 1999
++++ main.c	Tue Oct 26 23:47:37 1999
+@@ -22,7 +22,13 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>		/* free() */
++#if HAVE_GETOPT_H
+ #include <getopt.h>
++#else
++extern  int     getopt();
++extern  char    *optarg;
++extern  int     optind;
++#endif
+ #include <limits.h>
+ #include "gui.h"
+ #include "mixer.h"
diff --git a/audio/xmixer/files/patch-ae b/audio/xmixer/files/patch-ae
new file mode 100644
index 000000000000..08af966700bf
--- /dev/null
+++ b/audio/xmixer/files/patch-ae
@@ -0,0 +1,22 @@
+--- mixer.c.orig	Sat Aug 21 15:26:41 1999
++++ mixer.c	Tue Oct 26 23:47:37 1999
+@@ -46,7 +46,18 @@
+ #	include <sys/asound.h>
+ #endif
+ #ifdef OSS
+-#	include <sys/soundcard.h>
++/* "The nice thing about standards..." */
++#if defined (__linux__) || defined (__bsdi__)
++#include <sys/soundcard.h>
++#else
++#if defined (__FreeBSD__)
++#include <machine/soundcard.h>
++#else
++#if defined (__NetBSD__) || defined (__OpenBSD__)
++#include <soundcard.h> /* OSS emulation */
++#endif
++#endif
++#endif
+ #endif
+ #include "mixer.h"
+ 
diff --git a/audio/xmixer/files/patch-af b/audio/xmixer/files/patch-af
new file mode 100644
index 000000000000..8587fbcd70d1
--- /dev/null
+++ b/audio/xmixer/files/patch-af
@@ -0,0 +1,16 @@
+--- xmixer.man.orig	Sat Aug 21 13:57:37 1999
++++ xmixer.man	Wed Oct 27 06:07:12 1999
+@@ -4,9 +4,11 @@
+ .\"
+ .TH XMIXER 1 "Aug 1999" "GNU" "Version 0.9"
+ .SH NAME
+-xmixer - Xaw-based soundcard mixer program for Linux/X11
++
++.Sh NAME
++.Nm xmixer, gmixer
++.Nd Xaw- and GTK+-based soundcard mixer programs for X11
+ .br
+-gmixer - Gtk+-based soundcard mixer program for Linux/X11
+ .SH SYNOPSIS
+ .BI "xmixer [-h?qnVD] [-m "<device> "] [-d "<display> "] [-g "<geom> "]
+