diff options
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/x48/Makefile | 10 | ||||
-rw-r--r-- | emulators/x48/distinfo | 4 | ||||
-rw-r--r-- | emulators/x48/files/patch-src+global.h | 25 | ||||
-rw-r--r-- | emulators/x48/files/patch-src+hp48.h | 11 | ||||
-rw-r--r-- | emulators/x48/pkg-descr | 2 | ||||
-rw-r--r-- | emulators/x48/pkg-plist | 2 |
6 files changed, 10 insertions, 44 deletions
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile index 9a7d65217576..8a28451c6f55 100644 --- a/emulators/x48/Makefile +++ b/emulators/x48/Makefile @@ -3,9 +3,10 @@ PORTNAME= x48 PORTVERSION= 0.6.4 +PORTREVISION= 1 CATEGORIES= emulators math MASTER_SITES= SF/${PORTNAME}.berlios -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gxrom-r.bz2 sxrom-e.bz2 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gxrom-r.bz2 sxrom-j.bz2 DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -37,14 +38,15 @@ post-extract: .SILENT # Extract official HP ROM images for GX/SX ${CP} ${_DISTDIR}/gxrom-r.bz2 ${WRKSRC} && ${BZIP2_CMD} \ -d ${WRKSRC}/gxrom-r.bz2 -# The latest SX ROM revision is J, but it does not work with x48, so use E - ${CP} ${_DISTDIR}/sxrom-e.bz2 ${WRKSRC} && ${EXTRACT_CMD} \ - -d ${WRKSRC}/sxrom-e.bz2 + ${CP} ${_DISTDIR}/sxrom-j.bz2 ${WRKSRC} && ${BZIP2_CMD} \ + -d ${WRKSRC}/sxrom-j.bz2 post-patch: # Enable serial communication and prefer GX Revision R ROM by default @${REINPLACE_CMD} -e '/useSerial/s+False+True+ ; s+ttyS+cuau+ ; \ s+rom\.dump+${DATADIR}/gxrom-r+' ${WRKSRC}/src/X48.ad.h +# Force correct type per what comment says + @${REINPLACE_CMD} -e '/timer1/s+char+signed &+' ${WRKSRC}/src/hp48.h do-install: .for p in x48 dump2rom checkrom mkcard diff --git a/emulators/x48/distinfo b/emulators/x48/distinfo index ec9e2f5e4462..7c0476c9d3e1 100644 --- a/emulators/x48/distinfo +++ b/emulators/x48/distinfo @@ -2,5 +2,5 @@ SHA256 (x48/x48-0.6.4.tar.bz2) = dd42fb3dfde860abb758f8e6d5ccd01845bbf0dcd808b87 SIZE (x48/x48-0.6.4.tar.bz2) = 227991 SHA256 (x48/gxrom-r.bz2) = f89eb7bf979e62db53d436e3218b963c693f66c52797218c01d6552f1bbe014f SIZE (x48/gxrom-r.bz2) = 332316 -SHA256 (x48/sxrom-e.bz2) = b08f7e9108f85f1f54f632ce13f880f7dfebc57866c464ea8d3ad24ad4f89c2e -SIZE (x48/sxrom-e.bz2) = 190826 +SHA256 (x48/sxrom-j.bz2) = abd7f59cc07dcd22d1ac62bff901172d37e1ea4f01e1afdd099aa4bcf77e14a8 +SIZE (x48/sxrom-j.bz2) = 193349 diff --git a/emulators/x48/files/patch-src+global.h b/emulators/x48/files/patch-src+global.h deleted file mode 100644 index cfa5b53e5848..000000000000 --- a/emulators/x48/files/patch-src+global.h +++ /dev/null @@ -1,25 +0,0 @@ ---- src/global.h.orig Tue Sep 7 22:41:45 1999 -+++ src/global.h Mon Nov 22 17:03:53 2004 -@@ -79,6 +79,14 @@ - - #else /* Not Linux */ - -+#if defined(__FreeBSD__) -+ -+#ifndef FREEBSD -+#define FREEBSD 1 -+#endif -+ -+#else /* Not FreeBSD */ -+ - #if defined(sun) && defined(unix) - - #if defined(__svr4__) || defined(SVR4) || defined(SYSV) -@@ -106,6 +114,7 @@ - #endif /* Not HP-UX */ - #endif /* Not Solaris */ - #endif /* Sun && Unix */ -+#endif /* Not FreeBSD */ - #endif /* Not Linux */ - - #ifdef SYSV diff --git a/emulators/x48/files/patch-src+hp48.h b/emulators/x48/files/patch-src+hp48.h deleted file mode 100644 index 602a5b37f4e3..000000000000 --- a/emulators/x48/files/patch-src+hp48.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/hp48.h.orig Sat Jun 28 20:50:52 2003 -+++ src/hp48.h Sat Jun 28 20:52:14 2003 -@@ -246,7 +246,7 @@ - - word_8 unknown2; - -- char timer1; /* may NOT be unsigned !!! */ -+ signed char timer1; /* may NOT be unsigned !!! */ - word_32 timer2; - - long t1_instr; diff --git a/emulators/x48/pkg-descr b/emulators/x48/pkg-descr index 534922dc403f..7d00496405f4 100644 --- a/emulators/x48/pkg-descr +++ b/emulators/x48/pkg-descr @@ -2,6 +2,6 @@ This emulator is capable of providing a faithful replication of the HP48 SX/GX graphic calculators. Around mid 2000, Hewlett Packard has graciously made available the ROMs -required to run the package. +required to run the package (included). WWW: http://x48.berlios.de/ diff --git a/emulators/x48/pkg-plist b/emulators/x48/pkg-plist index e31c66fafaaf..1e6c8c88efa5 100644 --- a/emulators/x48/pkg-plist +++ b/emulators/x48/pkg-plist @@ -3,5 +3,5 @@ bin/dump2rom bin/mkcard bin/x48 %%DATADIR%%/gxrom-r -%%DATADIR%%/sxrom-e +%%DATADIR%%/sxrom-j @dirrm %%DATADIR%% |