UPDATE: plan9port-20200519

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: plan9port-20200519

Gleydson Soares-2
Hi,

here is an update [1] for plan9port, bringing it to latest github commit.

i have removed some heavy optional run_dependencies to slim down it, since
it does not affect the plan9port usability itself. if one wants to read .ps
file or whatever you should just install pkg_add ghostscript/etc and use your
plumber pattern to reach them ;-)

I have removed the following extra files what are not part of plan9port,
it looks like out-of-date i doubt someone will note it is out:

- cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/pgw.tar.bz2
- cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/roget.tar.bz2
- cd ${WRKSRC}/sky && tar xzf ${FULLDISTDIR}/scat.tgz

while here get rid of MAP_STACK patch has been merged upstream [2]

i tidy up the port, it requires some additional cleanup i will do afterwards
though,

works fine here, if you are a plan9port user please raise your hands

[1] https://trusted.com.br/gsoares/plan9port-20200519.diff
[2] https://github.com/9fans/plan9port/commit/8c573cab6819c69142389d36b978b3c683771afe

? plan9port-20200519.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/plan9/plan9port/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile 20 Mar 2020 16:44:27 -0000 1.32
+++ Makefile 24 May 2020 15:02:53 -0000
@@ -5,12 +5,11 @@ BROKEN-powerpc = threading issues
 
 COMMENT = Plan 9 from user space
 
-DISTNAME = plan9port-20190619
-REVISION = 0
+DISTNAME = plan9port-20200519
 
 GH_ACCOUNT = 9fans
 GH_PROJECT = plan9port
-GH_COMMIT = e995a0c101863688d5f14649ae3de45a7c43789c
+GH_COMMIT = bfe4377e409ce271c479665e6ef966a7b6008626
 
 CATEGORIES = plan9
 
@@ -24,16 +23,6 @@ PERMIT_PACKAGE = Yes
 
 WANTLIB = X11 Xext c m pthread util fontconfig freetype z
 
-DISTFILES = ${GH_COMMIT}.tar.gz pgw.tar.bz2:1 \
- roget.tar.bz2:0 scat.tgz:1
-DIST_SUBDIR = plan9port
-MASTER_SITES0 = http://pdos.lcs.mit.edu/~rsc/software/plan9/
-MASTER_SITES1 = http://pdos.lcs.mit.edu/~rsc/
-
-BUILD_DEPENDS = archivers/bzip2
-RUN_DEPENDS = print/ghostscript/gnu \
- print/gv
-
 WRKDIST = ${WRKDIR}/plan9port-${GH_COMMIT}
 
 PLAN9 = ${PREFIX}/plan9
@@ -43,19 +32,15 @@ NO_TEST = Yes
 SUBST_VARS += CC
 UPDATE_PLIST_ARGS += -i CC
 
-post-extract:
- cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/pgw.tar.bz2
- cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/roget.tar.bz2
- cd ${WRKSRC}/sky && tar xzf ${FULLDISTDIR}/scat.tgz
-
 post-patch:
- cd ${WRKSRC}/src/libthread && cp Darwin-x86_64-swapcontext.c \
- OpenBSD-x86_64.c && cp Darwin-x86_64-asm.s \
+ cd ${WRKSRC}/src/libthread && cp Darwin-x86_64-asm.s \
  OpenBSD-x86_64-asm.S && mv OpenBSD-386-asm.s \
  OpenBSD-386-asm.S
 
 pre-configure:
  ${SUBST_CMD} ${WRKSRC}/INSTALL ${WRKSRC}/bin/{9c,9l}
+ cd ${WRKSRC} && sed -i 's,#!/bin/bash,#!/bin/sh,' \
+ bin/{macedit,wintext}
 
 do-build:
  cd ${WRKSRC} && env CC9="${CC}" CCFLAGS="${CFLAGS}" ./INSTALL -b
@@ -66,6 +51,7 @@ do-install:
 .endfor
  cd ${WRKSRC} && sed -i 's#/usr/local#${TRUEPREFIX}#' \
  `cat lib/moveplan9.files`
+
  ${INSTALL_DATA_DIR} ${PLAN9}
  cd ${WRKSRC} && pax -rw . ${PLAN9}
  cd ${PREFIX} && ln -s ../plan9/bin/9 bin/9
