Subject: pkg/26849: misc/dialog fix for Interix
To: None <gnats-bugs@gnats.NetBSD.org>
From: None <hiramatu@boreas.dti.ne.jp>
List: pkgsrc-bugs
Date: 09/04/2004 23:27:45
>Number:         26849
>Category:       pkg
>Synopsis:       misc/dialog doesn't build on Interix
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Sep 04 14:26:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Hiramatsu Yoshifumi
>Release:        NetBSD 2.0E
>Organization:
	
>Environment:
System: Interix nile 3.5 SP-8.0.1969.1 x86 AMD_x86_Family15_Model12_Stepping0
Architecture: i386
Machine: i386
>Description:
misc/dialog doesn't build on Interix.

Interix uses ncurses for its system curses, but doesn't install ncurses.h.

>How-To-Repeat:
	
>Fix:

diff -buNr dialog.orig/distinfo dialog/distinfo
--- dialog.orig/distinfo	Sat Sep  4 23:01:58 2004
+++ dialog/distinfo	Sat Sep  4 23:01:52 2004
@@ -4,7 +4,7 @@
 Size (dialog-0.6z.tar.gz) = 50901 bytes
 SHA1 (patch-aa) = 39dddd7e772d2d0e796ba80eb9309db8b5c679f5
 SHA1 (patch-ab) = 39318c50019277ffa1cecdb33f16e16c11ad37af
-SHA1 (patch-ac) = 5862dd0163f2979b8071d8dbc6388c466a162042
+SHA1 (patch-ac) = 1f4b7c6ccca2bd8cf8c898127f691f3de986e14f
 SHA1 (patch-ad) = 90a88a838923423cfe3bdbfc5d9de6d40bd10cee
 SHA1 (patch-ae) = c0aae5c99837a17919fea47734d90fb6006dd381
 SHA1 (patch-af) = 4b47fa64e73deca0bb69ad1bc83102e46eaa01fe
diff -buNr dialog.orig/patches/patch-ac dialog/patches/patch-ac
--- dialog.orig/patches/patch-ac	Sat Sep  4 23:01:58 2004
+++ dialog/patches/patch-ac	Sat Sep  4 23:01:52 2004
@@ -1,17 +1,23 @@
-$NetBSD: patch-ac,v 1.8 2003/09/15 15:02:55 jschauma Exp $
+$NetBSD$
 
---- dialog.h.orig	1995-08-18 07:35:06.000000000 -0400
-+++ dialog.h	2003-09-14 21:47:41.000000000 -0400
-@@ -28,7 +28,7 @@
- #ifdef ultrix
+--- dialog.h.orig	Fri Aug 18 20:35:06 1995
++++ dialog.h	Sat Sep  4 22:59:29 2004
+@@ -25,10 +25,12 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#ifdef ultrix
++#if defined ultrix
  #include <cursesX.h>
- #else
--#include <curses.h>
+-#else
++#elif defined __INTERIX
+ #include <curses.h>
++#else
 +#include <ncurses.h>
  #endif
  
  /*
-@@ -42,6 +42,7 @@
+@@ -42,6 +44,7 @@
  #define TAB 9
  #define MAX_LEN 2048
  #define BUF_SIZE (10*1024)
@@ -19,7 +25,7 @@
  #define MIN(x,y) (x < y ? x : y)
  #define MAX(x,y) (x > y ? x : y)
  
-@@ -151,6 +152,9 @@
+@@ -151,6 +154,9 @@
  void draw_shadow (WINDOW * win, int y, int x, int height, int width);
  #endif
  
@@ -29,7 +35,7 @@
  int dialog_yesno (const char *title, const char *prompt, int height, int width);
  int dialog_msgbox (const char *title, const char *prompt, int height,
  		int width, int pause);
-@@ -171,33 +175,11 @@
+@@ -171,33 +177,11 @@
   */
  #ifndef HAVE_LIBGPM
  
>Release-Note:
>Audit-Trail:
>Unformatted: