Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Aug 2019 09:13:12 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r508147 - in head/devel/plan9port: . files
Message-ID:  <201908050913.x759DC08089845@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Mon Aug  5 09:13:11 2019
New Revision: 508147
URL: https://svnweb.freebsd.org/changeset/ports/508147

Log:
  devel/plan9port: Update to latest commit
  
  - Convert pkg-message to UCL and only show it on install

Modified:
  head/devel/plan9port/Makefile
  head/devel/plan9port/distinfo
  head/devel/plan9port/files/pkg-message.in
  head/devel/plan9port/pkg-plist

Modified: head/devel/plan9port/Makefile
==============================================================================
--- head/devel/plan9port/Makefile	Mon Aug  5 09:11:10 2019	(r508146)
+++ head/devel/plan9port/Makefile	Mon Aug  5 09:13:11 2019	(r508147)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	plan9port
-PORTVERSION=	20180205
+PORTVERSION=	20190619
 CATEGORIES=	devel plan9
 DIST_SUBDIR=	plan9port
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -25,7 +25,7 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 USES=		localbase:ldflags perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	9fans
-GH_TAGNAME=	4798a8a5560552480efde5fe8b1f7963a25a96d3
+GH_TAGNAME=	e995a0c101863688d5f14649ae3de45a7c43789c
 USE_PERL5=	build
 USE_XORG=	x11 xt xext
 
@@ -59,13 +59,11 @@ post-patch:
 		${WRKSRC}/src/cmd/upas/ml/mlmgr.c \
 		${WRKSRC}/src/cmd/tcs/font/mkfile
 	@${REINPLACE_CMD} -e 's|ulong|u64int|' ${WRKSRC}/src/libmach/FreeBSD.c
-# Fix 9term: no ptys
-	@${SED} -e 's|util\.h|lib&|' ${WRKSRC}/src/cmd/9term/OpenBSD.c \
-		> ${WRKSRC}/src/cmd/9term/${OPSYS}.c
 
 do-configure:
 	@${ECHO_CMD} 'CFLAGS="${CFLAGS}"' > ${WRKSRC}/LOCAL.config
 	@${ECHO_CMD} 'LDFLAGS="${LDFLAGS}"' >> ${WRKSRC}/LOCAL.config
+	@${ECHO_CMD} 'FONTSRV=fontsrv' >> ${WRKSRC}/LOCAL.config
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} CC9=${CC} ./INSTALL -b

Modified: head/devel/plan9port/distinfo
==============================================================================
--- head/devel/plan9port/distinfo	Mon Aug  5 09:11:10 2019	(r508146)
+++ head/devel/plan9port/distinfo	Mon Aug  5 09:13:11 2019	(r508147)
@@ -1,9 +1,9 @@
-TIMESTAMP = 1520599448
+TIMESTAMP = 1564993745
 SHA256 (plan9port/pgw.tar.bz2) = de3af82012b3380612b56fa0c1a2ed8daf619a0215189fc59eab9919ec47ea15
 SIZE (plan9port/pgw.tar.bz2) = 9406367
 SHA256 (plan9port/roget.tar.bz2) = b24f051354dabe58f1d825e29db386091c84aec98125dbe499adeca51a32a836
 SIZE (plan9port/roget.tar.bz2) = 482956
 SHA256 (plan9port/scat.tgz) = a995f52544a712f2bdb87f531638d4c846224fa9212d034e3bd8e809cb99be1e
 SIZE (plan9port/scat.tgz) = 5145346
-SHA256 (plan9port/9fans-plan9port-20180205-4798a8a5560552480efde5fe8b1f7963a25a96d3_GH0.tar.gz) = 4bbc118d699924760079c57f81d71d743d6ccf58827bce17bc2844a71faf3564
-SIZE (plan9port/9fans-plan9port-20180205-4798a8a5560552480efde5fe8b1f7963a25a96d3_GH0.tar.gz) = 23434357
+SHA256 (plan9port/9fans-plan9port-20190619-e995a0c101863688d5f14649ae3de45a7c43789c_GH0.tar.gz) = 639e0bb01728ffd7cc1751eeb1bfc7314615d88d6fa7f4cde21033ad97622624
+SIZE (plan9port/9fans-plan9port-20190619-e995a0c101863688d5f14649ae3de45a7c43789c_GH0.tar.gz) = 23439831

Modified: head/devel/plan9port/files/pkg-message.in
==============================================================================
--- head/devel/plan9port/files/pkg-message.in	Mon Aug  5 09:11:10 2019	(r508146)
+++ head/devel/plan9port/files/pkg-message.in	Mon Aug  5 09:13:11 2019	(r508147)
@@ -1,3 +1,6 @@
+[
+{ type: install,
+  message: <<EOM
 The plan9port tools consist of many small binaries intimately tied
 together, some of them conflicting with %%OPSYS%% base utilities.  To
 avoid runtime conflicts, you may wish to append
@@ -6,3 +9,6 @@ avoid runtime conflicts, you may wish to append
 Alternatively, plan9port tools can be run with %%PREFIX%%/bin/9
 
     9 man 1 intro
+EOM
+}
+]

Modified: head/devel/plan9port/pkg-plist
==============================================================================
--- head/devel/plan9port/pkg-plist	Mon Aug  5 09:11:10 2019	(r508146)
+++ head/devel/plan9port/pkg-plist	Mon Aug  5 09:13:11 2019	(r508147)
@@ -192,6 +192,7 @@ plan9/bin/nroff
 plan9/bin/osxvers
 plan9/bin/p
 plan9/bin/page
+plan9/bin/paint
 plan9/bin/passwd
 plan9/bin/pbd
 plan9/bin/pemdecode
@@ -4287,6 +4288,7 @@ plan9/man/man1/netfiles.1
 plan9/man/man1/news.1
 plan9/man/man1/p.1
 plan9/man/man1/page.1
+plan9/man/man1/paint.1
 plan9/man/man1/passwd.1
 plan9/man/man1/pem.1
 plan9/man/man1/pic.1
@@ -5380,6 +5382,7 @@ plan9/src/cmd/dd.c
 plan9/src/cmd/delatex.lx
 plan9/src/cmd/deroff.c
 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
@@ -5400,9 +5403,6 @@ plan9/src/cmd/devdraw/nowsys.c
 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
@@ -5927,6 +5927,9 @@ 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/eenter.c
+plan9/src/cmd/paint/mkfile
+plan9/src/cmd/paint/paint.c
 plan9/src/cmd/pbd.c
 plan9/src/cmd/pic/arcgen.c
 plan9/src/cmd/pic/blockgen.c
@@ -6119,7 +6122,6 @@ plan9/src/cmd/rc/x.tab.h
 plan9/src/cmd/read.c
 plan9/src/cmd/readcons.c
 plan9/src/cmd/resample.c
-plan9/src/cmd/rio/Imakefile
 plan9/src/cmd/rio/README
 plan9/src/cmd/rio/client.c
 plan9/src/cmd/rio/color.c
@@ -7036,8 +7038,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
@@ -7048,7 +7051,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
@@ -7252,7 +7254,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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908050913.x759DC08089845>