maintenance update to 2.0.9
This commit is contained in:
naddy
parent
afca1eaea4
commit
4edaa84ff6
@ -1,24 +1,24 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2010/10/18 16:57:48 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2011/11/14 19:33:34 naddy Exp $
|
||||
|
||||
COMMENT= curses-based emulator for the Wyse 60 terminal
|
||||
|
||||
DISTNAME= wy60-2.0.8
|
||||
DISTNAME= wy60-2.0.9
|
||||
CATEGORIES= comms
|
||||
HOMEPAGE= http://gutschke.com/wy60/
|
||||
HOMEPAGE= https://code.google.com/p/wy60/
|
||||
|
||||
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
|
||||
|
||||
# GPL
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= c curses
|
||||
|
||||
MASTER_SITES= ${HOMEPAGE}html/archive/
|
||||
MASTER_SITES= https://wy60.googlecode.com/files/
|
||||
|
||||
WANTLIB= c curses
|
||||
|
||||
CONFIGURE_STYLE=gnu
|
||||
USE_GROFF = Yes
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/wy60
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (wy60-2.0.8.tar.gz) = ZltDynxRgpI24XqQ7aD5bw==
|
||||
RMD160 (wy60-2.0.8.tar.gz) = ggsEVJs3E02iFyz0g+YF3bf7Uk4=
|
||||
SHA1 (wy60-2.0.8.tar.gz) = kmsC6/XYZ2kwuQtP1/m+wGGknyE=
|
||||
SHA256 (wy60-2.0.8.tar.gz) = JUJDatxAkmwAmBlUajKXBqxTaIz7isngZBSWIG4rUoM=
|
||||
SIZE (wy60-2.0.8.tar.gz) = 130518
|
||||
MD5 (wy60-2.0.9.tar.gz) = 8ONI7eQ7S7gwke63huweZg==
|
||||
RMD160 (wy60-2.0.9.tar.gz) = xwy8UScpPseWK+ktvnaAU8Hh7ws=
|
||||
SHA1 (wy60-2.0.9.tar.gz) = 6gsQ/gVgvYuYEV1AiQuVMO30TLQ=
|
||||
SHA256 (wy60-2.0.9.tar.gz) = 9zeUBPC684+rpIr3sF+eDfZSZqt1BxsspWGVtj/AXtA=
|
||||
SIZE (wy60-2.0.9.tar.gz) = 159764
|
||||
|
||||
@ -1,96 +1,17 @@
|
||||
$OpenBSD: patch-wy60_c,v 1.1 2006/12/14 21:19:19 naddy Exp $
|
||||
--- wy60.c.orig Thu Dec 14 21:06:17 2006
|
||||
+++ wy60.c Thu Dec 14 21:36:54 2006
|
||||
@@ -59,6 +59,17 @@ typedef struct ScreenBuffer {
|
||||
} ScreenBuffer;
|
||||
$OpenBSD: patch-wy60_c,v 1.2 2011/11/14 19:33:34 naddy Exp $
|
||||
|
||||
Don't mix mixed declarations and code, for gcc2.95.
|
||||
|
||||
--- wy60.c.orig Mon Nov 14 20:08:56 2011
|
||||
+++ wy60.c Mon Nov 14 20:10:07 2011
|
||||
@@ -3347,9 +3347,9 @@ static void userInputReceived(int pty, const char *buf
|
||||
for (i = 0; i < count; i++) {
|
||||
char ch = buffer[i];
|
||||
|
||||
- logHostKey(ch);
|
||||
KeyDefs *nextKeySequence = currentKeySequence
|
||||
? currentKeySequence->down : keyDefinitions;
|
||||
+ logHostKey(ch);
|
||||
|
||||
|
||||
+static void flushConsole(void);
|
||||
+static void gotoXYforce(int x, int y);
|
||||
+static void putCapability(const char *capability);
|
||||
+static int putConsole(int ch);
|
||||
+static void putGraphics(char ch);
|
||||
+static void showCursor(int flag);
|
||||
+static void updateAttributes(void);
|
||||
+static void failure(int exitCode, const char *message, ...);
|
||||
+static void processSignal(int signalNumber, int pid, int pty);
|
||||
+
|
||||
+
|
||||
static int euid, egid, uid, gid, oldStylePty, streamsIO, jobControl;
|
||||
static char ptyName[40];
|
||||
static struct termios defaultTermios;
|
||||
@@ -260,7 +271,6 @@ static void logCharacters(int mode, cons
|
||||
logFd = -1;
|
||||
}
|
||||
if (logFd >= 0) {
|
||||
- static void flushConsole(void);
|
||||
int header[4];
|
||||
|
||||
gettimeofday(&timeValue, 0);
|
||||
@@ -295,7 +305,6 @@ static void logHostCharacter(int mode, c
|
||||
}
|
||||
|
||||
if (logFd >= 0) {
|
||||
- static void flushConsole(void);
|
||||
char buffer[80];
|
||||
|
||||
if (isatty(logFd))
|
||||
@@ -369,8 +378,6 @@ static void logDecode(const char *format
|
||||
|
||||
static void logDecodeFlush(void) {
|
||||
if (_decodeFd >= 0) {
|
||||
- static void flushConsole(void);
|
||||
-
|
||||
if (isatty(_decodeFd))
|
||||
strcat(_decodeBuffer, "\x1B[39m");
|
||||
strcat(_decodeBuffer, "\r\n");
|
||||
@@ -2203,14 +2210,6 @@ static ScreenBuffer *adjustScreenBuffer(
|
||||
|
||||
|
||||
static void displayCurrentScreenBuffer(void) {
|
||||
- static void flushConsole(void);
|
||||
- static void gotoXYforce(int x, int y);
|
||||
- static void putCapability(const char *capability);
|
||||
- static int putConsole(int ch);
|
||||
- static void putGraphics(char ch);
|
||||
- static void showCursor(int flag);
|
||||
- static void updateAttributes(void);
|
||||
-
|
||||
int x, y, lastAttributes = -1;
|
||||
int oldX = currentBuffer->cursorX;
|
||||
int oldY = currentBuffer->cursorY;
|
||||
@@ -2346,8 +2345,6 @@ static int putConsole(int ch) {
|
||||
|
||||
|
||||
static void putCapability(const char *capability) {
|
||||
- static void failure(int exitCode, const char *message, ...);
|
||||
-
|
||||
if (!capability || !strcmp(capability, "@"))
|
||||
failure(127, "Terminal has insufficient capabilities");
|
||||
logHostString(capability);
|
||||
@@ -2756,8 +2753,6 @@ static void setPage(int page) {
|
||||
|
||||
|
||||
static void putGraphics(char ch) {
|
||||
- static void updateAttributes(void);
|
||||
-
|
||||
if (ch == '\x02')
|
||||
graphicsMode = 1;
|
||||
else if (ch == '\x03')
|
||||
@@ -2839,7 +2834,6 @@ static void showCursor(int flag) {
|
||||
|
||||
|
||||
static void executeExternalProgram(const char *argv[]) {
|
||||
- static void failure(int exitCode, const char *message, ...);
|
||||
int pid, status;
|
||||
|
||||
if ((pid = fork()) < 0) {
|
||||
@@ -2886,8 +2880,6 @@ static void executeExternalProgram(const
|
||||
|
||||
|
||||
static void requestNewGeometry(int pty, int width, int height) {
|
||||
- static void processSignal(int signalNumber, int pid, int pty);
|
||||
-
|
||||
logDecode("setScreenSize(%d,%d)", width, height);
|
||||
|
||||
if (screenWidth != width || screenHeight != height) {
|
||||
for (;;) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2004/08/06 16:06:03 espie Exp $
|
||||
bin/wy60
|
||||
@comment $OpenBSD: PLIST,v 1.4 2011/11/14 19:33:34 naddy Exp $
|
||||
@bin bin/wy60
|
||||
@man man/man1/wy60.1
|
||||
share/examples/wy60/
|
||||
share/examples/wy60/wy60.rc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user