cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.6.4, from Brad.

Browse Source 
ok edd@ and sthen@ on a previous version. Maintainer timed out.
This commit is contained in:
pascal 2011-11-23 19:36:44 +00:00
parent 6d5758a006
commit 33eca7a3e0
8 changed files with 80 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
emulators/x48/Makefile
View File

@ -1,31 +1,43 @@
# $OpenBSD: Makefile,v 1.21 2010/10/24 21:17:49 ajacoutot Exp $
#
# $OpenBSD: Makefile,v 1.22 2011/11/23 19:36:44 pascal Exp $
COMMENT= HP48sx emulator
DISTNAME= x48-0.4.0
REVISION= 1
DISTNAME= x48-0.6.4
CATEGORIES= emulators
MAINTAINER= Todd T. Fries <todd@openbsd.org>
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xau Xdmcp Xext c pthread-stubs xcb
WANTLIB= X11 Xext c ncurses readline util
MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/emulators/}
MASTER_SITES= ${MASTER_SITE_BERLIOS:=x48/}
EXTRACT_SUFX= .tar.bz2
CONFIGURE_STYLE= imake noman
AUTOCONF_VERSION= 2.60
AUTOMAKE_VERSION= 1.10
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= LIBS="-lncurses -lutil"
CONFIGURE_ARGS= --with-appdefaultdir="${LOCALBASE}/lib/X11/app-defaults"
NO_REGRESS= Yes
WRKDIST= ${WRKDIR}
post-patch:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} sh ./autogen.sh
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/x48
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/x48/README-x48
${INSTALL_DATA} ${WRKSRC}/doc/CARDS.doc ${WRKSRC}/doc/ROMDump.doc \
${PREFIX}/share/x48
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/x48
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/x48/README-x48
.include <bsd.port.mk>

10
emulators/x48/distinfo
View File

@ -1,5 +1,5 @@
MD5 (x48-0.4.0.tar.gz) = 3aW8pBfrDc0Suep8N0L0Yg==
RMD160 (x48-0.4.0.tar.gz) = C7O7dpZQ8XbuV9lJBvWg70priMI=
SHA1 (x48-0.4.0.tar.gz) = rxSBXQTEiC4WcYoeEKWjNgFP4qI=
SHA256 (x48-0.4.0.tar.gz) = 8G35oVpY4gTFWO8/ZPYS8PaYA4EA7So1OOXTi6m4SJs=
SIZE (x48-0.4.0.tar.gz) = 134814
MD5 (x48-0.6.4.tar.bz2) = cA5jH4kkqZGzXYqGzmCqtw==
RMD160 (x48-0.6.4.tar.bz2) = pdfdtOtHQmxjmUHYz1OSa9NFHvU=
SHA1 (x48-0.6.4.tar.bz2) = 38gv6E8MeTpfe4AkEn4W00GtKJk=
SHA256 (x48-0.6.4.tar.bz2) = 3UL7Pf3oYKu3WPjm1czQGEW78NzYCLh3hu7D73CRBn8=
SIZE (x48-0.6.4.tar.bz2) = 227991

