Several issues with this update: * WANTLIB should be updated as now drawterm depends on sndio. * Patch expands tabs; this is inconsistent with the rest of ports tree. * "d9813b086ec6.tar.gz" is a poor name for distfile. Good luck finding a port that added this gem to ports/distfiles.
An updated diff follows. Comments? OKs? -- Dmitrij D. Czarkoff Index: Makefile =================================================================== RCS file: /var/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 23:16:04 -0000 @@ -4,28 +4,28 @@ ONLY_FOR_ARCHS= i386 amd64 powerpc sparc COMMENT= Plan9 terminal emulator -DISTNAME= drawterm-20110221 +COMMIT_ID= d9813b086ec6 +DISTNAME= drawterm-20160914 CATEGORIES= plan9 -HOMEPAGE= http://swtch.com/drawterm/ +HOMEPAGE= http://drawterm.9front.org/ -MASTER_SITES= ${HOMEPAGE} \ - http://openbsd.stanleylieber.com/drawterm/ -EXTRACT_SUFX= .tgz +DISTFILES= ${DISTNAME}{${COMMIT_ID}}${EXTRACT_SUFX} +MASTER_SITES= https://code.9front.org/hg/drawterm/archive/ -MAINTAINER= Stanley Lieber <stanley.lie...@gmail.com> +MAINTAINER= Stanley Lieber <s...@stanleylieber.com> # Lucent Public License Version 1.02 PERMIT_PACKAGE_CDROM= Yes -WANTLIB = X11 c pthread +WANTLIB= X11 c pthread sndio NO_TEST= Yes -MAKE_FLAGS= CONF=unix AUDIO=none +MAKE_FLAGS= CONF=openbsd -WRKDIST= ${WRKDIR}/drawterm/ +WRKDIST= ${WRKDIR}/drawterm-${COMMIT_ID}/ do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/drawterm/drawterm ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKDIST}/drawterm ${PREFIX}/bin .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /var/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 23:10:57 -0000 @@ -1,2 +1,2 @@ -SHA256 (drawterm-20110221.tgz) = 8yHq1y7YlvoMSYbcyfmE4T2XVwvb09H05vjYQT74Fqg= -SIZE (drawterm-20110221.tgz) = 1191194 +SHA256 (drawterm-20160914.tar.gz) = nSYimgN+OwRWWOSdqPB7h7rSpkv7SM1A2SrxFa20qNc= +SIZE (drawterm-20160914.tar.gz) = 492816 Index: patches/patch-Make_unix =================================================================== RCS file: /var/cvs/ports/plan9/drawterm/patches/patch-Make_unix,v retrieving revision 1.4 diff -u -p -r1.4 patch-Make_unix --- patches/patch-Make_unix 12 Oct 2011 20:13:33 -0000 1.4 +++ patches/patch-Make_unix 14 Sep 2016 23:07:39 -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: /var/cvs/ports/plan9/drawterm/patches/patch-posix-mips_getcallerpc_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-posix-mips_getcallerpc_c --- patches/patch-posix-mips_getcallerpc_c 18 Aug 2011 08:04:03 -0000 1.1.1.1 +++ patches/patch-posix-mips_getcallerpc_c 14 Sep 2016 23:07:39 -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: /var/cvs/ports/plan9/drawterm/patches/patch-posix-sun4u_getcallerpc_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-posix-sun4u_getcallerpc_c --- patches/patch-posix-sun4u_getcallerpc_c 18 Aug 2011 08:04:03 -0000 1.1.1.1 +++ patches/patch-posix-sun4u_getcallerpc_c 14 Sep 2016 23:07:39 -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];
