Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Jun 2023 17:48:33 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: af3b40f8fe4b - main - x11-wm/euclid-wm: Fix build with llvm15
Message-ID:  <202306061748.356HmXdK029702@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

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

commit af3b40f8fe4b392cbc8c585652688dba38812543
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-06-06 14:41:51 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-06-06 17:47:37 +0000

    x11-wm/euclid-wm: Fix build with llvm15
    
    - Remove GH_PROJECT as this is by default PORTNAME
    - Pet portclippy
    
    Approved by:    portmgr (blanket)
---
 x11-wm/euclid-wm/Makefile | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/x11-wm/euclid-wm/Makefile b/x11-wm/euclid-wm/Makefile
index 6c61f1813c66..0638ed3bc821 100644
--- a/x11-wm/euclid-wm/Makefile
+++ b/x11-wm/euclid-wm/Makefile
@@ -9,23 +9,13 @@ WWW=		http://euclid-wm.sourceforge.net
 
 LICENSE=	BSD3CLAUSE
 
+USES=		gmake xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	wmdiem
-GH_PROJECT=	euclid-wm
 GH_TAGNAME=	b6b0319
-
-OPTIONS_DEFINE=		XINERAMA EUCLID_MENU
-OPTIONS_SUB=		yes
-OPTIONS_DEFAULT=	XINERAMA
-EUCLID_MENU_DESC=	Custom built menuing program (work in progress)
+USE_XORG=	x11
 
 ALL_TARGET=		noxinerama
-XINERAMA_ALL_TARGET=	euclid-wm
-EUCLID_MENU_ALL_TARGET=	euclid-menu
-XINERAMA_USE=		XORG=xinerama
-
-USES=		gmake xorg
-USE_XORG=	x11
 
 PLIST_FILES=	bin/euclid-wm \
 		bin/start-euclid \
@@ -39,10 +29,28 @@ PLIST_FILES=	bin/euclid-wm \
 		%%EUCLID_MENU%%share/euclid-menu/handlers/c.sh \
 		%%EUCLID_MENU%%share/euclid-menu/handlers/default.sh
 
+OPTIONS_DEFINE=		XINERAMA EUCLID_MENU
+OPTIONS_DEFAULT=	XINERAMA
+OPTIONS_SUB=		yes
+
+EUCLID_MENU_DESC=	Custom built menuing program (work in progress)
+
+EUCLID_MENU_ALL_TARGET=	euclid-menu
+XINERAMA_USE=		XORG=xinerama
+XINERAMA_ALL_TARGET=	euclid-wm
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+	@${REINPLACE_CMD} -e 's|^CFLAGS = |CFLAGS = -Wno-error=int-conversion |g' \
+		${WRKSRC}/Makefile
+.endif
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/euclid-wm
 
 post-install-EUCLID_MENU-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/euclid-menu
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306061748.356HmXdK029702>