From 8013c10f846b4af4a7eb815a2d5abc4e01f56e08 Mon Sep 17 00:00:00 2001
From: Joseph Mingrone <jrm@FreeBSD.org>
Date: Fri, 18 Aug 2017 13:21:06 +0000
Subject: [PATCH] x11/cl-clx: Switch to upstream used by Quicklisp and take
 maintainership

Reviewed by:	mat
Differential Revision:	https://reviews.freebsd.org/D12030
---
 x11/cl-clx/Makefile  | 97 ++++++++++++++++----------------------------
 x11/cl-clx/distinfo  |  5 ++-
 x11/cl-clx/pkg-plist | 47 +++++++++++++++------
 3 files changed, 72 insertions(+), 77 deletions(-)

diff --git a/x11/cl-clx/Makefile b/x11/cl-clx/Makefile
index ff032086913a..f59ed9bba049 100644
--- a/x11/cl-clx/Makefile
+++ b/x11/cl-clx/Makefile
@@ -1,87 +1,58 @@
-# Created by: Anonymous
 # $FreeBSD$
 
 PORTNAME=	clx
-PORTVERSION=	0.7.4
-PORTREVISION?=	1
+DISTVERSION=	0.7.4
+PORTREVISION=	2
 CATEGORIES=	x11 lisp
-MASTER_SITES=	http://common-lisp.net/~abridgewater/dist/clx/
 PKGNAMEPREFIX=	cl-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	X11 client library for Common Lisp
 
 LICENSE=	MIT
 
 USES=		tar:tgz
 
-.if !defined(FASL_BUILD)
 USES+=		makeinfo
 USE_ASDF=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	sharplispers
+
 INFO=		clx
 PLIST_SUB=	ASDF_PATHNAME="${ASDF_PATHNAME:S,^${PREFIX}/,,}" \
 		ASDF_REGISTRY="${ASDF_REGISTRY:S,^${PREFIX}/,,}"
+PORTDOCS=	CHANGES NEWS README-R5 README.md exclMakefile exclREADME
+
+OPTIONS_DEFINE=	DOCS
 
 do-build:
-	cd ${WRKSRC}/manual && makeinfo --no-split clx.texinfo
+	(cd ${WRKSRC}/manual && makeinfo --no-split clx.texinfo)
 
 do-install:
