alacritty: cleanups for pkgsrc proper import

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Thu Oct 22 16:25:23 2020 +0200
Changeset:	1b70b39f630d8ca1f8c4d4f1d7c60d3dc4ea4d8d

Modified Files:
	alacritty/DESCR
	alacritty/Makefile
Removed Files:
	alacritty/TODO

Log Message:
alacritty: cleanups for pkgsrc proper import

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1b70b39f630d8ca1f8c4d4f1d7c60d3dc4ea4d8d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 alacritty/DESCR    | 10 +++-------
 alacritty/Makefile | 22 ++++++----------------
 alacritty/TODO     |  3 ---
 3 files changed, 9 insertions(+), 26 deletions(-)

diffs:
diff --git a/alacritty/DESCR b/alacritty/DESCR
index 1212a93bb1..e7189bd66d 100644
--- a/alacritty/DESCR
+++ b/alacritty/DESCR
@@ -1,10 +1,6 @@
 Alacritty is a terminal emulator with a strong focus on simplicity and
 performance. With such a strong focus on performance, included
 features are carefully considered and you can always expect Alacritty
-to be blazingly fast. By making good choices for defaults, Alacritty
-requires no additional setup. However, it does allow configuration of
-many aspects of the terminal.
-
-The software is considered to be at a beta level of readiness -- there
-are a few missing features and bugs to be fixed, but it is already
-used by many as a daily driver.
+to be blazingly fast (on modern hardware). By making good choices for
+defaults, Alacritty requires no additional setup. However, it does
+allow configuration of many aspects of the terminal.
diff --git a/alacritty/Makefile b/alacritty/Makefile
index bb78af4f59..310bdec4b0 100644
--- a/alacritty/Makefile
+++ b/alacritty/Makefile
@@ -6,34 +6,27 @@ MASTER_SITES=	${MASTER_SITE_GITHUB:=alacritty/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/jwilm/alacritty
+HOMEPAGE=	https://github.com/alacritty/alacritty
 COMMENT=	Cross-platform, GPU-accelerated terminal emulator
 LICENSE=	apache-2.0
 
 BUILD_DEPENDS+=		cmake-[0-9]*:../../devel/cmake
-
-USE_LANGUAGES+=		c c++
-USE_TOOLS+=		gmake pkg-config	# for fontconfig-sys
+BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 .include "cargo-depends.mk"
 
-#DEPENDS+=	xcb-[0-9]*:../../x11/xcb
+USE_LANGUAGES+=		c c++
+USE_TOOLS+=		gmake pkg-config	# for fontconfig-sys
 
 MAKE_ENV+=	OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
+MAKE_ENV+=	RUSTFLAGS=${RUSTFLAGS:Q}
 RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
 RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.fontconfig}/lib
 RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.freetype2}/lib
-MAKE_ENV+=	RUSTFLAGS=${RUSTFLAGS:Q}
-
-# TODO: doesn't include dlopen.bl3.mk?
-BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 
-# The xcb 0.8.2 crate depends on any version of python 3.
+# The xcb crate depends on any version of python 3.
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 PYTHON_FOR_BUILD_ONLY=		tool
-BUILD_DEPENDS+=			${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-#REPLACE_PYTHON+=		../vendor/xcb-0.8.2/rs-client.py
-#REPLACE_PYTHON+=		../vendor/xcb-0.8.2/build.rs
 
 INSTALLATION_DIRS=	bin share/examples/alacritty
 
@@ -43,11 +36,8 @@ do-install:
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-#.include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../lang/rust/cargo.mk"
-#.include "../../lang/rust/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
-# .include "../../x11/xcb-util/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/alacritty/TODO b/alacritty/TODO
deleted file mode 100644
index 725585293f..0000000000
--- a/alacritty/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-* This package tracks https://github.com/jwilm/alacritty/issues/2631,
-  which is why the build is not done from a release tarball. The ticket
-  aims to fix NetBSD builds for alacritty.