Index: head/emulators/m2000/Makefile
===================================================================
--- head/emulators/m2000/Makefile	(revision 435663)
+++ head/emulators/m2000/Makefile	(revision 435664)
@@ -1,86 +1,90 @@
 # Created by: Edwin Groothuis <edwin@mavetju.org>
 # $FreeBSD$
 
 PORTNAME=	m2000
 PORTVERSION=	0.6
 PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	\
 		http://www.komkon.org/~dekogel/files/p2000/:code \
 		http://www.mavetju.org/download/adopted/:tapes \
 		ftp://ftp.komkon.org/pub/EMUL8/P2000/Tapes/:tapes \
 		http://www.mavetju.org/download/adopted/:code
 DISTFILES=	${PORTNAME:tu}${EXTRACT_SUFX}:code \
 		tapeconv.zip:code \
 		${M2000TAPES:S/$/.gz:tapes/}
 DIST_SUBDIR=	m2000
 EXTRACT_ONLY=	${PORTNAME:tu}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable emulator for the Philips P2000 home computer
 
+LICENSE=	NONE # and commercial distribution is explicitly prohibited
+
 EXTRACT_DEPENDS=${UNZIP_CMD}:archivers/unzip
 
 M2000TAPES=	3DDoolhof2.cas		\
 		BrickWall.cas		\
 		Componist.cas		\
 		ElevatorHumpie.cas	\
 		ErrorSoft1.cas		\
 		Fraxxon.cas		\
 		KleurenDemo.cas		\
 		LazyBug.cas		\
 		MachoMan.cas		\
 		MonkeyKong.cas		\
 		Snakey.cas		\
 		SpaceAttack.cas		\
 		SpaceFight.cas		\
 		SpaceMission.cas	\
 		SpeelPalijs.cas		\
 		StarTrek.cas		\
 		VluchtSimulator.cas
 
 WRKSRC=		${WRKDIR}/P2000
 ALL_TARGET=	x
-USE_XORG=	x11 xi
+USE_XORG=	x11 xext xi
 
 SUB_FILES=	m2000.sh
 PORTDOCS=	M2000.txt
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	${MKDIR} ${WRKDIR}/tapeconv
 	${UNZIP_CMD} ${DISTDIR}/${DIST_SUBDIR}/tapeconv.zip -d ${WRKDIR}/tapeconv
 	${MV} ${WRKDIR}/tapeconv/PCM2CAS.C ${WRKDIR}/tapeconv/PCM2CAS.c
 
 post-build:
