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
This commit is contained in:
Robert Clausecker 2023-11-18 07:53:25 +01:00
parent 9a1cc55633
commit e893333a04
5 changed files with 36 additions and 51 deletions

View file

@ -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 <bsd.port.mk>

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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 <stdio.h>
+#undef fdclose
#include <stdlib.h>
#include <string.h>
#include <math.h>