Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Apr 2020 22:44:48 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r533278 - in head/devel/plan9port: . files
Message-ID:  <202004282244.03SMim55060518@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Tue Apr 28 22:44:48 2020
New Revision: 533278
URL: https://svnweb.freebsd.org/changeset/ports/533278

Log:
  devel/plan9port: Update to newest commit
  
  Should build fine on aarch64 now.
  
  Changes:	https://github.com/9fans/plan9port/compare/e995a0c101863688d5f14649ae3de45a7c43789c...4650064aa757c217fa72f8819a2cf67c689bcdef

Added:
  head/devel/plan9port/files/patch-bin_9l   (contents, props changed)
Modified:
  head/devel/plan9port/Makefile
  head/devel/plan9port/distinfo
  head/devel/plan9port/pkg-plist

Modified: head/devel/plan9port/Makefile
==============================================================================
--- head/devel/plan9port/Makefile	Tue Apr 28 21:40:36 2020	(r533277)
+++ head/devel/plan9port/Makefile	Tue Apr 28 22:44:48 2020	(r533278)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	plan9port
-PORTVERSION=	20190619
+PORTVERSION=	20200330
 CATEGORIES=	devel plan9
 DIST_SUBDIR=	plan9port
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -15,19 +15,18 @@ LICENSE_NAME=	Lucent Public License Version 1.02
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN_aarch64=		fails to compile: no such file or directory: 'getcallerpc-arm64'
-BROKEN_armv6=		fails to compile: thread.c:130:5: no member named 'arm_r0' in 'mcontext_t'
-BROKEN_armv7=		fails to compile: thread.c:130:5: no member named 'arm_r0' in 'mcontext_t'
+BROKEN_armv6=	fails to compile: thread.c:130:5: no member named 'arm_r0' in 'mcontext_t'
+BROKEN_armv7=	fails to compile: thread.c:130:5: no member named 'arm_r0' in 'mcontext_t'
 
-LIB_DEPENDS=	libfreetype.so:print/freetype2 \
-		libfontconfig.so:x11-fonts/fontconfig
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 
 USES=		localbase:ldflags perl5 shebangfix xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	9fans
-GH_TAGNAME=	e995a0c101863688d5f14649ae3de45a7c43789c
+GH_TAGNAME=	4650064aa757c217fa72f8819a2cf67c689bcdef
 USE_PERL5=	build
-USE_XORG=	x11 xt xext
+USE_XORG=	x11 xext xt
 
 SHEBANG_GLOB=	*
 SHEBANG_LANG=	rc
@@ -37,14 +36,16 @@ rc_CMD=		${PREFIX}/plan9/bin/rc
 SUB_FILES=	pkg-message
 SUB_LIST=	OPSYS=${OPSYS}
 
-OPTIONS_DEFINE=	DATA
+OPTIONS_DEFINE=		DATA
 OPTIONS_DEFAULT=	DATA
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 DATA_DESC=	Install dictionary, thesaurus, and other data files
 
 DATA_MASTER_SITES=	https://9fans.github.io/plan9port/dist/
-DATA_DISTFILES=		pgw.tar.bz2 roget.tar.bz2 scat.tgz
+DATA_DISTFILES=		pgw.tar.bz2 \
+			roget.tar.bz2 \
+			scat.tgz
 
 post-extract-DATA-on:
 	@cd ${WRKSRC}/dict && ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/pgw.tar.bz2
@@ -52,7 +53,6 @@ post-extract-DATA-on:
 	@cd ${WRKSRC}/sky && ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/scat.tgz
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|\[5-9\]\.||' ${WRKSRC}/bin/9l
 	@${REINPLACE_CMD} -e 's|/lib/font/bit|${PREFIX}/plan9/font|' \
 		${WRKSRC}/src/cmd/acme/acme.c
 	@${REINPLACE_CMD} -e 's|#!/bin/rc|#!${PREFIX}/plan9/bin/rc|' \