Index: distinfo
===================================================================
RCS file: /cvs/ports/plan9/plan9port/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 11 Sep 2019 00:40:54 -0000 1.12
+++ distinfo 24 May 2020 15:02:53 -0000
@@ -1,8 +1,2 @@
-SHA256 (plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz) = Y54LsBco/9fMF1Husb/HMUYV2I1vp/TN4hAzrZdiJiQ=
-SHA256 (plan9port/pgw.tar.bz2) = WMdWEelUjG7muSL6OsgnCmPsJMn88b1OPtEYQn8TVtw=
-SHA256 (plan9port/roget.tar.bz2) = sk8FE1Tavljx2CXinbOGCRyErsmBJdvkma3spRoyqDY=
-SHA256 (plan9port/scat.tgz) = qZX1JUSnEvK9uH9TFjjUyEYiT6khLQNOO9joCcuZvh4=
-SIZE (plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz) = 23439831
-SIZE (plan9port/pgw.tar.bz2) = 9404968
-SIZE (plan9port/roget.tar.bz2) = 482956
-SIZE (plan9port/scat.tgz) = 5145346
+SHA256 (plan9port-20200519-bfe4377e.tar.gz) = TvWs9bPicRSZYfAU3TwBs1a/iCe743v8BQEpotRyGjk=
+SIZE (plan9port-20200519-bfe4377e.tar.gz) = 23447210
Index: patches/patch-INSTALL
===================================================================
RCS file: /cvs/ports/plan9/plan9port/patches/patch-INSTALL,v
retrieving revision 1.7
diff -u -p -r1.7 patch-INSTALL
--- patches/patch-INSTALL 11 Sep 2019 00:40:54 -0000 1.7
+++ patches/patch-INSTALL 24 May 2020 15:02:53 -0000
@@ -3,33 +3,33 @@ $OpenBSD: patch-INSTALL,v 1.7 2019/09/11
 Index: INSTALL
 --- INSTALL.orig
 +++ INSTALL
-@@ -134,7 +134,7 @@ fi
+@@ -118,7 +118,7 @@ fi
  if [ `uname` != Darwin ]; then
  # Determine whether fontsrv X11 files are available.
  rm -f a.out
 - cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \
 + ${CC} -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \
+    -I/usr/X11R7/include -I/usr/X11R7/include/freetype2 \
     -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1
  if [ -f a.out ]; then
- echo " fontsrv dependencies found."
-@@ -160,7 +160,7 @@ cd src
+@@ -144,7 +144,7 @@ echo "* Compiler version:"
+ cd src
  if $dobuild; then
- if [ ! -x ../bin/mk ]; then
- echo "* Building mk..."
-- ../dist/buildmk 2>&1 | sed 's/^[+] //'
-+ ../dist/buildmk 2>&1
- fi
+ echo "* Building mk..."
+- ../dist/buildmk 2>&1 | sed 's/^[+] //'
++ ../dist/buildmk 2>&1
+
  if [ ! -x ../bin/mk ]; then
  echo "* Error: mk failed to build."
-@@ -168,7 +168,6 @@ if $dobuild; then
+@@ -152,7 +152,6 @@ if $dobuild; then
  fi
-
+
  echo "* Building everything (be patient)..."
 - mk clean
  mk libs-nuke
  mk all || exit 1
  if [ ! -x $PLAN9/src/cmd/o.cleanname -o ! -x $PLAN9/src/cmd/acme/o.acme ]; then
-@@ -227,5 +226,5 @@ if $doinstall; then
+@@ -211,5 +210,5 @@ if $doinstall; then
  echo " PLAN9=$PLAN9 export PLAN9"
  echo ' PATH=$PATH:$PLAN9/bin export PATH'
  fi
