Attachment #184972 for bug #221191

View | Details | Raw Unified | Return to bug 221191
Collapse All | Expand All

Lines 2-8 Link Here

(-)devel/plan9port/Makefile (-21 / +141 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= plan9port	4	PORTNAME= plan9port
5	PORTVERSION= 20170210	5	PORTVERSION= 20170723
6	CATEGORIES= devel plan9	6	CATEGORIES= devel plan9
7		7
8	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
Lines 14-37 Link Here
14	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	14	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
15		15
16	GH_ACCOUNT= 9fans	16	GH_ACCOUNT= 9fans
17	GH_TAGNAME= 9f34853	17	GH_TAGNAME= 4a8c0c7
18	USE_GITHUB= yes	18	USE_GITHUB= yes
19		19
		20	DIST_SUBDIR= ${PORTNAME}
		21
20	LIB_DEPENDS= libfreetype.so:print/freetype2 \	22	LIB_DEPENDS= libfreetype.so:print/freetype2 \
21	libfontconfig.so:x11-fonts/fontconfig	23	libfontconfig.so:x11-fonts/fontconfig
22	RUN_DEPENDS= rc:shells/rc
23		24
24	BROKEN_sparc64= does not install: cleanname not found	25	BROKEN_sparc64= does not install: cleanname not found
25		26
		27	OPTIONS_DEFINE= SRC
		28	OPTIONS_DEFAULT=
		29	OPTIONS_SUB= yes
		30
		31	SRC_DESC= Install sources
		32
26	USES= perl5 shebangfix tar:tgz	33	USES= perl5 shebangfix tar:tgz
		34	USE_XORG= x11 xt xi xaw xext
		35	USE_PERL5= build
		36
27	SHEBANG_LANG= rc	37	SHEBANG_LANG= rc
28	rc_OLD_CMD= /bin/rc	38	rc_OLD_CMD= /bin/rc /usr/local/plan9/bin/rc
29	rc_CMD= ${LOCALBASE}/bin/rc	39	rc_CMD= ${PLAN9}/bin/rc
30	SHEBANG_FILES= acid/transcript \	40	# /usr/bin/perl
		41	SHEBANG_FILES= unix/man/fixurls
		42	# /bin/rc
		43	SHEBANG_FILES+= acid/transcript \
31	acid/window \	44	acid/window \
32	mac/9term.app/Contents/MacOS/9term \	45	mac/9term.app/Contents/MacOS/9term \
33	mac/Plumb.app/Contents/MacOS/plumb \	46	mac/Plumb.app/Contents/MacOS/plumb \
34	src/cmd/9660/mk9660.rc \	47	src/cmd/9660/mk9660.rc \
		48	src/cmd/acme/mail/mkbox \
35	src/cmd/dict/egfix \	49	src/cmd/dict/egfix \
36	src/cmd/dict/egfix2 \	50	src/cmd/dict/egfix2 \
37	src/cmd/dict/gefix \	51	src/cmd/dict/gefix \
Lines 39-49 Link Here
39	src/cmd/lp/lpsend.rc \	53	src/cmd/lp/lpsend.rc \
40	src/cmd/map/map.rc \	54	src/cmd/map/map.rc \
41	src/cmd/map/mapdemo.rc \	55	src/cmd/map/mapdemo.rc \
		56	src/cmd/postscript/hardcopy/hardcopy.rc \
		57	src/cmd/postscript/psencoding/psencoding.rc \
42	src/cmd/spell/spell.rc \	58	src/cmd/spell/spell.rc \
43	src/cmd/upas/filterkit/pipefrom.sample \	59	src/cmd/upas/filterkit/pipefrom.sample \
44	unix/man/fixurls	60	src/cmd/upas/filterkit/pipeto.sample-hold \
45	USE_PERL5= build	61	src/cmd/upas/filterkit/pipeto.sample \
46	USE_XORG= x11 xt xi xaw	62	tmac/sendcover \
		63	troff/font/devutf/mkMAP
		64	# /usr/local/plan9/bin/rc
		65	SHEBANG_FILES+= bin/codereview \
		66	bin/quote1 \
		67	bin/quote2 \
		68	bin/ssam \
		69	bin/upas/isspam \
		70	bin/upas/msgcat \
		71	bin/upas/spam \
		72	bin/upas/spambox \
		73	bin/upas/unspam \
		74	bin/upas/unspambox \
		75	lp/bin/lpsend.rc \
		76	lp/bin/UNLOCK \
		77	lp/daemon/generic \
		78	lp/daemon/gsdev \
		79	lp/daemon/psdev \
		80	lp/kill/generic \
		81	lp/process/dvipost \
		82	lp/process/g3post \
		83	lp/process/generic \
		84	lp/process/gifpost \
		85	lp/process/hpost \
		86	lp/process/jpgpost \
		87	lp/process/noproc \
		88	lp/process/p9bitpost \
		89	lp/process/pdfgs \
		90	lp/process/pdfpost \
		91	lp/process/post \
		92	lp/process/ppost \
		93	lp/process/psextract \
		94	lp/process/tr2post \
		95	lp/sched/FIFO \
		96	lp/spooler/generic \
		97	lp/spooler/lpdspool \
		98	lp/spooler/nospool \
		99	lp/stat/generic \
		100	lp/stat/lpd \
		101	mail/lib/validateattachment \
		102	man/secindex \
		103	src/cmd/fossil/conf.rc \
		104	src/cmd/lp/lp.rc \
		105	src/cmd/netfiles/netfileget \
		106	src/cmd/netfiles/netfileput \
		107	src/cmd/netfiles/netfilestat \
		108	src/cmd/postscript/printfont/printfont.rc \
		109	src/cmd/upas/misc/mail.rc \
		110	src/cmd/upas/misc/qmail \
		111	src/cmd/upas/misc/remotemail \
		112	src/cmd/venti/srv/conf.rc
		113
47	WRKSRC= ${WRKDIR}/plan9	114	WRKSRC= ${WRKDIR}/plan9
48	PLIST= ${WRKDIR}/.PLIST	115	PLIST= ${WRKDIR}/.PLIST
49	SUB_FILES= pkg-message	116	SUB_FILES= pkg-message
Lines 53-61 Link Here
53		120
54	EMPTY_DIRS= plan9/mail/queue \	121	EMPTY_DIRS= plan9/mail/queue \
55	plan9/log \	122	plan9/log \
56	plan9/dist/debian \
57	plan9/dist/pkg \
58	plan9/dist/troff \
59	plan9/bin/lpbin	123	plan9/bin/lpbin
60		124
61	post-extract:	125	post-extract:
Lines 74-88 Link Here
74	@${REINPLACE_CMD} -e 's\|, swizz(void)\|&, swizz8(void)\|' \	138	@${REINPLACE_CMD} -e 's\|, swizz(void)\|&, swizz8(void)\|' \
75	${WRKSRC}/src/cmd/xd.c	139	${WRKSRC}/src/cmd/xd.c
76	@${REINPLACE_CMD} -e '/^cd $$PLAN9/d' ${WRKSRC}/lib/moveplan9.sh	140	@${REINPLACE_CMD} -e '/^cd $$PLAN9/d' ${WRKSRC}/lib/moveplan9.sh
		141	@${REINPLACE_CMD} -e 's\|^#!/bin/bash$$\|#!/bin/sh\|' ${WRKSRC}/bin/macedit
		142	@${REINPLACE_CMD} -e 's\|#!/bin/rc\|#!${PLAN9}/bin/rc\|' \
		143	${WRKSRC}/src/cmd/upas/ml/mlmgr.c \
		144	${WRKSRC}/src/cmd/tcs/font/mkfile
		145	@${REINPLACE_CMD} -e '/<sys\/termios.h>/d' \
		146	${WRKSRC}/src/lib9/readcons.c \
		147	${WRKSRC}/src/cmd/9term/bsdpty.c
		148	@${REINPLACE_CMD} -e 's\|<sys/termios.h>\|<termios.h>\|' \
		149	${WRKSRC}/src/cmd/draw/mc.c
		150	@${REINPLACE_CMD} -e 's\|ulong\|u64int\|' ${WRKSRC}/src/libmach/FreeBSD.c
		151	@${REINPLACE_CMD} -e \
		152	'/[Rr]enaming hard-coded.*paths\./!s\|/usr/local/\|${PREFIX}/\|' \
		153	${WRKSRC}/INSTALL
		154	@${REINPLACE_CMD} -e 's\|/usr/local/\|${PREFIX}/\|g' \
		155	${WRKSRC}/bin/codereview \
		156	${WRKSRC}/bin/macedit \
		157	${WRKSRC}/lib/moveplan9.sh \
		158	${WRKSRC}/man/lookman.index \
		159	${WRKSRC}/plumb/basic \
		160	${WRKSRC}/src/cmd/9pfuse/errstr.c \
		161	${WRKSRC}/src/cmd/devdraw/mkwsysrules.sh \
		162	${WRKSRC}/src/cmd/fossil/mkfile \
		163	${WRKSRC}/src/cmd/lp/lp.rc \
		164	${WRKSRC}/src/cmd/postscript/printfont/printfont.rc \
		165	${WRKSRC}/src/cmd/sam/sam.c \
		166	${WRKSRC}/src/cmd/upas/nfs/imap.c \
		167	${WRKSRC}/src/cmd/venti/srv/mkfile \
		168	${WRKSRC}/src/lib9/_p9translate.c \
		169	${WRKSRC}/src/lib9/get9root.c \
		170	${WRKSRC}/src/libregexp/mkfile
77		171
78	do-build:	172	do-build:
79	cd ${WRKSRC} && CC9="${CC}" ./INSTALL	173	@cd ${WRKSRC} && { \
		174	export PLAN9_TARGET="${PLAN9}" CC9="${CC}"; \
		175	if [ ! -t 1 ]; then \
		176	export winid=1; \
		177	fi; \
		178	./INSTALL; \
		179	}
80		180
81	# Dynamic PLIST sucks, but it's over 8K lines, which sucks even more :(
82	post-build:	181	post-build:
83	${RM} -r `${FIND} ${WRKSRC}/dist -type f ! -regex ".*\.png"`	182	@${FIND} ${WRKSRC} -name .cvsignore -o -name .gitignore -delete
84	${RM} -r `${FIND} ${WRKSRC} -name .hg -o -name .hgignore \	183	@${RM} ${WRKSRC}/configure ${WRKSRC}/config ${WRKSRC}/install.log \
85	-o -name .hgtags -o -name .cvsignore`	184	${WRKSRC}/install.sum
86	@( cd ${WRKDIR} ; \	185	@( cd ${WRKDIR} ; \
87	${FIND} plan9 -type f; \	186	${FIND} plan9 -type f; \
88	${ECHO_CMD} "@dir(,,1777) plan9/news"; \	187	${ECHO_CMD} "@dir(,,1777) plan9/news"; \
Lines 89-104 Link Here
89	for D in ${EMPTY_DIRS}; do \	188	for D in ${EMPTY_DIRS}; do \
90	${ECHO_CMD} "@dir $${D}"; \	189	${ECHO_CMD} "@dir $${D}"; \
91	done; \	190	done; \
92	) \| sed -e '/plan9\/bin\/auxstats/s\|^\|\@$,kmem,2755$ \|' > ${PLIST}	191	) \| sed -e 's\|^plan9/bin/auxstats\|@(,kmem,2755) &\|' \
		192	-e 's\|^plan9/mac\|%%SRC%%&\|' \
		193	-e 's\|^plan9/unix\|%%SRC%%&\|' \
		194	-e 's\|^plan9/bin/macedit\|%%SRC%%&\|' \
		195	-e 's\|^plan9/bin/osxvers\|%%SRC%%&\|' \
		196	-e '/^plan9\/dist\//{/spaceglenda100\.png/!s/^/%%SRC%%/;}' \
		197	-e '/^plan9\/src\//{/src\/mk/!s/^/%%SRC%%/;}' > ${PLIST}
93		198
94	do-install:	199	do-install:
95	${CP} -a ${WRKSRC} ${STAGEDIR}${PREFIX}	200	${CP} -a ${WRKSRC} ${STAGEDIR}${PREFIX}
96		201
		202	do-install-SRC-off:
		203	@${RM} -r ${STAGEDIR}${PLAN9}/mac ${STAGEDIR}${PLAN9}/unix \
		204	${STAGEDIR}${PLAN9}/bin/osxvers ${STAGEDIR}${PLAN9}/bin/macedit
		205	@${FIND} ${STAGEDIR}${PLAN9}/dist ! -name spaceglenda100.png -delete
		206	@${FIND} ${STAGEDIR}${PLAN9}/src ! -path '${STAGEDIR}${PLAN9}/src/mk*' \
		207	-delete
		208
97	post-install:	209	post-install:
98	cd ${STAGEDIR}${PLAN9} && ${SETENV} PLAN9=${PLAN9} \	210	@${FIND} ${STAGEDIR}${PLAN9}/bin -type f \| \
99	PATH=${PATH}:${STAGEDIR}${PLAN9}/bin \	211	while read file; do \
100	${SH} lib/moveplan9.sh ${WRKSRC}	212	case "$$(file -- "$$file")" in \
		213	ELF) \
		214	${STRIP_CMD} -- "$$file"; \
		215	;; \
		216	esac \
		217	done