Modified: head/devel/plan9port/distinfo
==============================================================================
--- head/devel/plan9port/distinfo	Tue Apr 28 21:40:36 2020	(r533277)
+++ head/devel/plan9port/distinfo	Tue Apr 28 22:44:48 2020	(r533278)
@@ -1,9 +1,9 @@
-TIMESTAMP = 1564993745
+TIMESTAMP = 1588021911
 SHA256 (plan9port/pgw.tar.bz2) = de3af82012b3380612b56fa0c1a2ed8daf619a0215189fc59eab9919ec47ea15
 SIZE (plan9port/pgw.tar.bz2) = 9406367
 SHA256 (plan9port/roget.tar.bz2) = b24f051354dabe58f1d825e29db386091c84aec98125dbe499adeca51a32a836
 SIZE (plan9port/roget.tar.bz2) = 482956
 SHA256 (plan9port/scat.tgz) = a995f52544a712f2bdb87f531638d4c846224fa9212d034e3bd8e809cb99be1e
 SIZE (plan9port/scat.tgz) = 5145346
-SHA256 (plan9port/9fans-plan9port-20190619-e995a0c101863688d5f14649ae3de45a7c43789c_GH0.tar.gz) = 639e0bb01728ffd7cc1751eeb1bfc7314615d88d6fa7f4cde21033ad97622624
-SIZE (plan9port/9fans-plan9port-20190619-e995a0c101863688d5f14649ae3de45a7c43789c_GH0.tar.gz) = 23439831
+SHA256 (plan9port/9fans-plan9port-20200330-4650064aa757c217fa72f8819a2cf67c689bcdef_GH0.tar.gz) = a19edb9d52690efa0d7bd31dd1b24bbe6abf88c49e7c5be06becc42700eeae6b
+SIZE (plan9port/9fans-plan9port-20200330-4650064aa757c217fa72f8819a2cf67c689bcdef_GH0.tar.gz) = 23436289

Added: head/devel/plan9port/files/patch-bin_9l
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/plan9port/files/patch-bin_9l	Tue Apr 28 22:44:48 2020	(r533278)
@@ -0,0 +1,11 @@
+--- bin/9l.orig	2020-04-27 21:22:16 UTC
++++ bin/9l
+@@ -14,7 +14,7 @@ case "$tag" in
+ *DragonFly*|*BSD*)
+ 	ld=${CC9:-gcc}
+ 	userpath=true
+-	extralibs="$extralibs -lutil"
++	extralibs="$extralibs -lutil -lpthread"
+ 	;;
+ *OSF1*)
+ 	ld=${CC9:-cc}

Modified: head/devel/plan9port/pkg-plist
==============================================================================
--- head/devel/plan9port/pkg-plist	Tue Apr 28 21:40:36 2020	(r533277)
+++ head/devel/plan9port/pkg-plist	Tue Apr 28 22:44:48 2020	(r533278)
@@ -7,7 +7,6 @@ plan9/LICENSE
 plan9/LOCAL.config
 plan9/Makefile
 plan9/README.md
-plan9/TODO
 plan9/acid/386
 plan9/acid/68020
 plan9/acid/acme
@@ -77,11 +76,13 @@ plan9/bin/calendar
 plan9/bin/cat
 plan9/bin/cb
 plan9/bin/cleanname
+plan9/bin/clock
 plan9/bin/cmapcube
 plan9/bin/cmp
 plan9/bin/col
 plan9/bin/colors
 plan9/bin/comm
+plan9/bin/compress
 plan9/bin/core
 plan9/bin/crop
 plan9/bin/date
@@ -240,6 +241,7 @@ plan9/bin/sha1sum
 plan9/bin/sig
 plan9/bin/slay
 plan9/bin/sleep
+plan9/bin/soelim
 plan9/bin/sort
 plan9/bin/spell
 plan9/bin/split
@@ -279,6 +281,7 @@ plan9/bin/troff2png
 plan9/bin/tweak
 plan9/bin/u
 plan9/bin/u.rc
+plan9/bin/uncompress
 plan9/bin/unicode
 plan9/bin/uniq
 plan9/bin/units
@@ -330,12 +333,14 @@ plan9/bin/wc
 plan9/bin/web
 plan9/bin/win
 plan9/bin/wintext
+plan9/bin/winwatch
 plan9/bin/wmail
 plan9/bin/xd
 plan9/bin/xshove
 plan9/bin/yacc
 plan9/bin/yesterday
 plan9/bin/yuv