Index: patches/patch-bin_9c
===================================================================
RCS file: /cvs/ports/plan9/plan9port/patches/patch-bin_9c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-bin_9c
--- patches/patch-bin_9c 9 May 2017 22:22:36 -0000 1.2
+++ patches/patch-bin_9c 24 May 2020 15:02:53 -0000
@@ -8,24 +8,15 @@ Index: bin/9c
  {
 - cc=${CC9:-gcc}
 + cc=${CC9:-${CC}}
- ngflags=" \
+ cflags=" \
  -O2 \
  -c \
-@@ -54,7 +54,7 @@ quiet()
+@@ -64,7 +64,7 @@ quiet()
 
  useclang()
  {
 - cc=${CC9:-clang}
 + cc=${CC9:-${CC}}
- ngflags=" \
+ cflags=" \
  -O2 \
  -c \
-@@ -79,6 +79,8 @@ useclang()
-
- tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}-${CC9:-cc}"
- case "$tag" in
-+*OpenBSD*gcc*) usegcc ;;
-+*OpenBSD*clang*) useclang ;;
- *FreeBSD*gcc*) usegcc ;;
- *FreeBSD*clang*) useclang ;;
- *DragonFly*|*BSD*) usegcc ;;
Index: patches/patch-bin_9l
===================================================================
RCS file: /cvs/ports/plan9/plan9port/patches/patch-bin_9l,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bin_9l
--- patches/patch-bin_9l 1 Mar 2017 00:59:59 -0000 1.1
+++ patches/patch-bin_9l 24 May 2020 15:02:53 -0000
@@ -1,15 +1,13 @@
 $OpenBSD: patch-bin_9l,v 1.1 2017/03/01 00:59:59 gsoares Exp $
---- bin/9l.orig Wed Nov  2 20:17:40 2016
-+++ bin/9l Tue Feb 28 17:32:32 2017
-@@ -11,6 +11,11 @@ nmflags=""
- extralibs="-lm"
+Index: bin/9l
+--- bin/9l.orig
++++ bin/9l
+@@ -12,7 +12,7 @@ extralibs="-lm"
  tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}"
  case "$tag" in
-+*OpenBSD*)
-+ ld=${CC9:-${CC}}
-+ userpath=true
-+ extralibs="$extralibs -lutil"
-+ ;;
- *FreeBSD*)
- ld=${CC9:-gcc}
+ *DragonFly*|*BSD*)
+- ld="${CC9:-gcc} $CC9FLAGS"
++ ld="${CC9:-${CC}} $CC9FLAGS"
  userpath=true
