svn commit: r435664 - in head/emulators/m2000: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Wed Mar 8 09:01:51 UTC 2017
Author: amdmi3
Date: Wed Mar 8 09:01:49 2017
New Revision: 435664
URL: https://svnweb.freebsd.org/changeset/ports/435664
Log:
- Add LICENSE
- Add missing xorg dependency
- Respect CFLAGS/LDFLAGS
- Unsilence installation
- Switch to options helpers
- Regenerate patches
Modified:
head/emulators/m2000/Makefile
head/emulators/m2000/files/patch-Makefile.X
head/emulators/m2000/files/patch-X.c
Modified: head/emulators/m2000/Makefile
==============================================================================
--- head/emulators/m2000/Makefile Wed Mar 8 08:17:55 2017 (r435663)
+++ head/emulators/m2000/Makefile Wed Mar 8 09:01:49 2017 (r435664)
@@ -19,6 +19,8 @@ EXTRACT_ONLY= ${PORTNAME:tu}${EXTRACT_SU
MAINTAINER= ports at 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 \
@@ -41,7 +43,7 @@ M2000TAPES= 3DDoolhof2.cas \
WRKSRC= ${WRKDIR}/P2000
ALL_TARGET= x
-USE_XORG= x11 xi
+USE_XORG= x11 xext xi
SUB_FILES= m2000.sh
PORTDOCS= M2000.txt
@@ -54,23 +56,25 @@ post-extract:
${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"
@@ -78,7 +82,7 @@ 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'"
Modified: head/emulators/m2000/files/patch-Makefile.X
==============================================================================
--- head/emulators/m2000/files/patch-Makefile.X Wed Mar 8 08:17:55 2017 (r435663)
+++ head/emulators/m2000/files/patch-Makefile.X Wed Mar 8 09:01:49 2017 (r435664)
@@ -1,5 +1,5 @@
---- 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
@@ -19,7 +19,7 @@
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)
Modified: head/emulators/m2000/files/patch-X.c
==============================================================================
--- head/emulators/m2000/files/patch-X.c Wed Mar 8 08:17:55 2017 (r435663)
+++ head/emulators/m2000/files/patch-X.c Wed Mar 8 09:01:49 2017 (r435664)
@@ -1,6 +1,6 @@
---- 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);
More information about the svn-ports-all
mailing list