4 files changed, 21 insertions, 24 deletions

diff --git a/emulators/vgb/Makefile b/emulators/vgb/Makefile
index e2e543ac8157..9dc93700e32e 100644
--- a/emulators/vgb/Makefile
+++ b/emulators/vgb/Makefile
@@ -17,13 +17,16 @@ MAINTAINER=	nakai@FreeBSD.org
 WRKSRC=		${WRKDIR}/GB
 
 USE_X_PREFIX=	yes
-CONFIGURE_ENV=  X11BASE=${X11BASE}
+
+do-configure:
+	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' ${FILESDIR}/vgb.sh \
+		> ${WRKSRC}/vgb.sh
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/gblist ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/gblist ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/libexec/VGB ${PREFIX}/share/VGB
-	@${INSTALL_PROGRAM} ${WRKSRC}/vgb ${PREFIX}/libexec/VGB
-	@${INSTALL_DATA} ${WRKSRC}/CART.GB ${PREFIX}/share/VGB
-	@${INSTALL_SCRIPT} ${WRKSRC}/vgb.sh ${PREFIX}/bin/vgb
+	${INSTALL_PROGRAM} ${WRKSRC}/vgb ${PREFIX}/libexec/VGB
+	${INSTALL_DATA} ${WRKSRC}/CART.GB ${PREFIX}/share/VGB
+	${INSTALL_SCRIPT} ${WRKSRC}/vgb.sh ${PREFIX}/bin/vgb
 
 .include <bsd.port.mk>
diff --git a/emulators/vgb/files/patch-aa b/emulators/vgb/files/patch-aa
index ddf0522d1f98..7b4066607784 100644
--- a/emulators/vgb/files/patch-aa
+++ b/emulators/vgb/files/patch-aa
@@ -1,21 +1,23 @@
-*** Makefile.org	Thu Oct 31 03:00:44 1996
---- Makefile	Thu Oct 31 03:01:14 1996
+*** Makefile.orig	Wed Jul  3 20:29:30 1996
+--- Makefile	Sat Jan 15 00:00:00 2000
 ***************
-*** 27,34 ****
+*** 26,34 ****
+  # If you are getting linker errors about not found X11 functions,
   # change the -L/usr/X11R6/lib to the directory where X11
   # libraries libX11.* and libXext.* are located on your system.
-  CC	= gcc
+! CC	= gcc
 ! DEFINES	= -DUNIX -DLSB_FIRST -DDEBUG -DMITSHM
 ! CFLAGS	= -O2 -I/usr/X11/include  -L/usr/X11/lib/ ${DEFINES}
   OBJECTS	= VGB.o GB.o Z80.o Debug.o Unix.o
   
   # Make the standard distribution: VGB, DASM, and utilities.
---- 27,34 ----
+--- 26,34 ----
+  # If you are getting linker errors about not found X11 functions,
   # change the -L/usr/X11R6/lib to the directory where X11
   # libraries libX11.* and libXext.* are located on your system.
-  CC	= gcc
-! DEFINES	= -DUNIX -DLSB_FIRST -DDEBUG
-! CFLAGS	= -O2 -I/usr/X11R6/include  -L/usr/X11R6/lib/ ${DEFINES}
+! CC	?= gcc
+! DEFINES	= -DUNIX -DLSB_FIRST
+! CFLAGS	+= -I${X11BASE}/include -L${X11BASE}/lib ${DEFINES}
   OBJECTS	= VGB.o GB.o Z80.o Debug.o Unix.o
   
   # Make the standard distribution: VGB, DASM, and utilities.
diff --git a/emulators/vgb/files/vgb.sh b/emulators/vgb/files/vgb.sh
index eb3df1e036fa..41a0773b6ea0 100644
--- a/emulators/vgb/files/vgb.sh
+++ b/emulators/vgb/files/vgb.sh
@@ -1,3 +1,3 @@
-#! /bin/sh
+#!/bin/sh
 
-/usr/X11R6/libexec/VGB/vgb $*
+%%PREFIX%%/libexec/VGB/vgb $*
diff --git a/emulators/vgb/pkg-descr b/emulators/vgb/pkg-descr
index 4cfb7fafe774..36f3b9acebae 100644
--- a/emulators/vgb/pkg-descr
+++ b/emulators/vgb/pkg-descr
@@ -7,13 +7,5 @@ Virtual Game Boy is the Nintendo GameBoy(tm) emulator on X-Window.
   You buy the cartridges. GameBoy software is copyrighted and still sold. 
 Therefore, its distribution is an act of piracy. Nothing prohibits you 
 from backing up a cartridge you own and playing it on the emulator though.
-To back up a GameBoy cartridge, you can use either SmartCard copier (about
-$100 for a standalone version), or a self-built copier designed by Pascal 
-Felber, description of which is available at:
 
-           http://www.freeflight.com/fms/GameBoy/
-
-GameBoy-related archives with technical and other info are located at:
-
-                  http://www.freeflight.com/fms/GameBoy/
-                  ftp://ftp.komkon.org/pub/GameBoy/
+WWW: http://www.komkon.org/fms/