From owner-freebsd-ports Wed Aug 16 10:30:29 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 14E9E37CA1E for ; Wed, 16 Aug 2000 10:30:04 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id KAA85823; Wed, 16 Aug 2000 10:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 06CC437C96F; Wed, 16 Aug 2000 10:21:36 -0700 (PDT) Message-Id: <20000816172136.06CC437C96F@hub.freebsd.org> Date: Wed, 16 Aug 2000 10:21:36 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/20651: Update port: emulators/x48 to 0.4.1 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 20651 >Category: ports >Synopsis: Update port: emulators/x48 to 0.4.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Aug 16 10:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1-RELEASE i386 >Organization: >Environment: >Description: - Update to version 0.4.1 New file: patches/patch-ab patches/patch-ac patches/patch-ad patches/patch-ae Remove file: patches/patch-aa >How-To-Repeat: >Fix: diff -urN /usr/ports/emulators/x48/Makefile emulators/x48/Makefile --- /usr/ports/emulators/x48/Makefile Tue May 30 18:57:06 2000 +++ emulators/x48/Makefile Tue Aug 15 22:18:16 2000 @@ -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: ports/emulators/x48/Makefile,v 1.8 2000/05/29 23:40:47 steve Exp $ # 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 diff -urN /usr/ports/emulators/x48/files/md5 emulators/x48/files/md5 --- /usr/ports/emulators/x48/files/md5 Tue May 30 18:57:07 2000 +++ emulators/x48/files/md5 Tue Aug 15 20:43:54 2000 @@ -1 +1 @@ -MD5 (x48_041d.tar.gz) = 13ad77a3cedf910703155d1f2fdb639b +MD5 (x48_041.tar.gz) = f74af15851d1feb9d80ec6ef4ccc3c83 diff -urN /usr/ports/emulators/x48/patches/patch-aa emulators/x48/patches/patch-aa --- /usr/ports/emulators/x48/patches/patch-aa Fri Oct 25 05:41:37 1996 +++ emulators/x48/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,149 +0,0 @@ -diff -ru ../../work/x48-0.4.0/src/Imakefile ./src/Imakefile ---- ../../work/x48-0.4.0/src/Imakefile Thu Jan 12 05:17:01 1995 -+++ ./src/Imakefile Thu Oct 24 13:52:53 1996 -@@ -86,9 +86,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 - -@@ -101,16 +101,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 -ru ../../work/x48-0.4.0/src/serial.c ./src/serial.c ---- ../../work/x48-0.4.0/src/serial.c Wed Jan 11 12:24:04 1995 -+++ ./src/serial.c Wed Oct 23 10:59:25 1996 -@@ -77,6 +77,8 @@ - #ifdef SOLARIS - #include - #include -+#endif -+#if defined(SOLARIS) || defined(__FreeBSD__) || defined (__bsdi__) - #include - #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 -urN /usr/ports/emulators/x48/patches/patch-ab emulators/x48/patches/patch-ab --- /usr/ports/emulators/x48/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ emulators/x48/patches/patch-ab Tue Aug 15 20:53:06 2000 @@ -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 -urN /usr/ports/emulators/x48/patches/patch-ac emulators/x48/patches/patch-ac --- /usr/ports/emulators/x48/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ emulators/x48/patches/patch-ac Tue Aug 15 22:38:51 2000 @@ -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 -urN /usr/ports/emulators/x48/patches/patch-ad emulators/x48/patches/patch-ad --- /usr/ports/emulators/x48/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ emulators/x48/patches/patch-ad Tue Aug 15 20:46:45 2000 @@ -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 + #include ++#endif ++#if defined(SOLARIS) || defined(__FreeBSD__) || defined (__bsdi__) + #include + #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 -urN /usr/ports/emulators/x48/patches/patch-ae emulators/x48/patches/patch-ae --- /usr/ports/emulators/x48/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ emulators/x48/patches/patch-ae Tue Aug 15 22:30:37 2000 @@ -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 -urN /usr/ports/emulators/x48/pkg/DESCR emulators/x48/pkg/DESCR --- /usr/ports/emulators/x48/pkg/DESCR Fri Oct 25 05:41:38 1996 +++ emulators/x48/pkg/DESCR Tue Aug 15 20:54:04 2000 @@ -6,3 +6,5 @@ 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 -urN /usr/ports/emulators/x48/pkg/PLIST emulators/x48/pkg/PLIST --- /usr/ports/emulators/x48/pkg/PLIST Tue May 30 18:57:07 2000 +++ emulators/x48/pkg/PLIST Tue Aug 15 20:54:39 2000 @@ -3,7 +3,7 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message