Attachment #190342 for bug #225686




# $FreeBSD$

PORTNAME=	drawterm
PORTVERSION=	20180120
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	https://code.9front.org/hg/drawterm/archive/
DISTNAME=	tip

MAINTAINER=	winston@ml1.net
COMMENT=	Plan9 cpu client

# Additionally the Lucent Public License
LICENSE=	MIT

USES=	tar:tgz
USE_XORG=	x11 xt

OPTIONS_DEFINE=	DOCS

WRKSRC=		${WRKDIR}/${PORTNAME}-fac7facfeaa8

PLIST_FILES=	bin/drawterm
PORTDOCS=	LICENSE README
WRKSRC=		${WRKDIR}/${PORTNAME}

.include <bsd.port.pre.mk>

.if ${OPSYS} == "FreeBSD"
MAKE_ARGS=	CONF=freebsd
.else
MAKE_ARGS=	CONF=dragonfly
.endif

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/drawterm ${STAGEDIR}${PREFIX}/bin

	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (drawterm-20140106.tgz) = d165e86f3a0aa82fd70764ac4b08f9312ac3c6c4f559bf3e37588d6a92af394a	1	TIMESTAMP = 1517843279
2	SIZE (drawterm-20140106.tgz) = 1283386	2	SHA256 (tip.tar.gz) = db9c08dfaa9e5a4acf33b137b2fd3e4fbd867cb423507c66680b2aa9b546b477
		3	SIZE (tip.tar.gz) = 479640




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

Lines 6-9 Link Here

(-)pkg-descr (-1 / +1 lines)
6	and starts a shell. Typically, either explicitly or via the profile, one	6	and starts a shell. Typically, either explicitly or via the profile, one
7	uses the shell to start rio(1).	7	uses the shell to start rio(1).
8		8
9	WWW: http://swtch.com/drawterm/	9	WWW: http://drawterm.9front.org

Return to bug 225686

Lines 2-11 Link Here

(-)Makefile (-8 / +14 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= drawterm	4	PORTNAME= drawterm
5	PORTVERSION= 20140106	5	PORTVERSION= 20180120
6	PORTREVISION= 1
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= http://swtch.com/drawterm/	7	MASTER_SITES= https://code.9front.org/hg/drawterm/archive/
		8	DISTNAME= tip
9		9
10	MAINTAINER= winston@ml1.net	10	MAINTAINER= winston@ml1.net
11	COMMENT= Plan9 cpu client	11	COMMENT= Plan9 cpu client
Lines 13-28 Link Here
13	# Additionally the Lucent Public License	13	# Additionally the Lucent Public License
14	LICENSE= MIT	14	LICENSE= MIT
15		15
16	USES= tar:tgz
17	USE_XORG= x11 xt	16	USE_XORG= x11 xt
18		17
		18	OPTIONS_DEFINE= DOCS
		19
		20	WRKSRC= ${WRKDIR}/${PORTNAME}-fac7facfeaa8
		21
19	PLIST_FILES= bin/drawterm	22	PLIST_FILES= bin/drawterm
20	PORTDOCS= LICENSE README	23	PORTDOCS= LICENSE README
21	WRKSRC= ${WRKDIR}/${PORTNAME}
22		24
23	MAKE_ARGS= CONF=pthread	25	.include <bsd.port.pre.mk>
24		26
25	OPTIONS_DEFINE= DOCS	27	.if ${OPSYS} == "FreeBSD"
		28	MAKE_ARGS= CONF=freebsd
		29	.else
		30	MAKE_ARGS= CONF=dragonfly
		31	.endif
26		32
27	do-install:	33	do-install:
28	${INSTALL_PROGRAM} ${WRKSRC}/drawterm ${STAGEDIR}${PREFIX}/bin	34	${INSTALL_PROGRAM} ${WRKSRC}/drawterm ${STAGEDIR}${PREFIX}/bin
Lines 31-34 Link Here
31	${MKDIR} ${STAGEDIR}${DOCSDIR}	37	${MKDIR} ${STAGEDIR}${DOCSDIR}
32	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}	38	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
33		39
34	.include <bsd.port.mk>	40	.include <bsd.port.post.mk>

Lines 1-22 Link Here

(-)files/patch-Make.pthread (-22 lines)
1	--- Make.pthread.orig 2009-08-26 05:44:41 UTC
2	+++ Make.pthread
3	@@ -4,14 +4,14 @@ PTHREAD=-pthread -DPTHREAD
4	AR=ar
5	AS=no-as-here
6	RANLIB=ranlib
7	-X11=/usr/X11R6
8	-CC=gcc
9	-CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2
10	+X11=$(LOCALBASE)
11	+CC?=cc
12	+CFLAGS=-Wall -Wno-missing-braces -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD)
13	O=o
14	OS=posix
15	GUI=x11
16	-LDADD=-L$(X11)/lib64 -L$(X11)/lib -lX11 -ggdb
17	-LDFLAGS=$(PTHREAD)
18	+LDADD=-L$(X11)/lib64 -L$(X11)/lib -lX11
19	+LDFLAGS+=$(PTHREAD)
20	TARG=drawterm
21	# AUDIO=none
22	AUDIO=unix