git: d93b4d32034d - main - bsddialog: import version 0.0.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 21 Dec 2021 15:13:12 UTC
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=d93b4d32034df7cd70e80b496e8fe8c1bc57c629
commit d93b4d32034df7cd70e80b496e8fe8c1bc57c629
Merge: 02c16e2174ba 77a55d2c3b4d
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2021-12-21 15:08:55 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2021-12-21 15:13:00 +0000
bsddialog: import version 0.0.2
contrib/bsddialog/.gitignore | 3 +-
contrib/bsddialog/bsddialog.1 | 32 +-
contrib/bsddialog/bsddialog.c | 38 +-
contrib/bsddialog/examples_library/sade.c | 42 +-
contrib/bsddialog/examples_utility/mixedgauge.sh | 2 +-
contrib/bsddialog/lib/GNUMakefile | 4 +-
contrib/bsddialog/lib/Makefile | 37 +-
contrib/bsddialog/lib/barbox.c | 169 ++++++-
contrib/bsddialog/lib/bsddialog.3 | 562 +++++++++++++++++++++--
contrib/bsddialog/lib/bsddialog.h | 17 +-
contrib/bsddialog/lib/bsddialog_progressview.h | 54 +++
contrib/bsddialog/lib/bsddialog_theme.h | 4 +-
contrib/bsddialog/lib/formbox.c | 135 +++---
contrib/bsddialog/lib/lib_util.c | 7 +-
contrib/bsddialog/lib/lib_util.h | 7 +-
contrib/bsddialog/lib/libbsddialog.c | 30 +-
contrib/bsddialog/lib/menubox.c | 4 +-
contrib/bsddialog/lib/messagebox.c | 48 +-
contrib/bsddialog/lib/textbox.c | 3 +-
contrib/bsddialog/lib/theme.c | 8 +-
contrib/bsddialog/lib/timebox.c | 3 +-
lib/libbsddialog/Makefile | 5 +-
usr.bin/bsddialog/Makefile | 4 +-
23 files changed, 954 insertions(+), 264 deletions(-)
diff --cc contrib/bsddialog/.gitignore
index ee80e5f5a073,000000000000..557ad3300d1f
mode 100644,000000..100644
--- a/contrib/bsddialog/.gitignore
+++ b/contrib/bsddialog/.gitignore
@@@ -1,25 -1,0 +1,26 @@@
+bsddialog
+*.o
+*~
++*.a
+examples_library/buildlist
+examples_library/checklist
+examples_library/datebox
+examples_library/form
+examples_library/menu
+examples_library/mixedlist
+examples_library/radiolist
+examples_library/theme
+examples_library/treeview
+examples_library/infobox
+examples_library/msgbox
+examples_library/pause
+examples_library/rangebox
+examples_library/sade
+examples_library/timebox
+examples_library/yesno
+*.gz
+lib/libbsddialog.so*
+BSDDIALOG.geany
+BSDDIALOG.tags
+*.core
- bsdinstall/*
++freebsd-lab/
diff --cc contrib/bsddialog/lib/Makefile
index 08d8db5191dc,000000000000..e8f3ab6aae02
mode 100644,000000..100644
--- a/contrib/bsddialog/lib/Makefile
+++ b/contrib/bsddialog/lib/Makefile
@@@ -1,77 -1,0 +1,76 @@@
+# Any copyright is dedicated to the Public Domain, see:
+# <http://creativecommons.org/publicdomain/zero/1.0/>
+#
+# Written in 2021 by Alfonso Sabato Siciliano
+
- VERSION = 0.0.1
++VERSION = 0.0.2
+LIBRARY = bsddialog
+LIBRARY_SO = lib${LIBRARY:=.so}
- HEADERS = bsddialog.h bsddialog_theme.h
++HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h
+SOURCES = barbox.c formbox.c infobox.c libbsddialog.c lib_util.c menubox.c \
+ messagebox.c textbox.c theme.c timebox.c
+OBJECTS= ${SOURCES:.c=.o}
- FBSDFLAGS= -O2 -pipe -std=gnu99 -Wno-format-zero-length \
- -fstack-protector-strong -Qunused-arguments
- CFLAGS = -fPIC -Wall -Wextra
++CFLAGS = -I/usr/local/include -fPIC -Wall -Wextra
++LDFLAGS = -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
++ -Wl,--warn-shared-textrel -Wl,-soname,${LIBRARY_SO}.${VERSION}
++
+.if defined(DEBUG)
++# `make -DDEBUG`
+CFLAGS += -g
+.else
- CFLAGS += ${FBSDFLAGS}
++CFLAGS += -O2 -pipe -std=gnu99 -Wno-format-zero-length \
++ -fstack-protector-strong -Qunused-arguments
+.endif
- LDFLAGS = -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
- -Wl,--warn-shared-textrel -Wl,-soname,${LIBRARY_SO}.${VERSION}
-
- INSTALL_PREFIX=/usr/local
- LN = ln -s -f
- RM = rm -f
- CP = cp
- GZIP = gzip -cn
- LDCONFIG = /sbin/ldconfig -m
+
+.if defined(PORTNCURSES)
- # PORT ncurses `make -DPORTNCURSES`
++# PORT ncurses `make -DPORTNCURSES`
+CFLAGS += -DPORTNCURSES -I/usr/local/include
- LDFLAGS += -L/usr/local/lib -lform -lncurses -ltinfo
++LDFLAGS += -L/usr/local/lib -lformw -lncursesw -ltinfow
+.else
+# BASE ncurses
- LDFLAGS += -L/usr/lib -lform -lncurses -ltinfo
++LDFLAGS += -L/usr/lib -lformw -lncursesw -ltinfow
+.endif
+
++INSTALL_PREFIX=/usr/local
++LN = ln -s -f
++RM = rm -f
++CP = cp
++GZIP = gzip -cn
++LDCONFIG = /sbin/ldconfig -m
+MAN= ${OUTPUT}.3
+GZIP= gzip -cn
+MANDIR= /usr/local/share/man/man3
-
+INSTALL= install
+RM= rm -f
+
+#all : man ${LIBRARY}
+all : ${LIBRARY}
+
+${LIBRARY}: ${OBJECTS}
+ ${CC} ${LDFLAGS} ${.ALLSRC} -o ${LIBRARY_SO}.${VERSION}
+ # LN for devel
+ ${LN} ${LIBRARY_SO}.${VERSION} ${LIBRARY_SO}
+
+.c.o:
+ ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+
+man:
+ ${GZIP} ${LIBRARY}.3 > ${LIBRARY}.3.gz
+
+clean:
+ ${RM} ${LIBRARY_SO}* *.o *~ *.gz
+
+
+install:
+ ${CP} ${LIBRARY}.h ${INSTALL_PREFIX}/include
+ ${CP} ${LIBRARY_SO}.${VERSION} ${INSTALL_PREFIX}/lib/
+ ${LN} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}.${VERSION} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}
+ ${LDCONFIG} ${INSTALL_PREFIX}/lib
+ ${CP} ${LIBRARY}.3.gz ${INSTALL_PREFIX}/man/man3/
+
+unistall:
+ ${RM} ${INSTALL_PREFIX}/include/${LIBRARY}.h
+ ${RM} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}
+ ${RM} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}.${VERSION}
+ ${LDCONFIG} ${INSTALL_PREFIX}/lib
+ ${RM} ${INSTALL_PREFIX}/man/man3/${LIBRARY}.3.gz
diff --cc contrib/bsddialog/lib/bsddialog_progressview.h
index 000000000000,453d46a242e6..453d46a242e6
mode 000000,100644..100644
--- a/contrib/bsddialog/lib/bsddialog_progressview.h
+++ b/contrib/bsddialog/lib/bsddialog_progressview.h
diff --cc lib/libbsddialog/Makefile
index 394102dfb438,000000000000..95f8fad115a4
mode 100644,000000..100644
--- a/lib/libbsddialog/Makefile
+++ b/lib/libbsddialog/Makefile
@@@ -1,27 -1,0 +1,28 @@@
+BSDDIALOG= ${SRCTOP}/contrib/bsddialog
+
+.PATH: ${BSDDIALOG}/lib
+
+LIB= bsddialog
+PRIVATELIB= yes
+SHLIB_MAJOR= 0
+SRCS= barbox.c \
+ formbox.c \
+ infobox.c \
+ lib_util.c \
+ lib_util.h \
+ libbsddialog.c \
+ menubox.c \
+ messagebox.c \
+ textbox.c \
+ theme.c \
+ timebox.c
+INCS= bsddialog.h \
- bsddialog_theme.h
- MAN=
++ bsddialog_theme.h \
++ bsddialog_progressview.h
++MAN= bsddialog.3
+
+LIBADD= ncursesw tinfow formw
+
+WARNS= 2
+
+.include <bsd.lib.mk>
diff --cc usr.bin/bsddialog/Makefile
index 3ff5c378418e,000000000000..66d94ec19533
mode 100644,000000..100644
--- a/usr.bin/bsddialog/Makefile
+++ b/usr.bin/bsddialog/Makefile
@@@ -1,12 -1,0 +1,12 @@@
+BSDDIALOG= ${SRCTOP}/contrib/bsddialog
+.PATH: ${BSDDIALOG}
+
+PROG= bsddialog
+SRCS= bsddialog.c
- MAN=
++MAN= bsddialog.1
+CFLAGS+= -I${BSDDIALOG}/lib
+LIBADD= bsddialog
+
- WARNS= 2
++WARNS= 3
+
+.include <bsd.prog.mk>