Hi Patrick
> Hi!
>
> On 07/15, Patrick Marchand wrote:
>
> Let me know if I messed something up, as its the first time I create
> a diff for a port.
>
> I also updated the url's as the old bell labs one are now dead and
> Rus Cox changed his homepage.
Ok, I'll try to build from ports this evening with your patch.
> 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 15 Jul 2019 12:19:13 -0000
> @@ -4,13 +4,13 @@ ONLY_FOR_ARCHS = amd64 i386 powerpc
> BROKEN-powerpc = threading issues
>
> COMMENT = Plan 9 from user space
> -REVISION = 3
> +REVISION = 0
>
> -DISTNAME = plan9port-20180117
> +DISTNAME = plan9port-20190710
>
> GH_ACCOUNT = 9fans
> GH_PROJECT = plan9port
> -GH_COMMIT = 019be4481fee53a999ccb73c78e40df5f408b24e
> +GH_COMMIT = e995a0c101863688d5f14649ae3de45a7c43789c
>
> CATEGORIES = plan9
>
> @@ -27,8 +27,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 \
> @@ -64,8 +64,6 @@ do-install:
> .for l in .cvsignore .hg .hgignore .hgtags .gitignore .gitkeep *.orig
> *.beforesubst .travis.yml
> find ${WRKSRC} -name "$l" -exec rm -f {} \;
> .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.11
> diff -u -p -u -p -r1.11 distinfo
> --- distinfo 20 Jan 2018 03:29:56 -0000 1.11
> +++ distinfo 15 Jul 2019 12:19:13 -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 15 Jul 2019 12:19:13 -0000
> @@ -1,37 +1,14 @@
> $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
> +Index: INSTALL
> +--- INSTALL.orig
> ++++ INSTALL
> +@@ -134,7 +134,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 \
> + ${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
> - if $dobuild; then
> - if [ ! -x ../bin/mk ]; then
> - echo "* Building mk..."
> -- ../dist/buildmk 2>&1 | sed 's/^[+] //'
> -+ ../dist/buildmk 2>&1
> - fi
> - if [ ! -x ../bin/mk ]; then
> - echo "* Error: mk failed to build."
> -@@ -159,7 +159,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
> -@@ -218,5 +217,5 @@ if $doinstall; then
> - echo " PLAN9=$PLAN9 export PLAN9"
> - echo ' PATH=$PATH:$PLAN9/bin export PATH'
> - fi
> --) 2>&1 | tee install.log | $awk -f $PLAN9/dist/isum.awk -v
> 'copy='install.sum
> -+) 2>&1 | tee install.log
> -
> Index: pkg/DESCR
> ===================================================================
> RCS file: /cvs/ports/plan9/plan9port/pkg/DESCR,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 DESCR
> --- pkg/DESCR 26 Jun 2012 15:07:17 -0000 1.1.1.1
> +++ pkg/DESCR 15 Jul 2019 12:19:13 -0000
> @@ -1,6 +1,6 @@
> Plan 9 is a distributed computing environment built at Bell Labs
> starting in the late 1980s. The system can be obtained from Bell
> -Labs at http://plan9.bell-labs.com/plan9 and runs on PCs and a
> +Labs at https://plan9.io/ and runs on PCs and a
> variety of other platforms. Plan 9 became a convenient platform for
> experimenting with new ideas, applications, and services.
>
> 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 15 Jul 2019 12:19:14 -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
> @@ -4136,6 +4137,7 @@ plan9/include/u.h
> plan9/include/utf.h
> plan9/include/venti.h
> plan9/install.log
> +plan9/install.sum
> plan9/install.txt
> plan9/lib/
> plan9/lib/CVS.IEXIST
> @@ -4349,6 +4351,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 +5482,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 +5503,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 +6057,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 +6273,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 +7243,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 +7256,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 +7467,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
>
-
Andrea
