8 files changed, 3 insertions, 98 deletions

diff --git a/games/Makefile b/games/Makefile
index d213fe5e7dea..0510db0bff06 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -377,7 +377,6 @@
     SUBDIR += rubix
     SUBDIR += scid
     SUBDIR += scorched3d-devel
-    SUBDIR += scummvm
     SUBDIR += scummvm-tools
     SUBDIR += sdlroids
     SUBDIR += seabattle
diff --git a/games/bass/Makefile b/games/bass/Makefile
index 4da0f62112b9..522fa56db9c5 100644
--- a/games/bass/Makefile
+++ b/games/bass/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	BASS-CD
 MAINTAINER=	alexander@trull.com
 COMMENT=	Beneath a Steel Sky: a post-apocalyptic futuristic graphical adventure
 
-RUN_DEPENDS=	scummvm:${PORTSDIR}/games/scummvm
+RUN_DEPENDS=	scummvm:${PORTSDIR}/emulators/scummvm
 
 USE_ZIP=	yes
 NO_BUILD=	yes
diff --git a/games/fotaq/Makefile b/games/fotaq/Makefile
index 23663151eb97..5a79cdca2879 100644
--- a/games/fotaq/Makefile
+++ b/games/fotaq/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	FOTAQ_Talkie
 MAINTAINER=	alexander@trull.com
 COMMENT=	Flight of the Amazon Queen: a classic graphical adventure
 
-RUN_DEPENDS=	scummvm:${PORTSDIR}/games/scummvm
+RUN_DEPENDS=	scummvm:${PORTSDIR}/emulators/scummvm
 
 USE_ZIP=	yes
 NO_BUILD=	yes
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 5a44720644dd..8cec739a2eaf 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	scummvm
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools for use with the SCUMMVM game emulator
 
-RUN_DEPENDS=	scummvm:${PORTSDIR}/games/scummvm
+RUN_DEPENDS=	scummvm:${PORTSDIR}/emulators/scummvm
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
deleted file mode 100644
index 9ff7863c34dc..000000000000
--- a/games/scummvm/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# New ports collection makefile for:	scummvm
-# Date created:				Tue Sep  2 23:34:32 BST 2003
-# Whom:				Alex Trull <alexander@trull.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	scummvm
-PORTVERSION=	0.6.0
-CATEGORIES=	games emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	alexander@trull.com
-COMMENT=	Free implementation of LucasArts S.C.U.M.M. interpreter
-
-USE_BZIP2=	yes
-USE_GMAKE=	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
-
-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-patch:
-	@${REINPLACE_CMD} -e 's/-O//' ${WRKSRC}/Makefile
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/scummvm.6 ${PREFIX}/man/man6
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
deleted file mode 100644
index f30c72b493b1..000000000000
--- a/games/scummvm/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (scummvm-0.6.0.tar.bz2) = efc4207a7f10b24e9fc5afa10ed9c455
-SIZE (scummvm-0.6.0.tar.bz2) = 1631951
diff --git a/games/scummvm/pkg-descr b/games/scummvm/pkg-descr
deleted file mode 100644
index ac98324dc6c8..000000000000
--- a/games/scummvm/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-ScummVM is an implementation of LucasArts S.C.U.M.M. (Script Creation Utility
-for Maniac Mansion) interpreter, used in games such as Monkey Island, Indiana
-Jones, Day Of The Tentacle, Sam and Max, and many more. Some things are still
-missing, and some games cannot be completeted yet. There are quite a few known
-bugs. Regardless of the bugs it is still possible to play some games all the
-way through to the end. Still other games do not load at all. 
-
-Visit these following web pages for more information:
-
-WWW: http://scummvm.sourceforge.net/
-
--Adam Weinberger <adamw@FreeBSD.org>
diff --git a/games/scummvm/pkg-plist b/games/scummvm/pkg-plist
deleted file mode 100644
index ecd2aeec1ed6..000000000000
--- a/games/scummvm/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/scummvm
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%