* Update ncurses dependency.

5 files changed, 25 insertions, 26 deletions

diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile
index 4cc38f45691..c139e8b89a7 100644
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:44 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/07/06 08:04:14 jlam Exp $
 #
 
 DISTNAME=       dialog-0.6z
 CATEGORIES=	misc
 MASTER_SITES=   ${MASTER_SITE_SUNSITE:=utils/shell/}
 
-MAINTAINER=	lamj@stat.cmu.edu
+MAINTAINER=	jlam@netbsd.org
 
-DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
+DEPENDS+=	ncurses-4.2:../../devel/ncurses
 
 NO_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/examples/dialog
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dialog
 .for file in checklist guage infobox inputbox menubox msgbox radiolist textbox yesno
-	@${SED} "s,\.\./dialog,${PREFIX}/bin/dialog,g" \
-		${WRKSRC}/samples/${file} > ${WRKSRC}/samples/${file}.sed
-	@${INSTALL_SCRIPT} ${WRKSRC}/samples/${file}.sed \
+	${SED} "s,\.\./dialog,${PREFIX}/bin/dialog,g" \
+		${WRKSRC}/samples/${file} > ${WRKSRC}/samples/${file}.tmp
+	${INSTALL_SCRIPT} ${WRKSRC}/samples/${file}.tmp \
 		${PREFIX}/share/examples/dialog/${file}
-	@${RM} ${WRKSRC}/samples/${file}.sed
+	${RM} ${WRKSRC}/samples/${file}.tmp
 .endfor
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/dialog/patches/patch-aa b/misc/dialog/patches/patch-aa
index 0cb9c8dd426..e32f57a577f 100644
--- a/misc/dialog/patches/patch-aa
+++ b/misc/dialog/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 1999/01/04 20:47:31 frueauf Exp $
+$NetBSD: patch-aa,v 1.5 1999/07/06 08:04:15 jlam Exp $
 
---- Makefile.orig	Thu Jan  9 07:19:34 1997
-+++ Makefile	Mon Jan  4 20:39:17 1999
+--- Makefile.orig	Thu Jan  9 01:19:34 1997
++++ Makefile	Fri Jul  2 08:27:09 1999
 @@ -17,8 +17,8 @@
  # can be disabled to make dialog a bit smaller (could be done for more things)
  HAVE_GUAGE=true
@@ -18,21 +18,20 @@ $NetBSD: patch-aa,v 1.4 1999/01/04 20:47:31 frueauf Exp $
  
  CFLAGS = $(OPTIM) -DLOCALE -DVERSION=\"0.6z\"
 -LDFLAGS = -L .
-+LDFLAGS = -Wl,-R${PREFIX}/lib -L . -L${PREFIX}/lib
++LDFLAGS += -L . -L${LOCALBASE}/lib
  LDLIBS = -ldialog
  
  OBJS = checklist.o inputbox.o menubox.o msgbox.o \
-@@ -42,7 +42,8 @@
+@@ -42,7 +42,7 @@
  OBJS+=mouse.o
  endif
  ifeq ($(HAVE_NCURSES), true)
 -CFLAGS+=-DHAVE_NCURSES -I/usr/include/ncurses
-+#CFLAGS+=-DHAVE_NCURSES -I/usr/include/ncurses
-+CFLAGS+=-DHAVE_NCURSES -I${PREFIX}/include
++CFLAGS+=-DHAVE_NCURSES -I${LOCALBASE}/include
  LDLIBS+=-lncurses
  endif
  ifeq ($(HAVE_RC_FILE), true)
-@@ -59,7 +60,7 @@
+@@ -59,7 +59,7 @@
  all: libdialog.a dialog
  
  libdialog.a: $(OBJS)
@@ -41,7 +40,7 @@ $NetBSD: patch-aa,v 1.4 1999/01/04 20:47:31 frueauf Exp $
  
  dialog: dialog.o
  
-@@ -70,7 +71,7 @@
+@@ -70,7 +70,7 @@
  include .depend
  
  install: dialog libdialog.a
@@ -50,7 +49,7 @@ $NetBSD: patch-aa,v 1.4 1999/01/04 20:47:31 frueauf Exp $
  	cp dialog.man dialog.1
  ifeq ($(HAVE_RC_FILE),false)
  	mv dialog.1 dialog.in
-@@ -82,7 +83,7 @@
+@@ -82,7 +82,7 @@
  endif
  	mv dialog.1 dialog.in
  	sed -e "/COMMENTSTART/,/COMMENTEND/d" dialog.in >dialog.1
diff --git a/misc/dialog/patches/patch-ac b/misc/dialog/patches/patch-ac
index e329b73c7da..5bb4e276b31 100644
--- a/misc/dialog/patches/patch-ac
+++ b/misc/dialog/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:10:14 agc Exp $
+$NetBSD: patch-ac,v 1.3 1999/07/06 08:04:15 jlam Exp $
 
 --- dialog.h.orig	Fri Jan 23 17:37:12 1998
 +++ dialog.h	Fri Jan 23 18:14:38 1998
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.2 1998/08/07 11:10:14 agc Exp $
  #ifdef ultrix
  #include <cursesX.h>
  #else
-+#ifdef __NetBSD__
++#if defined(__NetBSD__)
 +#include <ncurses.h>
 +#else
  #include <curses.h>
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index f1ac6933dbd..0e4d642c973 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/05/13 23:46:50 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/07/06 08:04:33 jlam Exp $
 #
 
 DISTNAME=	gnome-utils-1.0.1
@@ -20,7 +20,7 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/bison:../../devel/bison
-DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
+DEPENDS+=	ncurses-4.2:../../devel/ncurses
 DEPENDS+=	gettext-0.10.35:../../devel/gettext
 DEPENDS+=	gnome-core-1.0.5:../../x11/gnome-libs
 DEPENDS+=	libaudiofile-0.1.6:../../audio/libaudiofile
@@ -28,6 +28,6 @@ DEPENDS+=	libaudiofile-0.1.6:../../audio/libaudiofile
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
 CONFIGURE_ENV+=	XGETTEXT="${LOCALBASE}/bin/xgettext"
-CONFIGURE_ARGS=	--with-ncurses=${PREFIX}
+CONFIGURE_ARGS=	--with-ncurses=${LOCALBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/sci/Makefile b/misc/sci/Makefile
index 984ba484af7..de9a45f157b 100644
--- a/misc/sci/Makefile
+++ b/misc/sci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/06/16 21:37:15 mjl Exp $
+# $NetBSD: Makefile,v 1.2 1999/07/06 08:05:02 jlam Exp $
 #
 
 DISTNAME=	sci.0.3.8
@@ -9,7 +9,7 @@ MASTER_SITES=	http://linuxparts.com/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://linuxparts.com/software.html
 
-DEPENDS+=       ncurses-1.9.9g:../../devel/ncurses
+DEPENDS+=       ncurses-4.2:../../devel/ncurses
 
 WRKSRC=         ${WRKDIR}/sci