+plan9/bin/zcat
 plan9/bin/zerotrunc
 plan9/bin/zip
 plan9/config
@@ -4149,7 +4154,6 @@ plan9/lib/libsec.a
 plan9/lib/libsunrpc.a
 plan9/lib/libthread.a
 plan9/lib/libventi.a
-plan9/lib/linux-isnptl.c
 plan9/lib/mimetype
 plan9/lib/moveplan9.files
 plan9/lib/moveplan9.sh
@@ -4236,6 +4240,7 @@ plan9/man/man1/cmp.1
 plan9/man/man1/col.1
 plan9/man/man1/colors.1
 plan9/man/man1/comm.1
+plan9/man/man1/compress.1
 plan9/man/man1/core.1
 plan9/man/man1/crop.1
 plan9/man/man1/date.1
@@ -4314,6 +4319,7 @@ plan9/man/man1/seq.1
 plan9/man/man1/sftpcache.1
 plan9/man/man1/sleep.1
 plan9/man/man1/snarfer.1
+plan9/man/man1/soelim.1
 plan9/man/man1/sort.1
 plan9/man/man1/spell.1
 plan9/man/man1/split.1
@@ -4343,6 +4349,7 @@ plan9/man/man1/venti.1
 plan9/man/man1/wc.1
 plan9/man/man1/web.1
 plan9/man/man1/wintext.1
+plan9/man/man1/winwatch.1
 plan9/man/man1/xd.1
 plan9/man/man1/yacc.1
 plan9/man/man1/yesterday.1
@@ -5360,6 +5367,8 @@ plan9/src/cmd/cleanname.c
 plan9/src/cmd/cmp.c
 plan9/src/cmd/col.c
 plan9/src/cmd/comm.c
+plan9/src/cmd/compress/compress.c
+plan9/src/cmd/compress/mkfile
 plan9/src/cmd/core.c
 plan9/src/cmd/date.c
 plan9/src/cmd/db/command.c
@@ -5382,28 +5391,20 @@ plan9/src/cmd/dd.c
 plan9/src/cmd/delatex.lx
 plan9/src/cmd/deroff.c
 plan9/src/cmd/devdraw/bigarrow.h
-plan9/src/cmd/devdraw/cocoa-screen-metal.m
-plan9/src/cmd/devdraw/cocoa-screen.h
-plan9/src/cmd/devdraw/cocoa-screen.m
-plan9/src/cmd/devdraw/cocoa-srv.c
-plan9/src/cmd/devdraw/cocoa-thread.c
-plan9/src/cmd/devdraw/cocoa-thread.h
 plan9/src/cmd/devdraw/devdraw.c
 plan9/src/cmd/devdraw/devdraw.h
 plan9/src/cmd/devdraw/drawclient.c
 plan9/src/cmd/devdraw/glendapng.h
 plan9/src/cmd/devdraw/latin1.c
-plan9/src/cmd/devdraw/macargv.c
+plan9/src/cmd/devdraw/mac-draw.c
+plan9/src/cmd/devdraw/mac-screen.m
 plan9/src/cmd/devdraw/macargv.m
 plan9/src/cmd/devdraw/mkfile
 plan9/src/cmd/devdraw/mklatinkbd.c
 plan9/src/cmd/devdraw/mkwsysrules.sh
 plan9/src/cmd/devdraw/mouseswap.c
 plan9/src/cmd/devdraw/nowsys.c
-plan9/src/cmd/devdraw/o.devdraw
-plan9/src/cmd/devdraw/osx-draw.c
-plan9/src/cmd/devdraw/osx-keycodes.h
-plan9/src/cmd/devdraw/snarf.c
+plan9/src/cmd/devdraw/srv.c
 plan9/src/cmd/devdraw/winsize.c
 plan9/src/cmd/devdraw/x11-alloc.c
 plan9/src/cmd/devdraw/x11-cload.c
@@ -5411,16 +5412,13 @@ plan9/src/cmd/devdraw/x11-draw.c
 plan9/src/cmd/devdraw/x11-fill.c
 plan9/src/cmd/devdraw/x11-get.c
 plan9/src/cmd/devdraw/x11-inc.h
