Index: head/emulators/scummvm/files/patch-sound::mixer.h
===================================================================
--- head/emulators/scummvm/files/patch-sound::mixer.h	(revision 78816)
+++ head/emulators/scummvm/files/patch-sound::mixer.h	(nonexistent)
@@ -1,11 +0,0 @@
---- sound/mixer.h.orig	Wed Jan  1 13:21:10 2003
-+++ sound/mixer.h	Wed Jan  1 13:21:41 2003
-@@ -25,6 +25,8 @@
- 
- #include <stdio.h>
- 
-+#undef USE_MAD
-+
- #ifdef USE_MAD
- #include <mad.h>
- #endif

Property changes on: head/emulators/scummvm/files/patch-sound::mixer.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/emulators/scummvm/Makefile
===================================================================
--- head/emulators/scummvm/Makefile	(revision 78816)
+++ head/emulators/scummvm/Makefile	(revision 78817)
@@ -1,50 +1,51 @@
 # New ports collection makefile for:	scummvm
 # Date created:				Tue Mar 26 13:05:21 CET 2002
 # Whom:				Miguel Mendez <flynn@energyhq.homeip.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	scummvm
 PORTVERSION=	0.3.0b
+PORTREVISION=	1
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}-src
 
 MAINTAINER=	flynn@energyhq.homeip.net
 COMMENT=	Free implementation of LucasArts S.C.U.M.M. interpreter
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
+LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
+		mad.1:${PORTSDIR}/audio/mad
 
 USE_GMAKE=	yes
 WRKSRC=         ${WRKDIR}/${PORTNAME}-0.3.0
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 MAN6=		scummvm.6
 
 pre-patch:
 	@${FIND} -E ${WRKSRC} -type f -iregex ".*\.(cpp|h|txt)" \
 		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
 	@${REINPLACE_CMD} -e 's|\r\n|\n|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's@sdl-config@sdl11-config@g' \
 		${WRKSRC}/backends/sdl/build.rules
 
 post-configure:
-	@${REINPLACE_CMD} -e 's@-lmad@@g; \
-			s@:= -g -O@+= ${CFLAGS}@' \
+	@${REINPLACE_CMD} -e 's@:= -g -O@+= ${CFLAGS}@' \
 		${WRKSRC}/Makefile
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/scummvm.6 ${PREFIX}/man/man6
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for docs in README
 	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/emulators/scummvm/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/games/scummvm/files/patch-sound::mixer.h
===================================================================
--- head/games/scummvm/files/patch-sound::mixer.h	(revision 78816)
+++ head/games/scummvm/files/patch-sound::mixer.h	(nonexistent)
@@ -1,11 +0,0 @@
---- sound/mixer.h.orig	Wed Jan  1 13:21:10 2003
-+++ sound/mixer.h	Wed Jan  1 13:21:41 2003
-@@ -25,6 +25,8 @@
- 
- #include <stdio.h>
- 
-+#undef USE_MAD
-+
- #ifdef USE_MAD
- #include <mad.h>
- #endif

Property changes on: head/games/scummvm/files/patch-sound::mixer.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/games/scummvm/Makefile
===================================================================
--- head/games/scummvm/Makefile	(revision 78816)
+++ head/games/scummvm/Makefile	(revision 78817)
@@ -1,50 +1,51 @@
 # New ports collection makefile for:	scummvm
 # Date created:				Tue Mar 26 13:05:21 CET 2002
 # Whom:				Miguel Mendez <flynn@energyhq.homeip.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	scummvm
 PORTVERSION=	0.3.0b
+PORTREVISION=	1
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}-src
 
 MAINTAINER=	flynn@energyhq.homeip.net
 COMMENT=	Free implementation of LucasArts S.C.U.M.M. interpreter
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
+LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
+		mad.1:${PORTSDIR}/audio/mad
 
 USE_GMAKE=	yes
 WRKSRC=         ${WRKDIR}/${PORTNAME}-0.3.0
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 MAN6=		scummvm.6
 
 pre-patch:
 	@${FIND} -E ${WRKSRC} -type f -iregex ".*\.(cpp|h|txt)" \
 		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
 	@${REINPLACE_CMD} -e 's|\r\n|\n|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's@sdl-config@sdl11-config@g' \
 		${WRKSRC}/backends/sdl/build.rules
 
 post-configure:
-	@${REINPLACE_CMD} -e 's@-lmad@@g; \
-			s@:= -g -O@+= ${CFLAGS}@' \
+	@${REINPLACE_CMD} -e 's@:= -g -O@+= ${CFLAGS}@' \
 		${WRKSRC}/Makefile
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/scummvm.6 ${PREFIX}/man/man6
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for docs in README
 	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/games/scummvm/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property