git: 5df7b7f16abc - main - devel/bsddialog: Update to 0.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 22 Apr 2022 19:31:26 UTC
The branch main has been updated by asiciliano (src committer):
URL: https://cgit.FreeBSD.org/ports/commit/?id=5df7b7f16abca034ddc216f157dbca255a03abf3
commit 5df7b7f16abca034ddc216f157dbca255a03abf3
Author: Alfonso S. Siciliano <asiciliano@FreeBSD.org>
AuthorDate: 2022-04-22 19:25:09 +0000
Commit: Alfonso S. Siciliano <asiciliano@FreeBSD.org>
CommitDate: 2022-04-22 19:30:50 +0000
devel/bsddialog: Update to 0.2
ChangeLog: https://gitlab.com/alfix/bsddialog/-/blob/c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c/CHANGELOG
PR: 263127
Approved by: bapt
---
devel/bsddialog/Makefile | 19 ++++++++--
devel/bsddialog/distinfo | 6 ++--
devel/bsddialog/files/patch-Makefile | 40 ++++-----------------
devel/bsddialog/files/patch-lib_Makefile | 60 --------------------------------
devel/bsddialog/pkg-plist | 5 ++-
5 files changed, 30 insertions(+), 100 deletions(-)
diff --git a/devel/bsddialog/Makefile b/devel/bsddialog/Makefile
index e37139baa369..e92c3a0e8e2f 100644
--- a/devel/bsddialog/Makefile
+++ b/devel/bsddialog/Makefile
@@ -1,5 +1,5 @@
PORTNAME= bsddialog
-PORTVERSION= 0.0.0.g20211213
+PORTVERSION= 0.2
CATEGORIES= devel
MAINTAINER= bapt@FreeBSD.org
@@ -9,7 +9,20 @@ LICENSE= BSD2CLAUSE
USE_GITLAB= yes
GL_ACCOUNT= alfix
-GL_COMMIT= 98afee468ccd515c9082dc668f80092ca4553825
+GL_COMMIT= c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c
-.include <bsd.port.mk>
+LIBDIR= ${WRKSRC}/lib
+HEADERS= ${LIBDIR}/bsddialog.h \
+ ${LIBDIR}/bsddialog_progressview.h \
+ ${LIBDIR}/bsddialog_theme.h
+
+do-install:
+ ${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/include
+ ${INSTALL_LIB} ${LIBDIR}/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/
+ ${INSTALL} -l rs ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
+ ${INSTALL_DATA} ${LIBDIR}/lib${PORTNAME}.a ${STAGEDIR}/${PREFIX}/lib
+ ${INSTALL_MAN} ${LIBDIR}/${PORTNAME}.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+.include <bsd.port.mk>
diff --git a/devel/bsddialog/distinfo b/devel/bsddialog/distinfo
index 22daba7ad4e7..b528b7a687db 100644
--- a/devel/bsddialog/distinfo
+++ b/devel/bsddialog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642434705
-SHA256 (alfix-bsddialog-98afee468ccd515c9082dc668f80092ca4553825_GL0.tar.gz) = 9e1e64137b9c93e1c305e8a9f17e5fc16984fe797a0c90b036a3bbbdf4583b67
-SIZE (alfix-bsddialog-98afee468ccd515c9082dc668f80092ca4553825_GL0.tar.gz) = 51722
+TIMESTAMP = 1649359564
+SHA256 (alfix-bsddialog-c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c_GL0.tar.gz) = af5fd0a4cca5f109e6bdcc0d7a6ac73e4f959c50056e6f331c52899036cc2bc7
+SIZE (alfix-bsddialog-c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c_GL0.tar.gz) = 60929
diff --git a/devel/bsddialog/files/patch-Makefile b/devel/bsddialog/files/patch-Makefile
index 32c94b200ada..7ba2075ebadb 100644
--- a/devel/bsddialog/files/patch-Makefile
+++ b/devel/bsddialog/files/patch-Makefile
@@ -1,37 +1,11 @@
---- Makefile.orig 2021-11-22 01:09:04 UTC
+--- Makefile.orig 2022-04-07 21:39:48 UTC
+++ Makefile
-@@ -7,15 +7,15 @@ OUTPUT= bsddialog
- SOURCES= bsddialog.c
- OBJECTS= ${SOURCES:.c=.o}
- LIBPATH= ${.CURDIR}/lib
--LIBBSDDIALOG= ${LIBPATH}/libbsddialog.so
-+LIBBSDDIALOG= ${LIBPATH}/libbsddialog.a
-
--CFLAGS= -Wall -I${LIBPATH}
--LDFLAGS= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
-+CFLAGS+= -Wall -I${LIBPATH}
+@@ -15,7 +15,7 @@ CFLAGS+= -I${LIBPATH} -std=gnu99 -Wall -Wextra -Werror
+ CFLAGS= -g -Wall -I${LIBPATH}
+ LIBDEBUG= -DDEBUG
+ .endif
+-LDFLAGS+= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
+LDFLAGS+= -L${LIBPATH} -lbsddialog
--BINDIR= /usr/local/bin
-+BINDIR= ${PREFIX}/bin
+ BINDIR= /usr/local/bin
MAN= ${OUTPUT}.1
- GZIP= gzip -cn
--MANDIR= /usr/local/share/man/man1
-+MANDIR= ${PREFIX}/share/man/man1
-
- INSTALL= install
- RM= rm -f
-@@ -36,9 +36,10 @@ ${LIBBSDDIALOG}:
- ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-
- install:
-- ${INSTALL} -s -m 555 ${OUTPUT} ${BINDIR}
-- ${GZIP} ${MAN} > ${MAN}.gz
-- ${INSTALL} -m 444 ${MAN}.gz ${MANDIR}
-+ ${INSTALL} -s -m 555 ${OUTPUT} ${DESTDIR}${BINDIR}
-+ ${MAKE} -C ${LIBPATH} install
-+ #${GZIP} ${MAN} > ${MAN}.gz
-+ #${INSTALL} -m 444 ${MAN}.gz ${DESTDIR}${MANDIR}
-
- unistall:
- ${RM} ${BINDIR}/${OUTPUT}
diff --git a/devel/bsddialog/files/patch-lib_Makefile b/devel/bsddialog/files/patch-lib_Makefile
deleted file mode 100644
index a915d7a81b16..000000000000
--- a/devel/bsddialog/files/patch-lib_Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
---- lib/Makefile.orig 2021-11-22 01:09:04 UTC
-+++ lib/Makefile
-@@ -6,6 +6,7 @@
- VERSION = 0.1
- LIBRARY = bsddialog
- LIBRARY_SO = lib${LIBRARY:=.so}
-+LIBRARY_A = lib${LIBRARY:=.a}
- HEADERS = bsddialog.h bsddialog_theme.h
- SOURCES = barbox.c editorbox.c formbox.c lib_util.c menubox.c textbox.c \
- timebox.c commandbox.c filebox.c infobox.c libbsddialog.c messagebox.c \
-@@ -13,8 +14,8 @@ SOURCES = barbox.c editorbox.c formbox.c lib_util.c me
- OBJECTS= ${SOURCES:.c=.o}
- FBSDFLAGS= -O2 -pipe -std=gnu99 -Wno-format-zero-length \
- -fstack-protector-strong -Qunused-arguments
--CFLAGS = -I/usr/local/include -fPIC -Wall -Wextra ${FBSDFLAGS}
--LDFLAGS = -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
-+CFLAGS += -fPIC -Wall -Wextra ${FBSDFLAGS}
-+LDFLAGS += -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
- -Wl,--warn-shared-textrel -Wl,-soname,${LIBRARY_SO}.${VERSION}
-
- INSTALL_PREFIX=/usr/local
-@@ -43,11 +44,18 @@ RM= rm -f
- #all : man ${LIBRARY}
- all : ${LIBRARY}
-
--${LIBRARY}: ${OBJECTS}
-+${LIBRARY}: ${LIBRARY_SO} ${LIBRARY_A}
-+
-+${LIBRARY_SO}.${VERSION}: ${OBJECTS}
- ${CC} ${LDFLAGS} ${.ALLSRC} -o ${LIBRARY_SO}.${VERSION}
-- # LN for devel
-+
-+${LIBRARY_SO}: ${LIBRARY_SO}.${VERSION}
- ${LN} ${LIBRARY_SO}.${VERSION} ${LIBRARY_SO}
-
-+${LIBRARY_A}: ${OBJECTS}
-+ ${AR} cr ${.TARGET} ${OBJECTS}
-+ ${RANLIB} ${.TARGET}
-+
- .c.o:
- ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-
-@@ -59,11 +67,12 @@ clean:
-
-
- 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/
-+ ${INSTALL} -m 644 ${HEADERS} ${DESTDIR}${INSTALL_PREFIX}/include
-+ ${INSTALL} -m 644 -s ${LIBRARY_SO}.${VERSION} ${DESTDIR}${INSTALL_PREFIX}/lib/
-+ ${INSTALL} -l rs ${DESTDIR}${INSTALL_PREFIX}/lib/${LIBRARY_SO}.${VERSION} ${DESTDIR}${INSTALL_PREFIX}/lib/${LIBRARY_SO}
-+ ${INSTALL} -m 644 ${LIBRARY_A} ${DESTDIR}/${INSTALL_PREFIX}/lib
-+ #${LDCONFIG} ${INSTALL_PREFIX}/lib
-+ #${CP} ${LIBRARY}.3.gz ${INSTALL_PREFIX}/man/man3/
-
- unistall:
- ${RM} ${INSTALL_PREFIX}/include/${LIBRARY}.h
diff --git a/devel/bsddialog/pkg-plist b/devel/bsddialog/pkg-plist
index 0ac12267e7f5..5ef3eb6b2600 100644
--- a/devel/bsddialog/pkg-plist
+++ b/devel/bsddialog/pkg-plist
@@ -1,6 +1,9 @@
bin/bsddialog
include/bsddialog.h
+include/bsddialog_progressview.h
include/bsddialog_theme.h
lib/libbsddialog.a
lib/libbsddialog.so
-lib/libbsddialog.so.0.0.1
+lib/libbsddialog.so.0.2
+man/man1/bsddialog.1.gz
+man/man3/bsddialog.3.gz