-plan9/src/cmd/devdraw/x11-init.c
-plan9/src/cmd/devdraw/x11-itrans.c
 plan9/src/cmd/devdraw/x11-keysym2ucs.c
 plan9/src/cmd/devdraw/x11-keysym2ucs.h
 plan9/src/cmd/devdraw/x11-load.c
 plan9/src/cmd/devdraw/x11-memdraw.h
 plan9/src/cmd/devdraw/x11-pixelbits.c
-plan9/src/cmd/devdraw/x11-srv.c
+plan9/src/cmd/devdraw/x11-screen.c
 plan9/src/cmd/devdraw/x11-unload.c
-plan9/src/cmd/devdraw/x11-wsys.c
 plan9/src/cmd/dformat
 plan9/src/cmd/dial.c
 plan9/src/cmd/dict/ahd.c
@@ -5460,6 +5458,7 @@ plan9/src/cmd/diff/mkfile
 plan9/src/cmd/disk/mkext.c
 plan9/src/cmd/disk/mkfile
 plan9/src/cmd/disk/mkfs.c
+plan9/src/cmd/draw/clock.c
 plan9/src/cmd/draw/cmapcube.c
 plan9/src/cmd/draw/colors.c
 plan9/src/cmd/draw/crop.c
@@ -5513,11 +5512,10 @@ plan9/src/cmd/file.c
 plan9/src/cmd/fmt.c
 plan9/src/cmd/fontsrv/a.h
 plan9/src/cmd/fontsrv/freetyperules.sh
+plan9/src/cmd/fontsrv/mac.c
 plan9/src/cmd/fontsrv/main.c
 plan9/src/cmd/fontsrv/mkfile
 plan9/src/cmd/fontsrv/nowsys.c
-plan9/src/cmd/fontsrv/osx-cocoa.c
-plan9/src/cmd/fontsrv/osx.c
 plan9/src/cmd/fontsrv/pjw.c
 plan9/src/cmd/fontsrv/showpjw.c
 plan9/src/cmd/fontsrv/x11.c
@@ -6148,6 +6146,7 @@ plan9/src/cmd/rio/showevent/ShowEvent.man
 plan9/src/cmd/rio/showevent/part01
 plan9/src/cmd/rio/showevent/patchlevel.h
 plan9/src/cmd/rio/showevent/sample.c
+plan9/src/cmd/rio/winwatch.c
 plan9/src/cmd/rio/xevents.c
 plan9/src/cmd/rio/xshove.c
 plan9/src/cmd/rm.c
@@ -6234,10 +6233,9 @@ plan9/src/cmd/smugfs/mkfile
 plan9/src/cmd/smugfs/openssl.c
 plan9/src/cmd/smugfs/tcp.c
 plan9/src/cmd/smugfs/util.c
+plan9/src/cmd/snarfer/mac-snarfer.c
 plan9/src/cmd/snarfer/mkfile
 plan9/src/cmd/snarfer/nowsys-snarfer.c
-plan9/src/cmd/snarfer/osx-cocoa-snarfer.c
-plan9/src/cmd/snarfer/osx-snarfer.c
 plan9/src/cmd/snarfer/snarfer.c
 plan9/src/cmd/snarfer/x11-snarfer.c
 plan9/src/cmd/sort.c
@@ -6688,7 +6686,6 @@ plan9/src/lib9/LICENSE
 plan9/src/lib9/_exits.c
 plan9/src/lib9/_p9dialparse.c
 plan9/src/lib9/_p9dir.c
-plan9/src/lib9/_p9translate.c
 plan9/src/lib9/announce.c
 plan9/src/lib9/argv0.c
 plan9/src/lib9/atexit.c
@@ -6774,14 +6771,9 @@ plan9/src/lib9/fmt/vsnprint.c
 plan9/src/lib9/fmtlock2.c
 plan9/src/lib9/fork.c
 plan9/src/lib9/frand.c
+plan9/src/lib9/frexp.c
 plan9/src/lib9/get9root.c
