ports/101027: Update port: emulators/x48 from 0.4.1e_1 to 0.4.3

Esa Karkkainen ejk at iki.fi
Sat Jul 29 17:10:16 UTC 2006 

>Number:         101027
>Category:       ports
>Synopsis:       Update port: emulators/x48 from 0.4.1e_1 to 0.4.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 29 17:10:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Esa Karkkainen
>Release:        FreeBSD 6.1-RELEASE-p2 i386
>Organization:
Is in state of disintegration
>Environment:
System: 6.1-RELEASE-p2 Thu Jun 15 07:22:23 EEST 2006
Ports tree cvsupped at Fri Jul 21 06:21:00 EEST 2006
>Description:
Update emulators/x48 from 0.4.1e_1 to 0.4.3.

I haven't tested 0.4.3 extensively, but it compiles and it doesn't
freeze like 0.4.1e_1 does.
>How-To-Repeat:
N/A
>Fix:

Files mentioned below will be deleted, when applying this fix.
Patches contained in these files are already included in 0.4.3.

ports/emulators/x48/files/patch-config.h
ports/emulators/x48/files/patch-src+dump2rom.c
ports/emulators/x48/files/patch-src+x48_x11.c

diff -ruN /usr/ports/emulators/x48/Makefile ports/emulators/x48/Makefile
--- /usr/ports/emulators/x48/Makefile	Mon May  8 20:09:07 2006
+++ ports/emulators/x48/Makefile	Sat Jul 29 04:32:07 2006
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	x48
-PORTVERSION=	0.4.1e
-PORTREVISION=	1
+PORTVERSION=	0.4.3
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.hpcalc.org/hp48/pc/emulators/
-DISTFILES=	${PORTNAME}-${PORTVERSION:S/.//g}.tgz \
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
 		gxrom-r.zip sxrom-e.zip
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION:S/.//g}.tgz
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	danfe at FreeBSD.org
 COMMENT=	A HP48 SX/GX calculator emulator
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/e//}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
diff -ruN /usr/ports/emulators/x48/distinfo ports/emulators/x48/distinfo
--- /usr/ports/emulators/x48/distinfo	Sun Jan 22 11:47:27 2006
+++ ports/emulators/x48/distinfo	Sat Jul 29 04:33:22 2006
@@ -1,6 +1,6 @@
-MD5 (x48-041e.tgz) = 0f03da2cea0ca3fd690dcae00f088faa
-SHA256 (x48-041e.tgz) = 54670340d281701bdb62f6ec6937ebab82add700a007bcb35c7f46cbda1cafa0
-SIZE (x48-041e.tgz) = 470212
+MD5 (x48-0.4.3.tar.gz) = b365c8957057bbc60badb412ef6fb44f
+SHA256 (x48-0.4.3.tar.gz) = 5efb6bfdae8b980ec497d7569c19edd01c579640ebb30eb27f727b182a1fb809
+SIZE (x48-0.4.3.tar.gz) = 128263
 MD5 (gxrom-r.zip) = e4ec80ac325313b006b8c94d9be8db5a
 SHA256 (gxrom-r.zip) = 42bd270bc17548c2f89ffa87b416ef22576303d1e39397d38219a4ba36d6ab7e
 SIZE (gxrom-r.zip) = 330144
diff -ruN /usr/ports/emulators/x48/files/patch-Imakefile ports/emulators/x48/files/patch-Imakefile
--- /usr/ports/emulators/x48/files/patch-Imakefile	Mon Nov 22 14:27:16 2004
+++ ports/emulators/x48/files/patch-Imakefile	Sat Jul 29 05:53:21 2006
@@ -1,15 +1,17 @@
---- src/Imakefile.orig	Sun Jul  4 17:04:21 1999
-+++ src/Imakefile	Sat Jun 28 19:01:04 2003
-@@ -26,7 +26,7 @@
+--- src/Imakefile.orig	Thu Apr 14 19:18:26 2005
++++ src/Imakefile	Sat Jul 29 05:52:37 2006
+@@ -25,8 +25,8 @@
+             TOP = ..
+             BIN = .
            UTILS = $(TOP)/utils
-        READLINE = $(TOP)/readline
-     READLINELIB = $(READLINE)/libreadline.a
+-    READLINELIB = -lreadline TermcapLibrary
 -EXTRA_LIBRARIES =
++    READLINELIB = -lreadline
 +EXTRA_LIBRARIES = -lutil
  
  #ifdef HAVE_XSHM
  # define XSHM_DEF -DHAVE_XSHM
-@@ -60,7 +60,7 @@
+@@ -56,7 +56,7 @@
        LDOPTIONS = LDOPTIONS_DEF
  #endif
  
@@ -18,9 +20,9 @@
             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)