+ extralibs="$extralibs -lutil"
+ ;;
Index: patches/patch-src_libthread_FreeBSD-386-asm_s
===================================================================
RCS file: patches/patch-src_libthread_FreeBSD-386-asm_s
diff -N patches/patch-src_libthread_FreeBSD-386-asm_s
--- patches/patch-src_libthread_FreeBSD-386-asm_s 21 Mar 2013 22:26:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$OpenBSD: patch-src_libthread_FreeBSD-386-asm_s,v 1.1 2013/03/21 22:26:27 sthen Exp $
-
-use movw with (16-bit) segment registers.
-
---- src/libthread/FreeBSD-386-asm.s.orig Thu Mar 21 16:24:32 2013
-+++ src/libthread/FreeBSD-386-asm.s Thu Mar 21 16:24:50 2013
-@@ -9,10 +9,10 @@ _tas:
- getmcontext:
- movl 4(%esp), %eax
-
-- movl %fs, 8(%eax)
-- movl %es, 12(%eax)
-- movl %ds, 16(%eax)
-- movl %ss, 76(%eax)
-+ movw %fs, 8(%eax)
-+ movw %es, 12(%eax)
-+ movw %ds, 16(%eax)
-+ movw %ss, 76(%eax)
- movl %edi, 20(%eax)
- movl %esi, 24(%eax)
- movl %ebp, 28(%eax)
-@@ -34,10 +34,10 @@ getmcontext:
- setmcontext:
- movl 4(%esp), %eax
-
-- movl 8(%eax), %fs
-- movl 12(%eax), %es
-- movl 16(%eax), %ds
-- movl 76(%eax), %ss
-+ movw 8(%eax), %fs
-+ movw 12(%eax), %es
-+ movw 16(%eax), %ds
-+ movw 76(%eax), %ss
- movl 20(%eax), %edi
- movl 24(%eax), %esi
- movl 28(%eax), %ebp
Index: patches/patch-src_libthread_thread_c
===================================================================
RCS file: patches/patch-src_libthread_thread_c
diff -N patches/patch-src_libthread_thread_c
--- patches/patch-src_libthread_thread_c 9 Apr 2018 15:14:33 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$OpenBSD: patch-src_libthread_thread_c,v 1.1 2018/04/09 15:14:33 gsoares Exp $
-
-Index: src/libthread/thread.c
---- src/libthread/thread.c.orig
-+++ src/libthread/thread.c
-@@ -107,12 +107,18 @@ threadalloc(void (*fn)(void*), void *arg, uint stack)
- uint x, y;
- ulong z;
-
-- /* allocate the task and stack together */
-- t = malloc(sizeof *t+stack);
-+ /* allocate the task */
-+ t = malloc(sizeof *t);
- if(t == nil)
- sysfatal("threadalloc malloc: %r");
- memset(t, 0, sizeof *t);
-- t->stk = (uchar*)(t+1);
-+ /* allocate the real stack */
-+ t->stk = mmap(NULL, stack, PROT_READ | PROT_WRITE,
-+    MAP_PRIVATE | MAP_ANON | MAP_STACK, -1, 0);
-+ if (t->stk == MAP_FAILED) {
-+ free(t);
-+ sysfatal("threadalloc malloc: %r");
-+ }
- t->stksize = stack;
- t->id = incref(&threadidref);
- //print("fn=%p arg=%p\n", fn, arg);
-@@ -133,8 +139,8 @@ threadalloc(void (*fn)(void*), void *arg, uint stack)
-
- /* call makecontext to do the real work. */
- /* leave a few words open on both ends */
-- t->context.uc.uc_stack.ss_sp = (void*)(t->stk+8);
-- t->context.uc.uc_stack.ss_size = t->stksize-64;
-+ t->context.uc.uc_stack.ss_sp = t->stk;
-+ t->context.uc.uc_stack.ss_size = t->stksize;
- #if defined(__sun__) && !defined(__MAKECONTEXT_V2_SOURCE) /* sigh */
- /* can avoid this with __MAKECONTEXT_V2_SOURCE but only on SunOS 5.9 */
- t->context.uc.uc_stack.ss_sp =
-@@ -364,6 +370,7 @@ procscheduler(Proc *p)
- delthreadinproc(p, t);
- p->nthread--;
- /*print("nthread %d\n", p->nthread); */
-+ munmap(t->stk, t->stksize);
- free(t);
- }
- }
Index: patches/patch-src_libthread_threadimpl_h
===================================================================
RCS file: patches/patch-src_libthread_threadimpl_h
diff -N patches/patch-src_libthread_threadimpl_h
--- patches/patch-src_libthread_threadimpl_h 9 Apr 2018 15:14:33 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_libthread_threadimpl_h,v 1.3 2018/04/09 15:14:33 gsoares Exp $
-
-Index: src/libthread/threadimpl.h
---- src/libthread/threadimpl.h.orig
-+++ src/libthread/threadimpl.h
-@@ -10,6 +10,8 @@
- # define _XOPEN_SOURCE /* for Snow Leopard */
- # endif
- # include <ucontext.h>
-+#elif defined(__OpenBSD__)
-+# include <sys/mman.h>
- #endif
- #include <sys/utsname.h>
- #include "libc.h"
Index: patches/patch-src_mkhdr
===================================================================
RCS file: /cvs/ports/plan9/plan9port/patches/patch-src_mkhdr,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_mkhdr
--- patches/patch-src_mkhdr 28 Nov 2015 01:37:59 -0000 1.2
+++ patches/patch-src_mkhdr 24 May 2020 15:02:53 -0000
@@ -1,10 +1,11 @@
 $OpenBSD: patch-src_mkhdr,v 1.2 2015/11/28 01:37:59 gsoares Exp $
---- src/mkhdr.orig Wed Nov 11 12:09:34 2015
-+++ src/mkhdr Tue Nov 24 10:56:24 2015
-@@ -30,8 +30,8 @@ LD=9l
+Index: src/mkhdr
+--- src/mkhdr.orig
++++ src/mkhdr
+@@ -11,8 +11,8 @@ CC=9c
+ LD=9l
  AS=9a
  AR=9ar
