4 files changed, 23 insertions, 33 deletions

diff --git a/emulators/vgba-bin/Makefile b/emulators/vgba-bin/Makefile
index bf6dfdb96bb6..e5502a5587c7 100644
--- a/emulators/vgba-bin/Makefile
+++ b/emulators/vgba-bin/Makefile
@@ -1,21 +1,20 @@
-# New ports collection makefile for:   vgb-bin
+# New ports collection makefile for:   vgba-bin
 # Date created:		04 Aug 2000
 # Whom:			Mario S F Ferreira <lioux@linf.unb.br> et al.
 #
 # $FreeBSD$
 #
 
-PORTNAME=	vgb
-PORTVERSION=	2.2
-PORTEPOCH=	1
+PORTNAME=	vgba
+PORTVERSION=	1.7
 CATEGORIES=	emulators
-MASTER_SITES=	http://fms.komkon.org/VGB/
+MASTER_SITES=	http://fms.komkon.org/VGBA/
 PKGNAMESUFFIX=	-bin
-DISTNAME=	VGB${PORTVERSION:S/.//}-FreeBSD-80x86-bin
+DISTNAME=	VGBA${PORTVERSION:S/.//}-FreeBSD-80x86-bin
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	Nintendo GameBoy(tm) emulator (closed binary version of vgb)
+COMMENT=	Virtual GameBoy Advance is an emulator of Nintendo GameBoy Advance(TM)
 
 ONLY_FOR_ARCHS=	i386
 USE_X_PREFIX=	yes
@@ -25,13 +24,10 @@ NO_WRKSUBDIR=	no
 INSTALL_DIR=	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/vgb ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/vgb-debug ${PREFIX}/bin
-	@${INSTALL_DIR} ${PREFIX}/share/vgb
-	@${INSTALL_DATA} ${WRKSRC}/CART.GB ${PREFIX}/share/vgb
+	@${INSTALL_PROGRAM} ${WRKSRC}/vgba ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	@${INSTALL_DIR} ${PREFIX}/share/doc/vgb
-	@${INSTALL_DATA} ${WRKSRC}/VGB.html ${PREFIX}/share/doc/vgb
+	@${INSTALL_DIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/VGBA.html ${DOCSDIR}
 .endif # !defined(NOPORTDOCS)
 
 .include <bsd.port.mk>
diff --git a/emulators/vgba-bin/distinfo b/emulators/vgba-bin/distinfo
index 92f8ea14b83c..1c88ec7b588a 100644
--- a/emulators/vgba-bin/distinfo
+++ b/emulators/vgba-bin/distinfo
@@ -1 +1 @@
-MD5 (VGB22-FreeBSD-80x86-bin.tar.Z) = a4cf3af2a1a3018d74373f807b5b3ccb
+MD5 (VGBA17-FreeBSD-80x86-bin.tar.Z) = d6b65579664e780d574df12029bd41b0
diff --git a/emulators/vgba-bin/pkg-descr b/emulators/vgba-bin/pkg-descr
index c21d192d191f..38f7b5f11969 100644
--- a/emulators/vgba-bin/pkg-descr
+++ b/emulators/vgba-bin/pkg-descr
@@ -1,13 +1,10 @@
-Virtual Game Boy is the Nintendo GameBoy(tm) emulator on X-Window.
-
-  Test your VGB installation with the command(default):
-
-	vgb /usr/X11R6/share/vgb/CART.GB
-
-Virtual GameBoy (VGB) is a portable emulator of the Nintendo GameBoy
-handheld videogame console. It allows to run most of GameBoy software
-on a personal computer, as well as debug this software. As VGB is
-written in a portable C programming language, it runs on many
-different platforms and operating systems
-
-WWW: http://www.komkon.org/fms/VGB/
+Virtual GameBoy Advance (VGBA) is an emulator of the GameBoy Advance
+videogame console produced by Nintendo. It allows to run GameBoy
+Advance games on PCs, Macs, or just about any other sufficiently
+fast computers in existence. It can also help to debug GameBoy
+Advance software without using a costly development system. VGBA
+is not a real GameBoy Advance though. Get the real thing if you
+want a real experience. Also, VGBA will not play older GameBoy and
+GameBoy Color games. You will need VGB for that.
+
+WWW: http://www.komkon.org/fms/VGBA/
diff --git a/emulators/vgba-bin/pkg-plist b/emulators/vgba-bin/pkg-plist
index ae943a1e8ff5..c4a62913c4ec 100644
--- a/emulators/vgba-bin/pkg-plist
+++ b/emulators/vgba-bin/pkg-plist
@@ -1,6 +1,3 @@
-bin/vgb
-bin/vgb-debug
-share/vgb/CART.GB
-%%PORTDOCS%%share/doc/vgb/VGB.html
-%%PORTDOCS%%@dirrm share/doc/vgb
-@dirrm share/vgb
+bin/vgba
+%%PORTDOCS%%%%DOCSDIR%%/VGBA.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%