UPDATE: plan9/plan9port

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: plan9/plan9port

Gleydson Soares-3
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
--- Makefile 21 Aug 2015 22:51:10 -0000 1.8
+++ Makefile 25 Nov 2015 02:41:04 -0000
@@ -5,8 +5,11 @@ BROKEN-powerpc = threading issues
 
 COMMENT = Plan 9 from user space
 
-DISTNAME = plan9port-20140306
-REVISION = 1
+DISTNAME = plan9port-20151111
+
+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
--- distinfo 9 Mar 2014 20:26:48 -0000 1.2
+++ distinfo 25 Nov 2015 02:41:04 -0000
@@ -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 -0000 1.4
+++ patches/patch-INSTALL 25 Nov 2015 02:41:04 -0000
@@ -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
-+++ INSTALL Wed 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 -I/usr/local/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1
-+ ${CC} -o a.out -c -Iinclude -I/usr/include -I${LOCALBASE}/include -I/usr/include/freetype2 -I${LOCALBASE}/include/freetype2 \
-+    -I${X11BASE}/include -I${X11BASE}/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1
- if [ -f a.out ]; then
- echo " fontsrv dependencies found."
- echo "FONTSRV=fontsrv" >>$PLAN9/config
-@@ -150,7 +151,7 @@ cd src
+--- INSTALL.orig Wed Nov 11 12:09:34 2015
++++ INSTALL Tue Nov 24 10:56:24 2015
+@@ -151,7 +151,7 @@ cd src
  if $dobuild; then
  if [ ! -x ../bin/mk ]; then
  echo "* Building mk..."
@@ -27,7 +11,7 @@ https://github.com/9fans/plan9port/commi
  fi
  if [ ! -x ../bin/mk ]; then
  echo "* Error: mk failed to build."
-@@ -158,7 +159,6 @@ if $dobuild; then
+@@ -159,7 +159,6 @@ if $dobuild; then
  fi
 
  echo "* Building everything (be patient)..."
@@ -35,7 +19,7 @@ https://github.com/9fans/plan9port/commi
  mk libs-nuke
  mk all || exit 1
  if [ ! -x $PLAN9/src/cmd/o.cleanname -o ! -x $PLAN9/src/cmd/acme/o.acme ]; then
-@@ -213,5 +213,5 @@ if $doinstall; then
+@@ -218,5 +217,5 @@ if $doinstall; then
  echo " PLAN9=$PLAN9 export PLAN9"
  echo ' PATH=$PATH:$PLAN9/bin export PATH'
  fi
