On Wed, Sep 14, 2016 at 04:38:35PM -0400, stanley lieber wrote:
> Updated again. The original drawterm is effectively abandoned by its authors.

I've tested this and can confirm it works. I'd really like to see this
committed as a frequent user of drawterm. The patch below fixes the
files CVS complained about in the previous patch, someone forgot to
`cvs rm` them after deleting them.

Ian


Index: Makefile
===================================================================
RCS file: /cvs/ports/plan9/drawterm/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile    11 Mar 2013 11:37:53 -0000      1.3
+++ Makefile    14 Sep 2016 20:55:02 -0000
@@ -1,31 +1,29 @@
 # $OpenBSD: Makefile,v 1.3 2013/03/11 11:37:53 espie Exp $
 
-ONLY_FOR_ARCHS=        i386 amd64 powerpc sparc64 mips64 mips64el
+ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 mips64 mips64el
 
-COMMENT=       Plan9 terminal emulator
+COMMENT=        Plan9 terminal emulator
 
-DISTNAME=      drawterm-20110221
-CATEGORIES=    plan9
+DISTNAME=       d9813b086ec6
+PKGNAME=        drawterm-20160914
+CATEGORIES=     plan9
 
-HOMEPAGE=      http://swtch.com/drawterm/
+HOMEPAGE=       http://drawterm.9front.org/
+MASTER_SITES=   https://code.9front.org/hg/drawterm/archive/
 
-MASTER_SITES=  ${HOMEPAGE} \
-               http://openbsd.stanleylieber.com/drawterm/
-EXTRACT_SUFX=  .tgz
-
-MAINTAINER=    Stanley Lieber <stanley.lie...@gmail.com>
+MAINTAINER=     Stanley Lieber <s...@stanleylieber.com>
 
 # Lucent Public License Version 1.02
-PERMIT_PACKAGE_CDROM=  Yes
+PERMIT_PACKAGE_CDROM=   Yes
 
-WANTLIB =      X11 c pthread
+WANTLIB=        X11 c pthread
 
-NO_TEST=       Yes
-MAKE_FLAGS=    CONF=unix AUDIO=none
+NO_TEST=        Yes
+MAKE_FLAGS=     CONF=openbsd
 
-WRKDIST=       ${WRKDIR}/drawterm/
+WRKDIST=        ${WRKDIR}/drawterm-${DISTNAME}/
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKDIR}/drawterm/drawterm ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKDIST}/drawterm ${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/plan9/drawterm/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo    18 Jan 2015 03:14:56 -0000      1.2
+++ distinfo    14 Sep 2016 20:55:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (drawterm-20110221.tgz) = 8yHq1y7YlvoMSYbcyfmE4T2XVwvb09H05vjYQT74Fqg=
-SIZE (drawterm-20110221.tgz) = 1191194
+SHA256 (d9813b086ec6.tar.gz) = nSYimgN+OwRWWOSdqPB7h7rSpkv7SM1A2SrxFa20qNc=
+SIZE (d9813b086ec6.tar.gz) = 492816
Index: patches/patch-Make_unix
===================================================================
RCS file: patches/patch-Make_unix
diff -N patches/patch-Make_unix
--- patches/patch-Make_unix     12 Oct 2011 20:13:33 -0000      1.4
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-Make_unix,v 1.4 2011/10/12 20:13:33 mpi Exp $
---- Make.unix.orig     Wed Aug 26 07:44:41 2009
-+++ Make.unix  Sat Oct  8 12:49:18 2011
-@@ -5,8 +5,8 @@
- AS=as
- 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
-+CC?=gcc
-+CFLAGS+=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include 
-I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD)
- O=o
- OS=posix
- GUI=x11
-@@ -19,5 +19,5 @@
- all: default
- 
- libmachdep.a:
--      arch=`uname -m|sed 's/i.86/386/;s/Power Macintosh/power/; 
s/x86_64/amd64/'`; \
-+      arch=`arch -s|sed 's/i386/386/; s/powerpc/power/; s/sparc64/sun4u/; 
s/mips64el/mips/; s/mips64/mips/'`; \
-       (cd posix-$$arch &&  make)
Index: patches/patch-posix-mips_getcallerpc_c
===================================================================
RCS file: patches/patch-posix-mips_getcallerpc_c
diff -N patches/patch-posix-mips_getcallerpc_c
--- patches/patch-posix-mips_getcallerpc_c      18 Aug 2011 08:04:03 -0000      
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-posix-mips_getcallerpc_c,v 1.1.1.1 2011/08/18 08:04:03 jasper 
Exp $
---- posix-mips/getcallerpc.c.orig      Tue Mar 10 11:45:20 2009
-+++ posix-mips/getcallerpc.c   Tue Mar 10 11:45:24 2009
-@@ -1,7 +1,7 @@
- #include "u.h"
- #include "libc.h"
- 
--ulong
-+uintptr
- getcallerpc(void *a)
- {
-       return ((ulong*)a)[-1];
Index: patches/patch-posix-sun4u_getcallerpc_c
===================================================================
RCS file: patches/patch-posix-sun4u_getcallerpc_c
diff -N patches/patch-posix-sun4u_getcallerpc_c
--- patches/patch-posix-sun4u_getcallerpc_c     18 Aug 2011 08:04:03 -0000      
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-posix-sun4u_getcallerpc_c,v 1.1.1.1 2011/08/18 08:04:03 jasper 
Exp $
---- posix-sun4u/getcallerpc.c.orig     Tue Mar 10 11:45:20 2009
-+++ posix-sun4u/getcallerpc.c  Tue Mar 10 11:45:24 2009
-@@ -1,7 +1,7 @@
- #include "u.h"
- #include "libc.h"
- 
--ulong
-+uintptr
- getcallerpc(void *a)
- {
-       return ((ulong*)a)[-1];


Reply via email to