aboutsummaryrefslogtreecommitdiff
path: root/emulators/x48
diff options
context:
space:
mode:
authorKevin Lo <kevlo@FreeBSD.org>2000-08-18 16:44:39 +0000
committerKevin Lo <kevlo@FreeBSD.org>2000-08-18 16:44:39 +0000
commitb7ff70393f6f6a9e098c1fde5216dc01089166bf (patch)
treeae06f3c6ae40148232ff4e9b26644c95edf36814 /emulators/x48
parent463ca00a317b34d6144d309b46b2489fbe24b942 (diff)
downloadports-b7ff70393f6f6a9e098c1fde5216dc01089166bf.tar.gz
ports-b7ff70393f6f6a9e098c1fde5216dc01089166bf.zip
Notes
Diffstat (limited to 'emulators/x48')
-rw-r--r--emulators/x48/Makefile27
-rw-r--r--emulators/x48/distinfo2
-rw-r--r--emulators/x48/files/patch-ab17
-rw-r--r--emulators/x48/files/patch-ac44
-rw-r--r--emulators/x48/files/patch-ad112
-rw-r--r--emulators/x48/files/patch-ae11
-rw-r--r--emulators/x48/pkg-descr2
-rw-r--r--emulators/x48/pkg-plist8
8 files changed, 204 insertions, 19 deletions
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 7d79d36f6175..ebb452c1360e 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -1,30 +1,29 @@
-# New ports collection makefile for: x48
-# Date created: Thu Oct 24 13:10:59 CDT 1996
-# Whom: erich@FreeBSD.org
+# New ports collection makefile for: x48
+# Date created: Thu Oct 24 13:10:59 CDT 1996
+# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
PORTNAME= x48
-PORTVERSION= 0.4.1d
+PORTVERSION= 0.4.1
CATEGORIES= emulators
MASTER_SITES= http://home.earthlink.net/~rmmlgetz/
-DISTNAME= ${PORTNAME}_041d
+DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g}
MAINTAINER= ports@FreeBSD.org
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes
-
-WRKSRC= ${WRKDIR}/x48-0.4.1
-
-post-extract:
- cd ${WRKSRC}/readline && ${RM} *.o
-
post-install:
- ${MKDIR} ${PREFIX}/share/x48
- ${CP} ${WRKSRC}/README ${PREFIX}/share/x48/README-x48
- ${CP} ${WRKSRC}/doc/CARDS.doc ${WRKSRC}/doc/ROMDump.doc ${PREFIX}/share/x48
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${PREFIX}/share/doc/x48
+.for file in README doc/CARDS.doc doc/ROMDump.doc
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/x48
+.endfor
+.endif
.include <bsd.port.mk>
diff --git a/emulators/x48/distinfo b/emulators/x48/distinfo
index 7cade903a27e..c06ac8613ee7 100644
--- a/emulators/x48/distinfo
+++ b/emulators/x48/distinfo
@@ -1 +1 @@
-MD5 (x48_041d.tar.gz) = 13ad77a3cedf910703155d1f2fdb639b
+MD5 (x48_041.tar.gz) = f74af15851d1feb9d80ec6ef4ccc3c83
diff --git a/emulators/x48/files/patch-ab b/emulators/x48/files/patch-ab
new file mode 100644
index 000000000000..b4a39a868171
--- /dev/null
+++ b/emulators/x48/files/patch-ab
@@ -0,0 +1,17 @@
+--- config.h.orig Tue Jun 29 07:36:58 1999
++++ config.h Tue Aug 15 20:52:55 2000
+@@ -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:
diff --git a/emulators/x48/files/patch-ac b/emulators/x48/files/patch-ac
new file mode 100644
index 000000000000..e12eec1b8897
--- /dev/null
+++ b/emulators/x48/files/patch-ac
@@ -0,0 +1,44 @@
+--- src/Imakefile.orig Thu Jun 17 00:32:19 1999
++++ src/Imakefile Tue Aug 15 22:07:30 2000
+@@ -60,7 +60,7 @@
+ LDOPTIONS = LDOPTIONS_DEF
+ #endif
+
+- DEFINES = -I/usr/openwin/include UNIX_DEF XSHM_DEF READLINE_DEF
++ DEFINES = UNIX_DEF XSHM_DEF READLINE_DEF
+ HDRS = annunc.h append.h buttons.h constants.h debugger.h \
+ device.h disasm.h errors.h global.h hp.h hp48.h \
+ hp48_emu.h hp48char.h icon.h mmu.h options.h resources.h \
+@@ -87,9 +87,9 @@
+ CO = co -l
+ TARFILES = Imakefile X48.ad $(TARS1) $(SRCS2) $(SRCS3) $(SRCS4) $(HDRS)
+
+-all:: $(BIN)/x48 $(BIN)/dump2rom $(BIN)/checkrom $(BIN)/mkcard
++all:: x48 dump2rom checkrom mkcard
+
+- PROGRAMS = $(BIN)/x48 $(BIN)/dump2rom $(BIN)/checkrom $(BIN)/mkcard
++ PROGRAMS = x48 dump2rom checkrom mkcard
+
+ depend:: version.c X48.ad.h
+
+@@ -102,16 +102,15 @@
+ 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,,)
++ComplexProgramTarget_1(x48, $(X48LIBS),)
++ComplexProgramTarget_2(dump2rom,,)
++ComplexProgramTarget_3(checkrom,,)
++ComplexProgramTarget_4(mkcard,,)
+
+ InstallAppDefaults(X48)
+
diff --git a/emulators/x48/files/patch-ad b/emulators/x48/files/patch-ad
new file mode 100644
index 000000000000..b86e6e6e4f10
--- /dev/null
+++ b/emulators/x48/files/patch-ad
@@ -0,0 +1,112 @@
+--- src/serial.c.orig Tue Jun 29 07:12:29 1999
++++ src/serial.c Tue Aug 15 20:46:02 2000
+@@ -77,6 +77,8 @@
+ #ifdef SOLARIS
+ #include <sys/stream.h>
+ #include <sys/stropts.h>
++#endif
++#if defined(SOLARIS) || defined(__FreeBSD__) || defined (__bsdi__)
+ #include <sys/termios.h>
+ #endif
+
+@@ -238,7 +240,7 @@
+
+ if (ttyp >= 0)
+ {
+-#if defined(SUNOS) || defined(HPUX)
++#if defined(SUNOS) || defined(HPUX) || defined(__FreeBSD__) || defined (__bsdi__)
+ if (tcgetattr(ttyp, &ttybuf) < 0)
+ #else
+ if (ioctl(ttyp, TCGETS, (char *)&ttybuf) < 0)
+@@ -263,7 +265,7 @@
+
+ if (ttyp >= 0)
+ {
+-#if defined(SUNOS) || defined (HPUX)
++#if defined(SUNOS) || defined (HPUX) || defined(__FreeBSD__) || defined (__bsdi__)
+ if (tcsetattr(ttyp, TCSANOW, &ttybuf) < 0)
+ #else
+ if (ioctl(ttyp, TCSETS, (char *)&ttybuf) < 0)
+@@ -291,7 +293,7 @@
+
+ if (ir_fd >= 0)
+ {
+-#if defined(SUNOS) || defined (HPUX)
++#if defined(SUNOS) || defined (HPUX) || defined (__FreeBSD__) || defined (__bsdi__)
+ if (tcgetattr(ir_fd, &ttybuf) < 0)
+ #else
+ if (ioctl(ir_fd, TCGETS, (char *)&ttybuf) < 0)
+@@ -315,7 +317,7 @@
+
+ if (ir_fd >= 0)
+ {
+-#if defined(SUNOS) || defined(HPUX)
++#if defined(SUNOS) || defined(HPUX) || defined (__FreeBSD__) || defined (__bsdi__)
+ if (tcsetattr(ir_fd, TCSANOW, &ttybuf) < 0)
+ #else
+ if (ioctl(ir_fd, TCSETS, (char *)&ttybuf) < 0)
+@@ -344,7 +346,7 @@
+
+ if (ir_fd >= 0)
+ {
+-#if defined(SUNOS) || defined (HPUX)
++#if defined(SUNOS) || defined (HPUX) || defined (__FreeBSD__) || defined (__bsdi__)
+ if (tcgetattr(ir_fd, &ttybuf) < 0)
+ #else
+ if (ioctl(ir_fd, TCGETS, (char *)&ttybuf) < 0)
+@@ -358,6 +360,10 @@
+ }
+ }
+
++#if defined(__FreeBSD__) || defined(__bsdi__)
++ cfsetspeed(&ttybuf, baud);
++#else
++
+ ttybuf.c_cflag &= ~CBAUD;
+
+ baud &= 0x7;
+@@ -404,9 +410,11 @@
+ ttybuf.c_cflag |= B9600;
+ }
+
++#endif /* FreeBSD */
++
+ if (ir_fd >= 0)
+ {
+-#if defined(SUNOS) || defined(HPUX)
++#if defined(SUNOS) || defined(HPUX) || defined (__FreeBSD__) || defined(__bsdi__)
+ if (tcsetattr(ir_fd, TCSANOW, &ttybuf) < 0)
+ #else
+ if (ioctl(ir_fd, TCSETS, (char *)&ttybuf) < 0)
+@@ -422,7 +430,7 @@
+
+ if (ttyp >= 0)
+ {
+-#if defined(SUNOS) || defined(HPUX)
++#if defined(SUNOS) || defined(HPUX) || defined (__FreeBSD__) || defined(__bsdi__)
+ if (tcgetattr(ttyp, &ttybuf) < 0)
+ #else
+ if (ioctl(ttyp, TCGETS, (char *)&ttybuf) < 0)
+@@ -437,6 +445,9 @@
+ }
+ }
+
++#if defined(__FreeBSD__) || defined(__bsdi__)
++ cfsetspeed(&ttybuf, baud);
++#else
+ ttybuf.c_cflag &= ~CBAUD;
+
+ baud &= 0x7;
+@@ -482,10 +493,11 @@
+ 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__)
+ if (tcsetattr(ttyp, TCSANOW, &ttybuf) < 0)
+ #else
+ if (ioctl(ttyp, TCSETS, (char *)&ttybuf) < 0)
diff --git a/emulators/x48/files/patch-ae b/emulators/x48/files/patch-ae
new file mode 100644
index 000000000000..8e0e422c140a
--- /dev/null
+++ b/emulators/x48/files/patch-ae
@@ -0,0 +1,11 @@
+--- src/x48_x11.c.orig Tue Jun 29 07:12:29 1999
++++ src/x48_x11.c Tue Aug 15 22:30:17 2000
+@@ -3605,6 +3605,8 @@
+ break;
+ case XK_Alt_L:
+ case XK_Alt_R:
++ case XK_Meta_L:
++ case XK_Meta_R:
+ key_event(BUTTON_ALPHA, xev);
+ wake = 1;
+ break;
diff --git a/emulators/x48/pkg-descr b/emulators/x48/pkg-descr
index eac31089d244..2a0f4f8aeeab 100644
--- a/emulators/x48/pkg-descr
+++ b/emulators/x48/pkg-descr
@@ -6,3 +6,5 @@ running this program. Of course you can run this program without a
copy of the ROM software in order to write trivial machine code
programs but you will not be able to access any of the calculator
functionality.
+
+WWW: http://home.earthlink.net/~rmmlgetz/
diff --git a/emulators/x48/pkg-plist b/emulators/x48/pkg-plist
index e30a17624e7b..089f27f79fd6 100644
--- a/emulators/x48/pkg-plist
+++ b/emulators/x48/pkg-plist
@@ -3,7 +3,7 @@ bin/dump2rom
bin/mkcard
bin/x48
lib/X11/app-defaults/X48
-share/x48/CARDS.doc
-share/x48/README-x48
-share/x48/ROMDump.doc
-@dirrm share/x48
+share/doc/x48/CARDS.doc
+share/doc/x48/README
+share/doc/x48/ROMDump.doc
+@dirrm share/doc/x48