Attachment 186521 Details for Bug 222436 – Update to version 20170914

[patch] Update to version 20170914

patch-devel_plan9port.20170914 (text/plain), 4.76 KB, created by kd-dev on 2017-09-18 22:48:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kd-dev

Created: 2017-09-18 22:48:18 UTC

Size: 4.76 KB

patch

obsolete

>Index: devel/plan9port/Makefile
>===================================================================
>--- devel/plan9port/Makefile	(revision 449976)
>+++ devel/plan9port/Makefile	(working copy)
>@@ -2,38 +2,52 @@
> # $FreeBSD$
> 
> PORTNAME=	plan9port
>-PORTVERSION=	20170723
>+PORTVERSION=	20170914
> CATEGORIES=	devel plan9
>+DIST_SUBDIR=	${PORTNAME}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Port of many Plan 9 programs to Unix-like operating systems
> 
>-LICENSE=	LUCENT
>-LICENSE_NAME=	Lucent Public License Version 1.02
>-LICENSE_FILE=	${WRKSRC}/LICENSE
>-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
>+LICENSE=		LUCENT
>+LICENSE_NAME_LUCENT=	Lucent Public License Version 1.02
>+LICENSE_FILE_LUCENT=	${WRKSRC}/LICENSE
>+LICENSE_PERMS_LUCENT=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>-GH_ACCOUNT=	9fans
>-GH_TAGNAME=	4a8c0c7
>-USE_GITHUB=	yes
>+BROKEN_sparc64=	does not install: cleanname not found
> 
>-DIST_SUBDIR=	${PORTNAME}
>-
> LIB_DEPENDS=	libfreetype.so:print/freetype2 \
> 		libfontconfig.so:x11-fonts/fontconfig
> 
>-BROKEN_sparc64=	does not install: cleanname not found
>+USES=		perl5 shebangfix tar:tgz
>+USE_XORG=	x11 xt xi xaw xext
>+USE_PERL5=	build
> 
>-OPTIONS_DEFINE=	SRC
>-OPTIONS_DEFAULT=
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	9fans
>+GH_TAGNAME=	1732959
>+
>+OPTIONS_DEFINE=	DICT SKY SRC
>+OPTIONS_DEFAULT=DICT SKY
> OPTIONS_SUB=	yes
> 
>-SRC_DESC=	Install sources
>+DICT_DESC=	Install the dictionary and thesaurus
>+SKY_DESC=	Install the sky catalogues and Digitized Sky Survey
>+SRC_DESC=	Install the sources
> 
>-USES=		perl5 shebangfix tar:tgz
>-USE_XORG=	x11 xt xi xaw xext
>-USE_PERL5=	build
>+DICT_MASTER_SITES=	https://9fans.github.io/plan9port/dist/
>+SKY_MASTER_SITES=	https://9fans.github.io/plan9port/dist/
> 
>+DICT_DISTFILES=		pgw.tar.bz2 roget.tar.bz2
>+SKY_DISTFILES=		scat.tgz
>+
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MDICT}
>+LICENSE+=	PD
>+LICENSE_COMB=	multi
>+.endif
>+
> SHEBANG_LANG=	rc
> rc_OLD_CMD=	/bin/rc /usr/local/plan9/bin/rc
> rc_CMD=		${PLAN9}/bin/rc
>@@ -62,17 +76,7 @@
> 		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 \
>+SHEBANG_FILES+=	lp/bin/lpsend.rc \
> 		lp/bin/UNLOCK \
> 		lp/daemon/generic \
> 		lp/daemon/gsdev \
>@@ -118,13 +122,15 @@
> 
> PLAN9=		${PREFIX}/plan9
> 
>-EMPTY_DIRS=	plan9/mail/queue \
>-		plan9/log \
>-		plan9/bin/lpbin
>-
> post-extract:
> 	${MV} ${WRKDIR}/plan9port-${GH_TAGNAME} ${WRKDIR}/plan9
> 
>+post-extract-DICT-on:
>+	${MV} ${WRKDIR}/pgw* ${WRKDIR}/roget* ${WRKDIR}/plan9/dict/
>+
>+post-extract-SKY-on:
>+	${MV} ${WRKDIR}/*.scat ${WRKDIR}/plan9/sky/
>+
> post-patch:
> 	@${FIND} ${WRKSRC}/man -type f -regex ".*\.[0-9?]$\" \
> 		| ${XARGS} ${REINPLACE_CMD} -e 's|\\\*9|${PLAN9}|'
>@@ -152,7 +158,6 @@
> 		'/[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 \
>@@ -179,16 +184,13 @@
> 	}
> 
> post-build:
>-	@${FIND} ${WRKSRC} -name .cvsignore -o -name .gitignore -delete
>+	@${FIND} ${WRKSRC} -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 's|^plan9/bin/auxstats|@(,kmem,2755) &|' \
>+	 ) | ${SED} -e 's|^plan9/bin/auxstats|@(,kmem,2755) &|' \
> 		-e 's|^plan9/mac|%%SRC%%&|' \
> 		-e 's|^plan9/unix|%%SRC%%&|' \
> 		-e 's|^plan9/bin/macedit|%%SRC%%&|' \
>Index: devel/plan9port/distinfo
>===================================================================
>--- devel/plan9port/distinfo	(revision 449976)
>+++ devel/plan9port/distinfo	(working copy)
>@@ -1,3 +1,8 @@
>-TIMESTAMP = 1501722772
>-SHA256 (plan9port/9fans-plan9port-20170723-4a8c0c7_GH0.tar.gz) = 0b48f908f4212a7b5c266d369f5ee38640f72cceecdedea324e8fd2ec4207089
>-SIZE (plan9port/9fans-plan9port-20170723-4a8c0c7_GH0.tar.gz) = 23469932
>+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-20170914-1732959_GH0.tar.gz) = c4755ef45b24805962787a8a40b846649d0c49b049cfeaec5d2dde1c1b6be2a4
>+SIZE (plan9port/9fans-plan9port-20170914-1732959_GH0.tar.gz) = 23429249

Actions: View | Diff

Attachments on bug 222436: 186521 | 186523 | 186582