Hi Gleydson / ports, Here is a revised patch for plan9port. I had messed up quite a few things in my first try, but I now think I understand the ports system much better.
Main changes I've seen include: - Plumb allows @ in filenames - Web patch was upstreamed - Import of paint program from 9front - Acme drops trailing spaces on Put when in auto-indent mode - Various fixes Let me know if I'm missing something or messed up the diff.
? plan9port.diff Index: Makefile =================================================================== RCS file: /cvs/ports/plan9/plan9port/Makefile,v retrieving revision 1.29 diff -u -p -u -p -r1.29 Makefile --- Makefile 12 Jul 2019 20:48:54 -0000 1.29 +++ Makefile 10 Aug 2019 02:59:31 -0000 @@ -4,17 +4,16 @@ ONLY_FOR_ARCHS = amd64 i386 powerpc BROKEN-powerpc = threading issues COMMENT = Plan 9 from user space -REVISION = 3 -DISTNAME = plan9port-20180117 +DISTNAME = plan9port-20190619 GH_ACCOUNT = 9fans GH_PROJECT = plan9port -GH_COMMIT = 019be4481fee53a999ccb73c78e40df5f408b24e +GH_COMMIT = e995a0c101863688d5f14649ae3de45a7c43789c CATEGORIES = plan9 -HOMEPAGE = http://swtch.com/plan9port/ +HOMEPAGE = https://9fans.github.io/plan9port/ MAINTAINER = Gleydson Soares <gsoa...@openbsd.org> @@ -27,8 +26,8 @@ WANTLIB = X11 Xext c m pthread util fon 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/ +MASTER_SITES0 = https://9fans.github.io/plan9port/ +MASTER_SITES1 = https://swtch.com/~rsc/ BUILD_DEPENDS = archivers/bzip2 RUN_DEPENDS = print/ghostscript/gnu \ Index: distinfo =================================================================== RCS file: /cvs/ports/plan9/plan9port/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- distinfo 20 Jan 2018 03:29:56 -0000 1.11 +++ distinfo 10 Aug 2019 02:59:31 -0000 @@ -1,8 +1,8 @@ -SHA256 (plan9port/019be4481fee53a999ccb73c78e40df5f408b24e.tar.gz) = BKlh9K2ee1SDvPLGG9Fi59a/L2Gv1G/rETPnARCaK4k= +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/019be4481fee53a999ccb73c78e40df5f408b24e.tar.gz) = 23431472 +SIZE (plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz) = 23439831 SIZE (plan9port/pgw.tar.bz2) = 9404968 SIZE (plan9port/roget.tar.bz2) = 482956 SIZE (plan9port/scat.tgz) = 5145346 Index: patches/patch-INSTALL =================================================================== RCS file: /cvs/ports/plan9/plan9port/patches/patch-INSTALL,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-INSTALL --- patches/patch-INSTALL 28 Feb 2017 02:27:41 -0000 1.6 +++ patches/patch-INSTALL 10 Aug 2019 02:59:31 -0000 @@ -1,17 +1,9 @@ $OpenBSD: patch-INSTALL,v 1.6 2017/02/28 02:27:41 gsoares Exp $ ---- INSTALL.orig Wed Nov 2 20:17:40 2016 -+++ INSTALL Mon Feb 27 21:57:58 2017 -@@ -128,7 +128,7 @@ fi - if [ `uname` != Darwin ]; then - # Determine whether fontsrv X11 files are available. - rm -f a.out -- gcc -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/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." -@@ -151,7 +151,7 @@ cd src +Index: INSTALL +--- INSTALL.orig ++++ INSTALL +@@ -160,7 +160,7 @@ cd src if $dobuild; then if [ ! -x ../bin/mk ]; then echo "* Building mk..." @@ -20,7 +12,7 @@ $OpenBSD: patch-INSTALL,v 1.6 2017/02/28 fi if [ ! -x ../bin/mk ]; then echo "* Error: mk failed to build." -@@ -159,7 +159,6 @@ if $dobuild; then +@@ -168,7 +168,6 @@ if $dobuild; then fi echo "* Building everything (be patient)..." @@ -28,7 +20,7 @@ $OpenBSD: patch-INSTALL,v 1.6 2017/02/28 mk libs-nuke mk all || exit 1 if [ ! -x $PLAN9/src/cmd/o.cleanname -o ! -x $PLAN9/src/cmd/acme/o.acme ]; then -@@ -218,5 +217,5 @@ if $doinstall; then +@@ -227,5 +226,5 @@ if $doinstall; then echo " PLAN9=$PLAN9 export PLAN9" echo ' PATH=$PATH:$PLAN9/bin export PATH' fi Index: patches/patch-bin_web =================================================================== RCS file: patches/patch-bin_web diff -N patches/patch-bin_web --- patches/patch-bin_web 25 Dec 2017 14:35:51 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-bin_web,v 1.2 2017/12/25 14:35:51 gsoares Exp $ - -# https://github.com/9fans/plan9port/pull/118 - -Index: bin/web ---- bin/web.orig -+++ bin/web -@@ -34,7 +34,7 @@ plumbunix() - $BROWSER -remote 'openURL('"$@"',new-tab)' || - $BROWSER "$@" - ;; -- *chrome*|*chromium*) -+ *) - $BROWSER "$@" - ;; - esac Index: patches/patch-src_mkhdr =================================================================== RCS file: /cvs/ports/plan9/plan9port/patches/patch-src_mkhdr,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-src_mkhdr --- patches/patch-src_mkhdr 28 Nov 2015 01:37:59 -0000 1.2 +++ patches/patch-src_mkhdr 10 Aug 2019 02:59:31 -0000 @@ -1,6 +1,8 @@ -$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 +$OpenBSD$ + +Index: src/mkhdr +--- src/mkhdr.orig ++++ src/mkhdr @@ -30,8 +30,8 @@ LD=9l AS=9a AR=9ar Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/plan9/plan9port/pkg/PLIST,v retrieving revision 1.10 diff -u -p -u -p -r1.10 PLIST --- pkg/PLIST 4 Sep 2018 12:46:19 -0000 1.10 +++ pkg/PLIST 10 Aug 2019 02:59:31 -0000 @@ -199,6 +199,7 @@ plan9/bin/nroff @comment plan9/bin/osxvers @bin plan9/bin/p @bin plan9/bin/page +@bin plan9/bin/paint @bin plan9/bin/passwd @bin plan9/bin/pbd @bin plan9/bin/pemdecode @@ -4349,6 +4350,7 @@ plan9/man/man1/INDEX @man plan9/man/man1/news.1 @man plan9/man/man1/p.1 @man plan9/man/man1/page.1 +@man plan9/man/man1/paint.1 @man plan9/man/man1/passwd.1 @man plan9/man/man1/pem.1 @man plan9/man/man1/pic.1 @@ -5479,6 +5481,7 @@ 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 @@ -5499,9 +5502,6 @@ 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/osx-screen-carbon.m -plan9/src/cmd/devdraw/osx-screen.h -plan9/src/cmd/devdraw/osx-srv.c plan9/src/cmd/devdraw/snarf.c plan9/src/cmd/devdraw/winsize.c plan9/src/cmd/devdraw/x11-alloc.c @@ -6056,6 +6056,10 @@ plan9/src/cmd/page/ps.c plan9/src/cmd/page/rotate.c plan9/src/cmd/page/util.c plan9/src/cmd/page/view.c +plan9/src/cmd/paint/ +plan9/src/cmd/paint/eenter.c +plan9/src/cmd/paint/mkfile +plan9/src/cmd/paint/paint.c plan9/src/cmd/pbd.c plan9/src/cmd/pic/ plan9/src/cmd/pic/arcgen.c @@ -6268,7 +6272,6 @@ plan9/src/cmd/read.c plan9/src/cmd/readcons.c plan9/src/cmd/resample.c plan9/src/cmd/rio/ -plan9/src/cmd/rio/Imakefile plan9/src/cmd/rio/README plan9/src/cmd/rio/client.c plan9/src/cmd/rio/color.c @@ -7239,8 +7242,9 @@ plan9/src/libdraw/chan.c plan9/src/libdraw/cloadimage.c plan9/src/libdraw/computil.c plan9/src/libdraw/creadimage.c +plan9/src/libdraw/cursor.c plan9/src/libdraw/debug.c -plan9/src/libdraw/defont.c +plan9/src/libdraw/defont.h plan9/src/libdraw/draw.c plan9/src/libdraw/drawclient.c plan9/src/libdraw/drawfcall.c @@ -7251,7 +7255,6 @@ plan9/src/libdraw/emenuhit.c plan9/src/libdraw/event.c plan9/src/libdraw/font.c plan9/src/libdraw/freesubfont.c -plan9/src/libdraw/getdefont.c plan9/src/libdraw/getrect.c plan9/src/libdraw/getsubfont.c plan9/src/libdraw/icossin.c @@ -7463,7 +7466,6 @@ plan9/src/libmemdraw/cload-stub.c plan9/src/libmemdraw/cload.c plan9/src/libmemdraw/cmap.c plan9/src/libmemdraw/cread.c -plan9/src/libmemdraw/defont.c plan9/src/libmemdraw/draw-stub.c plan9/src/libmemdraw/draw.c plan9/src/libmemdraw/drawtest.c