+@@ -85,22 +85,22 @@
+                   ProgramTargetName(checkrom) ProgramTargetName(mkcard)
+        TARFILES = Imakefile X48.ad $(TARS1) $(SRCS2) $(SRCS3) $(SRCS4) $(HDRS) x48.man
  
 -all:: $(BIN)/x48 $(BIN)/dump2rom $(BIN)/checkrom $(BIN)/mkcard
 +all:: x48 dump2rom checkrom mkcard
@@ -28,31 +30,23 @@
 -       PROGRAMS = $(BIN)/x48 $(BIN)/dump2rom $(BIN)/checkrom $(BIN)/mkcard
 +       PROGRAMS = x48 dump2rom checkrom mkcard
  
+ files::
+-	@echo $(BIN)/x48 $(BIN)/dump2rom $(BIN)/checkrom $(BIN)/mkcard
++	@echo x48 dump2rom checkrom mkcard
+ 
  depend:: version.c X48.ad.h
  
-@@ -102,16 +102,20 @@
- 	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,,)
-+NormalProgramTarget(x48, $(OBJS1),, $(X48LIBS),)
-+NormalProgramTarget(dump2rom, $(OBJS2),,,)
-+NormalProgramTarget(checkrom, $(OBJS3),,,)
-+NormalProgramTarget(mkcard, $(OBJS4),,,)
-+
-+InstallProgram(x48, $(BINDIR))
-+InstallProgram(dump2rom, $(BINDIR))
-+InstallProgram(checkrom, $(BINDIR))
-+InstallProgram(mkcard, $(BINDIR))
+ echo_tarfiles:
+ 	@echo $(TARFILES)
  
- InstallAppDefaults(X48)
+-NormalProgramTarget($(BIN)/x48, $(OBJS1), /**/, $(X48LIBS), /**/)
+-NormalProgramTarget($(BIN)/dump2rom, dump2rom.o, /**/, /**/, /**/ )
+-NormalProgramTarget($(BIN)/checkrom, checkrom.o romio.o, /**/, /**/, /**/ )
+-NormalProgramTarget($(BIN)/mkcard, mkcard.o, /**/, /**/, /**/ )
++NormalProgramTarget(x48, $(OBJS1), /**/, $(X48LIBS), /**/)
++NormalProgramTarget(dump2rom, dump2rom.o, /**/, /**/, /**/ )
++NormalProgramTarget(checkrom, checkrom.o romio.o, /**/, /**/, /**/ )
++NormalProgramTarget(mkcard, mkcard.o, /**/, /**/, /**/ )
  
