From nobody Fri Apr 22 19:31:26 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C2CEA198C826; Fri, 22 Apr 2022 19:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KlPfQ54gcz3Qkd; Fri, 22 Apr 2022 19:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650655886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQkOWxjufbTvaVDPviQQQhqXWRi48GndVgHL3B7cs0g=; b=KrpErLo9TrmBUbHa8BYKmmz4RW77X9EXPp+HqPkKywvySr4yEpS6vFLypYvvx+PV6BvSZR GoreMOD8L5DcvlhbyUo2zYiTAjnxgoQzWJ9jvpAWIJbEI6asn2EOQymirToQezpeaJBeEu jH+I4Kcr7UwOJn61PRWmwPhCovlLxeEOEfZ8muM9wXKdMI/ZNTRMdeSayZTJmlsoZAmOVX SjkEmqKeXl6R43SKtC2H7PayzDvPws927FBwNBPkdgSrTMR007YpNxVmjYY25HFXMTAN/q 3dn3M+ptmCkJrIlfs7mNmMLaCKQmf7gxd2aUUHbHVGqpppH6ApuWhA/kjf0tGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E567230EB; Fri, 22 Apr 2022 19:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23MJVQCp019735; Fri, 22 Apr 2022 19:31:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23MJVQBt019734; Fri, 22 Apr 2022 19:31:26 GMT (envelope-from git) Date: Fri, 22 Apr 2022 19:31:26 GMT Message-Id: <202204221931.23MJVQBt019734@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: 5df7b7f16abc - main - devel/bsddialog: Update to 0.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5df7b7f16abca034ddc216f157dbca255a03abf3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650655886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQkOWxjufbTvaVDPviQQQhqXWRi48GndVgHL3B7cs0g=; b=yeX+ADRVW2NmN5mkqpVlYHqSj/rSMhuXftdngm9JvaCAn/fBJi+2PSxVxlA+5Uq0ksIzbU xrvhqUABbJmAMUwKmpAZLVPqhbulDqy/K7D1+ccoVelqryoaM2gMOcs9//WJRawqpS105C KANy7aRwEDPq+HWvBLM6u/VA9sfJ2pQJ+tw2cC6paxkGxwX+dqsNL/JAyNjPWlxXHLWGhm SgPjF2EvQy5VUehgG8tREKcjQQi5G4hSCNV2nA4clQubltryEteVTVf0CWzvJyl2zQJVLz fok6ZauVK0IEWEA7oifQLjuxzoD4bTbv8KIq6k0EaLkfWv5R14AwsQGmwowwmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650655886; a=rsa-sha256; cv=none; b=BOTmSGTUUyfPkETBj9RhLAESFeVLzJJWwXZUu6ptW/l4srDRR4bodIvpNgnwhLcLNEvq4R x6ZA0HGH7oR1unzctvRxBREI7tmd6DXEx3iSYe3ZisPRdJVTTuzf3Z1sWDCYkMu44HVe2J jZFNCz57YV71eypZtadiPAZSM0qriEux1f3yIZtIJY8+d/sUOqXyiRWeFpVOT8alc4jfN4 0xwlij/nl0iAyt9ss37uHTUAKlUqyq8eLDjp18cH4cMbVPq7V6eBFQEGUp/BSW9+tOzWnN nFDuAgh5zkDmWrXmH0/xRwCBzHvP6u5lA/AtkptzszcFgFcKoxbGBWXhYs7w2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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 AuthorDate: 2022-04-22 19:25:09 +0000 Commit: Alfonso S. Siciliano 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 +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 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