18
emulators/x48/patches/patch-config_h
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-config_h,v 1.1 2002/02/21 01:04:22 naddy Exp $
--- config.h.orig Thu Feb 21 01:58:46 2002
+++ config.h Thu Feb 21 01:59:08 2002
@@ -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 -O6 -Wall */
/*
* Which Flags to pass to the Linker:

65
emulators/x48/patches/patch-src_Imakefile
View File

@ -1,65 +0,0 @@
$OpenBSD: patch-src_Imakefile,v 1.1 2002/02/21 01:04:22 naddy Exp $
--- src/Imakefile.orig Thu Jan 12 12:17:01 1995
+++ src/Imakefile Thu Feb 21 01:32:51 2002
@@ -22,7 +22,6 @@
#include "../config.h"
- BIN = $(TOP)/bin
UTILS = $(TOP)/utils
READLINE = $(TOP)/readline
READLINELIB = $(READLINE)/libreadline.a
@@ -86,31 +85,35 @@ EXTRA_LIBRARIES =
CO = co -l
TARFILES = Imakefile X48.ad $(TARS1) $(SRCS2) $(SRCS3) $(SRCS4) $(HDRS)
-all:: $(BIN)/x48 $(BIN)/dump2rom $(BIN)/checkrom $(BIN)/mkcard
- PROGRAMS = $(BIN)/x48 $(BIN)/dump2rom $(BIN)/checkrom $(BIN)/mkcard
+ PROGRAMS = x48 dump2rom checkrom mkcard
+
+all:: $(PROGRAMS)
depend:: version.c X48.ad.h
echo_tarfiles:
@echo $(TARFILES)
-#ifndef ComplexProgramTarget_4
-#define ComplexProgramTarget_4(program,locallib,syslib) @@\
-program: $(OBJS4) $(DEPLIBS4) @@\
- 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,,)
+#ifdef ProgramTargetHelper
+#undef ProgramTargetHelper
+#endif
+#define ProgramTargetHelper(program,srcs,objs,deplib,locallib,syslib) @@\
+ProgramTargetName(program): $(objs) $(deplib) @@\
+ RemoveTargetProgram($@) @@\
+ LinkRule($@,$(LDOPTIONS),$(objs),locallib $(LDLIBS) syslib) @@\
+ @@\
+CenterProgramTarget(program,$(srcs),$(objs),locallib,syslib) @@\
+SentinelProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
+PurifyProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
+ProofProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
+ @@\
+InstallProgram(program,$(BINDIR))
+
+ComplexProgramTarget_1(x48, $(X48LIBS),)
+ComplexProgramTarget_2(dump2rom,,)
+ComplexProgramTarget_3(checkrom,,)
+ComplexProgramTarget_4(mkcard,,)
InstallAppDefaults(X48)

13
emulators/x48/patches/patch-src_dump2rom_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_dump2rom_c,v 1.1 2002/02/21 01:04:22 naddy Exp $
--- src/dump2rom.c.orig Thu Feb 21 01:53:30 2002
+++ src/dump2rom.c Thu Feb 21 01:53:51 2002
@@ -130,8 +130,7 @@ char **argv;
{
FILE *dump;
long addr, size;
- char ch;
- int i, gx, error;
+ int ch, i, gx, error;
if (argc < 2) {
fprintf(stderr, "usage: %s hp48-dump-file\n", argv[0]);

8
emulators/x48/patches/patch-src_hp48_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_hp48_h,v 1.1 2002/02/21 01:04:23 naddy Exp $
--- src/hp48.h.orig Thu Feb 21 01:38:49 2002
+++ src/hp48.h Thu Feb 21 01:39:02 2002
@@ -218,7 +218,7 @@ typedef struct saturn_t {
$OpenBSD: patch-src_hp48_h,v 1.2 2011/11/23 19:36:44 pascal Exp $
--- src/hp48.h.orig Thu Oct 6 19:54:57 2011
+++ src/hp48.h Thu Oct 6 19:55:20 2011
@@ -227,7 +227,7 @@ typedef struct saturn_t {
word_8 unknown2;

148
emulators/x48/patches/patch-src_serial_c
View File

@ -1,113 +1,45 @@
$OpenBSD: patch-src_serial_c,v 1.1 2002/02/21 01:04:23 naddy Exp $
--- src/serial.c.orig Wed Jan 11 19:24:04 1995
+++ src/serial.c Thu Feb 21 01:32:51 2002
@@ -77,6 +77,8 @@
#ifdef SOLARIS
#include <sys/stream.h>
#include <sys/stropts.h>
+#endif
+#if defined(SOLARIS) || defined(__FreeBSD__) || defined (__bsdi__) || defined(__OpenBSD__)
#include <sys/termios.h>
#endif
@@ -238,7 +240,7 @@ serial_init()
if (ttyp >= 0)
$OpenBSD: patch-src_serial_c,v 1.2 2011/11/23 19:36:44 pascal Exp $
Adjust the serial code for *BSD
--- src/serial.c.orig Mon Nov 14 22:03:40 2011
+++ src/serial.c Tue Nov 15 11:45:59 2011
@@ -134,7 +134,19 @@ serial_init()
ttyp = -1;
if (useTerminal)
{
-#if defined(SUNOS) || defined(HPUX)
+#if defined(SUNOS) || defined(HPUX) || defined(__FreeBSD__) || defined (__bsdi__) || defined(__OpenBSD__)
if (tcgetattr(ttyp, &ttybuf) < 0)
#else
if (ioctl(ttyp, TCGETS, (char *)&ttybuf) < 0)
@@ -263,7 +265,7 @@ serial_init()
if (ttyp >= 0)
{
-#if defined(SUNOS) || defined (HPUX)
+#if defined(SUNOS) || defined (HPUX) || defined(__FreeBSD__) || defined (__bsdi__) || defined(__OpenBSD__)
if (tcsetattr(ttyp, TCSANOW, &ttybuf) < 0)
#else
if (ioctl(ttyp, TCSETS, (char *)&ttybuf) < 0)
@@ -291,7 +293,7 @@ serial_init()
if (ir_fd >= 0)
{
-#if defined(SUNOS) || defined (HPUX)
+#if defined(SUNOS) || defined (HPUX) || defined (__FreeBSD__) || defined (__bsdi__) || defined(__OpenBSD__)
if (tcgetattr(ir_fd, &ttybuf) < 0)
#else
if (ioctl(ir_fd, TCGETS, (char *)&ttybuf) < 0)
@@ -315,7 +317,7 @@ serial_init()
if (ir_fd >= 0)
{
-#if defined(SUNOS) || defined(HPUX)
+#if defined(SUNOS) || defined(HPUX) || defined (__FreeBSD__) || defined (__bsdi__) || defined(__OpenBSD__)
if (tcsetattr(ir_fd, TCSANOW, &ttybuf) < 0)
#else
if (ioctl(ir_fd, TCSETS, (char *)&ttybuf) < 0)
@@ -344,7 +346,7 @@ int baud;
if (ir_fd >= 0)
{
-#if defined(SUNOS) || defined (HPUX)
+#if defined(SUNOS) || defined (HPUX) || defined (__FreeBSD__) || defined (__bsdi__) || defined(__OpenBSD__)
if (tcgetattr(ir_fd, &ttybuf) < 0)
#else
if (ioctl(ir_fd, TCGETS, (char *)&ttybuf) < 0)
@@ -358,6 +360,10 @@ int baud;
}
}
+#if defined(__FreeBSD__) || defined(__bsdi__) || defined(__OpenBSD__)
+ cfsetspeed(&ttybuf, baud);
+#else
+
ttybuf.c_cflag &= ~CBAUD;
baud &= 0x7;
@@ -404,9 +410,11 @@ int baud;
ttybuf.c_cflag |= B9600;
}
+#endif /* FreeBSD */
+
if (ir_fd >= 0)
{
-#if defined(SUNOS) || defined(HPUX)
+#if defined(SUNOS) || defined(HPUX) || defined (__FreeBSD__) || defined(__bsdi__) || defined(__OpenBSD__)
if (tcsetattr(ir_fd, TCSANOW, &ttybuf) < 0)
#else
if (ioctl(ir_fd, TCSETS, (char *)&ttybuf) < 0)
@@ -422,7 +430,7 @@ int baud;
if (ttyp >= 0)
{
-#if defined(SUNOS) || defined(HPUX)
+#if defined(SUNOS) || defined(HPUX) || defined (__FreeBSD__) || defined(__bsdi__) || defined(__OpenBSD__)
if (tcgetattr(ttyp, &ttybuf) < 0)
#else
if (ioctl(ttyp, TCGETS, (char *)&ttybuf) < 0)
@@ -437,6 +445,9 @@ int baud;
}
}
+#if defined(__FreeBSD__) || defined(__bsdi__) || defined(__OpenBSD__)
+ cfsetspeed(&ttybuf, baud);
+#else
ttybuf.c_cflag &= ~CBAUD;
baud &= 0x7;
@@ -482,10 +493,11 @@ int baud;
-#if defined(IRIX)
+#if defined(CSRG_BASED)
+ int tty_m, tty_s;
+ if (openpty(&tty_m, &tty_s, tty_dev_name, NULL, NULL) == 0)
+ {
+ if (verbose)
+ printf("%s: wire connection on %s\n", progname, tty_dev_name);
+ wire_fd = tty_m;
+ ttyp = tty_s;
+ wire_name = strdup(tty_dev_name);
+ }
+ else
+ perror("openpty");
+#elif defined(IRIX)
if ((p = _getpty(&wire_fd, O_RDWR | O_EXCL | O_NDELAY, 0666, 0)) == NULL)
{
wire_fd = -1;
@@ -416,6 +428,8 @@ int baud;
fprintf(stderr, "%s: can\'t set baud rate, using 9600\n", progname);
ttybuf.c_cflag |= B9600;
}
+#endif
if (ttyp >= 0)
{
-#if defined(SUNOS) || defined(HPUX)
+#if defined(SUNOS) || defined(HPUX) || defined (__FreeBSD__) || defined(__bsdi__) || defined(__OpenBSD__)
if (tcsetattr(ttyp, TCSANOW, &ttybuf) < 0)
+#elif defined(CSRG_BASED)
+ cfsetspeed(&ttybuf, baud);
#else
if (ioctl(ttyp, TCSETS, (char *)&ttybuf) < 0)
ttybuf.c_cflag &= ~CBAUD;
@@ -497,6 +511,8 @@ int baud;
}
#if defined(__APPLE__)
+#elif defined(CSRG_BASED)
+ cfsetspeed(&ttybuf, baud);
#else
ttybuf.c_cflag &= ~CBAUD;

17
emulators/x48/pkg/PLIST
View File

@ -1,10 +1,9 @@
@comment $OpenBSD: PLIST,v 1.4 2004/09/15 00:42:04 espie Exp $
bin/checkrom
bin/dump2rom
bin/mkcard
bin/x48
@comment $OpenBSD: PLIST,v 1.5 2011/11/23 19:36:44 pascal Exp $
@bin bin/checkrom
@bin bin/dump2rom
@bin bin/mkcard
@bin bin/x48
lib/X11/app-defaults/X48
share/x48/
share/x48/CARDS.doc
share/x48/README-x48
share/x48/ROMDump.doc
@man man/man1/x48.1
share/doc/x48/
share/doc/x48/README-x48