svn commit: r502886 - head/lang/chez-scheme

[Ashish SHUKLA]

Author: ashish
Date: Tue May 28 10:58:31 2019
New Revision: 502886
URL: https://svnweb.freebsd.org/changeset/ports/502886

Log:
  - Update to 9.5.2
  - Add X11 option
  - Pet portlint

Modified:
  head/lang/chez-scheme/Makefile
  head/lang/chez-scheme/distinfo
  head/lang/chez-scheme/pkg-plist

Modified: head/lang/chez-scheme/Makefile
==============================================================================
--- head/lang/chez-scheme/Makefile	Tue May 28 10:57:57 2019	(r502885)
+++ head/lang/chez-scheme/Makefile	Tue May 28 10:58:31 2019	(r502886)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	chez-scheme
-PORTVERSION=	9.5
+PORTVERSION=	9.5.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
 MASTER_SITES=	http://distfiles.pirateparty.in/ashish/:boot \
 		LOCAL/ashish:boot
-DISTFILES=	${PORTNAME}-boot-a6fb.tar.xz:boot \
-		${PORTNAME}-boot-i3fb.tar.xz:boot
+DISTFILES=	${PORTNAME}-boot-a6fb-${PORTVERSION}.tar.xz:boot \
+		${PORTNAME}-boot-i3fb-${PORTVERSION}.tar.xz:boot
 
 MAINTAINER=	ashish at FreeBSD.org
 COMMENT=	Chez Scheme system
@@ -18,6 +18,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
+
+USES=		gmake iconv:lib ncurses
 USE_GITHUB=	yes
 GH_ACCOUNT=	cisco
 GH_PROJECT=	ChezScheme
@@ -25,13 +28,16 @@ GH_TUPLE=	nanopass:nanopass-framework-scheme:v1.9:nano
 		madler:zlib:v1.2.11:zlib/zlib \
 		dybvig:stex:v1.2.1:stex/stex
 
-USES=		gmake iconv:lib ncurses
-USE_XORG=	x11
+OPTIONS_DEFAULT=	X11
+OPTIONS_DEFINE=	X11
+
 HAS_CONFIGURE=	yes
 ALL_TARGET=	build
 CONFLICTS_INSTALL=	petite-chez-[0-9]*
 STRIP_FILES=	bin/petite bin/${PORTNAME} bin/${PORTNAME}-script
 CHEZ_LIBDIR=lib/csv${PORTVERSION}
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -luuid
 CONFIGURE_ARGS=	--installprefix=${PREFIX} \
 		--temproot=${STAGEDIR} \
 		--installschemename=${PORTNAME} \
@@ -39,6 +45,7 @@ CONFIGURE_ARGS=	--installprefix=${PREFIX} \
 PLIST_SUB=	PORTNAME=${PORTNAME} \
 		CHEZ_ARCH=${CHEZ_ARCH} \
 		CHEZ_LIBDIR=${CHEZ_LIBDIR}
+X11_USE=	XORG=x11
 
 .include <bsd.port.pre.mk>
 
@@ -55,6 +62,9 @@ post-patch:
 	${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
 		-e 's,/usr/local,${LOCALBASE},g' \
 		-e 's,-liconv,${ICONV_LIB},g' ${WRKSRC}/c/Mf-${CHEZ_ARCH}
+
+pre-build-X11-off:
+	${ECHO_CMD} '#undef LIBX11' >>${WRKSRC}/c/version.h
 
 post-install:
 .for f in ${STRIP_FILES}

Modified: head/lang/chez-scheme/distinfo
==============================================================================
--- head/lang/chez-scheme/distinfo	Tue May 28 10:57:57 2019	(r502885)
+++ head/lang/chez-scheme/distinfo	Tue May 28 10:58:31 2019	(r502886)
@@ -1,10 +1,10 @@
-TIMESTAMP = 1511729125
-SHA256 (chez-scheme-boot-a6fb.tar.xz) = ee94286508cf6e9d76b9ec9faf9aa73a452b59b4a86a2ed957ea89e271feb659
-SIZE (chez-scheme-boot-a6fb.tar.xz) = 2217812
-SHA256 (chez-scheme-boot-i3fb.tar.xz) = 1733fe28401f7a68c802b31e246696eaeccb3f9e8e32f57751a591383c91effa
-SIZE (chez-scheme-boot-i3fb.tar.xz) = 2115580
-SHA256 (cisco-ChezScheme-v9.5_GH0.tar.gz) = a1d9f93bd8a683ea3d8f2f1b4880f85ea40bf9a482ee6b84cb0fe0ab6148a98c
-SIZE (cisco-ChezScheme-v9.5_GH0.tar.gz) = 29245837
+TIMESTAMP = 1558926275
+SHA256 (chez-scheme-boot-a6fb-9.5.2.tar.xz) = e66d2e983a4856275a3490d03b6dd3e9a5795db4ea49f55407fa7d36af09df3c
+SIZE (chez-scheme-boot-a6fb-9.5.2.tar.xz) = 2283892
+SHA256 (chez-scheme-boot-i3fb-9.5.2.tar.xz) = ed384afddd0983caf2ba5416893ecad469556b179ee6ba248e0efbff0e40144c
+SIZE (chez-scheme-boot-i3fb-9.5.2.tar.xz) = 2184484
+SHA256 (cisco-ChezScheme-v9.5.2_GH0.tar.gz) = 3a370fdf2ffd67d6a0ccbb993dfab1cbaf4a0a97983c869cfaab40528c33c48b
+SIZE (cisco-ChezScheme-v9.5.2_GH0.tar.gz) = 30153222
 SHA256 (nanopass-nanopass-framework-scheme-v1.9_GH0.tar.gz) = 625b239f9030d0b1e86b1fffd8b69f7249a63e8b8ca85195a00cf22889f7fc86
 SIZE (nanopass-nanopass-framework-scheme-v1.9_GH0.tar.gz) = 3816290
 SHA256 (madler-zlib-v1.2.11_GH0.tar.gz) = 629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff

Modified: head/lang/chez-scheme/pkg-plist
==============================================================================
--- head/lang/chez-scheme/pkg-plist	Tue May 28 10:57:57 2019	(r502885)
+++ head/lang/chez-scheme/pkg-plist	Tue May 28 10:58:31 2019	(r502886)
@@ -34,5 +34,7 @@ bin/%%PORTNAME%%-script
 %%CHEZ_LIBDIR%%/examples/socket.ss
 %%CHEZ_LIBDIR%%/examples/template.ss
 %%CHEZ_LIBDIR%%/examples/unify.ss
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/kernel.o
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/main.o
 man/man1/petite.1.gz
 man/man1/%%PORTNAME%%.1.gz