- INSTALL=install
 -CFLAGS=
 -LDFLAGS=
 +CFLAGS=${CCFLAGS} -pthread
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/plan9/plan9port/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 11 Sep 2019 00:40:54 -0000 1.11
+++ pkg/PLIST 24 May 2020 15:02:54 -0000
@@ -9,7 +9,6 @@ plan9/INSTALL
 plan9/LICENSE
 plan9/Makefile
 plan9/README.md
-plan9/TODO
 plan9/acid/
 plan9/acid/386
 plan9/acid/68020
@@ -81,11 +80,13 @@ plan9/bin/bundle
 @bin plan9/bin/cat
 @bin plan9/bin/cb
 @bin plan9/bin/cleanname
+@bin plan9/bin/clock
 @bin plan9/bin/cmapcube
 @bin plan9/bin/cmp
 @bin plan9/bin/col
 @bin plan9/bin/colors
 @bin plan9/bin/comm
+@bin plan9/bin/compress
 @bin plan9/bin/core
 @bin plan9/bin/crop
 @bin plan9/bin/date
@@ -247,6 +248,7 @@ plan9/bin/samsave
 plan9/bin/sig
 plan9/bin/slay
 @bin plan9/bin/sleep
+plan9/bin/soelim
 @bin plan9/bin/sort
 plan9/bin/spell
 @bin plan9/bin/split
@@ -286,6 +288,7 @@ plan9/bin/troff2png
 @bin plan9/bin/tweak
 plan9/bin/u
 plan9/bin/u.rc
+@bin plan9/bin/uncompress
 @bin plan9/bin/unicode
 @bin plan9/bin/uniq
 @bin plan9/bin/units
@@ -339,22 +342,20 @@ plan9/bin/vwhois
 plan9/bin/web
 @bin plan9/bin/win
 plan9/bin/wintext
+@bin plan9/bin/winwatch
 plan9/bin/wmail
 @bin plan9/bin/xd
 @bin plan9/bin/xshove
 @bin plan9/bin/yacc
 plan9/bin/yesterday
 @bin plan9/bin/yuv
+@bin plan9/bin/zcat
 @bin plan9/bin/zerotrunc
 @bin plan9/bin/zip
 plan9/config
 plan9/configure
 plan9/dict/
 plan9/dict/README
-plan9/dict/pgw
-plan9/dict/pgwindex
-plan9/dict/roget
-plan9/dict/rogetindex
 plan9/dist/
 plan9/dist/README
 plan9/dist/addsrclinks
@@ -4154,39 +4155,38 @@ plan9/lib/gv.style
 plan9/lib/hyphen.tex
 plan9/lib/keyboard
 plan9/lib/lex.ncform
-plan9/lib/lib9.a
-plan9/lib/lib9p.a
-plan9/lib/lib9pclient.a
-plan9/lib/libString.a
-plan9/lib/libacme.a
-plan9/lib/libauth.a
-plan9/lib/libauthsrv.a
-plan9/lib/libavl.a
-plan9/lib/libbin.a
-plan9/lib/libbio.a
-plan9/lib/libcomplete.a
-plan9/lib/libdisk.a
-plan9/lib/libdiskfs.a
-plan9/lib/libdraw.a
-plan9/lib/libflate.a
-plan9/lib/libframe.a
-plan9/lib/libgeometry.a
-plan9/lib/libhtml.a
-plan9/lib/libhttpd.a
-plan9/lib/libip.a
-plan9/lib/libmach.a
-plan9/lib/libmemdraw.a
-plan9/lib/libmemlayer.a
-plan9/lib/libmp.a
-plan9/lib/libmux.a
-plan9/lib/libndb.a
-plan9/lib/libplumb.a
-plan9/lib/libregexp9.a
-plan9/lib/libsec.a
-plan9/lib/libsunrpc.a
-plan9/lib/libthread.a
-plan9/lib/libventi.a
-plan9/lib/linux-isnptl.c
+@static-lib plan9/lib/lib9.a
+@static-lib plan9/lib/lib9p.a
+@static-lib plan9/lib/lib9pclient.a
+@static-lib plan9/lib/libString.a
+@static-lib plan9/lib/libacme.a
+@static-lib plan9/lib/libauth.a
+@static-lib plan9/lib/libauthsrv.a
+@static-lib plan9/lib/libavl.a
+@static-lib plan9/lib/libbin.a
+@static-lib plan9/lib/libbio.a
+@static-lib plan9/lib/libcomplete.a
+@static-lib plan9/lib/libdisk.a
+@static-lib plan9/lib/libdiskfs.a
+@static-lib plan9/lib/libdraw.a
+@static-lib plan9/lib/libflate.a
+@static-lib plan9/lib/libframe.a
+@static-lib plan9/lib/libgeometry.a
+@static-lib plan9/lib/libhtml.a
+@static-lib plan9/lib/libhttpd.a
+@static-lib plan9/lib/libip.a
+@static-lib plan9/lib/libmach.a
+@static-lib plan9/lib/libmemdraw.a
+@static-lib plan9/lib/libmemlayer.a
+@static-lib plan9/lib/libmp.a
+@static-lib plan9/lib/libmux.a
+@static-lib plan9/lib/libndb.a
+@static-lib plan9/lib/libplumb.a
+@static-lib plan9/lib/libregexp9.a
+@static-lib plan9/lib/libsec.a
+@static-lib plan9/lib/libsunrpc.a
+@static-lib plan9/lib/libthread.a
+@static-lib plan9/lib/libventi.a
 plan9/lib/mimetype
 plan9/lib/moveplan9.files
 plan9/lib/moveplan9.sh