+ InstallProgram(x48,$(BINDIR))
+ InstallProgram(dump2rom,$(BINDIR))
diff -ruN /usr/ports/emulators/x48/files/patch-config.h ports/emulators/x48/files/patch-config.h
--- /usr/ports/emulators/x48/files/patch-config.h	Wed Jul  9 10:40:20 2003
+++ ports/emulators/x48/files/patch-config.h	Thu Jan  1 02:00:00 1970
@@ -1,17 +0,0 @@
---- config.h.orig	Mon Jun 28 17:36:58 1999
-+++ config.h	Sat Jun 28 21:40:54 2003
-@@ -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 -ruN /usr/ports/emulators/x48/files/patch-src+X48.ad ports/emulators/x48/files/patch-src+X48.ad
--- /usr/ports/emulators/x48/files/patch-src+X48.ad	Wed Jul  9 10:40:20 2003
+++ ports/emulators/x48/files/patch-src+X48.ad	Sat Jul 29 04:49:03 2006
@@ -1,5 +1,5 @@
---- src/X48.ad.orig	Wed Jan 11 13:24:05 1995
-+++ src/X48.ad	Sun Jun 29 10:46:17 2003
+--- src/X48.ad.orig	Thu Apr 14 17:48:22 2005
++++ src/X48.ad	Sat Jul 29 04:47:51 2006
 @@ -49,8 +49,8 @@
  ! resources controlling the connections
  !
@@ -7,7 +7,7 @@
 -*useSerial:		False
 -*serialLine:		/dev/ttyS0
 +*useSerial:		True
-+*serialLine:		/dev/cuaa0
++*serialLine:		/dev/cuad0
  
  !
  ! stuff controlling initialization
diff -ruN /usr/ports/emulators/x48/files/patch-src+dump2rom.c ports/emulators/x48/files/patch-src+dump2rom.c
--- /usr/ports/emulators/x48/files/patch-src+dump2rom.c	Wed Jul  9 10:40:20 2003
+++ ports/emulators/x48/files/patch-src+dump2rom.c	Thu Jan  1 02:00:00 1970
@@ -1,12 +0,0 @@
---- src/dump2rom.c.orig	Tue Sep  7 10:41:48 1999
-+++ src/dump2rom.c	Sun Jun 29 10:44:05 2003
-@@ -130,8 +130,7 @@
- {
-   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]);
diff -ruN /usr/ports/emulators/x48/files/patch-src+global.h ports/emulators/x48/files/patch-src+global.h
--- /usr/ports/emulators/x48/files/patch-src+global.h	Mon Nov 22 14:27:16 2004
+++ ports/emulators/x48/files/patch-src+global.h	Sat Jul 29 04:52:50 2006
@@ -1,6 +1,6 @@
---- src/global.h.orig	Tue Sep  7 22:41:45 1999
-+++ src/global.h	Mon Nov 22 17:03:53 2004
-@@ -79,6 +79,14 @@
+--- src/global.h.orig	Mon Mar 21 05:33:38 2005
++++ src/global.h	Sat Jul 29 04:52:13 2006
+@@ -79,6 +79,15 @@
  
  #else	/* Not Linux */
  
@@ -12,14 +12,15 @@
 +
 +#else  /* Not FreeBSD */
 +
++
  #if defined(sun) && defined(unix)
  
  #if defined(__svr4__) || defined(SVR4) || defined(SYSV)
-@@ -106,6 +114,7 @@
+@@ -106,6 +115,7 @@
  #endif  /* Not HP-UX */
  #endif  /* Not Solaris */
  #endif	/* Sun && Unix */
-+#endif  /* Not FreeBSD */
++#endif	/* FreeBSD */
  #endif	/* Not Linux */
  
  #ifdef SYSV
diff -ruN /usr/ports/emulators/x48/files/patch-src+hp48.h ports/emulators/x48/files/patch-src+hp48.h
--- /usr/ports/emulators/x48/files/patch-src+hp48.h	Wed Jul  9 10:40:20 2003
+++ ports/emulators/x48/files/patch-src+hp48.h	Sat Jul 29 04:55:00 2006
@@ -1,6 +1,6 @@
---- src/hp48.h.orig	Sat Jun 28 20:50:52 2003
-+++ src/hp48.h	Sat Jun 28 20:52:14 2003
-@@ -246,7 +246,7 @@
+--- src/hp48.h.orig	Sun Mar 20 19:47:22 2005
++++ src/hp48.h	Sat Jul 29 04:54:16 2006
+@@ -218,7 +218,7 @@
  
    word_8	unknown2;
  
