diff options
author | jlam <jlam@pkgsrc.org> | 1999-07-06 08:04:14 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 1999-07-06 08:04:14 +0000 |
commit | 706198eb78abc9c596fac0562b698da9432c79a9 (patch) | |
tree | 93e4ae5c5dd3ebcbc77ebdf40e4fcf10582c6d0b /misc/dialog | |
parent | 627932ce274babd13474fd25ce58c7d0bf5d5802 (diff) | |
download | pkgsrc-706198eb78abc9c596fac0562b698da9432c79a9.tar.gz |
* Update ncurses dependency.
Diffstat (limited to 'misc/dialog')
-rw-r--r-- | misc/dialog/Makefile | 18 | ||||
-rw-r--r-- | misc/dialog/patches/patch-aa | 19 | ||||
-rw-r--r-- | misc/dialog/patches/patch-ac | 4 |
3 files changed, 20 insertions, 21 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> |