diff options
| author | jlam <jlam@pkgsrc.org> | 2001-06-19 15:53:11 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-06-19 15:53:11 +0000 |
| commit | dbfddb7cdca0d81e70f167223a99442a80c490e9 (patch) | |
| tree | 0c72d729fdfbdf7cedfe968fd52ceff72898fe2b /misc/dialog/patches | |
| parent | 4015e855b6aa92668691cf854146535e16273358 (diff) | |
| download | pkgsrc-dbfddb7cdca0d81e70f167223a99442a80c490e9.tar.gz | |
Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. By using
ncurses/buildlink.mk, we can refer to the ncurses header as ncurses.h and
the ncurses lib as libncurses.
Diffstat (limited to 'misc/dialog/patches')
| -rw-r--r-- | misc/dialog/patches/patch-aa | 32 | ||||
| -rw-r--r-- | misc/dialog/patches/patch-ac | 18 |
2 files changed, 23 insertions, 27 deletions
diff --git a/misc/dialog/patches/patch-aa b/misc/dialog/patches/patch-aa index 3571bc7b46b..af0ea832a5a 100644 --- a/misc/dialog/patches/patch-aa +++ b/misc/dialog/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2000/10/31 16:26:34 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2001/06/19 15:53:11 jlam Exp $ --- Makefile.orig Thu Jan 9 01:19:34 1997 +++ Makefile -@@ -17,8 +17,8 @@ +@@ -17,20 +17,20 @@ # can be disabled to make dialog a bit smaller (could be done for more things) HAVE_GUAGE=true @@ -11,35 +11,35 @@ $NetBSD: patch-aa,v 1.7 2000/10/31 16:26:34 jlam Exp $ +BINDIR = ${PREFIX}/bin +MANDIR = ${PREFIX}/man/man1 - CC = gcc - CPP = gcc -E -@@ -29,8 +29,8 @@ +-CC = gcc +-CPP = gcc -E +-OPTIM = -O2 -Wall -Wstrict-prototypes -fomit-frame-pointer -pipe ++#CC = gcc ++CPP = $(CC) -E ++#OPTIM = -O2 -Wall -Wstrict-prototypes -fomit-frame-pointer -pipe + #OPTIM = -O -Wall -Wstrict-prototypes -g -pipe + + # end of the configuration part #---------------------------------------------------------------------------- # do not edit below this line -CFLAGS = $(OPTIM) -DLOCALE -DVERSION=\"0.6z\" -LDFLAGS = -L . +CFLAGS += $(OPTIM) -DLOCALE -DVERSION=\"0.6z\" -+LDFLAGS += -L . -L${LOCALBASE}/lib ++LDFLAGS += -L . LDLIBS = -ldialog OBJS = checklist.o inputbox.o menubox.o msgbox.o \ -@@ -42,8 +42,13 @@ +@@ -42,7 +42,7 @@ OBJS+=mouse.o endif ifeq ($(HAVE_NCURSES), true) -CFLAGS+=-DHAVE_NCURSES -I/usr/include/ncurses +CFLAGS+=-DHAVE_NCURSES -+endif -+ifeq ($(HAVE_TRUE_NCURSES), true) -+CFLAGS+=-DHAVE_TRUE_NCURSES -I${LOCALBASE}/include LDLIBS+=-lncurses -+else -+LDLIBS+=-lcurses endif ifeq ($(HAVE_RC_FILE), true) - CFLAGS+=-DHAVE_RC_FILE -@@ -59,7 +64,7 @@ +@@ -59,7 +59,7 @@ all: libdialog.a dialog libdialog.a: $(OBJS) @@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.7 2000/10/31 16:26:34 jlam Exp $ dialog: dialog.o -@@ -70,7 +75,7 @@ +@@ -70,7 +70,7 @@ include .depend install: dialog libdialog.a @@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.7 2000/10/31 16:26:34 jlam Exp $ cp dialog.man dialog.1 ifeq ($(HAVE_RC_FILE),false) mv dialog.1 dialog.in -@@ -82,7 +87,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 03884fd369f..bf4b10d5914 100644 --- a/misc/dialog/patches/patch-ac +++ b/misc/dialog/patches/patch-ac @@ -1,21 +1,17 @@ -$NetBSD: patch-ac,v 1.6 2000/11/10 00:40:35 wiz Exp $ +$NetBSD: patch-ac,v 1.7 2001/06/19 15:53:11 jlam Exp $ ---- dialog.h.orig Fri Aug 18 13:35:06 1995 +--- dialog.h.orig Fri Aug 18 07:35:06 1995 +++ dialog.h -@@ -28,8 +28,12 @@ +@@ -28,7 +28,7 @@ #ifdef ultrix #include <cursesX.h> #else -+#if defined(HAVE_TRUE_NCURSES) +-#include <curses.h> +#include <ncurses.h> -+#else - #include <curses.h> #endif -+#endif /* - * Change these if you want -@@ -42,6 +46,7 @@ +@@ -42,6 +42,7 @@ #define TAB 9 #define MAX_LEN 2048 #define BUF_SIZE (10*1024) @@ -23,7 +19,7 @@ $NetBSD: patch-ac,v 1.6 2000/11/10 00:40:35 wiz Exp $ #define MIN(x,y) (x < y ? x : y) #define MAX(x,y) (x > y ? x : y) -@@ -151,6 +156,9 @@ +@@ -151,6 +152,9 @@ void draw_shadow (WINDOW * win, int y, int x, int height, int width); #endif @@ -33,7 +29,7 @@ $NetBSD: patch-ac,v 1.6 2000/11/10 00:40:35 wiz Exp $ 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); -@@ -196,6 +204,7 @@ +@@ -196,6 +200,7 @@ extern __inline__ int mouse_wgetch (WINDOW * win) { |