diff -ruN /usr/ports/emulators/x48/files/patch-src+serial.c ports/emulators/x48/files/patch-src+serial.c
--- /usr/ports/emulators/x48/files/patch-src+serial.c	Mon Nov 29 21:56:09 2004
+++ ports/emulators/x48/files/patch-src+serial.c	Sat Jul 29 19:17:17 2006
@@ -1,24 +1,15 @@
 --- src/serial.c.orig	Tue Sep  7 10:41:48 1999
 +++ src/serial.c	Sat Jun 28 21:27:06 2003
-@@ -69,7 +69,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <sys/time.h>
--#if defined(LINUX) || defined(HPUX)
-+#if defined(LINUX) || defined(HPUX) || defined(CSRG_BASED)
- #include <sys/ioctl.h>
- #endif
- #include <unistd.h>
 @@ -77,6 +77,8 @@
  #ifdef SOLARIS
- #include <sys/stream.h>
- #include <sys/stropts.h>
+ #  include <sys/stream.h>
+ #  include <sys/stropts.h>
 +#endif
 +#if defined(SOLARIS) || defined(CSRG_BASED)
- #include <sys/termios.h>
+ #  include <sys/termios.h>
  #endif
  
-@@ -137,6 +139,19 @@
+@@ -134,6 +136,19 @@
    ttyp = -1;
    if (useTerminal)
      {
@@ -35,112 +26,106 @@
 +      else
 +        perror("openpty");
 +#else  /* FREEBSD */
- #ifdef IRIX
+ #if defined(IRIX)
        if ((p = _getpty(&wire_fd, O_RDWR | O_EXCL | O_NDELAY, 0666, 0)) == NULL)
          {
-@@ -234,11 +249,12 @@
- #endif /* LINUX */
- #endif /* SOLARIS */
- #endif /* IRIX */
+@@ -246,11 +264,12 @@
+         }
+       while ((wire_fd < 0) && (errno != ENOENT));
+ #endif
 +#endif /* FREEBSD */
      }
  
    if (ttyp >= 0)
      {
--#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined (CSRG_BASED)
+-#if defined(TCSANOW)
++#if defined(TCSANOW) || defined (CSRG_BASED)
        if (tcgetattr(ttyp, &ttybuf) < 0)
  #else
        if (ioctl(ttyp, TCGETS, (char *)&ttybuf) < 0)
-@@ -263,7 +279,7 @@
+@@ -275,7 +291,7 @@
  
    if (ttyp >= 0)
      {
--#if defined(SUNOS) || defined (HPUX)
-+#if defined(SUNOS) || defined (HPUX) || defined(CSRG_BASED)
+-#if defined(TCSANOW)
++#if defined(TCSANOW) || defined(CSRG_BASED)
        if (tcsetattr(ttyp, TCSANOW, &ttybuf) < 0)
  #else
        if (ioctl(ttyp, TCSETS, (char *)&ttybuf) < 0)
-@@ -291,7 +307,7 @@
+@@ -303,7 +319,7 @@
  
    if (ir_fd >= 0)
      {
--#if defined(SUNOS) || defined (HPUX)
-+#if defined(SUNOS) || defined (HPUX) || defined (CSRG_BASED)
+-#if defined(TCSANOW)
++#if defined(TCSANOW) || defined (CSRG_BASED)
        if (tcgetattr(ir_fd, &ttybuf) < 0)
  #else
        if (ioctl(ir_fd, TCGETS, (char *)&ttybuf) < 0)
-@@ -315,7 +331,7 @@
+@@ -327,7 +344,7 @@
  
    if (ir_fd >= 0)
      {
--#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined (CSRG_BASED)
+-#if defined(TCSANOW)
++#if defined(TCSANOW) || defined (CSRG_BASED)
        if (tcsetattr(ir_fd, TCSANOW, &ttybuf) < 0)
  #else
        if (ioctl(ir_fd, TCSETS, (char *)&ttybuf) < 0)
-@@ -344,7 +360,7 @@
+@@ -356,7 +372,7 @@
  
    if (ir_fd >= 0)
      {
--#if defined(SUNOS) || defined (HPUX)
-+#if defined(SUNOS) || defined (HPUX) || defined (CSRG_BASED)
+-#if defined(TCSANOW)
++#if defined(TCSANOW) || defined (CSRG_BASED)
        if (tcgetattr(ir_fd, &ttybuf) < 0)
  #else
        if (ioctl(ir_fd, TCGETS, (char *)&ttybuf) < 0)
-@@ -358,6 +374,10 @@
-         }
+@@ -415,6 +433,9 @@
+       ttybuf.c_cflag |= B9600;
      }
- 
+ #else
 +#if defined(CSRG_BASED)
 +  cfsetspeed(&ttybuf, baud);
 +#else
-+
    ttybuf.c_cflag &= ~CBAUD;
  
    baud &= 0x7;
-@@ -404,9 +424,11 @@
+@@ -461,9 +461,11 @@
        ttybuf.c_cflag |= B9600;
      }
- 
+ #endif
 +#endif /* CSRG_BASED */
 +
    if (ir_fd >= 0)
      {
--#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined (CSRG_BASED)
+-#if defined(TCSANOW)
++#if defined(TCSANOW) || defined (CSRG_BASED)
        if (tcsetattr(ir_fd, TCSANOW, &ttybuf) < 0)
  #else
        if (ioctl(ir_fd, TCSETS, (char *)&ttybuf) < 0)
-@@ -422,7 +444,7 @@
+@@ -479,7 +501,7 @@
  
    if (ttyp >= 0)
      {
--#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined (CSRG_BASED)
+-#if defined(TCSANOW)
++#if defined(TCSANOW) || defined (CSRG_BASED)
        if (tcgetattr(ttyp, &ttybuf) < 0)
  #else
        if (ioctl(ttyp, TCGETS, (char *)&ttybuf) < 0)
-@@ -437,6 +459,9 @@
-         }
+@@ -495,6 +516,8 @@
      }
  
-+#if defined(CSRG_BASED)
+ #if defined(__APPLE__)
++#elif defined(CSRG_BASED)
 +  cfsetspeed(&ttybuf, baud);
-+#else
+ #else
    ttybuf.c_cflag &= ~CBAUD;
  
-   baud &= 0x7;
-@@ -482,10 +507,11 @@
-         fprintf(stderr, "%s: can\'t set baud rate, using 9600\n", progname);
-       ttybuf.c_cflag |= B9600;
-     }
-+#endif
- 
+@@ -544,7 +544,7 @@
+ #endif
    if (ttyp >= 0)
      {
--#if defined(SUNOS) || defined(HPUX)
-+#if defined(SUNOS) || defined(HPUX) || defined (CSRG_BASED)
+-#if defined(TCSANOW)
++#if defined(TCSANOW) || defined (CSRG_BASED)
        if (tcsetattr(ttyp, TCSANOW, &ttybuf) < 0)
  #else
        if (ioctl(ttyp, TCSETS, (char *)&ttybuf) < 0)
diff -ruN /usr/ports/emulators/x48/files/patch-src+x48_x11.c ports/emulators/x48/files/patch-src+x48_x11.c
--- /usr/ports/emulators/x48/files/patch-src+x48_x11.c	Wed Jul  9 10:40:20 2003
+++ ports/emulators/x48/files/patch-src+x48_x11.c	Thu Jan  1 02:00:00 1970
@@ -1,19 +0,0 @@
---- src/x48_x11.c.orig	Thu Sep  9 01:05:58 1999
-+++ src/x48_x11.c	Sat Jun 28 20:55:35 2003
-@@ -4108,6 +4108,7 @@
-       break;
-     case XK_KP_Add:
-     case XK_plus:
-+    case XK_equal:
-       key_event(BUTTON_PLUS, xev);
-       wake = 1;
-       break;
-@@ -4168,6 +4169,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;
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list