Update to 0.2.3, and convert to use bsd.options.mk, available options:

X11 (enabled by default)

This closes PR pkg/28654 by pancake.

Here is a short summary of the changes from version 0.2.2 to 0.2.3:

        x)  An experimental dynamic binary translation subsystem has been
            added, which improves speed.  It should work when emulating
            R3000-style CPUs. Add -b to the command line to enable bintrans.
            (For R4000-style CPUs, the bintrans system is not entirely
            reliable yet.)  Bintrans backends have been written for the
            Alpha and i386 platforms.

        x)  Redhat Linux 7.1 for mips has been verified to work under
            DECstation 5000/200 emulation. (It could probably run with
            earlier versions of the emulator, but I hadn't seen it myself.)

        x)  Lots of minor bug fixes.

3 files changed, 19 insertions, 11 deletions

diff --git a/emulators/mips64emul/Makefile b/emulators/mips64emul/Makefile
index 73cbd91d7e8..39599ddf378 100644
--- a/emulators/mips64emul/Makefile
+++ b/emulators/mips64emul/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/11/04 12:18:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/20 23:14:59 xtraeme Exp $
 #
 
-DISTNAME=	mips64emul-0.2.2
+DISTNAME=	mips64emul-0.2.3
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.mdstud.chalmers.se/~md1gavan/mips64emul/src/
 
@@ -12,16 +12,13 @@ COMMENT=	MIPS 32/64-bit emulator
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=	yes
-USE_X11=	yes
 HAS_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin share/doc/${PKGBASE}
 
-GLOBAL_LDFLAGS=	-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mips64emul ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/mips64emul.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/mips64emul.1 ${PREFIX}/man/man1
 .for f in README HISTORY BUGS TODO RELEASE LICENSE 
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/${PKGBASE}
 .endfor
@@ -29,11 +26,20 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.c ${PREFIX}/share/doc/${PKGBASE}
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mips64emul
+PKG_SUPPORTED_OPTIONS=	X11
+PKG_DEFAULT_OPTIONS?=	X11
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:MX11)
+USE_X11=		yes
+GLOBAL_LDFLAGS=		-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
 SUBST_CLASSES=		x11
 SUBST_STAGE.x11=	post-patch
 SUBST_FILES.x11=	configure
 SUBST_SED.x11=		-e "s|-L/usr/X11R6/lib|${GLOBAL_LDFLAGS}|g" \
 			-e "s|/usr/X11R6|${X11BASE}|g"
-SUBST_MESSAGE.x11=	"Fixing linking flags."
+SUBST_MESSAGE.x11=	"Fixing X linking flags."
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/mips64emul/PLIST b/emulators/mips64emul/PLIST
index bc8bd7d6269..498b81e1d87 100644
--- a/emulators/mips64emul/PLIST
+++ b/emulators/mips64emul/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/11/04 12:18:54 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/12/20 23:14:59 xtraeme Exp $
 bin/mips64emul
 man/man1/mips64emul.1
 share/doc/mips64emul/20041024-netbsd-arc-installed.gif
@@ -20,4 +20,6 @@ share/doc/mips64emul/sprite-20040711.png
 share/doc/mips64emul/sprite-20040711_small.png
 share/doc/mips64emul/ultrix4.5-20040706.png
 share/doc/mips64emul/ultrix4.5-20040706_small.gif
+share/doc/mips64emul/20041129-redhat_mips.png
+share/doc/mips64emul/20041129-redhat_mips_small.png
 @dirrm share/doc/mips64emul
diff --git a/emulators/mips64emul/distinfo b/emulators/mips64emul/distinfo
index 3838b17e720..2446df7cda2 100644
--- a/emulators/mips64emul/distinfo
+++ b/emulators/mips64emul/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/11/04 12:18:54 xtraeme Exp $
+$NetBSD: distinfo,v 1.8 2004/12/20 23:14:59 xtraeme Exp $
 
-SHA1 (mips64emul-0.2.2.tar.gz) = 3329bffe9b1fd5887c6d713449db805557fc2d48
-Size (mips64emul-0.2.2.tar.gz) = 729050 bytes
+SHA1 (mips64emul-0.2.3.tar.gz) = 6c2f2c9e7a57da12d9786bfe9fe71339021dddbe
+Size (mips64emul-0.2.3.tar.gz) = 795082 bytes