@@ -4298,6 +4298,7 @@ plan9/man/man1/INDEX
 @man plan9/man/man1/col.1
 @man plan9/man/man1/colors.1
 @man plan9/man/man1/comm.1
+@man plan9/man/man1/compress.1
 @man plan9/man/man1/core.1
 @man plan9/man/man1/crop.1
 @man plan9/man/man1/date.1
@@ -4376,6 +4377,7 @@ plan9/man/man1/INDEX
 @man plan9/man/man1/sftpcache.1
 @man plan9/man/man1/sleep.1
 @man plan9/man/man1/snarfer.1
+@man plan9/man/man1/soelim.1
 @man plan9/man/man1/sort.1
 @man plan9/man/man1/spell.1
 @man plan9/man/man1/split.1
@@ -4405,6 +4407,7 @@ plan9/man/man1/INDEX
 @man plan9/man/man1/wc.1
 @man plan9/man/man1/web.1
 @man plan9/man/man1/wintext.1
+@man plan9/man/man1/winwatch.1
 @man plan9/man/man1/xd.1
 @man plan9/man/man1/yacc.1
 @man plan9/man/man1/yesterday.1
@@ -5130,20 +5133,9 @@ plan9/proto/allproto
 plan9/rcmain
 plan9/sky/
 plan9/sky/README
-plan9/sky/abell.scat
-plan9/sky/bayer.scat
-plan9/sky/con.scat
-plan9/sky/conindex.scat
 plan9/sky/constelnames
 plan9/sky/estartab
 plan9/sky/here.sample
-plan9/sky/mindex.scat
-plan9/sky/name.scat
-plan9/sky/ngc2000.scat
-plan9/sky/ngc2000type.scat
-plan9/sky/patch.scat
-plan9/sky/patchindex.scat
-plan9/sky/sao.scat
 plan9/src/
 plan9/src/cmd/
 plan9/src/cmd/9660/
@@ -5190,6 +5182,7 @@ plan9/src/cmd/9p.c
 plan9/src/cmd/9pserve.c
 plan9/src/cmd/9term/
 plan9/src/cmd/9term/9term.c
+plan9/src/cmd/9term/AIX.c
 plan9/src/cmd/9term/Darwin.c
 plan9/src/cmd/9term/DragonFly.c
 plan9/src/cmd/9term/FreeBSD.c
@@ -5379,6 +5372,7 @@ plan9/src/cmd/auth/ssh-agent.c
 plan9/src/cmd/auth/userpasswd.c
 plan9/src/cmd/auxclog.c
 plan9/src/cmd/auxstats/
+plan9/src/cmd/auxstats/AIX.c
 plan9/src/cmd/auxstats/Darwin.c
 plan9/src/cmd/auxstats/DragonFly.c
 plan9/src/cmd/auxstats/FreeBSD.c
@@ -5457,6 +5451,9 @@ plan9/src/cmd/cleanname.c
 plan9/src/cmd/cmp.c
 plan9/src/cmd/col.c
 plan9/src/cmd/comm.c
