Update to 0.6.0 release.

Approved by:	maintainer

3 files changed, 48 insertions, 21 deletions

diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index d53cf5af323e..9ff7863c34dc 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scummvm
-PORTVERSION=	0.5.1
-PORTREVISION=	3
+PORTVERSION=	0.6.0
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,27 +14,52 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	alexander@trull.com
 COMMENT=	Free implementation of LucasArts S.C.U.M.M. interpreter
 
-LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/mad
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_PERL5_BUILD=yes
+HAS_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_SDL=	sdl
 
+CONFIGURE_ARGS=--with-sdl-prefix=${LOCALBASE} \
+		--disable-alsa \
+		--with-zlib-prefix=/usr \
+		--disable-debug
+
+OPTIONS=	VORBIS "Enable Ogg Vorbis support" off \
+		MAD "Enable mad (MP3) support" on \
+		MPEG2 "Enable MPEG2 support" off
+
 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
+DOCS=		NEWS README TODO
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_VORBIS)
+LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg \
+		vorbis.3:${PORTSDIR}/audio/libvorbis
+CONFIGURE_ARGS+=--with-ogg-prefix=${LOCALBASE} \
+		--with-vorbis-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--disable-vorbis
+.endif
+
+.if !defined(WITHOUT_MAD)
+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
+CONFIGURE_ARGS+=--with-mad-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--disable-mad
+.endif
+
+.if defined(WITH_MPEG2)
+LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
+CONFIGURE_ARGS+=--with-mpeg2-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--disable-mpeg2
+.endif
 
-post-configure:
-	@${REINPLACE_CMD} -e 's@:= -g -O@+= ${CFLAGS}@' \
-		${WRKSRC}/Makefile
+post-patch:
+	@${REINPLACE_CMD} -e 's/-O//' ${WRKSRC}/Makefile
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin
@@ -43,9 +67,9 @@ do-install:
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for docs in README
-	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
+.for doc in ${DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index 4b548dd1ab39..f30c72b493b1 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1 +1,2 @@
-MD5 (scummvm-0.5.1.tar.bz2) = 67bdbe2e145b8072d0bac61f7ed150c0
+MD5 (scummvm-0.6.0.tar.bz2) = efc4207a7f10b24e9fc5afa10ed9c455
+SIZE (scummvm-0.6.0.tar.bz2) = 1631951
diff --git a/games/scummvm/pkg-plist b/games/scummvm/pkg-plist
index 5dcfc67bdc03..ecd2aeec1ed6 100644
--- a/games/scummvm/pkg-plist
+++ b/games/scummvm/pkg-plist
@@ -1,3 +1,5 @@
 bin/scummvm
-%%PORTDOCS%%share/doc/scummvm/README
-%%PORTDOCS%%@dirrm share/doc/scummvm
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%