From nobody Sat Nov 18 20:22:58 2023 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 4SXlZW09nyz51ZFs; Sat, 18 Nov 2023 20:22:59 +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 4SXlZV5CnNz4VCV; Sat, 18 Nov 2023 20:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700338978; 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=A0pesCKekAuOFpKT/9PBoIMtaRKtB0v+Sdo+5PmHBCU=; b=mo3V4d7XGUFiUc2dTeLu4FPcIG5TQudWZNOHBEpPBUYsGsNEgdfgERFu42H5I1xaH7HVcO qRMSUITzbawEaw8q5NHAShZI5su1sUdII5R7a6tuk+HY8bNLxQeR8QiUtypfNQH1bXrOIL D+VIv7/FjyWg4L1I1cd5fX4nr50+A5v9y0gIny6qsSd7ft6pgjLxzhZH01cyMdoCFkhKvf On4H9sOfx6f0P+GurxKci2xNvZEizWweT6wHLd+1r/xL49j1HgwxAs6v1RJRv5gn6hSw+b OLwHKJfpssGprHP1eGXh9z//dm02GQ1Jgl/fYJLFn4uz5u3o6s1ZTtqTE2fxFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700338978; 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=A0pesCKekAuOFpKT/9PBoIMtaRKtB0v+Sdo+5PmHBCU=; b=AOqKbLi4CJsRsHtFSWJHnIMowPykeK3I88Yr6LcO2GOs49QdiRxvRIPvV8W3xPtwnJ3nSb 2yJgTB5s/zw2TZhs+iCZXJKe2ub+EoC9OZGN82DHL2tQUqxSUUHbhmCvHDR95m4ZawEURK uQ176loqwwpiMKVBbBUOFbk+QQhdVux0i0iUI7YduVqyHQCxei8NCfrYBIoY+5M9HVqzTZ Td1juw90mL7KgelJvC+Y8IqWeNZ17VL/Lo2mzUeVudVpQ90k3VDxb65Ml15AP+I7go8gmy XdsHRq4S4NxArU4V7qyM6aKiXaK3hxCpDsj7M24jq4waOq5CvIsqWcEJLdpRBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700338978; a=rsa-sha256; cv=none; b=QxFvzvyx8Xi3e7KMPbFYgZGS48iCDvZI6yOnRMIlu5Lj0X0UET6zNFQeW5mht9/P+GneGX UzzGcmIA1bUMAkSQeaXvFW4EmOCg7JWbC1kPiruy9nW6+FcLn/Fs+DHhI04rMlNQUwT0r1 vpWpBtSQsjbMW6lEngJETh2zClh8OHEdSwIiuCj/OUL0qvpexRrm5Xm2OmL5N4SPAi54bN MU2M0WM5ikBGDtB2mwc1ZQ+VnlJzqtcG+GNBUBZqjX7Tksvgfwt4fyFJ2pDBnPrhhxwh0Q niNfaG/V7E+C7ZuvZrHf53Jp4TvLXve5EtNPeqsHxJizS8u9eWqg7XVWh7Xc+w== 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 4SXlZV3kD0zgwJ; Sat, 18 Nov 2023 20:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AIKMwQV016007; Sat, 18 Nov 2023 20:22:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AIKMwCP016004; Sat, 18 Nov 2023 20:22:58 GMT (envelope-from git) Date: Sat, 18 Nov 2023 20:22:58 GMT Message-Id: <202311182022.3AIKMwCP016004@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: e893333a049f - main - net/drawterm: update to 20230903 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e893333a049fb65a595afff686694dda1e40f35c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=e893333a049fb65a595afff686694dda1e40f35c commit e893333a049fb65a595afff686694dda1e40f35c Author: Robert Clausecker AuthorDate: 2023-11-18 06:53:25 +0000 Commit: Robert Clausecker CommitDate: 2023-11-18 20:20:44 +0000 net/drawterm: update to 20230903 - switch to maintained 9front fork - rework and simplify port - install man page - grab maintainership as maintainer wants to hand it over PR: 258489 --- net/drawterm/Makefile | 26 +++++++++++--------------- net/drawterm/distinfo | 5 +++-- net/drawterm/files/patch-Make.freebsd | 22 ++++++++++++++++++++++ net/drawterm/files/patch-Make.pthread | 22 ---------------------- net/drawterm/files/patch-include_unix.h | 12 ------------ 5 files changed, 36 insertions(+), 51 deletions(-) diff --git a/net/drawterm/Makefile b/net/drawterm/Makefile index 17dca94207b5..7a3675ebfa40 100644 --- a/net/drawterm/Makefile +++ b/net/drawterm/Makefile @@ -1,32 +1,28 @@ PORTNAME= drawterm -PORTVERSION= 20140106 -PORTREVISION= 1 -CATEGORIES= net +PORTVERSION= 20230903 +CATEGORIES= net x11 MASTER_SITES= http://swtch.com/drawterm/ -MAINTAINER= winston@ml1.net +MAINTAINER= fuz@FreeBSD.org COMMENT= Plan9 cpu client WWW= https://swtch.com/drawterm/ # Additionally the Lucent Public License LICENSE= MIT -USES= tar:tgz xorg +USES= xorg localbase:ldflags +USE_GITHUB= yes +GH_ACCOUNT= 9front +GH_TAGNAME= c4ea4d299aa1bbbcc972c04adf06c18245ce7674 USE_XORG= x11 xt -PLIST_FILES= bin/drawterm -PORTDOCS= LICENSE README -WRKSRC= ${WRKDIR}/${PORTNAME} +PLIST_FILES= bin/drawterm \ + share/man/man1/drawterm.1.gz -MAKE_ARGS= CONF=pthread - -OPTIONS_DEFINE= DOCS +MAKE_ARGS= CONF=${OPSYS:tl} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/drawterm ${STAGEDIR}${PREFIX}/bin - -post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/drawterm.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1/drawterm.1 .include diff --git a/net/drawterm/distinfo b/net/drawterm/distinfo index 19b935b00280..9c6e50422a65 100644 --- a/net/drawterm/distinfo +++ b/net/drawterm/distinfo @@ -1,2 +1,3 @@ -SHA256 (drawterm-20140106.tgz) = d165e86f3a0aa82fd70764ac4b08f9312ac3c6c4f559bf3e37588d6a92af394a -SIZE (drawterm-20140106.tgz) = 1283386 +TIMESTAMP = 1700290033 +SHA256 (9front-drawterm-20230903-c4ea4d299aa1bbbcc972c04adf06c18245ce7674_GH0.tar.gz) = 5c4dcdb99e9be032fd3a55f439a878f6478bfb1a6859039cf4db15a75bf22652 +SIZE (9front-drawterm-20230903-c4ea4d299aa1bbbcc972c04adf06c18245ce7674_GH0.tar.gz) = 612334 diff --git a/net/drawterm/files/patch-Make.freebsd b/net/drawterm/files/patch-Make.freebsd new file mode 100644 index 000000000000..127a6bbf63bb --- /dev/null +++ b/net/drawterm/files/patch-Make.freebsd @@ -0,0 +1,22 @@ +--- Make.freebsd.orig 2023-11-18 06:48:07 UTC ++++ Make.freebsd +@@ -1,16 +1,12 @@ + # OpenBSD + PTHREAD=-pthread +-AR=ar +-AS=as + RANLIB=ranlib +-X11=/usr/local +-CC=clang +-CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2 ++CFLAGS+=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2 + O=o + OS=posix + GUI=x11 +-LDADD=-L$(X11)/lib64 -L$(X11)/lib -lX11 -ggdb +-LDFLAGS=$(PTHREAD) ++LDADD=-lX11 -ggdb ++LDFLAGS+=$(PTHREAD) + TARG=drawterm + AUDIO=unix + diff --git a/net/drawterm/files/patch-Make.pthread b/net/drawterm/files/patch-Make.pthread deleted file mode 100644 index 165799784164..000000000000 --- a/net/drawterm/files/patch-Make.pthread +++ /dev/null @@ -1,22 +0,0 @@ ---- Make.pthread.orig 2009-08-26 05:44:41 UTC -+++ Make.pthread -@@ -4,14 +4,14 @@ PTHREAD=-pthread -DPTHREAD - AR=ar - AS=no-as-here - RANLIB=ranlib --X11=/usr/X11R6 --CC=gcc --CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2 -+X11=$(LOCALBASE) -+CC?=cc -+CFLAGS=-Wall -Wno-missing-braces -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) - O=o - OS=posix - GUI=x11 --LDADD=-L$(X11)/lib64 -L$(X11)/lib -lX11 -ggdb --LDFLAGS=$(PTHREAD) -+LDADD=-L$(X11)/lib64 -L$(X11)/lib -lX11 -+LDFLAGS+=$(PTHREAD) - TARG=drawterm - # AUDIO=none - AUDIO=unix diff --git a/net/drawterm/files/patch-include_unix.h b/net/drawterm/files/patch-include_unix.h deleted file mode 100644 index d697eb727bf6..000000000000 --- a/net/drawterm/files/patch-include_unix.h +++ /dev/null @@ -1,12 +0,0 @@ ---- include/unix.h.orig 2015-07-13 22:14:41 UTC -+++ include/unix.h -@@ -11,7 +11,9 @@ - #define _FILE_OFFSET_BITS 64 - - -+#define fdclose sysfdclose - #include -+#undef fdclose - #include - #include - #include