pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/x48 Update x48 from version 0.4.1 to 0.6.4.
details: https://anonhg.NetBSD.org/pkgsrc/rev/48a50c390270
branches: trunk
changeset: 621400:48a50c390270
user: he <he%pkgsrc.org@localhost>
date: Mon Jul 08 08:37:10 2013 +0000
description:
Update x48 from version 0.4.1 to 0.6.4.
Pkgsrc changes;
* HOMEPAGE & distribution site moved.
* HP has released the ROMs, and copies of these are now automatically
installed.
* I could not get the X11 shm option to work (native X11, NetBSD 6.1/i386),
so it is disabled in the Makefile.
* Patch with updated pty handling code, borrowing some from FreeBSD's
package here.
Upstream changes:
2011-08-08 "G. Allen Morris III" <gam3%gam3.net@localhost> release 0.6.4
* Default to throttling speed only when key-pressed
* Add throttle switch for speed emulation
* Fix buffer overflow bug
* release keys on loss of focus
* typo in access_time adjust
2010-02-01 "G. Allen Morris III" <gam3%gam3.net@localhost> release 0.6.3
* made updates to x48.spec
* put debian directory in dist file
* install X48 app data in correct place
using pkg-config appdefaultdir xt
* removed more debugging messages
* added 'netbook' look for small/short screens
use +netbook on the command line
2010-01-30 "G. Allen Morris III" <gam3%gam3.net@localhost> release 0.6.2
* remove setlocal code that was causing a bug.
* removed some debugging code.
2009-06-31 "G. Allen Morris III" <gam3%gam3.net@localhost> release 0.6.1
* Fix to XShm to solve the 'LCD' Scramble problem.
2006-04-20 "G. Allen Morris III" <gam3%gam3.net@localhost>
* Added simple paste feature
* Repaired debugger non-readline input
* Changed from building with Imakefile to using GNU autoconfig
2005-03-20 "G. Allen Morris III" <gam3%gam3.net@localhost>
* added equal key for + and Meta Keys for Alpha
* applied a different fix for the arrow repeat key bug
* fixed a bug in the timer one logic. The cursor now flashes on input.
2005-03-20 "G. Allen Morris III" <gam3%gam3.net@localhost>
* added patch [000390] time.h compile bug
* added patch [000391] Arrow key repeat patch
* added ChangeLog file
2005-03-18 "G. Allen Morris III" <gam3%gam3.net@localhost>
* starting from x48 0.4.0.
diffstat:
emulators/x48/DESCR | 8 +-
emulators/x48/Makefile | 44 ++-
emulators/x48/PLIST | 9 +-
emulators/x48/distinfo | 27 +-
emulators/x48/patches/patch-Makefile.am | 15 +
emulators/x48/patches/patch-aa | 31 -
emulators/x48/patches/patch-ab | 51 --
emulators/x48/patches/patch-ac | 56 ---
emulators/x48/patches/patch-ad | 43 --
emulators/x48/patches/patch-ae | 194 -----------
emulators/x48/patches/patch-af | 13 -
emulators/x48/patches/patch-configure.ac | 26 +
emulators/x48/patches/patch-src_emulate.c | 4 +-
emulators/x48/patches/patch-src_global.h | 21 +
emulators/x48/patches/patch-src_serial.c | 522 ++++++++++++++++++++++++++++++
15 files changed, 645 insertions(+), 419 deletions(-)
diffs (truncated from 1156 to 300 lines):
diff -r 351a15b54d21 -r 48a50c390270 emulators/x48/DESCR
--- a/emulators/x48/DESCR Mon Jul 08 08:30:12 2013 +0000
+++ b/emulators/x48/DESCR Mon Jul 08 08:37:10 2013 +0000
@@ -1,8 +1,2 @@
This emulator is capable of providing a faithful replication of the
-HP48. In order to do so, it requires a copy of the ROM software
-from YOUR calculator. In order to avoid breaking copyright laws,
-and upsetting HP, you MUST BE THE PROUD OWNER OF AN HP48 before
-running this program. Of course you can run this program without a
-copy of the ROM software in order to write trivial machine code
-programs but you will not be able to access any of the calculator
-functionality.
+HP48.
diff -r 351a15b54d21 -r 48a50c390270 emulators/x48/Makefile
--- a/emulators/x48/Makefile Mon Jul 08 08:30:12 2013 +0000
+++ b/emulators/x48/Makefile Mon Jul 08 08:37:10 2013 +0000
@@ -1,24 +1,51 @@
-# $NetBSD: Makefile,v 1.15 2013/01/17 15:51:26 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2013/07/08 08:37:10 he Exp $
#
-DISTNAME= x48_041
-PKGNAME= x48-0.4.1
-PKGREVISION= 1
+DISTNAME= x48-0.6.4
CATEGORIES= emulators
-MASTER_SITES= http://home.earthlink.net/~rmmlgetz/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=x48.berlios/}
+DISTFILES= ${PKGNAME}${EXTRACT_SUFX}
+DISTFILES+= sxrom-e.bz2 gxrom-r.bz2
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://home.earthlink.net/~rmmlgetz/
+HOMEPAGE= http://x48.berlios.de/
COMMENT= HP48 emulator
+LICENSE= gnu-gpl-v3
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_IMAKE= YES
+WRKSRC= ${WRKDIR}
+#USE_IMAKE= YES
+GNU_CONFIGURE= YES
+USE_TOOLS+= pkg-config aclocal autoconf automake autoreconf
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake
+
+DATADIR= lib/x48
INSTALLATION_DIRS+= share/doc/x48/romdump
+INSTALLATION_DIRS+= ${DATADIR}
+INSTALLATION_DIRS+= lib/X11/app-defaults
+
+CONFIGURE_ARGS= --disable-shm
CPPFLAGS+= -DHAVE_STDLIB
+SUBST_CLASSES= fix-ad
+SUBST_STAGE.fix-ad= post-configure
+SUBST_MESSAGE.fix-ad= Fix default rom path
+SUBST_FILES.fix-ad= X48.ad
+SUBST_SED.fix-ad= -e 's,"rom.dump,"${DATADIR}/gxrom-r,'
+
+
+pre-configure:
+ cd ${WRKSRC} && autoreconf -fi
+
post-install:
+ cd ${WRKSRC} && \
+ ${INSTALL_DATA} X48 \
+ ${DESTDIR}${PREFIX}/lib/X11/app-defaults
+ cd ${WRKSRC} && \
+ ${INSTALL_DATA} ??rom-? ${DESTDIR}${PREFIX}/${DATADIR}
cd ${WRKSRC}/doc && \
${INSTALL_MAN} CARDS.doc INSTALLING ROMDump.doc \
${DESTDIR}${PREFIX}/share/doc/x48
@@ -28,4 +55,5 @@
${DESTDIR}${PREFIX}/share/doc/x48/romdump
.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 351a15b54d21 -r 48a50c390270 emulators/x48/PLIST
--- a/emulators/x48/PLIST Mon Jul 08 08:30:12 2013 +0000
+++ b/emulators/x48/PLIST Mon Jul 08 08:37:10 2013 +0000
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:51:10 joerg Exp $
-bin/x48
+@comment $NetBSD: PLIST,v 1.3 2013/07/08 08:37:10 he Exp $
+bin/checkrom
bin/dump2rom
-bin/checkrom
bin/mkcard
+bin/x48
lib/X11/app-defaults/X48
+lib/x48/gxrom-r
+lib/x48/sxrom-e
+man/man1/x48.1
share/doc/x48/CARDS.doc
share/doc/x48/INSTALLING
share/doc/x48/ROMDump.doc
diff -r 351a15b54d21 -r 48a50c390270 emulators/x48/distinfo
--- a/emulators/x48/distinfo Mon Jul 08 08:30:12 2013 +0000
+++ b/emulators/x48/distinfo Mon Jul 08 08:37:10 2013 +0000
@@ -1,13 +1,16 @@
-$NetBSD: distinfo,v 1.7 2013/01/17 15:51:26 joerg Exp $
+$NetBSD: distinfo,v 1.8 2013/07/08 08:37:10 he Exp $
-SHA1 (x48_041.tar.gz) = 7b166ab4a7570b0617a0d8d01d0938b6ae372ab6
-RMD160 (x48_041.tar.gz) = e41b32bd2b38c4163e4a1aae0776048b0c372637
-Size (x48_041.tar.gz) = 193864 bytes
-SHA1 (patch-aa) = f69a736b1057081f12076a2e33d725c0f3659c79
-SHA1 (patch-ab) = 5bc7609bcaaa555ad29cb5cc3a8b53d83e7e6da5
-SHA1 (patch-ac) = ee5784614db4bf00c047e819aaa0f272d3bf9bce
-SHA1 (patch-ad) = c1f98b7672fe96ab8e203081dfedd6cf96075cfa
-SHA1 (patch-ae) = 29ec4f1495ab23d520883eebd51356b394c7143f
-SHA1 (patch-af) = 60adc15ae8c20528892cbcaa029a3dd206a7edca
-SHA1 (patch-src_emulate.c) = 9c670fb5382603a6de3b6ee15aff1f294d5d2810
-SHA1 (patch-src_timer_c) = 976debb83985bad55ca8b25dfe256370e59e3ac8
+SHA1 (gxrom-r.bz2) = c60a83cd57681c3cb359f0cd2505ede686fdb4c8
+RMD160 (gxrom-r.bz2) = 1dafce5902310161cb60f3dde401941565fd031c
+Size (gxrom-r.bz2) = 332316 bytes
+SHA1 (sxrom-e.bz2) = 62d07d48d2acc4ccb8da9b5ae264a19e2d09b361
+RMD160 (sxrom-e.bz2) = 023f2c2ca0ba12c5b0abb6e3b70e4888257e04a9
+Size (sxrom-e.bz2) = 190826 bytes
+SHA1 (x48-0.6.4.tar.bz2) = dfc82fe84f0c793a5f7b8024127e16d341ad2899
+RMD160 (x48-0.6.4.tar.bz2) = a5d7ddb4eb47426c639941d8cf53926bd3451ef5
+Size (x48-0.6.4.tar.bz2) = 227991 bytes
+SHA1 (patch-Makefile.am) = c17957624ea2a65e7bce3e65ced645993b30ee0c
+SHA1 (patch-configure.ac) = 55f1033b0f49e0a296290a1af83f6772e5783f0d
+SHA1 (patch-src_emulate.c) = 75a62b9038a07baff779ed7fad46252e276e69b0
+SHA1 (patch-src_global.h) = 48f076bdf72fb7a6df92e1bb961997fb3844ab30
+SHA1 (patch-src_serial.c) = 9b681d0d94ad53c9d770e54d56eddbda900627b1
diff -r 351a15b54d21 -r 48a50c390270 emulators/x48/patches/patch-Makefile.am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/x48/patches/patch-Makefile.am Mon Jul 08 08:37:10 2013 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.am,v 1.1 2013/07/08 08:37:10 he Exp $
+
+Can't use $< in non-implicit rule.
+
+--- Makefile.am.orig 2011-11-15 03:03:40.000000000 +0000
++++ Makefile.am
+@@ -9,7 +9,7 @@ EXTRA_DIST=rpm/x48.spec \
+ debian/dirs debian/docs debian/menu debian/README.Debian debian/rules
+
+ X48 : src/X48.ad
+- cp $< $@
++ cp src/X48.ad $@
+
+ appdefault_DATA = X48
+
diff -r 351a15b54d21 -r 48a50c390270 emulators/x48/patches/patch-aa
--- a/emulators/x48/patches/patch-aa Mon Jul 08 08:30:12 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2012/04/22 22:04:24 dholland Exp $
-
-- configure for pkgsrc
-- use valid compiler options
-
---- config.h.orig 1999-06-28 22:36:58.000000000 +0000
-+++ config.h
-@@ -29,7 +29,7 @@
- /*
- * Which OS are you on?
- */
--#define UNIX_DEF -DLINUX
-+/* #define UNIX_DEF -DLINUX */
- /* #define UNIX_DEF -DSOLARIS */
- /* #define UNIX_DEF -DSUNOS */
- /* #define UNIX_DEF -DIRIX */
-@@ -56,12 +56,12 @@
- /*
- * Which Compiler to use:
- */
--#define CC_DEF gcc
-+/* #define CC_DEF gcc */
-
- /*
- * Which Optimization Flags:
- */
--#define CDEBUGFLAGS_DEF -O6 -Wall
-+#define CDEBUGFLAGS_DEF -O3 -Wall
-
- /*
- * Which Flags to pass to the Linker:
diff -r 351a15b54d21 -r 48a50c390270 emulators/x48/patches/patch-ab
--- a/emulators/x48/patches/patch-ab Mon Jul 08 08:30:12 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2010/01/30 00:02:54 joerg Exp $
-
---- src/Imakefile.orig Sun Feb 4 18:31:52 2001
-+++ src/Imakefile
-@@ -60,7 +60,7 @@
- LDOPTIONS = LDOPTIONS_DEF
- #endif
-
-- DEFINES = -I/usr/openwin/include UNIX_DEF XSHM_DEF READLINE_DEF
-+ DEFINES = UNIX_DEF XSHM_DEF READLINE_DEF
- HDRS = annunc.h append.h buttons.h constants.h debugger.h \
- device.h disasm.h errors.h global.h hp.h hp48.h \
- hp48_emu.h hp48char.h icon.h mmu.h options.h resources.h \
-@@ -87,9 +87,9 @@
- CO = co -l
- TARFILES = Imakefile X48.ad $(TARS1) $(SRCS2) $(SRCS3) $(SRCS4) $(HDRS)
-
--all:: $(BIN)/x48 $(BIN)/dump2rom $(BIN)/checkrom $(BIN)/mkcard
-+all:: x48 dump2rom checkrom mkcard
-
-- PROGRAMS = $(BIN)/x48 $(BIN)/dump2rom $(BIN)/checkrom $(BIN)/mkcard
-+ PROGRAMS = x48 dump2rom checkrom mkcard
-
- depend:: version.c X48.ad.h
-
-@@ -102,16 +102,20 @@
- RemoveTargetProgram($@) @@\
- $(CC) -o $@ $(LDOPTIONS) $(OBJS4) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS) @@\
- @@\
--SaberProgramTarget(program,$(SRCS4),$(OBJS4),locallib,syslib) @@\
- @@\
- InstallProgram(program,$(BINDIR)) @@\
- InstallManPage(program,$(MANDIR))
- #endif /* ComplexProgramTarget_4 */
-
--ComplexProgramTarget_1($(BIN)/x48, $(X48LIBS),)
--ComplexProgramTarget_2($(BIN)/dump2rom,,)
--ComplexProgramTarget_3($(BIN)/checkrom,,)
--ComplexProgramTarget_4($(BIN)/mkcard,,)
-+NormalProgramTarget(x48, $(OBJS1),, $(X48LIBS),)
-+NormalProgramTarget(dump2rom, $(OBJS2),,,)
-+NormalProgramTarget(checkrom, $(OBJS3),,,)
-+NormalProgramTarget(mkcard, $(OBJS4),,,)
-+
-+InstallProgram(x48,$(BINDIR))
-+InstallProgram(dump2rom,$(BINDIR))
-+InstallProgram(checkrom,$(BINDIR))
-+InstallProgram(mkcard,$(BINDIR))
-
- InstallAppDefaults(X48)
-
diff -r 351a15b54d21 -r 48a50c390270 emulators/x48/patches/patch-ac
--- a/emulators/x48/patches/patch-ac Mon Jul 08 08:30:12 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/27 14:56:27 agc Exp $
-
---- src/init.c.orig Sun Feb 4 18:32:22 2001
-+++ src/init.c
-@@ -1204,13 +1204,15 @@
- struct stat st;
- FILE *fp;
-
-- fprintf(stderr, "testing: Getting home dir\n");
-+ if (!quiet)
-+ fprintf(stderr, "testing: Getting home dir\n");
- get_home_directory(path);
- strcat(path, "/");
-
- saturn.rom = (word_4 *)NULL;
-
-- fprintf(stderr, "testing: Reading ROM files\n");
-+ if (!quiet)
-+ fprintf(stderr, "testing: Reading ROM files\n");
- strcpy(fnam, path);
- strcat(fnam, "rom");
- if (!read_rom_file(fnam, &saturn.rom, &rom_size))
-@@ -1367,7 +1369,8 @@
- exit (1);
- }
-
-- fprintf(stderr, "testing: Reading RAM file\n");
-+ if (!quiet)
-+ fprintf(stderr, "testing: Reading RAM file\n");
-
- strcpy(fnam, path);
- strcat(fnam, "ram");
-@@ -1466,11 +1469,13 @@
- saturn.card_status |= port2_is_ram ? 8 : 0;
- }
-
-+#ifdef notyet
- fprintf(stderr, "testing: Reading Enteries file\n");
- strcpy(fnam, path);
- strcat(fnam, "entries.o");
- if (!read_entries_file(fnam, &saturn.entries))
- return 0;
-+#endif
-
-
- return 1;
-@@ -1841,7 +1846,8 @@
- {
- if (!initialize)
- {
-- fprintf(stderr, "testing: Read Files\n");
-+ if (!quiet)
-+ fprintf(stderr, "testing: Read Files\n");
- if (read_files())
Home |
Main Index |
Thread Index |
Old Index