From owner-svn-ports-all@freebsd.org Thu Aug 17 18:06:45 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B572DCD45E; Thu, 17 Aug 2017 18:06:45 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E6BA4827A3; Thu, 17 Aug 2017 18:06:44 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7HI6igo061165; Thu, 17 Aug 2017 18:06:44 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7HI6hmD061162; Thu, 17 Aug 2017 18:06:43 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201708171806.v7HI6hmD061162@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Thu, 17 Aug 2017 18:06:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448163 - in head/devel/plan9port: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/devel/plan9port: . files X-SVN-Commit-Revision: 448163 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2017 18:06:45 -0000 Author: swills Date: Thu Aug 17 18:06:43 2017 New Revision: 448163 URL: https://svnweb.freebsd.org/changeset/ports/448163 Log: devel/plan9port: Update to 20170723 PR: 221191 Submitted by: kdrakehp@zoho.com Modified: head/devel/plan9port/Makefile head/devel/plan9port/distinfo head/devel/plan9port/files/patch-src-cmd-auxstats-FreeBSD.c Modified: head/devel/plan9port/Makefile ============================================================================== --- head/devel/plan9port/Makefile Thu Aug 17 18:04:27 2017 (r448162) +++ head/devel/plan9port/Makefile Thu Aug 17 18:06:43 2017 (r448163) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= plan9port -PORTVERSION= 20170210 +PORTVERSION= 20170723 CATEGORIES= devel plan9 MAINTAINER= ports@FreeBSD.org @@ -14,24 +14,38 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GH_ACCOUNT= 9fans -GH_TAGNAME= 9f34853 +GH_TAGNAME= 4a8c0c7 USE_GITHUB= yes +DIST_SUBDIR= ${PORTNAME} + LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig -RUN_DEPENDS= rc:shells/rc BROKEN_sparc64= does not install: cleanname not found +OPTIONS_DEFINE= SRC +OPTIONS_DEFAULT= +OPTIONS_SUB= yes + +SRC_DESC= Install sources + USES= perl5 shebangfix tar:tgz +USE_XORG= x11 xt xi xaw xext +USE_PERL5= build + SHEBANG_LANG= rc -rc_OLD_CMD= /bin/rc -rc_CMD= ${LOCALBASE}/bin/rc -SHEBANG_FILES= acid/transcript \ +rc_OLD_CMD= /bin/rc /usr/local/plan9/bin/rc +rc_CMD= ${PLAN9}/bin/rc +# /usr/bin/perl +SHEBANG_FILES= unix/man/fixurls +# /bin/rc +SHEBANG_FILES+= acid/transcript \ acid/window \ mac/9term.app/Contents/MacOS/9term \ mac/Plumb.app/Contents/MacOS/plumb \ src/cmd/9660/mk9660.rc \ + src/cmd/acme/mail/mkbox \ src/cmd/dict/egfix \ src/cmd/dict/egfix2 \ src/cmd/dict/gefix \ @@ -39,11 +53,64 @@ SHEBANG_FILES= acid/transcript \ src/cmd/lp/lpsend.rc \ src/cmd/map/map.rc \ src/cmd/map/mapdemo.rc \ + src/cmd/postscript/hardcopy/hardcopy.rc \ + src/cmd/postscript/psencoding/psencoding.rc \ src/cmd/spell/spell.rc \ src/cmd/upas/filterkit/pipefrom.sample \ - unix/man/fixurls -USE_PERL5= build -USE_XORG= x11 xt xi xaw + src/cmd/upas/filterkit/pipeto.sample-hold \ + src/cmd/upas/filterkit/pipeto.sample \ + tmac/sendcover \ + troff/font/devutf/mkMAP +# /usr/local/plan9/bin/rc +SHEBANG_FILES+= bin/codereview \ + bin/quote1 \ + bin/quote2 \ + bin/ssam \ + bin/upas/isspam \ + bin/upas/msgcat \ + bin/upas/spam \ + bin/upas/spambox \ + bin/upas/unspam \ + bin/upas/unspambox \ + lp/bin/lpsend.rc \ + lp/bin/UNLOCK \ + lp/daemon/generic \ + lp/daemon/gsdev \ + lp/daemon/psdev \ + lp/kill/generic \ + lp/process/dvipost \ + lp/process/g3post \ + lp/process/generic \ + lp/process/gifpost \ + lp/process/hpost \ + lp/process/jpgpost \ + lp/process/noproc \ + lp/process/p9bitpost \ + lp/process/pdfgs \ + lp/process/pdfpost \ + lp/process/post \ + lp/process/ppost \ + lp/process/psextract \ + lp/process/tr2post \ + lp/sched/FIFO \ + lp/spooler/generic \ + lp/spooler/lpdspool \ + lp/spooler/nospool \ + lp/stat/generic \ + lp/stat/lpd \ + mail/lib/validateattachment \ + man/secindex \ + src/cmd/fossil/conf.rc \ + src/cmd/lp/lp.rc \ + src/cmd/netfiles/netfileget \ + src/cmd/netfiles/netfileput \ + src/cmd/netfiles/netfilestat \ + src/cmd/postscript/printfont/printfont.rc \ + src/cmd/upas/misc/mail.rc \ + src/cmd/upas/misc/qmail \ + src/cmd/upas/misc/remotemail \ + src/cmd/venti/srv/conf.rc + WRKSRC= ${WRKDIR}/plan9 PLIST= ${WRKDIR}/.PLIST SUB_FILES= pkg-message @@ -53,9 +120,6 @@ PLAN9= ${PREFIX}/plan9 EMPTY_DIRS= plan9/mail/queue \ plan9/log \ - plan9/dist/debian \ - plan9/dist/pkg \ - plan9/dist/troff \ plan9/bin/lpbin post-extract: @@ -74,30 +138,86 @@ post-patch: @${REINPLACE_CMD} -e 's|, swizz(void)|&, swizz8(void)|' \ ${WRKSRC}/src/cmd/xd.c @${REINPLACE_CMD} -e '/^cd $$PLAN9/d' ${WRKSRC}/lib/moveplan9.sh + @${REINPLACE_CMD} -e 's|^#!/bin/bash$$|#!/bin/sh|' ${WRKSRC}/bin/macedit + @${REINPLACE_CMD} -e 's|#!/bin/rc|#!${PLAN9}/bin/rc|' \ + ${WRKSRC}/src/cmd/upas/ml/mlmgr.c \ + ${WRKSRC}/src/cmd/tcs/font/mkfile + @${REINPLACE_CMD} -e '//d' \ + ${WRKSRC}/src/lib9/readcons.c \ + ${WRKSRC}/src/cmd/9term/bsdpty.c + @${REINPLACE_CMD} -e 's|||' \ + ${WRKSRC}/src/cmd/draw/mc.c + @${REINPLACE_CMD} -e 's|ulong|u64int|' ${WRKSRC}/src/libmach/FreeBSD.c + @${REINPLACE_CMD} -e \ + '/[Rr]enaming hard-coded.*paths\./!s|/usr/local/|${PREFIX}/|' \ + ${WRKSRC}/INSTALL + @${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|g' \ + ${WRKSRC}/bin/codereview \ + ${WRKSRC}/bin/macedit \ + ${WRKSRC}/lib/moveplan9.sh \ + ${WRKSRC}/man/lookman.index \ + ${WRKSRC}/plumb/basic \ + ${WRKSRC}/src/cmd/9pfuse/errstr.c \ + ${WRKSRC}/src/cmd/devdraw/mkwsysrules.sh \ + ${WRKSRC}/src/cmd/fossil/mkfile \ + ${WRKSRC}/src/cmd/lp/lp.rc \ + ${WRKSRC}/src/cmd/postscript/printfont/printfont.rc \ + ${WRKSRC}/src/cmd/sam/sam.c \ + ${WRKSRC}/src/cmd/upas/nfs/imap.c \ + ${WRKSRC}/src/cmd/venti/srv/mkfile \ + ${WRKSRC}/src/lib9/_p9translate.c \ + ${WRKSRC}/src/lib9/get9root.c \ + ${WRKSRC}/src/libregexp/mkfile do-build: - cd ${WRKSRC} && CC9="${CC}" ./INSTALL + @cd ${WRKSRC} && { \ + export PLAN9_TARGET="${PLAN9}" CC9="${CC}"; \ + if [ ! -t 1 ]; then \ + export winid=1; \ + fi; \ + ./INSTALL; \ + } -# Dynamic PLIST sucks, but it's over 8K lines, which sucks even more :( post-build: - ${RM} -r `${FIND} ${WRKSRC}/dist -type f ! -regex ".*\.png"` - ${RM} -r `${FIND} ${WRKSRC} -name .hg -o -name .hgignore \ - -o -name .hgtags -o -name .cvsignore` + @${FIND} ${WRKSRC} -name .cvsignore -o -name .gitignore -delete + @${RM} ${WRKSRC}/configure ${WRKSRC}/config ${WRKSRC}/install.log \ + ${WRKSRC}/install.sum @( cd ${WRKDIR} ; \ ${FIND} plan9 -type f; \ ${ECHO_CMD} "@dir(,,1777) plan9/news"; \ for D in ${EMPTY_DIRS}; do \ ${ECHO_CMD} "@dir $${D}"; \ done; \ - ) | sed -e '/plan9\/bin\/auxstats/s|^|\@\(,kmem,2755\) |' > ${PLIST} + ) | sed -e 's|^plan9/bin/auxstats|@(,kmem,2755) &|' \ + -e 's|^plan9/mac|%%SRC%%&|' \ + -e 's|^plan9/unix|%%SRC%%&|' \ + -e 's|^plan9/bin/macedit|%%SRC%%&|' \ + -e 's|^plan9/bin/osxvers|%%SRC%%&|' \ + -e '/^plan9\/dist\//{/spaceglenda100\.png/!s/^/%%SRC%%/;}' \ + -e '/^plan9\/src\//{/src\/mk/!s/^/%%SRC%%/;}' > ${PLIST} do-install: ${CP} -a ${WRKSRC} ${STAGEDIR}${PREFIX} +do-install-SRC-off: + @${RM} -r ${STAGEDIR}${PLAN9}/mac ${STAGEDIR}${PLAN9}/unix \ + ${STAGEDIR}${PLAN9}/bin/osxvers ${STAGEDIR}${PLAN9}/bin/macedit + @${FIND} ${STAGEDIR}${PLAN9}/dist ! -name spaceglenda100.png -delete + @${FIND} ${STAGEDIR}${PLAN9}/src ! -path '${STAGEDIR}${PLAN9}/src/mk*' \ + -delete + post-install: - cd ${STAGEDIR}${PLAN9} && ${SETENV} PLAN9=${PLAN9} \ - PATH=${PATH}:${STAGEDIR}${PLAN9}/bin \ - ${SH} lib/moveplan9.sh ${WRKSRC} + @${FIND} ${STAGEDIR}${PLAN9}/bin -type f | \ + while read file; do \ + case "$$(file -- "$$file")" in \ + *ELF*) \ + ${STRIP_CMD} -- "$$file"; \ + ;; \ + esac \ + done + +post-install-SRC-on: + @${STRIP_CMD} -- ${STAGEDIR}${PLAN9}/src/cmd/devdraw/o.devdraw install-user: @${MKDIR} ${HOME}/lib Modified: head/devel/plan9port/distinfo ============================================================================== --- head/devel/plan9port/distinfo Thu Aug 17 18:04:27 2017 (r448162) +++ head/devel/plan9port/distinfo Thu Aug 17 18:06:43 2017 (r448163) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490480978 -SHA256 (9fans-plan9port-20170210-9f34853_GH0.tar.gz) = bde67dd164872bb40444eb0397c6136f2469139a011c8262f3e6c5f8eae6dae4 -SIZE (9fans-plan9port-20170210-9f34853_GH0.tar.gz) = 23458438 +TIMESTAMP = 1501722772 +SHA256 (plan9port/9fans-plan9port-20170723-4a8c0c7_GH0.tar.gz) = 0b48f908f4212a7b5c266d369f5ee38640f72cceecdedea324e8fd2ec4207089 +SIZE (plan9port/9fans-plan9port-20170723-4a8c0c7_GH0.tar.gz) = 23469932 Modified: head/devel/plan9port/files/patch-src-cmd-auxstats-FreeBSD.c ============================================================================== --- head/devel/plan9port/files/patch-src-cmd-auxstats-FreeBSD.c Thu Aug 17 18:04:27 2017 (r448162) +++ head/devel/plan9port/files/patch-src-cmd-auxstats-FreeBSD.c Thu Aug 17 18:06:43 2017 (r448163) @@ -1,5 +1,5 @@ ---- src/cmd/auxstats/FreeBSD.c.orig 2010-03-18 01:25:34.000000000 +0300 -+++ src/cmd/auxstats/FreeBSD.c 2014-10-02 23:43:36.000000000 +0400 +--- src/cmd/auxstats/FreeBSD.c.orig 2017-07-23 11:11:56 UTC ++++ src/cmd/auxstats/FreeBSD.c @@ -8,20 +8,15 @@ #include #include @@ -22,7 +22,7 @@ void xapm(int); void xloadavg(int); void xcpu(int); -@@ -45,7 +40,6 @@ +@@ -45,7 +40,6 @@ void (*statfn[])(int) = static kvm_t *kvm; static struct nlist nl[] = { @@ -30,7 +30,7 @@ { "_cp_time" }, { "" } }; -@@ -86,45 +80,28 @@ +@@ -86,45 +80,28 @@ kread(ulong addr, char *buf, int size) void xnet(int first) {