-	${CC} -o ${WRKDIR}/tapeconv/PCM2CAS ${WRKDIR}/tapeconv/PCM2CAS.c
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${WRKDIR}/tapeconv/PCM2CAS ${WRKDIR}/tapeconv/PCM2CAS.c
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/m2000.sh ${STAGEDIR}${PREFIX}/bin/m2000
-	@${INSTALL_PROGRAM} ${WRKDIR}/tapeconv/PCM2CAS ${STAGEDIR}${PREFIX}/bin/tapeconv
+	${INSTALL_SCRIPT} ${WRKDIR}/m2000.sh ${STAGEDIR}${PREFIX}/bin/m2000
+	${INSTALL_PROGRAM} ${WRKDIR}/tapeconv/PCM2CAS ${STAGEDIR}${PREFIX}/bin/tapeconv
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/m2000/
-	@${INSTALL_PROGRAM} ${WRKSRC}/m2000 ${STAGEDIR}${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/P2000ROM.bin ${STAGEDIR}${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/Default.fnt ${STAGEDIR}${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/BASIC.bin ${STAGEDIR}${DATADIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/M2000.txt ${STAGEDIR}${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/m2000 ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/P2000ROM.bin ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/Default.fnt ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/BASIC.bin ${STAGEDIR}${DATADIR}
 .for f in ${M2000TAPES}
 	@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${f}.gz > ${WRKDIR}/${f}
-	@${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/M2000.txt ${STAGEDIR}${DOCSDIR}
+
 post-install:
 	@${ECHO_CMD} "Run 'make install-user' to install the tapes in your own directory"
 
 install-user:
 	@${ECHO_CMD} "Copying tapes to ${HOME}/.m2000..."
 	@${MKDIR} ${HOME}/.m2000
 .for f in ${M2000TAPES}
-	@${INSTALL_DATA} ${WRKDIR}/${f} ${HOME}/.m2000
+	${INSTALL_DATA} ${WRKDIR}/${f} ${HOME}/.m2000
 	@${CHMOD} u+w ${HOME}/.m2000/${f}
 .endfor
 	@${ECHO_CMD} "Done. Now start it with 'm2000 [tapename]' and execute the commands 'cload' and 'run'"
 
 .include <bsd.port.mk>
Index: head/emulators/m2000/files/patch-Makefile.X
===================================================================
--- head/emulators/m2000/files/patch-Makefile.X	(revision 435663)
+++ head/emulators/m2000/files/patch-Makefile.X	(revision 435664)
@@ -1,39 +1,39 @@
---- Makefile.X.orig	Fri Feb 14 04:53:43 1997
-+++ Makefile.X	Wed Aug 24 16:01:47 2005
+--- Makefile.X.orig	1997-02-13 17:53:43 UTC
++++ Makefile.X
 @@ -18,14 +18,14 @@
  # aware though, screen refresh is much slower when shared
  # memory is not used
  
 -CC	= gcc	# C compiler used
 -LD	= gcc	# Linker used
 +CC	?= gcc	# C compiler used
 +LD	?= gcc	# Linker used
  
 -CFLAGS  = -Wall -fomit-frame-pointer -O2 -I/usr/X11/include \
 +CFLAGS  += -Wall -fomit-frame-pointer -O2 -I${LOCALBASE}/include \
  	  -DLSB_FIRST -DHAVE_FTRUNCATE -DHAVE_CLOCK -DUNIX_X \
  	  -DSOUND -DMITSHM
  
 -LFLAGS	= -s -L/usr/X11/lib
 +LFLAGS	+= -L${LOCALBASE}/lib
  
  OBJECTS = M2000.o P2000.o Z80.o Z80Debug.o \
            Unix.o X.o
-@@ -33,13 +33,13 @@
+@@ -33,13 +33,13 @@ OBJECTS = M2000.o P2000.o Z80.o Z80Debug
  all:    m2000 fontc splitape z80dasm
  
  m2000:	$(OBJECTS)
 -	$(LD) $(LFLAGS) -o m2000 $(OBJECTS) -lXext -lX11
 +	$(CC) $(LFLAGS) -o m2000 $(OBJECTS) -lXext -lX11
  fontc:	fontc.o
 -	$(LD) $(LFLAGS) -o fontc fontc.o
 +	$(CC) $(LFLAGS) -o fontc fontc.o
  splitape: splitape.o
 -	$(LD) $(LFLAGS) -o splitape splitape.o
 +	$(CC) $(LFLAGS) -o splitape splitape.o
  z80dasm: Z80Dasm.o
 -	$(LD) $(LFLAGS) -o z80dasm Z80Dasm.o
 +	$(CC) $(LFLAGS) -o z80dasm Z80Dasm.o
  
  M2000.o:    M2000.c P2000.h Z80.h Help.h Z80IO.h
  P2000.o:    P2000.c P2000.h Z80.h Z80IO.h
Index: head/emulators/m2000/files/patch-X.c
===================================================================
--- head/emulators/m2000/files/patch-X.c	(revision 435663)
+++ head/emulators/m2000/files/patch-X.c	(revision 435664)
@@ -1,11 +1,11 @@
---- X.c.orig	Wed Aug 24 15:59:59 2005
-+++ X.c	Wed Aug 24 16:00:08 2005
-@@ -290,7 +290,7 @@
+--- X.c.orig	1997-02-13 17:53:43 UTC
++++ X.c
+@@ -290,7 +290,7 @@ int InitMachine(void)
   DefaultGC=DefaultGCOfScreen (Scr);
   DefaultCMap=DefaultColormapOfScreen (Scr);
   bpp=DefaultDepthOfScreen (Scr);
 - if (bpp!=8 && bpp!=16 && bpp!=32)
 + if (bpp!=8 && bpp!=16 && bpp!=24 && bpp!=32)
   {
    printf ("FAILED - Only 8,16 and 32 bpp displays are supported\n");
    return 0;