pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/dialog Update to 1.0.20050911. Changes since 1997...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5f686804131f
branches: trunk
changeset: 500002:5f686804131f
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri Sep 30 22:02:56 2005 +0000
description:
Update to 1.0.20050911. Changes since 1997 (or 1995?) are too many
to mention here, see
http://dickey.his.com/dialog/CHANGES
for details.
Closes PR pkg/30856.
diffstat:
misc/dialog/Makefile | 27 +---
misc/dialog/PLIST | 14 +--
misc/dialog/distinfo | 19 +--
misc/dialog/patches/patch-aa | 76 --------------
misc/dialog/patches/patch-ab | 224 -------------------------------------------
misc/dialog/patches/patch-ac | 70 -------------
misc/dialog/patches/patch-ad | 35 ------
misc/dialog/patches/patch-ae | 89 -----------------
misc/dialog/patches/patch-af | 199 --------------------------------------
misc/dialog/patches/patch-ag | 25 ----
misc/dialog/patches/patch-ah | 71 -------------
misc/dialog/patches/patch-ai | 57 ----------
misc/dialog/patches/patch-aj | 24 ----
misc/dialog/patches/patch-ak | 11 --
14 files changed, 14 insertions(+), 927 deletions(-)
diffs (truncated from 1014 to 300 lines):
diff -r e100e58ef49c -r 5f686804131f misc/dialog/Makefile
--- a/misc/dialog/Makefile Fri Sep 30 22:01:33 2005 +0000
+++ b/misc/dialog/Makefile Fri Sep 30 22:02:56 2005 +0000
@@ -1,34 +1,23 @@
-# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:14 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/09/30 22:02:56 wiz Exp $
-DISTNAME= dialog-0.6z
-PKGREVISION= 3
+DISTNAME= dialog-1.0-20050911
+PKGNAME= ${DISTNAME:C/-2/.2/}
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SUNSITE:=utils/shell/}
+MASTER_SITES= ftp://invisible-island.net/dialog/
+EXTRACT_SUFX= .tgz
MAINTAINER= tech-pkg%NetBSD.org@localhost
+HOMEPAGE= http://dickey.his.com/dialog/dialog.html
COMMENT= Display dialog boxes from shell scripts
-USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
+MAKEFILE= makefile
INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-P]-*
PKG_INSTALLATION_TYPES= overwrite pkgviews
-EGDIR= ${PREFIX}/share/examples/dialog
-EGFILES= checklist guage infobox inputbox menubox msgbox
-EGFILES+= radiolist textbox yesno
-
INSTALLATION_DIRS= bin man/man1
-post-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- cd ${WRKSRC}/samples; for file in ${EGFILES}; do \
- ${MV} $${file} $${file}.tmp; \
- ${SED} "s|\.\./dialog|${PREFIX}/bin/dialog|g" \
- $${file}.tmp > $${file}; \
- ${RM} $${file}.tmp; \
- ${INSTALL_SCRIPT} $${file} ${EGDIR}; \
- done
-
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e100e58ef49c -r 5f686804131f misc/dialog/PLIST
--- a/misc/dialog/PLIST Fri Sep 30 22:01:33 2005 +0000
+++ b/misc/dialog/PLIST Fri Sep 30 22:02:56 2005 +0000
@@ -1,13 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:27:54 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/09/30 22:02:56 wiz Exp $
bin/dialog
-man/man1/dialog.1.gz
-share/examples/dialog/checklist
-share/examples/dialog/guage
-share/examples/dialog/infobox
-share/examples/dialog/inputbox
-share/examples/dialog/menubox
-share/examples/dialog/msgbox
-share/examples/dialog/radiolist
-share/examples/dialog/textbox
-share/examples/dialog/yesno
-@dirrm share/examples/dialog
+man/man1/dialog.1
diff -r e100e58ef49c -r 5f686804131f misc/dialog/distinfo
--- a/misc/dialog/distinfo Fri Sep 30 22:01:33 2005 +0000
+++ b/misc/dialog/distinfo Fri Sep 30 22:02:56 2005 +0000
@@ -1,16 +1,5 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 11:02:51 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/09/30 22:02:56 wiz Exp $
-SHA1 (dialog-0.6z.tar.gz) = 3c9483554bbb63bb8838e1f7b31f2600a33198ad
-RMD160 (dialog-0.6z.tar.gz) = 174a66402790388b3acdad1b49e624fefcf2dfb0
-Size (dialog-0.6z.tar.gz) = 50901 bytes
-SHA1 (patch-aa) = 39dddd7e772d2d0e796ba80eb9309db8b5c679f5
-SHA1 (patch-ab) = 39318c50019277ffa1cecdb33f16e16c11ad37af
-SHA1 (patch-ac) = 5862dd0163f2979b8071d8dbc6388c466a162042
-SHA1 (patch-ad) = 90a88a838923423cfe3bdbfc5d9de6d40bd10cee
-SHA1 (patch-ae) = c0aae5c99837a17919fea47734d90fb6006dd381
-SHA1 (patch-af) = 4b47fa64e73deca0bb69ad1bc83102e46eaa01fe
-SHA1 (patch-ag) = 55d7a46411d1e8775048b5d52e2451acba58e5bd
-SHA1 (patch-ah) = 33a9423930fde5b785c70c4755adf946f8ceecdd
-SHA1 (patch-ai) = fc2d0690cd07b019c031115eb92cad5f19b4904d
-SHA1 (patch-aj) = ffa5f39a31dbaca2e4c10ec3d2034721a531cffa
-SHA1 (patch-ak) = f720d9dd5f79fea389dfca662f7d2bc8dcbf95b6
+SHA1 (dialog-1.0-20050911.tgz) = 96c11fb4a98d5f9f074d8339fe2bad501e0f5786
+RMD160 (dialog-1.0-20050911.tgz) = 9fe5698fd2dda5cd2391302d39b081abf6f86ab8
+Size (dialog-1.0-20050911.tgz) = 307686 bytes
diff -r e100e58ef49c -r 5f686804131f misc/dialog/patches/patch-aa
--- a/misc/dialog/patches/patch-aa Fri Sep 30 22:01:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2003/10/08 03:01:32 danw Exp $
-
---- Makefile.orig Thu Jan 9 01:19:34 1997
-+++ Makefile Tue Oct 7 22:51:21 2003
-@@ -17,21 +17,19 @@
- # can be disabled to make dialog a bit smaller (could be done for more things)
- HAVE_GUAGE=true
-
--BINDIR = /usr/bin
--MANDIR = /usr/man/man1/
-+BINDIR = ${PREFIX}/bin
-+MANDIR = ${PREFIX}/man/man1
-
--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 .
--LDLIBS = -ldialog
-+CFLAGS += $(OPTIM) -DLOCALE -DVERSION=\"0.6z\"
-
- OBJS = checklist.o inputbox.o menubox.o msgbox.o \
- textbox.o util.o yesno.o
-@@ -42,7 +40,7 @@
- OBJS+=mouse.o
- endif
- ifeq ($(HAVE_NCURSES), true)
--CFLAGS+=-DHAVE_NCURSES -I/usr/include/ncurses
-+CFLAGS+=-DHAVE_NCURSES
- LDLIBS+=-lncurses
- endif
- ifeq ($(HAVE_RC_FILE), true)
-@@ -56,12 +54,9 @@
-
- SRCS = $(OBJS:.o=.c)
-
--all: libdialog.a dialog
-+all: dialog
-
--libdialog.a: $(OBJS)
-- ar rcs libdialog.a $(OBJS)
--
--dialog: dialog.o
-+dialog: dialog.o $(OBJS)
-
- clean:
- rm -f core *.o *~ dialog .depend libdialog.a dialog.1 dialog.in
-@@ -69,8 +64,8 @@
-
- include .depend
-
--install: dialog libdialog.a
-- install -s dialog $(BINDIR)
-+install: dialog
-+ ${BSD_INSTALL_PROGRAM} dialog $(BINDIR)
- cp dialog.man dialog.1
- ifeq ($(HAVE_RC_FILE),false)
- mv dialog.1 dialog.in
-@@ -82,7 +77,7 @@
- endif
- mv dialog.1 dialog.in
- sed -e "/COMMENTSTART/,/COMMENTEND/d" dialog.in >dialog.1
-- install -m 644 dialog.1 $(MANDIR)
-+ ${BSD_INSTALL_MAN} dialog.1 $(MANDIR)
- # install -m 644 libdialog.a /usr/lib/
-
- depend:
diff -r e100e58ef49c -r 5f686804131f misc/dialog/patches/patch-ab
--- a/misc/dialog/patches/patch-ab Fri Sep 30 22:01:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/07/28 20:30:11 jlam Exp $
-
---- checklist.c.orig Thu Aug 17 19:36:06 1995
-+++ checklist.c Fri Jul 28 15:30:22 2000
-@@ -64,8 +64,8 @@
- int list_height, int item_no, const char * const * items, int flag,
- int separate_output)
- {
-- int i, x, y, cur_x, cur_y, box_x, box_y;
-- int key = 0, button = 0, choice = 0, scroll = 0, max_choice, *status;
-+ int i, j, x, y, cur_x, cur_y, box_x, box_y;
-+ int key = 0, button = 0, choice = 0, d_scroll = 0, max_choice, *status;
- WINDOW *dialog, *list;
-
- checkflag = flag;
-@@ -83,6 +83,26 @@
-
- max_choice = MIN (list_height, item_no);
-
-+ /* Find length of longest item in order to center checklist */
-+ check_x = 0;
-+ item_x = 0;
-+ for (i = 0; i < item_no; i++) {
-+ check_x = MAX (check_x, strlen (items[i * 3])
-+ + strlen (items[i * 3 + 1]) + 6);
-+ item_x = MAX (item_x, strlen (items[i * 3]));
-+ }
-+
-+ /* Choose useful default height and width if they are negative */
-+ if (height < 0)
-+ height = strheight(prompt) + list_height + 4 + 2;
-+ if (width < 0) {
-+ i = strwidth(prompt);
-+ j = ((title != NULL) ? strwidth(title) : 0);
-+ width = MAX (i, j);
-+ width = MAX (width, check_x + 4) + 4;
-+ }
-+ width = MAX (width, MIN_DIALOG_WIDTH);
-+
- /* center dialog box on screen */
- x = (COLS - width) / 2;
- y = (LINES - height) / 2;
-@@ -131,14 +151,6 @@
- draw_box (dialog, box_y, box_x, list_height + 2, list_width + 2,
- menubox_border_attr, menubox_attr);
-
-- check_x = 0;
-- item_x = 0;
-- /* Find length of longest item in order to center checklist */
-- for (i = 0; i < item_no; i++) {
-- check_x = MAX (check_x, strlen (items[i * 3])
-- + strlen (items[i * 3 + 1]) + 6);
-- item_x = MAX (item_x, strlen (items[i * 3]));
-- }
- check_x = (list_width - check_x) / 2;
- item_x = check_x + item_x + 6;
-
-@@ -171,7 +183,7 @@
- any item tag in list */
- for (i = 0; i < max_choice; i++)
- if (toupper (key) ==
-- toupper (items[(scroll + i) * 3][0]))
-+ toupper (items[(d_scroll + i) * 3][0]))
- break;
-
- if (i < max_choice ||
-@@ -183,35 +195,35 @@
- i = key - '1';
- else if (key == KEY_UP || key == '-') {
- if (!choice) {
-- if (!scroll)
-+ if (!d_scroll)
- continue;
- /* Scroll list down */
- getyx (dialog, cur_y, cur_x);
- if (list_height > 1) {
- /* De-highlight current first item */
-- print_item (list, items[scroll * 3],
-- items[scroll * 3 + 1], status[scroll],
-+ print_item (list, items[d_scroll * 3],
-+ items[d_scroll * 3 + 1], status[d_scroll],
- 0, FALSE);
- scrollok (list, TRUE);
- wscrl (list, -1);
- scrollok (list, FALSE);
- }
-- scroll--;
-- print_item (list, items[scroll * 3],
-- items[scroll * 3 + 1],
-- status[scroll], 0, TRUE);
-+ d_scroll--;
-+ print_item (list, items[d_scroll * 3],
-+ items[d_scroll * 3 + 1],
-+ status[d_scroll], 0, TRUE);
- wnoutrefresh (list);
-
- /* print the up/down arrows */
- wmove (dialog, box_y, box_x + check_x + 5);
-- wattrset (dialog, scroll ? uarrow_attr : menubox_attr);
-- waddch (dialog, scroll ? ACS_UARROW : ACS_HLINE);
-+ wattrset (dialog, d_scroll ? uarrow_attr : menubox_attr);
-+ waddch (dialog, d_scroll ? ACS_UARROW : ACS_HLINE);
- wmove (dialog, box_y, box_x + check_x + 6);
-- waddch (dialog, scroll ? '(' : ACS_HLINE);
-+ waddch (dialog, d_scroll ? '(' : ACS_HLINE);
- wmove (dialog, box_y, box_x + check_x + 7);
-- waddch (dialog, scroll ? '-' : ACS_HLINE);
-+ waddch (dialog, d_scroll ? '-' : ACS_HLINE);
- wmove (dialog, box_y, box_x + check_x + 8);
-- waddch (dialog, scroll ? ')' : ACS_HLINE);
-+ waddch (dialog, d_scroll ? ')' : ACS_HLINE);
- wattrset (dialog, darrow_attr);
- wmove (dialog, box_y + list_height + 1,
- box_x + check_x + 5);
-@@ -232,24 +244,24 @@
- i = choice - 1;
- } else if (key == KEY_DOWN || key == '+') {
- if (choice == max_choice - 1) {
-- if (scroll + choice >= item_no - 1)
-+ if (d_scroll + choice >= item_no - 1)
- continue;
- /* Scroll list up */
- getyx (dialog, cur_y, cur_x);
- if (list_height > 1) {
- /* De-highlight current last item before scrolling up */
-- print_item (list, items[(scroll + max_choice - 1) * 3],
-- items[(scroll + max_choice - 1) * 3 + 1],
Home |
Main Index |
Thread Index |
Old Index