- Add PKG_DESTDIR_SUPPORT

- Fix build with (optional) mitshm
- Add xbeeb-roms option (default off) which will download and install the
  roms required to run

3 files changed, 19 insertions, 25 deletions

diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile
index 26384e63596..2337667387c 100644
--- a/emulators/xbeeb/Makefile
+++ b/emulators/xbeeb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/11/11 23:48:19 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2009/02/13 10:08:40 abs Exp $
 #
 
 DISTNAME=	xbeeb-0.4.1
@@ -24,22 +24,9 @@ REQD_DIRS=	${PREFIX}/lib/X11/fonts/xbeeb
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.xbeeb
-PKG_SUPPORTED_OPTIONS=	mitshm
-PKG_SUGGESTED_OPTIONS=
-
-.include "../../mk/bsd.options.mk"
-
-# The emulator can be compiled either to use MIT-SHM, or to not.
-# Unfortunately it doesn't support both at once.
-.if empty(PKG_OPTIONS:Mmitshm)
-SUBST_CLASSES+=		nomitshm
-SUBST_STAGE.nomitshm=	post-patch
-SUBST_MESSAGE.nomitshm=	Disabling MIT-SHM
-SUBST_FILES.nomitshm=	src/Config.h
-SUBST_SED.nomitshm=	-e "s|\#define	*MITSHM|\#undef MITSHM|"
-.endif
+PKG_DESTDIR_SUPPORT=    user-destdir
 
+.include "options.mk"
 
 .include "../../mk/oss.buildlink3.mk"
 
@@ -67,7 +54,6 @@ SUBST_SED.nooss=	-e "s|^\#define\\([	 ]*SOUND_OSS.*\\)\$$|\#undef\\1|"
 
 .endif # OSS_TYPE
 
-
 SUBST_CLASSES+=		beebroot
 SUBST_STAGE.beebroot=	post-patch
 SUBST_MESSAGE.beebroot=	Adjusting XBEEBROOT path
@@ -94,12 +80,12 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/xbeeb ${PREFIX}/bin/xbeeb
-	${INSTALL_MAN} ${MAN_PAGE} ${PREFIX}/${PKGMANDIR}/man1/xbeeb.1
-	${INSTALL_DATA} ${WRKSRC}/roms/xdfs0.90.rom ${PREFIX}/${XBEEBROOT}/roms/xdfs0.90.rom
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${PREFIX}/${XBEEBROOT}/docs
-	cd ${WRKSRC}/fonts && ${INSTALL_DATA} *.pcf ${PREFIX}/lib/X11/fonts/xbeeb
-	mkfontdir ${PREFIX}/lib/X11/fonts/xbeeb
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xbeeb ${DESTDIR}${PREFIX}/bin/xbeeb
+	${INSTALL_MAN} ${MAN_PAGE} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xbeeb.1
+	${INSTALL_DATA} ${WRKSRC}/roms/xdfs0.90.rom ${DESTDIR}${PREFIX}/${XBEEBROOT}/roms/xdfs0.90.rom
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${DESTDIR}${PREFIX}/${XBEEBROOT}/docs
+	cd ${WRKSRC}/fonts && ${INSTALL_DATA} *.pcf ${DESTDIR}${PREFIX}/lib/X11/fonts/xbeeb
+	mkfontdir ${DESTDIR}${PREFIX}/lib/X11/fonts/xbeeb
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/emulators/xbeeb/PLIST b/emulators/xbeeb/PLIST
index 8168b9d8620..e0267fc2121 100644
--- a/emulators/xbeeb/PLIST
+++ b/emulators/xbeeb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/01/06 15:09:59 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/02/13 10:08:40 abs Exp $
 bin/xbeeb
 lib/X11/fonts/xbeeb/ttext-grc-ldh.pcf
 lib/X11/fonts/xbeeb/ttext-grc-udh.pcf
@@ -27,6 +27,8 @@ ${XBEEBROOT}/docs/SnapshotFormat
 ${XBEEBROOT}/docs/Thanks
 ${XBEEBROOT}/docs/WWWSites
 ${XBEEBROOT}/roms/xdfs0.90.rom
+${PLIST.xbeeb-roms}share/xbeeb/roms/BASIC4.rom
+${PLIST.xbeeb-roms}share/xbeeb/roms/OS1.2.rom
 @dirrm ${XBEEBROOT}/docs
 @dirrm ${XBEEBROOT}/roms
 @dirrm ${XBEEBROOT}
diff --git a/emulators/xbeeb/distinfo b/emulators/xbeeb/distinfo
index 29b2f7f3541..5339fdf79fd 100644
--- a/emulators/xbeeb/distinfo
+++ b/emulators/xbeeb/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.7 2006/09/22 13:21:37 dsainty Exp $
+$NetBSD: distinfo,v 1.8 2009/02/13 10:08:40 abs Exp $
 
+SHA1 (BASIC2.rom) = 4a7393f3a45ea309f744441c16723e2ef447a281
+RMD160 (BASIC2.rom) = 2179cda4734227556bac230346cacd805e4e03a4
+Size (BASIC2.rom) = 16384 bytes
+SHA1 (OS-1.2.rom) = c97bf477475e17db433ef3036c346be94ec49662
+RMD160 (OS-1.2.rom) = 58d05cbbc98a3070ac746db4d8ef712f13671896
+Size (OS-1.2.rom) = 16384 bytes
 SHA1 (xbeeb-0.4.1.tgz) = 5e2fccfabd0aa5a656758b2ea0536570a790dabe
 RMD160 (xbeeb-0.4.1.tgz) = 67dba3262f7e5886a86e5656288d807fea540d9b
 Size (xbeeb-0.4.1.tgz) = 351715 bytes