diff --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common index 288b1f63d..8b34b219a 100644 --- a/devel/ncurses/Makefile.common +++ b/devel/ncurses/Makefile.common @@ -42,6 +42,10 @@ SUBST_MESSAGE.rpath= Fixing rpath in ncurses-config. CONFIGURE_ARGS+= --disable-mixed-case .endif +.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix" +CFLAGS+= -D_NETBSD_SOURCE +.endif + .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) TOOL_DEPENDS+= ncurses-${NC_VERS}:../../devel/ncurses CONFIGURE_ENV+= BUILD_CC=${NATIVE_CC:Q} diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo index cf4ead3eb..b3cb21895 100644 --- a/devel/ncurses/distinfo +++ b/devel/ncurses/distinfo @@ -7,4 +7,5 @@ SHA1 (patch-aa) = 6acf84077e84fd693bb2b52377774db3d15b4f8f SHA1 (patch-ab) = 235ae1d844721a5ea9d027d051eedc0f7898413c SHA1 (patch-ac) = fd1892bfb4dcf8a22ae4654eb944eda9725f964e SHA1 (patch-ncurses_base_MKlib__gen.sh) = f8ce67fbd273529e4161a2820677d05a623fd527 -SHA1 (patch-ncurses_tinfo_lib__baudrate.c) = e383a11530a3045e729ab8c738e57a9e217a994f +SHA1 (patch-ncurses_tinfo_lib__baudrate.c) = ff7ac80e2ec5801f33c28c9f7262b01e1aa77b6c +SHA1 (patch-zz-minix-a) = 67ef8a56b56bf8e8a5da14a7162ed668d14f9b67 diff --git a/devel/ncurses/patches/patch-ncurses_tinfo_lib__baudrate.c b/devel/ncurses/patches/patch-ncurses_tinfo_lib__baudrate.c index bc934366b..a4c29e97f 100644 --- a/devel/ncurses/patches/patch-ncurses_tinfo_lib__baudrate.c +++ b/devel/ncurses/patches/patch-ncurses_tinfo_lib__baudrate.c @@ -18,7 +18,7 @@ sys/ttydev.h doesn't exist in OpenBSD 5.5 * ospeed's type for compatibility. */ -#if NCURSES_OSPEED_COMPAT && ((defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)) -+#if NCURSES_OSPEED_COMPAT && ((defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || (defined(__OpenBSD__) && (OpenBSD < 201405)) || defined(__APPLE__)) ++#if NCURSES_OSPEED_COMPAT && ((defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__minix) || defined(__NetBSD__) || (defined(__OpenBSD__) && (OpenBSD < 201405)) || defined(__APPLE__)) #undef B0 #undef B50 #undef B75 diff --git a/devel/ncurses/patches/patch-zz-minix-a b/devel/ncurses/patches/patch-zz-minix-a new file mode 100644 index 000000000..d08fd5c20 --- /dev/null +++ b/devel/ncurses/patches/patch-zz-minix-a @@ -0,0 +1,23 @@ +--- misc/terminfo.src.orig Sat Jul 25 19:27:20 2015 ++++ misc/terminfo.src Sun Oct 4 09:28:04 2015 +@@ -18457,9 +18457,11 @@ + + # See + # http://www.minix3.org/manpages/html4/console.html ++# LSC Add back some missing support for fn keys, keypad and PgUp/PgDn ++# Added lf0@, lf1@, lf2@, lf3@, lf4@, lf5@, , not sure what it does... to check! + minix|minix console (v3), + acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376, +- kdch1=\177, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~, ++ kdch1=\E[3~, kbs=\177, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~, + kf11=\E[11;2~, kf12=\E[12;2~, kf13=\E[13;2~, + kf14=\E[14;2~, kf15=\E[15;2~, kf16=\E[17;2~, + kf17=\E[18;2~, kf18=\E[19;2~, kf19=\E[20;2~, kf2=\E[12~, +@@ -18473,6 +18475,7 @@ + kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, + kich1=\E[@, knp=\E[U, kpp=\E[V, lf0@, lf1@, lf2@, lf3@, lf4@, lf5@, + use=minix-3.0, ++ khome=\E[H, kcuu1=\E[A, + + minix-3.0|minix console (v3.0), + use=ecma+color, use=minix-1.7,