diff options
Diffstat (limited to 'emulators/aliados')
| -rw-r--r-- | emulators/aliados/Makefile | 11 | ||||
| -rw-r--r-- | emulators/aliados/PLIST | 4 | ||||
| -rw-r--r-- | emulators/aliados/distinfo | 12 | ||||
| -rw-r--r-- | emulators/aliados/patches/patch-aa | 115 | ||||
| -rw-r--r-- | emulators/aliados/patches/patch-aliados.cpp | 12 | ||||
| -rw-r--r-- | emulators/aliados/patches/patch-cpm.cpp | 12 |
6 files changed, 18 insertions, 148 deletions
diff --git a/emulators/aliados/Makefile b/emulators/aliados/Makefile index 618c86845fe..e0c05b11485 100644 --- a/emulators/aliados/Makefile +++ b/emulators/aliados/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2012/10/03 12:55:09 asau Exp $ +# $NetBSD: Makefile,v 1.7 2013/08/21 10:23:41 shattered Exp $ # -DISTNAME= aliados-0.1.1 -PKGREVISION= 1 +DISTNAME= aliados-0.2.0 CATEGORIES= emulators MASTER_SITES= http://www.arrakis.es/~ninsesabe/aliados/ EXTRACT_SUFX= .tgz @@ -13,8 +12,8 @@ COMMENT= CP/M 80 emulator PKG_INSTALLATION_TYPES= overwrite pkgviews -NO_CONFIGURE= YES -USE_LANGUAGES= c++ +GNU_CONFIGURE= YES +USE_LANGUAGES= c c++ USE_NCURSES= yes # tigetstr tparm setupterm INSTALLATION_DIRS= bin share/doc/aliados @@ -22,7 +21,7 @@ INSTALLATION_DIRS= bin share/doc/aliados do-install: ${INSTALL_PROGRAM} ${WRKSRC}/aliados ${DESTDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/aliados - ${INSTALL_DATA} ${WRKSRC}/aliados.doc ${DESTDIR}${PREFIX}/share/doc/aliados + ${INSTALL_DATA} ${WRKSRC}/aliadosdoc.html ${DESTDIR}${PREFIX}/share/doc/aliados .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/aliados/PLIST b/emulators/aliados/PLIST index 4c0ebd2dd84..f5acb35e668 100644 --- a/emulators/aliados/PLIST +++ b/emulators/aliados/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2012/05/15 11:34:52 shattered Exp $ +@comment $NetBSD: PLIST,v 1.3 2013/08/21 10:23:41 shattered Exp $ bin/aliados share/doc/aliados/README -share/doc/aliados/aliados.doc +share/doc/aliados/aliadosdoc.html diff --git a/emulators/aliados/distinfo b/emulators/aliados/distinfo index 3b8b094ee87..5c31931076c 100644 --- a/emulators/aliados/distinfo +++ b/emulators/aliados/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.3 2011/11/23 23:27:07 joerg Exp $ +$NetBSD: distinfo,v 1.4 2013/08/21 10:23:41 shattered Exp $ -SHA1 (aliados-0.1.1.tgz) = adcc43f7bafc2ee11222002d03f306e8f561e3f6 -RMD160 (aliados-0.1.1.tgz) = a4a37f349937d32c1449553816de5f3d87836545 -Size (aliados-0.1.1.tgz) = 50210 bytes -SHA1 (patch-aa) = 3098fd2b27832cc52ba242204c0c6d625c6deb0e -SHA1 (patch-aliados.cpp) = 28e891997d38953eb0544848760cbc8da82165ba -SHA1 (patch-cpm.cpp) = 1dc8e6be75b605cb22522aa13927dd16b2b036d9 +SHA1 (aliados-0.2.0.tgz) = 07de1cdf27cff9e15764df7d09d327badf90b92c +RMD160 (aliados-0.2.0.tgz) = ede3ed71908b166658fc82f651a87243fbf10dff +Size (aliados-0.2.0.tgz) = 128397 bytes +SHA1 (patch-cpm.cpp) = cd7350f8d854c10ec3afefb15df37855680a4ed9 diff --git a/emulators/aliados/patches/patch-aa b/emulators/aliados/patches/patch-aa deleted file mode 100644 index 00610ea2271..00000000000 --- a/emulators/aliados/patches/patch-aa +++ /dev/null @@ -1,115 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2011/11/23 23:27:07 joerg Exp $ - ---- Makefile.orig 2004-03-20 19:31:28.000000000 +0000 -+++ Makefile -@@ -1,16 +1,17 @@ - # Makefile para aliados - - # Path to ncurses required in hp-ux. --CPPFLAGS=-W -Wall -I/opt/ncurses/include -+#CPPFLAGS=-W -Wall -I/opt/ncurses/include -+CPPFLAGS+= ${CXXFLAGS} - - # To compile with console emulation using curses. --LDFLAGS=-lncurses -L/opt/ncurses/lib -+LDFLAGS+="-lncurses" - - # To compile without console emulation. - #LDFLAGS= - #CURSESFLAGS=-DNO_CURSES - --all: aliados disassemble -+all: aliados - - # If you want to build the versions with and without libz80 at the same time. - -@@ -21,17 +22,17 @@ both: aliados aliadoslz disassemble - #------------------------------------------------ - - aliadoslz: aliadoslz.o cpmlz.o realconsole.o cpuz.o directory.o -- g++ $(CPPFLAGS) $(LDFLAGS) -o aliadoslz -lz80 \ -+ $(CXX) $(CPPFLAGS) $(LDFLAGS) -o aliadoslz -lz80 \ - aliadoslz.o cpmlz.o realconsole.o cpuz.o directory.o printer.o - - aliadoslz.o: aliados.cpp cpm.h console.h realconsole.h printer.h -- g++ $(CPPFLAGS) -o aliadoslz.o -c aliados.cpp -+ $(CXX) $(CPPFLAGS) -o aliadoslz.o -c aliados.cpp - - cpmlz.o: cpm.cpp cpm.h cpu.h console.h directory.h printer.h -- g++ $(CPPFLAGS) -o cpmlz.o -c cpm.cpp -+ $(CXX) $(CPPFLAGS) -o cpmlz.o -c cpm.cpp - - cpuz.o: cpu.cpp cpu.h -- g++ $(CPPFLAGS) -o cpuz.o -c cpu.cpp -+ $(CXX) $(CPPFLAGS) -o cpuz.o -c cpu.cpp - - #------------------------------------------------ - # Version using ImcZ80. -@@ -41,7 +42,7 @@ cpuz.o: cpu.cpp cpu.h - - # Uncomment this if you compile with ImcZ80 and with libz80. - #aliados: aliados.o cpm.o Z80.o realconsole.o cpu.o --# g++ $(CPPFLAGS) $(LDFLAGS) -o aliados \ -+# $(CXX) $(CPPFLAGS) $(LDFLAGS) -o aliados \ - # aliados.o cpm.o realconsole.o Z80.o cpu.o \ - # directory.o printer.o \ - # -lz80 -@@ -50,47 +51,47 @@ cpuz.o: cpu.cpp cpu.h - aliados: aliados.o cpm.o Z80.o realconsole.o cpu.o disasm.o \ - directory.o printer.o - -- g++ $(CPPFLAGS) -o aliados \ -+ $(CXX) $(CPPFLAGS) -o aliados \ - aliados.o cpm.o realconsole.o Z80.o cpu.o \ - disasm.o directory.o printer.o \ - $(LDFLAGS) - - aliados.o: aliados.cpp cpm.h console.h realconsole.h printer.h -- g++ $(CPPFLAGS) -DUSE_ImcZ80 -c aliados.cpp -+ $(CXX) $(CPPFLAGS) -DUSE_ImcZ80 -c aliados.cpp - - cpm.o: cpm.cpp cpm.h cpu.h console.h Z80.hxx directory.h printer.h -- g++ $(CPPFLAGS) -DUSE_ImcZ80 -c cpm.cpp -+ $(CXX) $(CPPFLAGS) -DUSE_ImcZ80 -c cpm.cpp - - cpu.o: cpu.cpp cpu.h Z80.hxx disasm.h -- g++ $(CPPFLAGS) -DUSE_ImcZ80 -c cpu.cpp -+ $(CXX) $(CPPFLAGS) -DUSE_ImcZ80 -c cpu.cpp - - Z80.o: Z80.cxx Z80.hxx z80ops.hxx cbops.hxx edops.hxx -- g++ -c Z80.cxx -+ $(CXX) -c Z80.cxx - - #------------------------------------------------ - # Common to all versions. - #------------------------------------------------ - - realconsole.o: realconsole.cpp realconsole.h console.h -- g++ $(CPPFLAGS) $(CURSESFLAGS) -c realconsole.cpp -+ $(CXX) $(CPPFLAGS) $(CURSESFLAGS) -c realconsole.cpp - - disasm.o: disasm.cpp disasm.h cpu.h -- g++ $(CPPFLAGS) -c disasm.cpp -+ $(CXX) $(CPPFLAGS) -c disasm.cpp - - directory.o: directory.cpp directory.h -- g++ $(CPPFLAGS) -c directory.cpp -+ $(CXX) $(CPPFLAGS) -c directory.cpp - - printer.o: printer.cpp printer.h -- g++ $(CPPFLAGS) -c printer.cpp -+ $(CXX) $(CPPFLAGS) -c printer.cpp - - # disassemble is a tiny disassembler that uses the disassemble code - # of the debugger. Works correctly only with .COM files. - - disassemble.o: disassemble.cpp cpu.h disasm.h Z80.hxx -- g++ $(CPPFLAGS) -c disassemble.cpp -+ $(CXX) $(CPPFLAGS) -c disassemble.cpp - - disassemble: disassemble.o cpu.o disasm.o Z80.o -- g++ $(CPPFLAGS) -o disassemble disassemble.o cpu.o disasm.o Z80.o -+ $(CXX) $(CPPFLAGS) -o disassemble disassemble.o cpu.o disasm.o Z80.o - - tgz: - tar cf - Makefile *.cpp *.h *.cxx *.hxx \ diff --git a/emulators/aliados/patches/patch-aliados.cpp b/emulators/aliados/patches/patch-aliados.cpp deleted file mode 100644 index d8a12353325..00000000000 --- a/emulators/aliados/patches/patch-aliados.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aliados.cpp,v 1.1 2011/11/23 23:27:07 joerg Exp $ - ---- aliados.cpp.orig 2004-03-20 19:35:40.000000000 +0000 -+++ aliados.cpp -@@ -14,6 +14,7 @@ using std::endl; - using std::flush; - #include <stdexcept> - #include <memory> -+#include <stdlib.h> - - namespace { - diff --git a/emulators/aliados/patches/patch-cpm.cpp b/emulators/aliados/patches/patch-cpm.cpp index c2e6506a791..d72ca3773b4 100644 --- a/emulators/aliados/patches/patch-cpm.cpp +++ b/emulators/aliados/patches/patch-cpm.cpp @@ -1,12 +1,12 @@ -$NetBSD: patch-cpm.cpp,v 1.1 2011/11/23 23:27:07 joerg Exp $ +$NetBSD: patch-cpm.cpp,v 1.2 2013/08/21 10:23:41 shattered Exp $ ---- cpm.cpp.orig 2011-11-23 16:40:21.000000000 +0000 +--- cpm.cpp.orig 2005-05-16 20:19:55.000000000 +0000 +++ cpm.cpp -@@ -14,6 +14,7 @@ - #include <stdexcept> +@@ -19,6 +19,7 @@ + #include <memory> #include <stdio.h> +#include <string.h> #include <unistd.h> - #include <sys/types.h> - #include <sys/stat.h> + #include <errno.h> + #include <ctype.h> |