head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.106 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.104 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.102 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.100 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.98 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.96 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.94 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.92 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.90 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.88 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.86 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.84 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.82 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.80 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.78 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.76 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.74 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.72 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.70 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.68 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.66 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.64 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.62 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.58 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.38 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.60 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.56 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.54 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.52 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.50 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.48 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.46 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.44 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.42 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.40 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.36 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.34 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.32 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.30 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.28 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.26 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.24 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.22 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.20 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.18 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.16 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.14 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.12 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.10 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.8 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.6 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.4 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.2 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.4.0.20 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.18 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.16 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.14 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.12 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.10 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.8 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.6 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.4 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.2 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.3.0.38 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.36 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.34 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.32 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.30 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.28 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.26 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.24 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.22 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.20 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.18 pkgsrc-2008Q1:1.3.0.16 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.12 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.10 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.8 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.1.1.1.0.2 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.1.1.0.6 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.1.1.0.8 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.1.1.0.12 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.1.1.0.14 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.16 pkgviews-base:1.1 buildlink2-base:1.1.1.1 buildlink2:1.1.1.1.0.10 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2013.03.28.21.31.25; author joerg; state Exp; branches; next 1.4; 1.4 date 2010.09.27.12.01.49; author taca; state Exp; branches; next 1.3; 1.3 date 2006.04.11.15.08.38; author joerg; state Exp; branches; next 1.2; 1.2 date 2004.11.29.05.09.43; author taca; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.01.20; author seb; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.01.20; author seb; state Exp; branches 1.1.1.1.10.1; next ; 1.1.1.1.10.1 date 2002.05.31.13.01.20; author jlam; state dead; branches; next 1.1.1.1.10.2; 1.1.1.1.10.2 date 2002.06.23.18.51.26; author jlam; state Exp; branches; next ; desc @@ 1.5 log @Fix return types. @ text @$NetBSD: patch-al,v 1.4 2010/09/27 12:01:49 taca Exp $ * Add DragonFly support. * Don't declare errno. --- uip/vmh.c.orig 2013-03-28 18:02:16.000000000 +0000 +++ uip/vmh.c @@@@ -113,13 +113,20 @@@@ void __cputchar __P((int)); #define SMALLMOVE 1 #define LARGEMOVE 10 +#ifndef A_CHARTEXT +#define A_CHARTEXT 0xff +#endif #define XYZ /* XXX */ -#if (defined(__FreeBSD__) && __FreeBSD__ >= 5) || (defined(linux)) +#if (defined(__FreeBSD__) && __FreeBSD__ >= 5) || (defined(linux)) || defined(__DragonFly__) struct ldat { +#ifdef __DragonFly__ + char *text; +#else NCURSES_CH_T *text; +#endif NCURSES_SIZE_T firstchar; NCURSES_SIZE_T lastchar; NCURSES_SIZE_T oldindex; @@@@ -222,6 +229,15 @@@@ static struct ltchars ltc; #endif #endif /* TIOCGLTC */ +#ifdef __NetBSD__ +static char *tc_CE, *tc_CM, *tc_SO, *tc_SE, *tc_US, *tc_UE; +#define CE tc_CE +#define CM tc_CM +#define SO tc_SO +#define SE tc_SE +#define US tc_US +#define UE tc_UE +#endif #if !defined(SYS5) && !defined(BSD44) && !defined(TERMINFO) int _putchar (); @@@@ -239,7 +255,6 @@@@ static TYPESIG TSTPser (); /* MISCELLANY */ -extern int errno; #if !defined(BSD44) && !defined(__GNU_LIBRARY__) extern int sys_nerr; extern char *sys_errlist[]; @@@@ -248,7 +263,9 @@@@ extern char *sys_errlist[]; static void adorn (); static vmh(), lreset(), linsert(), ladvance(), lretreat(), lgo(); -static TTYon(), TTYoff(), foreground(); +static foreground(); +static void TTYon (void); +static void TTYoff (void); static int PEERinit(), pINI(), pLOOP(), pTTY(), pWIN(), WINinit(); static int WINgetstr(), WINless(), WINputc(), TTYinit(), pWINaux(); /* */ @@@@ -348,7 +365,11 @@@@ static vmh () { wclrtoeol (Command); wrefresh (Command); - switch (WINgetstr (Command, buffer)) { +#ifndef JAPAN + switch (WINgetstr (Command, buffer, sizeof(buffer))) { +#else + switch (WINgetstr (Command, (unsigned char *)buffer, sizeof(buffer))) { +#endif case NOTOK: break; @@@@ -808,6 +829,9 @@@@ static int WINinit (nprog) { sideground (); #ifndef TERMINFO +#ifdef __NetBSD__ + CM = getcap("cm"); +#endif if (CM == NULL) #else /* TERMINFO */ if (cursor_address == NULL) /* assume mtr wanted "cm", not "CM" */ @@@@ -822,6 +846,15 @@@@ static int WINinit (nprog) { #ifndef TERMINFO if (tgetflag ("xt") || tgetnum ("sg") > 0) SO = SE = US = UE = NULL; +#ifdef __NetBSD__ + else { + SO = getcap("so"); + SE = getcap("se"); + US = getcap("us"); + UE = getcap("ue"); + } + CE = getcap("ce"); +#endif #else /* TERMINFO */ /* * If termcap mapped directly to terminfo, we'd use the following: @@@@ -862,21 +895,36 @@@@ static int WINinit (nprog) { /* */ -static int WINgetstr (w, buffer) +static int WINgetstr (w, buffer, size) register WINDOW *w; +#ifndef JAPAN char *buffer; +#else /* JAPAN */ +unsigned char *buffer; +#endif /* JAPAN */ +size_t size; { register int c; +#ifndef JAPAN register char *bp; +#else /* JAPAN */ + register unsigned char *bp; +#endif /* JAPAN */ bp = buffer; *bp = 0; + --size; for (;;) { - switch (c = wgetch (w) & 0xff) { - case ERR: - adios (NULLCP, "wgetch lost"); + c = wgetch(w); + if (c == ERR) + adios (NULLCP, "wgetch lost"); + if (bp - buffer >= size && + !(c == intrc || c == EOFC || c == ERASE || c == KILL || + c == WERASC || c == '\r' || c == '\n')) + continue; + switch (c &= A_CHARTEXT) { case '\f': wrefresh (curscr); break; @@@@ -1382,7 +1430,7 @@@@ WINDOW *w; lp -> l_buf[i] = w -> lines[getcury(w)] -> line[i].ch; #else wmove(w, getcury(w), i); - lp -> l_buf[i] = winch(w); /* 8bit ?? */ + lp -> l_buf[i] = winch(w) & A_CHARTEXT; #endif } lp -> l_buf[getmaxx(w)] = '\0'; @@@@ -1413,8 +1461,12 @@@@ WINDOW *w; } #endif /* __NCURSES_H */ for (cp = lp -> l_buf + strlen (lp -> l_buf) - 1; cp >= lp -> l_buf; cp--) +#ifndef JAPAN if (isspace (*cp)) - *cp = 0; +#else /* JAPAN */ + if (isspace ((unsigned char)(*cp))) +#endif /* JAPAN */ + *cp = '\0'; else break; @@@@ -1539,7 +1591,7 @@@@ static int TTYinit (nprog) { /* */ -static TTYon () { +static void TTYon (void) { if (tty_ready == DONE) return; @@@@ -1573,13 +1625,15 @@@@ static TTYon () { /* */ -static TTYoff () { +static void TTYoff (void) { if (tty_ready == NOTOK) return; INTR = intrc; #ifndef SYS5 +#ifndef __NetBSD__ (void) ioctl (fileno (stdin), TIOCSETC, (char *) &tc); +#endif #else /* SYS5 */ #if defined(TCGETATTR) && !defined(TCSETA) && defined(TCSANOW) (void) tcsetattr (fileno (stdin), TCSANOW, &sg); @@@@ -1591,6 +1645,9 @@@@ static TTYoff () { leaveok (curscr, TRUE); mvcur (0, COLS - 1, LINES - 1, 0); endwin (); +#ifdef __NetBSD__ + (void) ioctl (fileno (stdin), TIOCSETC, (char *) &tc); +#endif if (tty_ready == DONE) { #ifndef TERMINFO if (CE) @ 1.4 log @ * Fix build problem on NetBSD current, terminfo case. * Add comments to each patch file. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.3 2006/04/11 15:08:38 joerg Exp $ d6 1 a6 1 --- uip/vmh.c.orig 2006-04-11 14:16:00.000000000 +0000 d54 12 a65 1 @@@@ -348,7 +363,11 @@@@ static vmh () { d78 1 a78 1 @@@@ -808,6 +827,9 @@@@ static int WINinit (nprog) { d88 1 a88 1 @@@@ -822,6 +844,15 @@@@ static int WINinit (nprog) { d104 1 a104 1 @@@@ -862,21 +893,36 @@@@ static int WINinit (nprog) { d145 1 a145 1 @@@@ -1382,7 +1428,7 @@@@ WINDOW *w; d154 1 a154 1 @@@@ -1413,8 +1459,12 @@@@ WINDOW *w; d168 17 a184 1 @@@@ -1579,7 +1629,9 @@@@ static TTYoff () { d194 1 a194 1 @@@@ -1591,6 +1643,9 @@@@ static TTYoff () { @ 1.3 log @Add DragonFly support. Fix errno usage. Remove special-casing of FreeBSD-like systems with objformat, we want minor shared library numbers. @ text @d1 4 a4 1 $NetBSD$ @ 1.2 log @Overhaul ja-mh package, update to ja-mh6-3.05. - Based on mh-6.8.4-JP-3.05 + four official patches. - Update MASTER_SITES and HOMEPAGE. - make vmh(1) build again. - specify proper link option; build again after introduce of "toolchain wrappers." - improve patch to concat.c. Great thanks to Masanori Mikawa on tech-pkg-ja. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.1 2002/05/31 13:01:20 seb Exp $ d3 1 a3 1 --- uip/vmh.c.orig 2004-10-12 16:02:00.000000000 +0900 d5 1 a5 1 @@@@ -113,6 +113,9 @@@@ void __cputchar __P((int)); d15 13 a27 1 @@@@ -222,6 +225,15 @@@@ static struct ltchars ltc; d43 9 a51 1 @@@@ -348,7 +360,11 @@@@ static vmh () { d64 1 a64 1 @@@@ -808,6 +824,9 @@@@ static int WINinit (nprog) { d74 1 a74 1 @@@@ -822,6 +841,15 @@@@ static int WINinit (nprog) { d90 1 a90 1 @@@@ -862,21 +890,36 @@@@ static int WINinit (nprog) { d131 1 a131 1 @@@@ -1382,7 +1425,7 @@@@ WINDOW *w; d140 1 a140 1 @@@@ -1413,8 +1456,12 @@@@ WINDOW *w; d154 1 a154 1 @@@@ -1579,7 +1626,9 @@@@ static TTYoff () { d164 1 a164 1 @@@@ -1591,6 +1640,9 @@@@ static TTYoff () { @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 5 --- ./uip/vmh.c.orig Tue Feb 9 20:30:00 1999 +++ ./uip/vmh.c Tue Feb 29 23:19:05 2000 @@@@ -23,6 +23,9 @@@@ If curses ever gets fixed, then XYZ code can be removed */ d9 2 a10 2 +#ifdef UNISTD +#include d12 4 a15 2 #ifdef __osf__ #define _BSD d17 10 a26 6 @@@@ -85,9 +88,15 @@@@ #define _maxy maxy #define _curx curx /* curses.h */ #define _cury cury +#ifndef __NetBSD__ void __cputchar __P((int)); d28 10 a37 3 #undef _putchar +#ifdef BSD44 +#define _putchar __cputchar d39 27 a65 1 #define _putchar (int (*)()) __cputchar d67 27 a93 2 #include /* sgttyb */ #endif /* !__NCURSES_H && (BSD44 || linux) */ a94 7 @@@@ -1509,7 +1518,7 @@@@ tpgrp; TYPESIG (*tstat) (); - if ((pgrp = getpgrp (0)) == NOTOK) + if ((pgrp = getpgrp (/*0*/)) == NOTOK) adios ("process group", "unable to determine"); d96 58 a153 1 if (ioctl (fileno (stdin), TIOCGPGRP, (char *) &tpgrp) == NOTOK) @ 1.1.1.1 log @Reimport of package ja-mh6 from japanese/mh into mail/ja-mh. This is part of the japanese category retirement. Pathnames to japanese/ adjusted. @ text @@ 1.1.1.1.10.1 log @file patch-al was added on branch buildlink2 on 2002-06-23 18:51:26 +0000 @ text @d1 39 @ 1.1.1.1.10.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 39 $NetBSD: patch-al,v 1.1.1.1.10.1 2002/06/23 18:51:26 jlam Exp $ --- ./uip/vmh.c.orig Tue Feb 9 20:30:00 1999 +++ ./uip/vmh.c Tue Feb 29 23:19:05 2000 @@@@ -23,6 +23,9 @@@@ If curses ever gets fixed, then XYZ code can be removed */ +#ifdef UNISTD +#include +#endif #ifdef __osf__ #define _BSD #endif @@@@ -85,9 +88,15 @@@@ #define _maxy maxy #define _curx curx /* curses.h */ #define _cury cury +#ifndef __NetBSD__ void __cputchar __P((int)); +#endif #undef _putchar +#ifdef BSD44 +#define _putchar __cputchar +#else #define _putchar (int (*)()) __cputchar +#endif #include /* sgttyb */ #endif /* !__NCURSES_H && (BSD44 || linux) */ @@@@ -1509,7 +1518,7 @@@@ tpgrp; TYPESIG (*tstat) (); - if ((pgrp = getpgrp (0)) == NOTOK) + if ((pgrp = getpgrp (/*0*/)) == NOTOK) adios ("process group", "unable to determine"); for (;;) { if (ioctl (fileno (stdin), TIOCGPGRP, (char *) &tpgrp) == NOTOK) @