Re: update plan9/plan9port
builds and runs fine for me. OK gsoares@
Re: update plan9/plan9port
On 2023/01/26 18:12:49 +0100, Omar Polo wrote:
> I'm not using exactly this, I have my own build in ~/plan9 (was
> /usr/local/plan9 but had to move it to test the update) with a few
> patches, but I've been using it continuously at least for the last two
> years (rebasing on top of the latest commit every few months) without
> any issue. I'm mostly using Acme, grep (via `g') and the manpages.
>
> I've dropped the substitution for bin/wintext (was rewritten in rc)
> and while here i've simplified do-install: there are no more any
> .cvsignore, .hg, .hgignore or .hgtags file, and adjusted the find
> invocation to delete the other files in one go.
>
> The patch for libthread/daemonize.c was merged upstream and so can be
> dropped.
>
> ok?
Kyle Milz (offlist) noted that patch-src_mkhdr is not needed anymore.
it builds, links, package and works fine without. Thanks!
updated diff
Index: Makefile
===
RCS file: /home/cvs/ports/plan9/plan9port/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile23 Sep 2022 02:28:27 - 1.40
+++ Makefile26 Jan 2023 16:37:16 -
@@ -2,11 +2,11 @@ ONLY_FOR_ARCHS = amd64 i386 powerpc powe
COMMENT = Plan 9 from user space
-DISTNAME = plan9port-20210323
+DISTNAME = plan9port-20230123
GH_ACCOUNT = 9fans
GH_PROJECT = plan9port
-GH_COMMIT =88a87fadae6629932d9c160f53ad5d79775f8f94
+GH_COMMIT =e2a141ae0952c2d28a9f500bb9da6dc72e57be3c
CATEGORIES = plan9
@@ -32,18 +32,17 @@ UPDATE_PLIST_ARGS += -i CC
pre-configure:
${SUBST_CMD} ${WRKSRC}/INSTALL ${WRKSRC}/bin/{9c,9l}
cd ${WRKSRC} && sed -i 's,#!/bin/bash,#!/bin/sh,' \
- bin/{macedit,wintext}
+ bin/macedit
do-build:
cd ${WRKSRC} && env CC9="${CC}" CCFLAGS="${CFLAGS}" ./INSTALL -b
do-install:
-.for l in .cvsignore .hg .hgignore .hgtags .gitignore .gitkeep *.orig
*.beforesubst .travis.yml
- find ${WRKSRC} -name "$l" -delete
-.endfor
+ rm -f ${WRKSRC}/.travis.yml
cd ${WRKSRC} && sed -i 's#/usr/local#${TRUEPREFIX}#' \
`cat lib/moveplan9.files`
-
+ find ${WRKSRC} \( -name .gitignore -o -name .gitkeep -o \
+ -name \*.orig -o -name \*.beforesubst \) -delete
${INSTALL_DATA_DIR} ${PLAN9}
cd ${WRKSRC} && pax -rw . ${PLAN9}
cd ${PREFIX} && ln -s ../plan9/bin/9 bin/9
Index: distinfo
===
RCS file: /home/cvs/ports/plan9/plan9port/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo25 Mar 2021 21:44:06 - 1.17
+++ distinfo26 Jan 2023 11:12:14 -
@@ -1,2 +1,2 @@
-SHA256 (plan9port-20210323-88a87fad.tar.gz) =
1LhzoJQDUCT+VCgqf91lIlW3O1HE/XiudwF0bR4+jzg=
-SIZE (plan9port-20210323-88a87fad.tar.gz) = 23413373
+SHA256 (plan9port-20230123-e2a141ae.tar.gz) =
z7Tw88brcf/PDRH055Wbw2srEW/sH+MrXpLXzUSGnFw=
+SIZE (plan9port-20230123-e2a141ae.tar.gz) = 23411241
Index: patches/patch-INSTALL
===
RCS file: /home/cvs/ports/plan9/plan9port/patches/patch-INSTALL,v
retrieving revision 1.10
diff -u -p -r1.10 patch-INSTALL
--- patches/patch-INSTALL 11 Mar 2022 19:49:08 - 1.10
+++ patches/patch-INSTALL 26 Jan 2023 11:22:51 -
@@ -1,7 +1,7 @@
Index: INSTALL
--- INSTALL.orig
+++ INSTALL
-@@ -102,7 +102,7 @@ fi
+@@ -113,7 +113,7 @@ fi
if [ `uname` != Darwin ]; then
# Determine whether fontsrv X11 files are available.
rm -f a.out
@@ -10,7 +10,7 @@ Index: INSTALL
-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
-@@ -128,7 +128,7 @@ echo "* Compiler version:"
+@@ -139,7 +139,7 @@ echo "* Compiler version:"
cd src
if $dobuild; then
echo "* Building mk..."
@@ -19,7 +19,7 @@ Index: INSTALL
if [ ! -x ../bin/mk ]; then
echo "* Error: mk failed to build."
-@@ -136,7 +136,6 @@ if $dobuild; then
+@@ -147,7 +147,6 @@ if $dobuild; then
fi
echo "* Building everything (be patient)..."
@@ -27,7 +27,7 @@ Index: INSTALL
mk libs-nuke
mk all || exit 1
if [ ! -x $PLAN9/src/cmd/o.cleanname -o ! -x $PLAN9/src/cmd/acme/o.acme
]; then
-@@ -195,5 +194,5 @@ if $doinstall; then
+@@ -206,5 +205,5 @@ if $doinstall; then
echo " PLAN9=$PLAN9 export PLAN9"
echo ' PATH=$PATH:$PLAN9/bin export PATH'
fi
Index: patches/patch-bin_9l
===
RCS file: /home/cvs/ports/plan9/plan9port/patches/patch-bin_9l,v
retrieving revision 1.4
diff -u -p -r1.4 patch-bin_9l
--- patches/patch-bin_9l11 Mar 2022 19:49:08 - 1.4
+++
update plan9/plan9port
I'm not using exactly this, I have my own build in ~/plan9 (was
/usr/local/plan9 but had to move it to test the update) with a few
patches, but I've been using it continuously at least for the last two
years (rebasing on top of the latest commit every few months) without
any issue. I'm mostly using Acme, grep (via `g') and the manpages.
I've dropped the substitution for bin/wintext (was rewritten in rc)
and while here i've simplified do-install: there are no more any
.cvsignore, .hg, .hgignore or .hgtags file, and adjusted the find
invocation to delete the other files in one go.
The patch for libthread/daemonize.c was merged upstream and so can be
dropped.
ok?
Index: Makefile
===
RCS file: /home/cvs/ports/plan9/plan9port/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile23 Sep 2022 02:28:27 - 1.40
+++ Makefile26 Jan 2023 16:37:16 -
@@ -2,11 +2,11 @@ ONLY_FOR_ARCHS = amd64 i386 powerpc powe
COMMENT = Plan 9 from user space
-DISTNAME = plan9port-20210323
+DISTNAME = plan9port-20230123
GH_ACCOUNT = 9fans
GH_PROJECT = plan9port
-GH_COMMIT =88a87fadae6629932d9c160f53ad5d79775f8f94
+GH_COMMIT =e2a141ae0952c2d28a9f500bb9da6dc72e57be3c
CATEGORIES = plan9
@@ -32,18 +32,17 @@ UPDATE_PLIST_ARGS += -i CC
pre-configure:
${SUBST_CMD} ${WRKSRC}/INSTALL ${WRKSRC}/bin/{9c,9l}
cd ${WRKSRC} && sed -i 's,#!/bin/bash,#!/bin/sh,' \
- bin/{macedit,wintext}
+ bin/macedit
do-build:
cd ${WRKSRC} && env CC9="${CC}" CCFLAGS="${CFLAGS}" ./INSTALL -b
do-install:
-.for l in .cvsignore .hg .hgignore .hgtags .gitignore .gitkeep *.orig
*.beforesubst .travis.yml
- find ${WRKSRC} -name "$l" -delete
-.endfor
+ rm -f ${WRKSRC}/.travis.yml
cd ${WRKSRC} && sed -i 's#/usr/local#${TRUEPREFIX}#' \
`cat lib/moveplan9.files`
-
+ find ${WRKSRC} \( -name .gitignore -o -name .gitkeep -o \
+ -name \*.orig -o -name \*.beforesubst \) -delete
${INSTALL_DATA_DIR} ${PLAN9}
cd ${WRKSRC} && pax -rw . ${PLAN9}
cd ${PREFIX} && ln -s ../plan9/bin/9 bin/9
Index: distinfo
===
RCS file: /home/cvs/ports/plan9/plan9port/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo25 Mar 2021 21:44:06 - 1.17
+++ distinfo26 Jan 2023 11:12:14 -
@@ -1,2 +1,2 @@
-SHA256 (plan9port-20210323-88a87fad.tar.gz) =
1LhzoJQDUCT+VCgqf91lIlW3O1HE/XiudwF0bR4+jzg=
-SIZE (plan9port-20210323-88a87fad.tar.gz) = 23413373
+SHA256 (plan9port-20230123-e2a141ae.tar.gz) =
z7Tw88brcf/PDRH055Wbw2srEW/sH+MrXpLXzUSGnFw=
+SIZE (plan9port-20230123-e2a141ae.tar.gz) = 23411241
Index: patches/patch-INSTALL
===
RCS file: /home/cvs/ports/plan9/plan9port/patches/patch-INSTALL,v
retrieving revision 1.10
diff -u -p -r1.10 patch-INSTALL
--- patches/patch-INSTALL 11 Mar 2022 19:49:08 - 1.10
+++ patches/patch-INSTALL 26 Jan 2023 11:22:51 -
@@ -1,7 +1,7 @@
Index: INSTALL
--- INSTALL.orig
+++ INSTALL
-@@ -102,7 +102,7 @@ fi
+@@ -113,7 +113,7 @@ fi
if [ `uname` != Darwin ]; then
# Determine whether fontsrv X11 files are available.
rm -f a.out
@@ -10,7 +10,7 @@ Index: INSTALL
-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
-@@ -128,7 +128,7 @@ echo "* Compiler version:"
+@@ -139,7 +139,7 @@ echo "* Compiler version:"
cd src
if $dobuild; then
echo "* Building mk..."
@@ -19,7 +19,7 @@ Index: INSTALL
if [ ! -x ../bin/mk ]; then
echo "* Error: mk failed to build."
-@@ -136,7 +136,6 @@ if $dobuild; then
+@@ -147,7 +147,6 @@ if $dobuild; then
fi
echo "* Building everything (be patient)..."
@@ -27,7 +27,7 @@ Index: INSTALL
mk libs-nuke
mk all || exit 1
if [ ! -x $PLAN9/src/cmd/o.cleanname -o ! -x $PLAN9/src/cmd/acme/o.acme
]; then
-@@ -195,5 +194,5 @@ if $doinstall; then
+@@ -206,5 +205,5 @@ if $doinstall; then
echo " PLAN9=$PLAN9 export PLAN9"
echo ' PATH=$PATH:$PLAN9/bin export PATH'
fi
Index: patches/patch-bin_9l
===
RCS file: /home/cvs/ports/plan9/plan9port/patches/patch-bin_9l,v
retrieving revision 1.4
diff -u -p -r1.4 patch-bin_9l
--- patches/patch-bin_9l11 Mar 2022 19:49:08 - 1.4
+++ patches/patch-bin_9l26 Jan 2023 11:22:51 -
@@ -1,7 +1,7 @@
Index: bin/9l
--- bin/9l.orig
+++ bin/9l
-@@ -12,7 +12,7 @@ extralibs="-lm"
+@@ -14,7 +14,7 @@ extralibs="-lm"
tag="${SYSNAME:-`uname`}"
case "$tag" in
Re: update plan9/plan9port
On Sat, Jan 30, 2021 at 03:29:16PM +1100, Jonathan Gray wrote: > update plan9port to a newer snapshot > > fixes clang 11 build by using -fcommon: > https://github.com/9fans/plan9port/commit/69439fae6705a125047246c889384ed3aeb4d104 ok gsoares
Re: update plan9/plan9port
On Sat, Jan 30, 2021 at 03:29:16PM +1100, Jonathan Gray wrote: > update plan9port to a newer snapshot > > fixes clang 11 build by using -fcommon: > https://github.com/9fans/plan9port/commit/69439fae6705a125047246c889384ed3aeb4d104 OK kn
update plan9/plan9port
update plan9port to a newer snapshot
fixes clang 11 build by using -fcommon:
https://github.com/9fans/plan9port/commit/69439fae6705a125047246c889384ed3aeb4d104
Index: Makefile
===
RCS file: /cvs/ports/plan9/plan9port/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile16 Nov 2020 23:56:37 - 1.36
+++ Makefile30 Jan 2021 04:11:09 -
@@ -6,11 +6,11 @@ BROKEN-powerpc = threading issues
COMMENT = Plan 9 from user space
-DISTNAME = plan9port-20200927
+DISTNAME = plan9port-20210129
GH_ACCOUNT = 9fans
GH_PROJECT = plan9port
-GH_COMMIT =291f7411783bf6871b253f3b15ce691eea7a257e
+GH_COMMIT =36cd4c58c1346375b98f517fb8568be5bb47618d
CATEGORIES = plan9
@@ -32,10 +32,6 @@ NO_TEST =Yes
SUBST_VARS += CC
UPDATE_PLIST_ARGS += -i CC
-
-post-patch:
- cd ${WRKSRC}/src/libthread && mv OpenBSD-386-asm.s \
- OpenBSD-386-asm.S
pre-configure:
${SUBST_CMD} ${WRKSRC}/INSTALL ${WRKSRC}/bin/{9c,9l}
Index: distinfo
===
RCS file: /cvs/ports/plan9/plan9port/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo16 Nov 2020 23:56:37 - 1.15
+++ distinfo30 Jan 2021 04:11:09 -
@@ -1,2 +1,2 @@
-SHA256 (plan9port-20200927-291f7411.tar.gz) =
TbkO14WQZtJqQk6944sxi7YDCtkgnNv7T1+zL7SGplk=
-SIZE (plan9port-20200927-291f7411.tar.gz) = 23446639
+SHA256 (plan9port-20210129-36cd4c58.tar.gz) =
1PqRIaFCHx0GWU4Mh3eiE5LKa9i3OwtdTUlZhD7/3AI=
+SIZE (plan9port-20210129-36cd4c58.tar.gz) = 23416712
Index: patches/patch-INSTALL
===
RCS file: /cvs/ports/plan9/plan9port/patches/patch-INSTALL,v
retrieving revision 1.8
diff -u -p -r1.8 patch-INSTALL
--- patches/patch-INSTALL 21 Jun 2020 20:37:20 - 1.8
+++ patches/patch-INSTALL 30 Jan 2021 04:11:09 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-INSTALL,v 1.8 2020/06/21
Index: INSTALL
--- INSTALL.orig
+++ INSTALL
-@@ -118,7 +118,7 @@ fi
+@@ -102,7 +102,7 @@ fi
if [ `uname` != Darwin ]; then
# Determine whether fontsrv X11 files are available.
rm -f a.out
@@ -12,7 +12,7 @@ Index: INSTALL
-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
-@@ -144,7 +144,7 @@ echo "* Compiler version:"
+@@ -128,7 +128,7 @@ echo "* Compiler version:"
cd src
if $dobuild; then
echo "* Building mk..."
@@ -21,7 +21,7 @@ Index: INSTALL
if [ ! -x ../bin/mk ]; then
echo "* Error: mk failed to build."
-@@ -152,7 +152,6 @@ if $dobuild; then
+@@ -136,7 +136,6 @@ if $dobuild; then
fi
echo "* Building everything (be patient)..."
@@ -29,7 +29,7 @@ Index: INSTALL
mk libs-nuke
mk all || exit 1
if [ ! -x $PLAN9/src/cmd/o.cleanname -o ! -x $PLAN9/src/cmd/acme/o.acme
]; then
-@@ -211,5 +210,5 @@ if $doinstall; then
+@@ -195,5 +194,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.3
diff -u -p -r1.3 patch-bin_9c
--- patches/patch-bin_9c21 Jun 2020 20:37:20 - 1.3
+++ patches/patch-bin_9c30 Jan 2021 04:11:09 -
@@ -11,7 +11,7 @@ Index: bin/9c
cflags=" \
-O2 \
-c \
-@@ -64,7 +64,7 @@ quiet()
+@@ -60,7 +60,7 @@ quiet()
useclang()
{
Index: patches/patch-bin_9l
===
RCS file: /cvs/ports/plan9/plan9port/patches/patch-bin_9l,v
retrieving revision 1.2
diff -u -p -r1.2 patch-bin_9l
--- patches/patch-bin_9l21 Jun 2020 20:37:20 - 1.2
+++ patches/patch-bin_9l30 Jan 2021 04:11:09 -
@@ -3,7 +3,7 @@ Index: bin/9l
--- bin/9l.orig
+++ bin/9l
@@ -12,7 +12,7 @@ extralibs="-lm"
- tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}"
+ tag="${SYSNAME:-`uname`}"
case "$tag" in
*DragonFly*|*BSD*)
- ld="${CC9:-gcc} $CC9FLAGS"
Index: patches/patch-src_libsec_386_mkfile
===
RCS file: patches/patch-src_libsec_386_mkfile
diff -N patches/patch-src_libsec_386_mkfile
--- patches/patch-src_libsec_386_mkfile 31 Aug 2019 14:09:13 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_libsec_386_mkfile,v 1.1 2019/08/31 14:09:13 sthen Exp $
-
-Index: src/libsec/386/mkfile
src/libsec/386/mkfile.orig
-+++ src/libsec/386/mkfile
-@@ -1,4 +1,5 @@
- <$PLAN9/src/mkhdr
-+CC?=cc
-
Re: [update] plan9/plan9port 20180117 -> 20190619
committed, thanks!
Re: [update] plan9/plan9port 20180117 -> 20190619
Hi, On 08/12, Patrick Marchand wrote: > Fixed it, see the new patch. Has anybody else played around with this diff ? I've been using the updated plan9port programs daily at work and have yet to hit problems. Thanks
Re: [update] plan9/plan9port 20180117 -> 20190619
On Sun, Aug 11, 2019 at 03:42:09PM -0400, Patrick Marchand wrote:
> 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.
Hi Patrick,
makesum complais here, the extra stuff wasnt moved yet into
new MASTER_SITES, ill ask Russ Cox for providing it over
there.
{x220} /usr/ports/plan9/plan9port $ make makesum
===> Checking files for plan9port-20190619
`/usr/ports/distfiles/plan9port/e995a0c101863688d5f14649ae3de45a7c43789c.tar.gz'
is up to date.
>> Fetch https://swtch.com/~rsc/pgw.tar.bz2
ftp: Error retrieving file: 404 Not Found
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2993
'/usr/ports/distfiles/plan9port/pgw.tar.bz2': @lock=pgw.tar.bz2.dist;
/usr/...)
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2272
'_internal-fetch-all')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2447
'fetch-all')
*** Error 1 in /usr/ports/plan9/plan9port
(/usr/ports/infrastructure/mk/bsd.port.mk:2090 'makesum')
so,we should keep the following for now:
-MASTER_SITES0 = http://pdos.lcs.mit.edu/~rsc/software/plan9/
-MASTER_SITES1 =http://pdos.lcs.mit.edu/~rsc/
Thanks,
Gleydson.
[update] plan9/plan9port 20180117 -> 20190619
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
--- Makefile12 Jul 2019 20:48:54 - 1.29
+++ Makefile10 Aug 2019 02:59:31 -
@@ -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
@@ -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
--- distinfo20 Jan 2018 03:29:56 - 1.11
+++ distinfo10 Aug 2019 02:59:31 -
@@ -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 - 1.6
+++ patches/patch-INSTALL 10 Aug 2019 02:59:31 -
@@ -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
-+++ INSTALLMon 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
UPDATE: plan9/plan9port
the following diff updates plan9port to the latest stable code.
It is now available on github.
* upstream feedback about tag releases
https://github.com/9fans/plan9port/issues/47
as pointed out upstream the current code is stable, since we've GH_COMMIT for
handling hashed-tarball, I added GH_* for it.
patches merged:
- patch-INSTALL / fontsrv support
- patch-src_cmd_auxstats_OpenBSD_c
- patch-src_lib9_dirread_c
...along with a bunch of others small fixes.
OK? works fine here amd64 and i386.
// gsoares
Index: Makefile
===
RCS file: /cvs/ports/plan9/plan9port/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile21 Aug 2015 22:51:10 - 1.8
+++ Makefile25 Nov 2015 02:41:04 -
@@ -5,8 +5,11 @@ BROKEN-powerpc = threading issues
COMMENT = Plan 9 from user space
-DISTNAME = plan9port-20140306
-REVISION = 1
+DISTNAME = plan9port-2015
+
+GH_ACCOUNT = 9fans
+GH_PROJECT = plan9port
+GH_COMMIT =6a93bd5c92bd2954314f492f10bbcac2c3416da0
CATEGORIES = plan9
@@ -20,26 +23,22 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB = X11 Xext c kvm m pthread util fontconfig freetype z
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} pgw.tar.bz2 \
+DISTFILES =${GH_COMMIT}.tar.gz pgw.tar.bz2:1 \
roget.tar.bz2:0 scat.tgz:1
DIST_SUBDIR = plan9port
-MASTER_SITES = https://plan9port.googlecode.com/files/
MASTER_SITES0 =http://pdos.lcs.mit.edu/~rsc/software/plan9/
MASTER_SITES1 =http://pdos.lcs.mit.edu/~rsc/
-EXTRACT_SUFX = .tgz
BUILD_DEPENDS =archivers/bzip2
RUN_DEPENDS = print/ghostscript/gnu \
print/gv
-WRKDIST = ${WRKDIR}/plan9port
+WRKDIST = ${WRKDIR}/plan9port-${GH_COMMIT}
PLAN9 =${PREFIX}/plan9
NO_TEST = Yes
-SUBST_VARS+= CC
-
post-extract:
cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/pgw.tar.bz2
cd ${WRKSRC}/dict && tar xjf ${FULLDISTDIR}/roget.tar.bz2
@@ -50,15 +49,14 @@ post-patch:
OpenBSD-x86_64.c && cp Darwin-x86_64-asm.s \
OpenBSD-x86_64-asm.S
find ${WRKSRC} -name .cvsignore -exec rm -f {} \;
- cd ${WRKSRC} && rm -rf .hg .hgignore .hgtags
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/INSTALL
+ cd ${WRKSRC} && rm -rf .hg .hgignore .hgtags .gitignore
+
do-build:
cd ${WRKSRC} && env CC9="${CC}" CCFLAGS="${CFLAGS}" ./INSTALL -b
do-install:
find ${WRKSRC}/src -name '*.orig' -exec rm -f {} \+
- cd ${WRKSRC} && sed -i 's#/usr/local#${TRUEPREFIX}#' \
+ cd ${WRKSRC} && rm *.orig && sed -i 's#/usr/local#${TRUEPREFIX}#' \
`cat lib/moveplan9.files`
${INSTALL_DATA_DIR} ${PLAN9}
Index: distinfo
===
RCS file: /cvs/ports/plan9/plan9port/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo9 Mar 2014 20:26:48 - 1.2
+++ distinfo25 Nov 2015 02:41:04 -
@@ -1,8 +1,8 @@
+SHA256 (plan9port/6a93bd5c92bd2954314f492f10bbcac2c3416da0.tar.gz) =
O5FlvPIqAXSRjpxwHB+oI/Syfe2p3Su76GFrMfOV8AM=
SHA256 (plan9port/pgw.tar.bz2) = WMdWEelUjG7muSL6OsgnCmPsJMn88b1OPtEYQn8TVtw=
-SHA256 (plan9port/plan9port-20140306.tgz) =
y7gmzeaTq9qiBRxJ5+v3URm/KkeR/jsyKfGsNqQI6us=
SHA256 (plan9port/roget.tar.bz2) = sk8FE1Tavljx2CXinbOGCRyErsmBJdvkma3spRoyqDY=
SHA256 (plan9port/scat.tgz) = qZX1JUSnEvK9uH9TFjjUyEYiT6khLQNOO9joCcuZvh4=
+SIZE (plan9port/6a93bd5c92bd2954314f492f10bbcac2c3416da0.tar.gz) = 23458495
SIZE (plan9port/pgw.tar.bz2) = 9404968
-SIZE (plan9port/plan9port-20140306.tgz) = 54512505
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.4
diff -u -p -u -p -r1.4 patch-INSTALL
--- patches/patch-INSTALL 13 Nov 2015 02:53:48 - 1.4
+++ patches/patch-INSTALL 25 Nov 2015 02:41:04 -
@@ -1,24 +1,8 @@
$OpenBSD: patch-INSTALL,v 1.4 2015/11/13 02:53:48 gsoares Exp $
-INSTALL: append /usr/X11R6/include and /usr/X11R6/include/freetype2 to
-X11 headers detection, so that enable fontsrv build on OpenBSD.
-
-merged upstream:
-https://github.com/9fans/plan9port/commit/8ee5da7cf764bf5685c137264cd4d6a03f12ba89
-
INSTALL.orig Thu Mar 6 07:00:08 2014
-+++ INSTALLWed Jun 10 20:03:02 2015
-@@ -128,7 +128,8 @@ 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
Update plan9/plan9port with fontsrv support
This enables support for fontsrv. I'm aware of the lock, just didn't want to forget this once it's open. Index: patches/patch-INSTALL === RCS file: /cvs/ports/plan9/plan9port/patches/patch-INSTALL,v retrieving revision 1.2 diff -u -r1.2 patch-INSTALL --- patches/patch-INSTALL 9 Mar 2014 20:26:48 - 1.2 +++ patches/patch-INSTALL 23 Jul 2014 06:30:02 - @@ -1,6 +1,15 @@ -$OpenBSD: patch-INSTALL,v 1.2 2014/03/09 20:26:48 pascal Exp $ INSTALL.orig Thu Mar 6 11:00:08 2014 -+++ INSTALL Sun Mar 9 20:58:02 2014 +$OpenBSD$ +--- INSTALL.orig Tue Jul 22 22:17:14 2014 INSTALL Tue Jul 22 22:17:17 2014 +@@ -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 src/cmd/fontsrv/x11.c /dev/null 21 ++ gcc -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 21 + if [ -f a.out ]; then + echo fontsrv dependencies found. + echo FONTSRV=fontsrv $PLAN9/config @@ -150,7 +150,7 @@ cd src if $dobuild; then if [ ! -x ../bin/mk ]; then Index: pkg/PLIST === RCS file: /cvs/ports/plan9/plan9port/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- pkg/PLIST 9 Mar 2014 20:26:48 - 1.3 +++ pkg/PLIST 23 Jul 2014 06:30:02 - @@ -122,6 +122,7 @@ @bin plan9/bin/factotum @bin plan9/bin/file @bin plan9/bin/fmt +@bin plan9/bin/fontsrv @bin plan9/bin/fortune plan9/bin/fossil/ plan9/bin/fossil/conf
Re: Update plan9/plan9port with fontsrv support
On 2014/07/23 02:31, Matt Jibson wrote: This enables support for fontsrv. I'm aware of the lock, just didn't want to forget this once it's open. Realistically it's unlikely for developers to remember this mail for the month or more that ports locks usually take, it would be better to hang onto it and resend later. btw it's missing a REVISION bump.