Index: patches/patch-src_cmd_auxstats_OpenBSD_c
===================================================================
RCS file: patches/patch-src_cmd_auxstats_OpenBSD_c
diff -N patches/patch-src_cmd_auxstats_OpenBSD_c
--- patches/patch-src_cmd_auxstats_OpenBSD_c 18 Sep 2014 15:22:46 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_cmd_auxstats_OpenBSD_c,v 1.2 2014/09/18 15:22:46 naddy Exp $
---- src/cmd/auxstats/OpenBSD.c.orig Sun Oct 21 16:08:57 2012
-+++ src/cmd/auxstats/OpenBSD.c Thu Sep 18 17:15:38 2014
-@@ -3,11 +3,12 @@
- #include <nlist.h>
- #include <sys/types.h>
- #include <sys/param.h>
-+#include <sys/sched.h>
- #include <sys/socket.h>
- #include <sys/sysctl.h>
- #include <sys/time.h>
--#include <sys/dkstat.h>
- #include <net/if.h>
-+#include <net/if_var.h>
- #include <machine/apmvar.h>
- #include <sys/ioctl.h>
- #include <uvm/uvm_param.h>
Index: patches/patch-src_lib9_dirread_c
===================================================================
RCS file: patches/patch-src_lib9_dirread_c
diff -N patches/patch-src_lib9_dirread_c
--- patches/patch-src_lib9_dirread_c 9 Mar 2014 20:26:48 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_lib9_dirread_c,v 1.2 2014/03/09 20:26:48 pascal Exp $
---- src/lib9/dirread.c.orig Fri Feb 28 11:00:07 2014
-+++ src/lib9/dirread.c Sun Mar  9 21:00:01 2014
-@@ -25,14 +25,14 @@ mygetdents(int fd, struct dirent *buf, int n)
- long off;
- return getdirentries(fd, (void*)buf, n, &off);
- }
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- static int
- mygetdents(int fd, struct dirent *buf, int n)
- {
- off_t off;
- return getdirentries(fd, (void*)buf, n, &off);
- }
--#elif defined(__sun__) || defined(__NetBSD__)
-+#elif defined(__sun__) || defined(__NetBSD__) || defined(__OpenBSD__)
- static int
- mygetdents(int fd, struct dirent *buf, int n)
- {
Index: patches/patch-src_mkhdr
===================================================================
RCS file: /cvs/ports/plan9/plan9port/patches/patch-src_mkhdr,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_mkhdr
--- patches/patch-src_mkhdr 26 Jun 2012 15:07:17 -0000 1.1.1.1
+++ patches/patch-src_mkhdr 25 Nov 2015 02:41:04 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_mkhdr,v 1.1.1.1 2012/06/26 15:07:17 pascal Exp $
---- src/mkhdr.orig Mon Oct 24 06:00:05 2011
-+++ src/mkhdr Wed Feb  1 17:37:09 2012
-@@ -28,8 +28,8 @@ LD=9l
+--- 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
  AS=9a
  AR=9ar
  INSTALL=install
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/plan9/plan9port/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 17 Jun 2015 22:48:33 -0000 1.4
+++ pkg/PLIST 25 Nov 2015 02:41:06 -0000
@@ -3,12 +3,12 @@
 bin/9
 plan9/
 plan9/CHANGES
+plan9/CONTRIBUTING.md
 plan9/CONTRIBUTORS
 plan9/INSTALL
-plan9/INSTALL.orig
 plan9/LICENSE
 plan9/Makefile
-plan9/README
+plan9/README.md
 plan9/TODO
 plan9/acid/
 plan9/acid/386
@@ -85,6 +85,7 @@ plan9/bin/bundle
 @bin plan9/bin/cmp
 plan9/bin/codereview
 plan9/bin/codereview.py
+@bin plan9/bin/col
 @bin plan9/bin/colors
 @bin plan9/bin/comm
 @bin plan9/bin/core
@@ -173,6 +174,7 @@ plan9/bin/lc
 plan9/bin/lookman
 plan9/bin/lpbin/
 @bin plan9/bin/ls
+plan9/bin/macedit
 plan9/bin/man
 @bin plan9/bin/mapd
 @bin plan9/bin/mc
@@ -218,6 +220,8 @@ plan9/bin/ps
 plan9/bin/psfonts
 plan9/bin/psu
 plan9/bin/psv
+plan9/bin/quote1
+plan9/bin/quote2
 @bin plan9/bin/ramfs
 @shell plan9/bin/rc
 @bin plan9/bin/read
@@ -4144,6 +4148,8 @@ plan9/lib/codereview/codereview.cfg
 plan9/lib/codereview/codereview.py
 plan9/lib/darwin-main.c
 plan9/lib/fortunes
+plan9/lib/git/
+plan9/lib/git/commit-msg.hook
 plan9/lib/grap.defines
 plan9/lib/gv.resource
 plan9/lib/gv.style
@@ -4294,6 +4300,7 @@ plan9/man/man1/INDEX
 @man plan9/man/man1/clog.1
 @man plan9/man/man1/cmp.1
 @man plan9/man/man1/codereview.1
+@man plan9/man/man1/col.1
 @man plan9/man/man1/colors.1
 @man plan9/man/man1/comm.1
 @man plan9/man/man1/core.1
@@ -4316,12 +4323,12 @@ plan9/man/man1/INDEX
 @man plan9/man/man1/fortune.1
 @man plan9/man/man1/freq.1
 @man plan9/man/man1/fsize.1
+@man plan9/man/man1/git.1
 @man plan9/man/man1/grap.1
 @man plan9/man/man1/graph.1
 @man plan9/man/man1/grep.1
 @man plan9/man/man1/gview.1
 @man plan9/man/man1/gzip.1
-@man plan9/man/man1/hg.1
 @man plan9/man/man1/hget.1
 @man plan9/man/man1/hist.1
 @man plan9/man/man1/hoc.1
@@ -5084,7 +5091,6 @@ plan9/postscript/troff/H
 plan9/postscript/troff/HB
 plan9/postscript/troff/HI
 plan9/postscript/troff/HL
-plan9/postscript/troff/HX
 plan9/postscript/troff/Helvetica-Narrow-BoldOblique
 plan9/postscript/troff/I
 plan9/postscript/troff/Jp
@@ -5251,6 +5257,7 @@ plan9/src/cmd/acme/exec.c
 plan9/src/cmd/acme/file.c
 plan9/src/cmd/acme/fns.h
 plan9/src/cmd/acme/fsys.c
+plan9/src/cmd/acme/logf.c
 plan9/src/cmd/acme/look.c
 plan9/src/cmd/acme/mail/
 plan9/src/cmd/acme/mail/dat.h
@@ -5456,6 +5463,7 @@ plan9/src/cmd/cb/cbtype.h
 plan9/src/cmd/cb/mkfile
 plan9/src/cmd/cleanname.c
 plan9/src/cmd/cmp.c
+plan9/src/cmd/col.c
 plan9/src/cmd/comm.c
 plan9/src/cmd/core.c
 plan9/src/cmd/date.c
@@ -6580,7 +6588,7 @@ plan9/src/cmd/upas/bayes/regcomp.c
 plan9/src/cmd/upas/bayes/regen.c
 plan9/src/cmd/upas/common/
 plan9/src/cmd/upas/common/appendfiletombox.c
-plan9/src/cmd/upas/common/aux.c
+plan9/src/cmd/upas/common/auxx.c
 plan9/src/cmd/upas/common/common.h
 plan9/src/cmd/upas/common/config.c
 plan9/src/cmd/upas/common/libsys.c
@@ -6946,6 +6954,8 @@ plan9/src/lib9/fork.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
@@ -7496,6 +7506,10 @@ plan9/src/libmp/PowerMacintosh/
 plan9/src/libmp/PowerMacintosh/mkfile
 plan9/src/libmp/arm/
 plan9/src/libmp/arm/mkfile
+plan9/src/libmp/arm64/
+plan9/src/libmp/arm64/mkfile
+plan9/src/libmp/mips/
+plan9/src/libmp/mips/mkfile
 plan9/src/libmp/mkfile
 plan9/src/libmp/port/
 plan9/src/libmp/port/betomp.c
@@ -7606,6 +7620,10 @@ plan9/src/libsec/PowerMacintosh/
 plan9/src/libsec/PowerMacintosh/mkfile
 plan9/src/libsec/arm/
 plan9/src/libsec/arm/mkfile
+plan9/src/libsec/arm64/
+plan9/src/libsec/arm64/mkfile
+plan9/src/libsec/mips/
+plan9/src/libsec/mips/mkfile
 plan9/src/libsec/mkfile
 plan9/src/libsec/port/
 plan9/src/libsec/port/aes.c
@@ -7719,7 +7737,7 @@ 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-asm.s
 plan9/src/libthread/OpenBSD-386.c
 plan9/src/libthread/OpenBSD-power-asm.S
 plan9/src/libthread/OpenBSD-power.c
@@ -7889,12 +7907,9 @@ plan9/troff/font/devutf/DejaVuSerifBoldO
 plan9/troff/font/devutf/DejaVuSerifOblique
 plan9/troff/font/devutf/GR
 plan9/troff/font/devutf/H
-plan9/troff/font/devutf/HB
-plan9/troff/font/devutf/HI
 plan9/troff/font/devutf/HK
 plan9/troff/font/devutf/HL
 plan9/troff/font/devutf/HM
-plan9/troff/font/devutf/HX
 plan9/troff/font/devutf/Helvetica-Narrow
 plan9/troff/font/devutf/Helvetica-Narrow-Bold
 plan9/troff/font/devutf/Helvetica-Narrow-BoldOblique
@@ -7958,11 +7973,9 @@ plan9/troff/font/devutf/charlib/F_i
 plan9/troff/font/devutf/charlib/F_l
 plan9/troff/font/devutf/charlib/L1
 plan9/troff/font/devutf/charlib/LA
-plan9/troff/font/devutf/charlib/LH
 plan9/troff/font/devutf/charlib/LH.example
 plan9/troff/font/devutf/charlib/LV
 plan9/troff/font/devutf/charlib/PC
-plan9/troff/font/devutf/charlib/RC
 plan9/troff/font/devutf/charlib/README
 plan9/troff/font/devutf/charlib/S_l
 plan9/troff/font/devutf/charlib/_b_x