6 files changed, 37 insertions, 27 deletions

diff --git a/audio/aureal-kmod/Makefile b/audio/aureal-kmod/Makefile
index 15e91deae107..208ca0ae0886 100644
--- a/audio/aureal-kmod/Makefile
+++ b/audio/aureal-kmod/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	aureal-kmod
 PORTVERSION=	1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
-MASTER_SITES=	http://www.cis.ohio-state.edu/~matey/au88x0/
+MASTER_SITES=	http://home.columbus.rr.com/amatey/au88x0/
 DISTNAME=	au88x0-${PORTVERSION}_${PORTREVISION}
 
-MAINTAINER=	matey@cis.ohio-state.edu
+MAINTAINER=	lx@matey.org
 
 NO_PACKAGE=	Should be in sync with the kernel to work correctly
 
@@ -64,8 +64,8 @@ MAKE_ENV+=	HAVE_KOBJ_PCM=1
 
 .if ${OSVERSION} > 500000
 # FreeBSD 5-CURRENT
-.if ${VERSION_SOUND_C_CURRENT} < 40
-BROKEN=		"Base system is outdated. This port needs -CURRENT after newpcm megacommit (built after 3/24/2001)"
+.if ${VERSION_SOUND_C_CURRENT} < 52
+BROKEN=		"Base system is outdated. This port needs -CURRENT after 6/17/2001."
 .endif
 .endif
 
diff --git a/audio/aureal-kmod/distinfo b/audio/aureal-kmod/distinfo
index 9dda6439a804..caef3366931e 100644
--- a/audio/aureal-kmod/distinfo
+++ b/audio/aureal-kmod/distinfo
@@ -1,4 +1,4 @@
 MD5 (au88x0-1.1_3.tar.gz) = 811026b4fd105b5b9e6a0ebfdc83b75a
 MD5 (au88x0-1.3_1.tar.gz) = ec49c6e62847f6a0da318fea8c954917
 MD5 (au88x0-1.3_2.tar.gz) = 266a8ba37778bfd1ea4007407f733540
-MD5 (au88x0-1.5_2.tar.gz) = 59c17f9d252b7859ad2431cd651ed04b
+MD5 (au88x0-1.5_3.tar.gz) = fa401f56925ea7793fb4238c354a44b7
diff --git a/audio/aureal-kmod/files/aureal.sh b/audio/aureal-kmod/files/aureal.sh
index 3df9adb324b9..457d513edbbb 100644
--- a/audio/aureal-kmod/files/aureal.sh
+++ b/audio/aureal-kmod/files/aureal.sh
@@ -38,13 +38,11 @@ case "$1" in
 			echo ""
 			exit 64
 		fi
-		/sbin/kldload snd_pcm.ko
 		/sbin/kldload ${LIBDIR}/${DRIVERFILE}
 		echo -n " aureal-kmod"
 		;;
 	stop)
 		/sbin/kldunload ${DRIVERFILE}
-		/sbin/kldunload snd_pcm.ko
 		echo -n " aureal-kmod"
 		;;
 	*)
diff --git a/audio/aureal-kmod/files/patch-Makefile.inc b/audio/aureal-kmod/files/patch-Makefile.inc
index bb625ed3579c..4a7a059b2d27 100644
--- a/audio/aureal-kmod/files/patch-Makefile.inc
+++ b/audio/aureal-kmod/files/patch-Makefile.inc
@@ -1,17 +1,20 @@
 
 $FreeBSD$
 
---- Makefile.inc.orig	Tue Jan 16 20:33:37 2001
-+++ Makefile.inc	Tue Jan 16 20:35:06 2001
-@@ -0,0 +1,11 @@
-+.PATH:	 /sys/dev/sound/pci ${WRKSRC}
+--- Makefile.inc.orig	Thu Jun 21 22:34:06 2001
++++ Makefile.inc	Thu Jun 21 22:37:50 2001
+@@ -0,0 +1,14 @@
++.PATH: /sys/dev/sound/pci ${WRKSRC}
 +
-+KMODDIR	 = ${PREFIX}/lib/au88x0
-+KMOD	 = snd_au88${MODEL}
-+SRCS	+= au88x0.c
-+SRCS	+= device_if.h bus_if.h isa_if.h pci_if.h
++KMODDIR=	${PREFIX}/lib/au88x0
++KMOD=	snd_au88${MODEL}
++.if ${OSVERSION} < 500000
++KMODDEPS=	snd_pcm
++.endif
++SRCS+=	au88x0.c
++SRCS+=	device_if.h bus_if.h isa_if.h pci_if.h
 +.if ${OSVERSION} > 500000 || defined(HAVE_KOBJ_PCM)
-+SRCS	+= ac97_if.h channel_if.h feeder_if.h mixer_if.h
++SRCS+=	ac97_if.h channel_if.h feeder_if.h mixer_if.h
 +.endif
-+OBJS	 = ${WRKSRC}/asp${MODEL}.o
-+CFLAGS	+= -I${WRKSRC}
++OBJS=	${WRKSRC}/asp${MODEL}.o
++CFLAGS+=	-I${WRKSRC}
diff --git a/audio/aureal-kmod/pkg-descr b/audio/aureal-kmod/pkg-descr
index 069914179cf3..4fb88673d8d4 100644
--- a/audio/aureal-kmod/pkg-descr
+++ b/audio/aureal-kmod/pkg-descr
@@ -1,3 +1,3 @@
 FreeBSD Driver for Aureal Vortex based soundcards.
 
-WWW: http://www.cis.ohio-state.edu/~matey/au88x0/
+WWW: http://home.columbus.rr.com/amatey/au88x0/
diff --git a/audio/aureal-kmod/pkg-message b/audio/aureal-kmod/pkg-message
index 35657745a46f..af7df622fc51 100644
--- a/audio/aureal-kmod/pkg-message
+++ b/audio/aureal-kmod/pkg-message
@@ -1,10 +1,21 @@
 -------------------------------------------------------------------------------
-You can load the module by typing (as root of course):
+To use the driver, make a copy of %%PREFIX%%/etc/rc.d/aureal.sh.sample under 
+%%PREFIX%%/etc/rc.d/aureal.sh and do: chmod +x %%PREFIX%%/etc/rc.d/aureal.sh.
 
-# kldload %%PREFIX%%/lib/au88x0/snd_au88X0.ko
+To load the driver run (as root):
 
-where X is 1, 2 or 3 depending on which Aureal chipset do you have - au8810
-(Vortex Advantage), au8820 (Vortex 1) or au8830 (Vortex 2) correspondingly.
+# %%PREFIX%%/etc/rc.d/aureal.sh start
+
+To unload it:
+
+# %%PREFIX%%/etc/rc.d/aureal.sh stop
+
+It'll also load the driver automatically when the system is started.
+
+In case it fails to detect the type of your Vortex soundcard correctly,
+edit this script and set "CARD=" to 88X0 where X is 1, 2 or 3 depending 
+on which Aureal chipset you have - au8810 (Vortex Advantage), au8820 
+(Vortex 1) or au8830 (Vortex 2) correspondingly.
 
 Please note that you also need to have a `snd_pcm.ko' module either already
 loaded or placed into appropriate location for modules on your system (default
@@ -13,9 +24,7 @@ install snd_pcm by doing:
 
 # cd /sys/modules/sound/pcm/ && make all install
 
-Please also note that module for 4.1-STABLE system is untested, so please use it
-with caution and if possible please report if it works for you to
-Alexander Matey <matey@cis.ohio-state.edu>.
+Report problems to Alexander Matey <lx@matey.org>.
 
 Thanks and enjoy!