diff -urN /usr/ports/audio/asmix/Makefile audio/asmix/Makefile
--- /usr/ports/audio/asmix/Makefile	Sun Jun 27 10:03:22 2004
+++ audio/asmix/Makefile	Sat Mar 12 01:09:02 2005
@@ -6,20 +6,25 @@
 #
 
 PORTNAME=	asmix
-PORTVERSION=	1.4
+PORTVERSION=	1.5
 CATEGORIES=	audio afterstep
 MASTER_SITES=	http://www.tigr.net/afterstep/download/asmix/
-MASTER_SITE_SUBDIR=	apps/asmix
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Volume control dock-app for the AfterStep Window Manager
 
+USE_X_PREFIX=	yes
+USE_XPM=	yes
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+
 MAN1=		${PORTNAME}.1x
 PLIST_FILES=	bin/asmix
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
+post-patch:
+.for file in asmix.c configure autoconf/config.h.in
+	@${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|g ; \
+		 s|MACHINE_SOUNDCARD|SYS_SOUNDCARD|g' ${WRKSRC}/${file}
+.endfor
 
 .include <bsd.port.mk>
diff -urN /usr/ports/audio/asmix/distinfo audio/asmix/distinfo
--- /usr/ports/audio/asmix/distinfo	Wed Mar 31 18:03:55 2004
+++ audio/asmix/distinfo	Sat Mar 12 00:51:30 2005
@@ -1,2 +1,2 @@
-MD5 (asmix-1.4.tar.gz) = a1836666d0662f7b80774a9aaee377d4
-SIZE (asmix-1.4.tar.gz) = 36383
+MD5 (asmix-1.5.tar.gz) = de731150e2e57bf3d809b141ffdc8969
+SIZE (asmix-1.5.tar.gz) = 35765
diff -urN /usr/ports/audio/asmix/files/patch-asmix.c audio/asmix/files/patch-asmix.c
--- /usr/ports/audio/asmix/files/patch-asmix.c	Mon Sep  1 07:20:53 2003
+++ audio/asmix/files/patch-asmix.c	Thu Jan  1 09:00:00 1970
@@ -1,13 +0,0 @@
---- asmix.c.orig	Sun Aug 31 15:18:35 2003
-+++ asmix.c	Sun Aug 31 15:19:04 2003
-@@ -22,9 +22,7 @@
- #include <sys/errno.h>
- #include <sys/ioctl.h>
- #include <fcntl.h>
--#ifdef HAVE_MACHINE_SOUNDCARD_H
--#  include <machine/soundcard.h>
--#endif
-+#include <sys/soundcard.h>
- #ifdef HAVE_LINUX_SOUNDCARD_H
- #  include <linux/soundcard.h>
- #endif