101		218
		219	post-install-SRC-on:
		220	@${STRIP_CMD} -- ${STAGEDIR}${PLAN9}/src/cmd/devdraw/o.devdraw
		221
102	install-user:	222	install-user:
103	@${MKDIR} ${HOME}/lib	223	@${MKDIR} ${HOME}/lib
104	${INSTALL_DATA} ${PLAN9}/plumb/initial.plumbing ${HOME}/lib/plumbing	224	${INSTALL_DATA} ${PLAN9}/plumb/initial.plumbing ${HOME}/lib/plumbing

Lines 1-3 Link Here

(-)devel/plan9port/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1490480978	1	TIMESTAMP = 1501722772
2	SHA256 (9fans-plan9port-20170210-9f34853_GH0.tar.gz) = bde67dd164872bb40444eb0397c6136f2469139a011c8262f3e6c5f8eae6dae4	2	SHA256 (plan9port/9fans-plan9port-20170723-4a8c0c7_GH0.tar.gz) = 0b48f908f4212a7b5c266d369f5ee38640f72cceecdedea324e8fd2ec4207089
3	SIZE (9fans-plan9port-20170210-9f34853_GH0.tar.gz) = 23458438	3	SIZE (plan9port/9fans-plan9port-20170723-4a8c0c7_GH0.tar.gz) = 23469932