-plan9/src/lib9/getcallerpc-386.c
-plan9/src/lib9/getcallerpc-arm.c
-plan9/src/lib9/getcallerpc-arm64.c
-plan9/src/lib9/getcallerpc-mips.c
-plan9/src/lib9/getcallerpc-power.c
-plan9/src/lib9/getcallerpc-sun4u.s
-plan9/src/lib9/getcallerpc-x86_64.c
+plan9/src/lib9/getcallerpc.c
 plan9/src/lib9/getenv.c
 plan9/src/lib9/getfields.c
 plan9/src/lib9/getnetconn.c
@@ -7484,38 +7476,20 @@ plan9/src/libsunrpc/rpc.c
 plan9/src/libsunrpc/server.c
 plan9/src/libsunrpc/suncall.c
 plan9/src/libsunrpc/udp.c
+plan9/src/libthread/386-ucontext.c
 plan9/src/libthread/386-ucontext.h
-plan9/src/libthread/BSD.c
 plan9/src/libthread/COPYING.SPARC64-CONTEXT
 plan9/src/libthread/COPYRIGHT
-plan9/src/libthread/Darwin-386-asm.s
-plan9/src/libthread/Darwin-386.c
-plan9/src/libthread/Darwin-power-asm.s
-plan9/src/libthread/Darwin-power.c
 plan9/src/libthread/Darwin-x86_64-asm.s
-plan9/src/libthread/Darwin-x86_64-swapcontext.c
-plan9/src/libthread/FreeBSD-386-asm.s
-plan9/src/libthread/FreeBSD.c
-plan9/src/libthread/Linux-386-asm.s
 plan9/src/libthread/Linux-arm-asm.s
-plan9/src/libthread/Linux-arm-context.s
-plan9/src/libthread/Linux-arm-swapcontext.c
-plan9/src/libthread/Linux-power-asm.s
-plan9/src/libthread/Linux-sparc64-asm.s
 plan9/src/libthread/Linux-sparc64-context.S
-plan9/src/libthread/Linux-sparc64-swapcontext.c
-plan9/src/libthread/Linux.c
 plan9/src/libthread/NetBSD-386-asm.s
 plan9/src/libthread/NetBSD-power-asm.s
 plan9/src/libthread/NetBSD.c
 plan9/src/libthread/OpenBSD-386-asm.s
-plan9/src/libthread/OpenBSD-386.c
 plan9/src/libthread/OpenBSD-power-asm.S
-plan9/src/libthread/OpenBSD-power.c
 plan9/src/libthread/OpenBSD-x86_64-asm.S
-plan9/src/libthread/OpenBSD-x86_64.c
-plan9/src/libthread/OpenBSD.c
-plan9/src/libthread/README.Linux
+plan9/src/libthread/arm-ucontext.c
 plan9/src/libthread/channel.c
 plan9/src/libthread/daemonize.c
 plan9/src/libthread/exec.c
@@ -7523,10 +7497,13 @@ plan9/src/libthread/ioproc.c
 plan9/src/libthread/ioproc.h
 plan9/src/libthread/iorw.c
 plan9/src/libthread/mkfile
+plan9/src/libthread/power-ucontext.c
 plan9/src/libthread/power-ucontext.h
 plan9/src/libthread/pthread.c
 plan9/src/libthread/ref.c
-plan9/src/libthread/sparc-ucontext.h
+plan9/src/libthread/sparc64-ucontext.c
+plan9/src/libthread/stkmalloc.c
+plan9/src/libthread/stkmmap.c
 plan9/src/libthread/sysofiles.sh
 plan9/src/libthread/test/mkfile
 plan9/src/libthread/test/pthreadloop.c
@@ -7541,6 +7518,7 @@ plan9/src/libthread/test/tspawnloop.c
 plan9/src/libthread/thread.c
 plan9/src/libthread/threadimpl.h
 plan9/src/libthread/wait.c
+plan9/src/libthread/x86_64-ucontext.c
 plan9/src/libthread/x86_64-ucontext.h
 plan9/src/libventi/cache.acid
 plan9/src/libventi/cache.c
@@ -7580,6 +7558,7 @@ plan9/src/make2mk
 plan9/src/mk2make
 plan9/src/mkcommon
 plan9/src/mkdirs
+plan9/src/mkenv
 plan9/src/mkfile
 plan9/src/mkhdr
 plan9/src/mklib



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004282244.03SMim55060518>