+plan9/src/cmd/compress/
+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/
@@ -5481,28 +5478,20 @@ plan9/src/cmd/delatex.lx
 plan9/src/cmd/deroff.c
 plan9/src/cmd/devdraw/
 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
-@bin 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
@@ -5510,16 +5499,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/
@@ -5563,6 +5549,7 @@ plan9/src/cmd/disk/mkext.c
 plan9/src/cmd/disk/mkfile
 plan9/src/cmd/disk/mkfs.c
 plan9/src/cmd/draw/
+plan9/src/cmd/draw/clock.c
 plan9/src/cmd/draw/cmapcube.c
 plan9/src/cmd/draw/colors.c
 plan9/src/cmd/draw/crop.c
@@ -5619,11 +5606,10 @@ plan9/src/cmd/fmt.c
 plan9/src/cmd/fontsrv/
 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
@@ -6241,6 +6227,7 @@ plan9/src/cmd/proof/proof.h
 plan9/src/cmd/proof/screen.c
 plan9/src/cmd/ramfs.c
 plan9/src/cmd/rc/
+plan9/src/cmd/rc/checkparse
 plan9/src/cmd/rc/code.c
 plan9/src/cmd/rc/exec.c
 plan9/src/cmd/rc/exec.h
@@ -6256,6 +6243,7 @@ plan9/src/cmd/rc/io.c
 plan9/src/cmd/rc/io.h
 plan9/src/cmd/rc/lex.c
 plan9/src/cmd/rc/mkfile
+plan9/src/cmd/rc/parse.c
 plan9/src/cmd/rc/pcmd.c
 plan9/src/cmd/rc/pfnc.c
 plan9/src/cmd/rc/plan9ish.c
@@ -6263,6 +6251,7 @@ plan9/src/cmd/rc/rc.h
 plan9/src/cmd/rc/simple.c
 plan9/src/cmd/rc/subr.c
 plan9/src/cmd/rc/syn.y
+plan9/src/cmd/rc/test.rc
 plan9/src/cmd/rc/trap.c
 plan9/src/cmd/rc/tree.c
 plan9/src/cmd/rc/unixcrap.c
@@ -6299,6 +6288,7 @@ plan9/src/cmd/rio/showevent/ShowEvent.ma
 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
@@ -6390,10 +6380,9 @@ plan9/src/cmd/smugfs/openssl.c
 plan9/src/cmd/smugfs/tcp.c
 plan9/src/cmd/smugfs/util.c
 plan9/src/cmd/snarfer/
+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
@@ -6754,6 +6743,7 @@ plan9/src/cmd/vbackup/diskcat.c
 plan9/src/cmd/vbackup/diskftp.c
 plan9/src/cmd/vbackup/disknfs.c
 plan9/src/cmd/vbackup/mkfile
+plan9/src/cmd/vbackup/mount-AIX.c
 plan9/src/cmd/vbackup/mount-BSD.c
 plan9/src/cmd/vbackup/mount-Darwin.c
 plan9/src/cmd/vbackup/mount-DragonFly.c
@@ -6877,7 +6867,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
@@ -6894,7 +6883,6 @@ plan9/src/lib9/convD2M.c
 plan9/src/lib9/convM2D.c
 plan9/src/lib9/convM2S.c
 plan9/src/lib9/convS2M.c
-plan9/src/lib9/create.c
 plan9/src/lib9/crypt.c
 plan9/src/lib9/ctime.c
 plan9/src/lib9/debugmalloc.c
@@ -6902,7 +6890,6 @@ plan9/src/lib9/dial.c
 plan9/src/lib9/dirfstat.c
 plan9/src/lib9/dirfwstat.c
 plan9/src/lib9/dirmodefmt.c
-plan9/src/lib9/dirread.c
 plan9/src/lib9/dirstat.c
 plan9/src/lib9/dirwstat.c
 plan9/src/lib9/dup.c
@@ -6964,14 +6951,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
@@ -7011,7 +6993,6 @@ plan9/src/lib9/readcons.c
 plan9/src/lib9/readn.c
 plan9/src/lib9/rfork.c
 plan9/src/lib9/searchpath.c