-	${MKDIR} ${STAGEDIR}${ASDF_PATHNAME} ${STAGEDIR}${ASDF_REGISTRY}
-	${INSTALL_DATA} ${WRKSRC}/attributes.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/big-requests.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/buffer.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/bufmac.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/clx.asd ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/clx.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/depdefs.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/dependent.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/display.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/dpms.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/fonts.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/gcontext.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/gl.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/glx.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/graphics.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/image.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/input.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/keysyms.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/macros.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/manager.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/package.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/requests.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/resource.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/screensaver.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/shape.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/text.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/translate.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/xinerama.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/xrender.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/xtest.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/xvidmode.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/debug
-	${INSTALL_DATA} ${WRKSRC}/debug/debug.lisp ${STAGEDIR}${ASDF_PATHNAME}/debug
-	${INSTALL_DATA} ${WRKSRC}/debug/describe.lisp ${STAGEDIR}${ASDF_PATHNAME}/debug
-	${INSTALL_DATA} ${WRKSRC}/debug/event-test.lisp ${STAGEDIR}${ASDF_PATHNAME}/debug
-	${INSTALL_DATA} ${WRKSRC}/debug/keytrans.lisp ${STAGEDIR}${ASDF_PATHNAME}/debug
-	${INSTALL_DATA} ${WRKSRC}/debug/trace.lisp ${STAGEDIR}${ASDF_PATHNAME}/debug
-	${INSTALL_DATA} ${WRKSRC}/debug/util.lisp ${STAGEDIR}${ASDF_PATHNAME}/debug
-	${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/demo
-	${INSTALL_DATA} ${WRKSRC}/demo/bezier.lisp ${STAGEDIR}${ASDF_PATHNAME}/demo
-	${INSTALL_DATA} ${WRKSRC}/demo/beziertest.lisp ${STAGEDIR}${ASDF_PATHNAME}/demo
-	${INSTALL_DATA} ${WRKSRC}/demo/clclock.lisp ${STAGEDIR}${ASDF_PATHNAME}/demo
-	${INSTALL_DATA} ${WRKSRC}/demo/clipboard.lisp ${STAGEDIR}${ASDF_PATHNAME}/demo
-	${INSTALL_DATA} ${WRKSRC}/demo/clx-demos.lisp ${STAGEDIR}${ASDF_PATHNAME}/demo
-	${INSTALL_DATA} ${WRKSRC}/demo/gl-test.lisp ${STAGEDIR}${ASDF_PATHNAME}/demo
-	${INSTALL_DATA} ${WRKSRC}/demo/hello.lisp ${STAGEDIR}${ASDF_PATHNAME}/demo
-	${INSTALL_DATA} ${WRKSRC}/demo/mandel.lisp ${STAGEDIR}${ASDF_PATHNAME}/demo
-	${INSTALL_DATA} ${WRKSRC}/demo/menu.lisp ${STAGEDIR}${ASDF_PATHNAME}/demo
-	${INSTALL_DATA} ${WRKSRC}/demo/zoid.lisp ${STAGEDIR}${ASDF_PATHNAME}/demo
-	${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/test
-	${INSTALL_DATA} ${WRKSRC}/test/image.lisp ${STAGEDIR}${ASDF_PATHNAME}/test
-	${INSTALL_DATA} ${WRKSRC}/test/trapezoid.lisp ${STAGEDIR}${ASDF_PATHNAME}/test
-	${LN} -sf ${ASDF_PATHNAME}/clx.asd ${STAGEDIR}${ASDF_REGISTRY}
-	${INSTALL_DATA} ${WRKSRC}/manual/*.info ${STAGEDIR}${PREFIX}/info
-.endif # FASL_BUILD
+	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME} \
+		${STAGEDIR}${ASDF_PATHNAME}/debug \
+		${STAGEDIR}${ASDF_PATHNAME}/demo \
+		${STAGEDIR}${ASDF_PATHNAME}/extensions \
+		${STAGEDIR}${ASDF_PATHNAME}/manual \
+		${STAGEDIR}${ASDF_REGISTRY}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.asd ${WRKSRC}/*.c \
+		${WRKSRC}/*.lisp ${WRKSRC}/exclMakefile \
+		${STAGEDIR}${ASDF_PATHNAME}
+	(cd ${WRKSRC}/debug && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${ASDF_PATHNAME}/debug)
+	(cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${ASDF_PATHNAME}/demo)
+	(cd ${WRKSRC}/extensions && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${ASDF_PATHNAME}/extensions)
+	(cd ${WRKSRC}/manual && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${ASDF_PATHNAME}/manual "! -name *.info")
+	${INSTALL_DATA} ${WRKSRC}/manual/*.info \
+		${STAGEDIR}${PREFIX}/${INFO_PATH}
+	${RLN} ${STAGEDIR}${ASDF_PATHNAME}/clx.asd ${STAGEDIR}${ASDF_REGISTRY}
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/x11/cl-clx/distinfo b/x11/cl-clx/distinfo
index d660b48a2c02..f5b30ff71b64 100644
--- a/x11/cl-clx/distinfo
+++ b/x11/cl-clx/distinfo
@@ -1,2 +1,3 @@
-SHA256 (clx-0.7.4.tgz) = 4a80f80255ace26eb8df214957dda3d7b7e51955537405ec893a34b18e569028
-SIZE (clx-0.7.4.tgz) = 444490
+TIMESTAMP = 1503056773
+SHA256 (sharplispers-clx-0.7.4_GH0.tar.gz) = 95b30cb2343676364ee154f40dea750e4b7c9bed18542a0a938363eba97e3f35
+SIZE (sharplispers-clx-0.7.4_GH0.tar.gz) = 467298
diff --git a/x11/cl-clx/pkg-plist b/x11/cl-clx/pkg-plist
index 01a7b0b3e6fc..69cceef7afa7 100644
--- a/x11/cl-clx/pkg-plist
+++ b/x11/cl-clx/pkg-plist
@@ -1,15 +1,18 @@
 %%ASDF_PATHNAME%%/attributes.lisp
-%%ASDF_PATHNAME%%/big-requests.lisp
 %%ASDF_PATHNAME%%/buffer.lisp
 %%ASDF_PATHNAME%%/bufmac.lisp
+%%ASDF_PATHNAME%%/build-clx.lisp
+%%ASDF_PATHNAME%%/clx-module.lisp
 %%ASDF_PATHNAME%%/clx.asd
 %%ASDF_PATHNAME%%/clx.lisp
+%%ASDF_PATHNAME%%/cmudep.lisp
 %%ASDF_PATHNAME%%/debug/debug.lisp
 %%ASDF_PATHNAME%%/debug/describe.lisp
 %%ASDF_PATHNAME%%/debug/event-test.lisp
 %%ASDF_PATHNAME%%/debug/keytrans.lisp
 %%ASDF_PATHNAME%%/debug/trace.lisp
 %%ASDF_PATHNAME%%/debug/util.lisp
+%%ASDF_PATHNAME%%/defsystem.lisp
 %%ASDF_PATHNAME%%/demo/bezier.lisp
 %%ASDF_PATHNAME%%/demo/beziertest.lisp
 %%ASDF_PATHNAME%%/demo/clclock.lisp
@@ -17,34 +20,54 @@
 %%ASDF_PATHNAME%%/demo/clx-demos.lisp
 %%ASDF_PATHNAME%%/demo/gl-test.lisp
 %%ASDF_PATHNAME%%/demo/hello.lisp
+%%ASDF_PATHNAME%%/demo/image.lisp
 %%ASDF_PATHNAME%%/demo/mandel.lisp
 %%ASDF_PATHNAME%%/demo/menu.lisp
+%%ASDF_PATHNAME%%/demo/trapezoid.lisp
 %%ASDF_PATHNAME%%/demo/zoid.lisp
+%%ASDF_PATHNAME%%/dep-allegro.lisp
+%%ASDF_PATHNAME%%/dep-lispworks.lisp
+%%ASDF_PATHNAME%%/dep-openmcl.lisp
 %%ASDF_PATHNAME%%/depdefs.lisp
 %%ASDF_PATHNAME%%/dependent.lisp
 %%ASDF_PATHNAME%%/display.lisp
-%%ASDF_PATHNAME%%/dpms.lisp
+%%ASDF_PATHNAME%%/exclMakefile
+%%ASDF_PATHNAME%%/exclcmac.lisp
+%%ASDF_PATHNAME%%/excldefsys.lisp
+%%ASDF_PATHNAME%%/excldep.c
+%%ASDF_PATHNAME%%/excldep.lisp
+%%ASDF_PATHNAME%%/extensions/big-requests.lisp
+%%ASDF_PATHNAME%%/extensions/composite.lisp
+%%ASDF_PATHNAME%%/extensions/dbe.lisp
+%%ASDF_PATHNAME%%/extensions/dpms.lisp
+%%ASDF_PATHNAME%%/extensions/dri2.lisp
+%%ASDF_PATHNAME%%/extensions/gl.lisp
+%%ASDF_PATHNAME%%/extensions/glx.lisp
+%%ASDF_PATHNAME%%/extensions/randr.lisp
+%%ASDF_PATHNAME%%/extensions/screensaver.lisp
+%%ASDF_PATHNAME%%/extensions/shape.lisp
+%%ASDF_PATHNAME%%/extensions/xc-misc.lisp
+%%ASDF_PATHNAME%%/extensions/xinerama.lisp
+%%ASDF_PATHNAME%%/extensions/xrender.lisp
+%%ASDF_PATHNAME%%/extensions/xtest.lisp
+%%ASDF_PATHNAME%%/extensions/xvidmode.lisp
 %%ASDF_PATHNAME%%/fonts.lisp
 %%ASDF_PATHNAME%%/gcontext.lisp
-%%ASDF_PATHNAME%%/gl.lisp
-%%ASDF_PATHNAME%%/glx.lisp
+%%ASDF_PATHNAME%%/generalock.lisp
 %%ASDF_PATHNAME%%/graphics.lisp
 %%ASDF_PATHNAME%%/image.lisp
 %%ASDF_PATHNAME%%/input.lisp
 %%ASDF_PATHNAME%%/keysyms.lisp
 %%ASDF_PATHNAME%%/macros.lisp
 %%ASDF_PATHNAME%%/manager.lisp
+%%ASDF_PATHNAME%%/manual/clx.texinfo
+%%ASDF_PATHNAME%%/manual/style.css
 %%ASDF_PATHNAME%%/package.lisp
+%%ASDF_PATHNAME%%/provide.lisp
 %%ASDF_PATHNAME%%/requests.lisp
 %%ASDF_PATHNAME%%/resource.lisp
-%%ASDF_PATHNAME%%/screensaver.lisp
-%%ASDF_PATHNAME%%/shape.lisp
-%%ASDF_PATHNAME%%/test/image.lisp
-%%ASDF_PATHNAME%%/test/trapezoid.lisp
+%%ASDF_PATHNAME%%/sockcl.lisp
+%%ASDF_PATHNAME%%/socket.c
 %%ASDF_PATHNAME%%/text.lisp
 %%ASDF_PATHNAME%%/translate.lisp
-%%ASDF_PATHNAME%%/xinerama.lisp
-%%ASDF_PATHNAME%%/xrender.lisp
-%%ASDF_PATHNAME%%/xtest.lisp
-%%ASDF_PATHNAME%%/xvidmode.lisp
 %%ASDF_REGISTRY%%/clx.asd