Fri Oct 1 02:57:20 2021 UTC ()
xcolor: fix builds in some circumstances


(gutteridge)
diff -r1.4 -r1.5 pkgsrc/x11/xcolor/Makefile
cvs diff -r1.4 -r1.5 pkgsrc/x11/xcolor/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xcolor/Makefile 2021/09/09 09:23:03 1.4
+++ pkgsrc/x11/xcolor/Makefile 2021/10/01 02:57:20 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.4 2021/09/09 09:23:03 pin Exp $ 1# $NetBSD: Makefile,v 1.5 2021/10/01 02:57:20 gutteridge Exp $
2 2
3DISTNAME= xcolor-0.5.1 3DISTNAME= xcolor-0.5.1
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_GITHUB:=Soft/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=Soft/}
6 6
7MAINTAINER= pin@NetBSD.org 7MAINTAINER= pin@NetBSD.org
8HOMEPAGE= https://github.com/Soft/xcolor/ 8HOMEPAGE= https://github.com/Soft/xcolor/
9COMMENT= Lightweight color picker for X11 9COMMENT= Lightweight color picker for X11
10LICENSE= mit 10LICENSE= mit
11 11
12TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 12TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
13 13
14.include "cargo-depends.mk" 14.include "cargo-depends.mk"
@@ -20,14 +20,15 @@ PYTHON_FOR_BUILD_ONLY= tool @@ -20,14 +20,15 @@ PYTHON_FOR_BUILD_ONLY= tool
20INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 20INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
21 21
22RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib 22RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
23RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib 23RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
24 24
25do-install: 25do-install:
26 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/xcolor ${DESTDIR}${PREFIX}/bin 26 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/xcolor ${DESTDIR}${PREFIX}/bin
27 ${INSTALL_MAN} ${WRKSRC}/man/xcolor.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xcolor.1 27 ${INSTALL_MAN} ${WRKSRC}/man/xcolor.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xcolor.1
28 28
29.include "../../lang/rust/cargo.mk" 29.include "../../lang/rust/cargo.mk"
30.include "../../lang/python/tool.mk" 30.include "../../lang/python/tool.mk"
31.include "../../x11/libX11/buildlink3.mk" 31.include "../../x11/libX11/buildlink3.mk"
32.include "../../x11/libxcb/buildlink3.mk" 32.include "../../x11/libxcb/buildlink3.mk"
 33.include "../../x11/libXcursor/buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"