- Update to version 0.6.4

- Tighten Makefile header and COMMENT
- Register run-time dependency on required fonts
- NOPORTDOCS -> PORT_OPTIONS:MDOCS
- Convert trivial patch to sed(1) in-place editing

PR:		ports/176935 (version bump)
Submitted by:	pfg
Feature safe:	yes

4 files changed, 33 insertions, 41 deletions

diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index e416f90d1ef1..8a9cf9e2e475 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -1,52 +1,58 @@
-# New ports collection makefile for:	x48
-# Date created:				Thu Oct 24 13:10:59 CDT 1996
-# Whom:					Eric L. Hernes <erich@FreeBSD.org>
-#
+# Created by: Eric L. Hernes <erich@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	x48
-PORTVERSION=	0.6.3
+PORTVERSION=	0.6.4
 CATEGORIES=	emulators math
-MASTER_SITES=	BERLIOS
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		x48-gxrom-r${EXTRACT_SUFX} x48-sxrom-e${EXTRACT_SUFX}
+MASTER_SITES=	SF/${PORTNAME}.berlios
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} gxrom-r.bz2 sxrom-e.bz2
+DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	An HP48 SX/GX graphic calculator emulator
+COMMENT=	HP48 SX/GX graphic calculator emulator
 
 LICENSE=	GPLv3
 
-GNU_CONFIGURE=	yes
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/misc/7x14B-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc \
+		${LOCALBASE}/lib/X11/fonts/75dpi/helvR12-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75dpi
+
+USE_BZIP2=	yes
+USE_AUTOTOOLS=	aclocal autoheader automake autoconf
+AUTOMAKE_ARGS=	--add-missing --copy -Wno-portability
+ACLOCAL_ARGS=	# default args (--acdir=...) produce broken configure script
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LIBS=-lutil
 USE_GMAKE=	yes
 USE_XORG=	x11 xext xt
+NO_WRKSUBDIR=	yes
 
 PORTDOCS=	ChangeLog README
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-extract: .SILENT
 # Extract official HP ROM images for GX/SX
-	cd ${WRKSRC} && ${TAR} -zxf ${DISTDIR}/x48-gxrom-r${EXTRACT_SUFX}
-	${MV} ${WRKSRC}/.hp48/rom ${WRKSRC}/gxrom-r
-	cd ${WRKSRC} && ${TAR} -zxf ${DISTDIR}/x48-sxrom-e${EXTRACT_SUFX}
-	${MV} ${WRKSRC}/.hp48/rom ${WRKSRC}/sxrom-e
+	${CP} ${_DISTDIR}/gxrom-r.bz2 ${WRKSRC} && ${EXTRACT_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
 
 post-patch:
-# Prefer GX Revision R ROM by default
-	@${REINPLACE_CMD} -e 's+rom\.dump+${DATADIR}/gxrom-r+' \
-		${WRKSRC}/src/X48.ad
+# 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
 
 do-install:
 .for p in x48 dump2rom checkrom mkcard
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${p} ${PREFIX}/bin
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/src/X48.ad ${PREFIX}/lib/X11/app-defaults/X48
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/??rom-? ${DATADIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S+^+${WRKSRC}/+} ${DOCSDIR}
 .endif
diff --git a/emulators/x48/distinfo b/emulators/x48/distinfo
index 3bed89b59fca..ec9e2f5e4462 100644
--- a/emulators/x48/distinfo
+++ b/emulators/x48/distinfo
@@ -1,6 +1,6 @@
-SHA256 (x48-0.6.3.tar.gz) = c765bfa3b059e31ed9034a7c7f1bee102a228fd164dfc555c8d2e6ae342c7638
-SIZE (x48-0.6.3.tar.gz) = 319892
-SHA256 (x48-gxrom-r.tar.gz) = 4609111de35ba013fc25f8379f75ef3723a9a72140afe70c00f82d6eda952d8c
-SIZE (x48-gxrom-r.tar.gz) = 332583
-SHA256 (x48-sxrom-e.tar.gz) = 5b5585df13b4d41329dc8c9b509e6291786b514cac2915ae935d1f60479dce6b
-SIZE (x48-sxrom-e.tar.gz) = 189906
+SHA256 (x48/x48-0.6.4.tar.bz2) = dd42fb3dfde860abb758f8e6d5ccd01845bbf0dcd808b87786eec3ef7091067f
+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
diff --git a/emulators/x48/files/patch-src+X48.ad b/emulators/x48/files/patch-src+X48.ad
deleted file mode 100644
index 25880923ee81..000000000000
--- a/emulators/x48/files/patch-src+X48.ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/X48.ad.orig	Wed Jan 11 13:24:05 1995
-+++ src/X48.ad	Sun Jun 29 10:46:17 2003
-@@ -49,8 +49,8 @@
- ! resources controlling the connections
- !
- *useTerminal:		True
--*useSerial:		False
--*serialLine:		/dev/ttyS0
-+*useSerial:		True
-+*serialLine:		/dev/cuaa0
- 
- !
- ! stuff controlling initialization
diff --git a/emulators/x48/pkg-plist b/emulators/x48/pkg-plist
index d3e874d9488e..e31c66fafaaf 100644
--- a/emulators/x48/pkg-plist
+++ b/emulators/x48/pkg-plist
@@ -2,7 +2,6 @@ bin/checkrom
 bin/dump2rom
 bin/mkcard
 bin/x48
-lib/X11/app-defaults/X48
 %%DATADIR%%/gxrom-r
 %%DATADIR%%/sxrom-e
 @dirrm %%DATADIR%%