From b043c46c72cd46d38c4f20a482f5103171a2ba92 Mon Sep 17 00:00:00 2001
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Sun, 11 Sep 2005 09:32:47 +0000
Subject: [PATCH] emulators/m2000: fix plist

	- fix plist
	- utilize DATADIR
	- follow the naming rule of COMMENT

PR:		ports/85968
Submitted by:	Yen-Ming Lee <leeym@freebsd.org>
---
 emulators/m2000/Makefile  | 15 ++++++++------
 emulators/m2000/pkg-plist | 50 +++++++++++++++++++++--------------------------
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/emulators/m2000/Makefile b/emulators/m2000/Makefile
index 2e1e7c2bbf1e..41cf23fbcc22 100644
--- a/emulators/m2000/Makefile
+++ b/emulators/m2000/Makefile
@@ -21,7 +21,7 @@ DIST_SUBDIR=	m2000
 EXTRACT_ONLY=	${PORTNAME:U}${EXTRACT_SUFX}
 
 MAINTAINER=	edwin@mavetju.org
-COMMENT=	M2000 is a portable emulator for the P2000 home computer
+COMMENT=	A portable emulator for the Philips P2000 home computer
 
 EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
 
@@ -48,6 +48,7 @@ ALL_TARGET=	x
 USE_XLIB=	yes
 
 SUB_FILES=	m2000.sh
+PORTDOCS=	M2000.txt
 
 post-extract:
 	${MKDIR} ${WRKDIR}/tapeconv
@@ -61,15 +62,17 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/m2000.sh ${PREFIX}/bin/m2000
 	@${INSTALL_PROGRAM} ${WRKDIR}/tapeconv/PCM2CAS ${PREFIX}/bin/tapeconv
 	@${MKDIR} ${PREFIX}/share/m2000/
-	@${INSTALL_PROGRAM} ${WRKSRC}/m2000 ${PREFIX}/share/m2000
-	@${INSTALL_DATA} ${WRKSRC}/P2000ROM.bin ${PREFIX}/share/m2000
-	@${INSTALL_DATA} ${WRKSRC}/Default.fnt ${PREFIX}/share/m2000
-	@${INSTALL_DATA} ${WRKSRC}/BASIC.bin ${PREFIX}/share/m2000
+	@${INSTALL_PROGRAM} ${WRKSRC}/m2000 ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/P2000ROM.bin ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/Default.fnt ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/BASIC.bin ${DATADIR}
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/M2000.txt ${DOCSDIR}
+.endif
 .for f in ${M2000TAPES}
 	@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${f}.gz > ${WRKDIR}/${f}
-	@${INSTALL_DATA} ${WRKDIR}/${f} ${PREFIX}/share/m2000
+	@${INSTALL_DATA} ${WRKDIR}/${f} ${DATADIR}
 .endfor
 
 post-install:
diff --git a/emulators/m2000/pkg-plist b/emulators/m2000/pkg-plist
index f97088ed0710..e66f3147bab3 100644
--- a/emulators/m2000/pkg-plist
+++ b/emulators/m2000/pkg-plist
@@ -1,30 +1,24 @@
 bin/m2000
 bin/tapeconv
-
-share/m2000/m2000
-
-share/m2000/P2000ROM.bin
-share/m2000/BASIC.bin
-share/m2000/Default.fnt
-
-share/m2000/3DDoolhof2.cas
-share/m2000/BrickWall.cas
-share/m2000/Componist.cas
-share/m2000/ElevatorHumpie.cas
-share/m2000/ErrorSoft1.cas
-share/m2000/Fraxxon.cas
-share/m2000/KleurenDemo.cas
-share/m2000/LazyBug.cas
-share/m2000/MachoMan.cas
-share/m2000/MonkeyKong.cas
-share/m2000/Snakey.cas
-share/m2000/SpaceAttack.cas
-share/m2000/SpaceFight.cas
-share/m2000/SpaceMission.cas
-share/m2000/SpeelPalijs.cas
-share/m2000/StarTrek.cas
-share/m2000/VluchtSimulator.cas
-
-%%DOCSDIR%%/M2000.txt
-
-@dirrm share/m2000
+%%DATADIR%%/m2000                                                              
+%%DATADIR%%/P2000ROM.bin                                                       
+%%DATADIR%%/BASIC.bin                                                          
+%%DATADIR%%/Default.fnt                                                        
+%%DATADIR%%/3DDoolhof2.cas                                                     
+%%DATADIR%%/BrickWall.cas                                                      
+%%DATADIR%%/Componist.cas                                                      
+%%DATADIR%%/ElevatorHumpie.cas                                                 
+%%DATADIR%%/ErrorSoft1.cas                                                     
+%%DATADIR%%/Fraxxon.cas                                                        
+%%DATADIR%%/KleurenDemo.cas                                                    
+%%DATADIR%%/LazyBug.cas                                                        
+%%DATADIR%%/MachoMan.cas                                                       
+%%DATADIR%%/MonkeyKong.cas                                                     
+%%DATADIR%%/Snakey.cas                                                         
+%%DATADIR%%/SpaceAttack.cas                                                    
+%%DATADIR%%/SpaceFight.cas                                                     
+%%DATADIR%%/SpaceMission.cas                                                   
+%%DATADIR%%/SpeelPalijs.cas                                                    
+%%DATADIR%%/StarTrek.cas                                                       
+%%DATADIR%%/VluchtSimulator.cas                                                
+@dirrm %%DATADIR%%                                                             
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0