-plan9/src/lib9/seek.c
 plan9/src/lib9/sendfd.c
 plan9/src/lib9/sleep.c
 plan9/src/lib9/strdup.c
@@ -7359,6 +7340,7 @@ plan9/src/libhttpd/unallowed.c
 plan9/src/libhttpd/urlfmt.c
 plan9/src/libhttpd/urlunesc.c
 plan9/src/libip/
+plan9/src/libip/AIX.c
 plan9/src/libip/BSD.c
 plan9/src/libip/Darwin.c
 plan9/src/libip/DragonFly.c
@@ -7384,6 +7366,7 @@ plan9/src/libip/ptclbsum.c
 plan9/src/libip/testreadipifc.c
 plan9/src/libip/udp.c
 plan9/src/libmach/
+plan9/src/libmach/AIX.c
 plan9/src/libmach/Darwin.c
 plan9/src/libmach/DragonFly.c
 plan9/src/libmach/FreeBSD.c
@@ -7725,38 +7708,20 @@ plan9/src/libsunrpc/server.c
 plan9/src/libsunrpc/suncall.c
 plan9/src/libsunrpc/udp.c
 plan9/src/libthread/
+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
@@ -7764,10 +7729,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/
 plan9/src/libthread/test/mkfile
@@ -7783,6 +7751,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/
 plan9/src/libventi/cache.acid
@@ -7823,6 +7792,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
Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: plan9port-20200519

Gleydson Soares-2
On Sun, May 24, 2020 at 12:27:25PM -0300, Gleydson Soares wrote:

> Hi,
>
> here is an update [1] for plan9port, bringing it to latest github commit.
>
> i have removed some heavy optional run_dependencies to slim down it, since
> it does not affect the plan9port usability itself. if one wants to read .ps
> file or whatever you should just install pkg_add ghostscript/etc and use your
> plumber pattern to reach them ;-)
>
> I have removed the following extra files what are not part of plan9port,
> it looks like out-of-date i doubt someone will note it is out:
>
> - cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/pgw.tar.bz2
> - cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/roget.tar.bz2
> - cd ${WRKSRC}/sky && tar xzf ${FULLDISTDIR}/scat.tgz
>
> while here get rid of MAP_STACK patch has been merged upstream [2]
>
> i tidy up the port, it requires some additional cleanup i will do afterwards
> though,
>
> works fine here, if you are a plan9port user please raise your hands
>
> [1] https://trusted.com.br/gsoares/plan9port-20200519.diff
> [2] https://github.com/9fans/plan9port/commit/8c573cab6819c69142389d36b978b3c683771afe

Neither feedback nor objetions. I'll commit it tomorrow unless
someone objects until there.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: plan9port-20200519

Aaron Bieber-2

Gleydson Soares writes:

> On Sun, May 24, 2020 at 12:27:25PM -0300, Gleydson Soares wrote:
>> Hi,
>>
>> here is an update [1] for plan9port, bringing it to latest github commit.
>>
>> i have removed some heavy optional run_dependencies to slim down it, since
>> it does not affect the plan9port usability itself. if one wants to read .ps
>> file or whatever you should just install pkg_add ghostscript/etc and use your
>> plumber pattern to reach them ;-)
>>
>> I have removed the following extra files what are not part of plan9port,
>> it looks like out-of-date i doubt someone will note it is out:
>>
>> - cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/pgw.tar.bz2
>> - cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/roget.tar.bz2
>> - cd ${WRKSRC}/sky && tar xzf ${FULLDISTDIR}/scat.tgz
>>
>> while here get rid of MAP_STACK patch has been merged upstream [2]
>>
>> i tidy up the port, it requires some additional cleanup i will do afterwards
>> though,
>>
>> works fine here, if you are a plan9port user please raise your hands
>>
>> [1] https://trusted.com.br/gsoares/plan9port-20200519.diff
>> [2] https://github.com/9fans/plan9port/commit/8c573cab6819c69142389d36b978b3c683771afe
>
> Neither feedback nor objetions. I'll commit it tomorrow unless
> someone objects until there.

I gave it a whirl! Sorry totally forgot to message ya back!

The tiny bits I use seem to work!

OK abieber@

--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A  4AF0 1F81 112D 62A9 ADCE