git: ffd7b6bd590f - main - x11/libXcursor: Avoid duplicates in cursor search path

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Mon, 25 Sep 2023 13:08:16 UTC

The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ffd7b6bd590ff4552e1f04c8004c723e296b669a

commit ffd7b6bd590ff4552e1f04c8004c723e296b669a
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-09-25 13:06:43 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-09-25 13:06:43 +0000

    x11/libXcursor: Avoid duplicates in cursor search path
    
    The cursor search path extrapolated by the configure script contains
    duplicated paths. Work around this by providing the full correct
    search path to configure via --with-cursorpath
    
    PR:             273806, 273744
    Reviewed by:    arrowd
    Approved by:    x11 (manu)
---
 x11/libXcursor/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 08ceee71ca96..159efaed8ee5 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libXcursor
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,7 +15,8 @@ USE_XORG=	xrender x11 xfixes xorgproto
 CPE_VENDOR=	x
 CPE_PRODUCT=	libxcursor
 
-CONFIGURE_ARGS=	--with-icondir=${PREFIX}/share/icons
+CONFIGURE_ARGS=	--with-icondir=${PREFIX}/share/icons \
+		--with-cursorpath="~/.local/share/icons:~/.icons:${PREFIX}/share/icons:${PREFIX}/share/pixmaps"
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>