- Update to version 0.6.3, which features number of bug fixes and "netbook"

  look for small/short screens.  Unfortunately, SX ROM revision J still does
  not seem to work
- Build is done with GNU make now (was Imake before)
- Contract ${MASTER_SITE_BERLIOS} -> BERLIOS
- Augment CATEGORIES (add math): x48 can be used as powerful calculator
- Add LICENSE (GPLv3), utilize PORTDOCS
- Touch a COMMENT (use HP's official "graphic calculator" spelling) and add
  couple of small comments about HP ROM images in Makefile

5 files changed, 19 insertions, 46 deletions

diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index c0bf6c359731..710ea2df0a4a 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -6,35 +6,38 @@
 #
 
 PORTNAME=	x48
-PORTVERSION=	0.4.3
-PORTREVISION=	3
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
+PORTVERSION=	0.6.3
+CATEGORIES=	emulators math
+MASTER_SITES=	BERLIOS
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		x48-gxrom-r${EXTRACT_SUFX} x48-sxrom-e${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	An HP48 SX/GX calculator emulator
+COMMENT=	An HP48 SX/GX graphic calculator emulator
 
-USE_IMAKE=	yes
-USE_XORG=	x11 xext
-NO_INSTALL_MANPAGES=	yes
-MAKE_JOBS_UNSAFE=	yes
+LICENSE=	GPLv3
 
-.include <bsd.port.pre.mk>
+GNU_CONFIGURE=	yes
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LIBS=-lutil
+USE_GMAKE=	yes
+USE_XORG=	x11 xext xt
+
+PORTDOCS=	ChangeLog README
 
 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
 
 post-patch:
-	@${REINPLACE_CMD} -e 's+rom.dump+${DATADIR}/gxrom-r+' \
+# Prefer GX Revision R ROM by default
+	@${REINPLACE_CMD} -e 's+rom\.dump+${DATADIR}/gxrom-r+' \
 		${WRKSRC}/src/X48.ad
-	@${REINPLACE_CMD} -e 's+cuaa+cuad+' ${WRKSRC}/src/X48.ad
 
 do-install:
 .for p in x48 dump2rom checkrom mkcard
@@ -45,9 +48,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/??rom-? ${DATADIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for f in README doc/CARDS.doc doc/ROMDump.doc
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S+^+${WRKSRC}/+} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/x48/distinfo b/emulators/x48/distinfo
index f9a50093f1f5..3bed89b59fca 100644
--- a/emulators/x48/distinfo
+++ b/emulators/x48/distinfo
@@ -1,5 +1,5 @@
-SHA256 (x48-0.4.3.tar.gz) = 5efb6bfdae8b980ec497d7569c19edd01c579640ebb30eb27f727b182a1fb809
-SIZE (x48-0.4.3.tar.gz) = 128263
+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
diff --git a/emulators/x48/files/patch-config.h b/emulators/x48/files/patch-config.h
deleted file mode 100644
index 122a229f217f..000000000000
--- a/emulators/x48/files/patch-config.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.h.orig	2005-04-14 21:33:56.000000000 +0300
-+++ config.h	2009-04-05 19:46:14.000000000 +0300
-@@ -49,7 +49,7 @@
- /*
-  * If you don't have the XShm extension, comment the following line
-  */
--#define HAVE_XSHM
-+/* #define HAVE_XSHM */
- 
- /*
-  * If you don't want to use the readline library,
diff --git a/emulators/x48/files/patch-src+Imakefile b/emulators/x48/files/patch-src+Imakefile
deleted file mode 100644
index 193fee1b0065..000000000000
--- a/emulators/x48/files/patch-src+Imakefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Imakefile.orig	Wed Sep  6 00:58:40 2006
-+++ src/Imakefile	Wed Sep  6 01:00:32 2006
-@@ -25,8 +25,8 @@
-             TOP = ..
-             BIN = .
-           UTILS = $(TOP)/utils
--    READLINELIB = -lreadline TermcapLibrary
--EXTRA_LIBRARIES =
-+    READLINELIB = -lreadline -ltermcap
-+EXTRA_LIBRARIES = -lutil
- 
- #ifdef HAVE_XSHM
- # define XSHM_DEF -DHAVE_XSHM
diff --git a/emulators/x48/pkg-plist b/emulators/x48/pkg-plist
index ba2b097c9ae6..d3e874d9488e 100644
--- a/emulators/x48/pkg-plist
+++ b/emulators/x48/pkg-plist
@@ -6,7 +6,3 @@ lib/X11/app-defaults/X48
 %%DATADIR%%/gxrom-r
 %%DATADIR%%/sxrom-e
 @dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/CARDS.doc
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/ROMDump.doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%