svn commit: r317000 - in head/emulators/x48: . files

[Alexey Dokuchaev]

Author: danfe
Date: Wed May  1 08:32:11 2013
New Revision: 317000
URL: http://svnweb.freebsd.org/changeset/ports/317000

Log:
  - It looks like SX ROM revision J is working fine now, use it instead of E
  - Convert another trivial patch to REINPLACE_CMD statement
  - Delete stale patch file, touch port description while I am here

Deleted:
  head/emulators/x48/files/patch-src+global.h
  head/emulators/x48/files/patch-src+hp48.h
Modified:
  head/emulators/x48/Makefile
  head/emulators/x48/distinfo
  head/emulators/x48/pkg-descr
  head/emulators/x48/pkg-plist

Modified: head/emulators/x48/Makefile
==============================================================================
--- head/emulators/x48/Makefile	Wed May  1 08:31:22 2013	(r316999)
+++ head/emulators/x48/Makefile	Wed May  1 08:32:11 2013	(r317000)
@@ -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

Modified: head/emulators/x48/distinfo
==============================================================================
--- head/emulators/x48/distinfo	Wed May  1 08:31:22 2013	(r316999)
+++ head/emulators/x48/distinfo	Wed May  1 08:32:11 2013	(r317000)
@@ -2,5 +2,5 @@ SHA256 (x48/x48-0.6.4.tar.bz2) = dd42fb3
 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

Modified: head/emulators/x48/pkg-descr
==============================================================================
--- head/emulators/x48/pkg-descr	Wed May  1 08:31:22 2013	(r316999)
+++ head/emulators/x48/pkg-descr	Wed May  1 08:32:11 2013	(r317000)
@@ -2,6 +2,6 @@ This emulator is capable of providing a 
 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/

Modified: head/emulators/x48/pkg-plist
==============================================================================
--- head/emulators/x48/pkg-plist	Wed May  1 08:31:22 2013	(r316999)
+++ head/emulators/x48/pkg-plist	Wed May  1 08:32:11 2013	(r317000)
@@ -3,5 +3,5 @@ bin/dump2rom
 bin/mkcard
 bin/x48
 %%DATADIR%%/gxrom-r
-%%DATADIR%%/sxrom-e
+%%DATADIR%%/sxrom-j
 @dirrm %%DATADIR%%