Lines 1-5 Link Here

(-)devel/plan9port/files/patch-src-cmd-auxstats-FreeBSD.c (-4 / +4 lines)
1	--- src/cmd/auxstats/FreeBSD.c.orig 2010-03-18 01:25:34.000000000 +0300	1	--- src/cmd/auxstats/FreeBSD.c.orig 2017-07-23 11:11:56 UTC
2	+++ src/cmd/auxstats/FreeBSD.c 2014-10-02 23:43:36.000000000 +0400	2	+++ src/cmd/auxstats/FreeBSD.c
3	@@ -8,20 +8,15 @@	3	@@ -8,20 +8,15 @@
4	#include <sys/time.h>	4	#include <sys/time.h>
5	#include <sys/dkstat.h>	5	#include <sys/dkstat.h>
Lines 22-28 Link Here
22	void xapm(int);	22	void xapm(int);
23	void xloadavg(int);	23	void xloadavg(int);
24	void xcpu(int);	24	void xcpu(int);
25	@@ -45,7 +40,6 @@	25	@@ -45,7 +40,6 @@ void (*statfn[])(int) =
26	static kvm_t *kvm;	26	static kvm_t *kvm;
27		27
28	static struct nlist nl[] = {	28	static struct nlist nl[] = {
Lines 30-36 Link Here
30	{ "_cp_time" },	30	{ "_cp_time" },
31	{ "" }	31	{ "" }
32	};	32	};
33	@@ -86,45 +80,28 @@	33	@@ -86,45 +80,28 @@ kread(ulong addr, char *buf, int size)
34	void	34	void
35	xnet(int first)	35	xnet(int first)
36	{	36	{

Return to bug 221191