Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Jul 2024 13:15:46 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: 8d3583f0a4d5 - main - devel/lasi: Fix build
Message-ID:  <202407281315.46SDFkwa022426@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=8d3583f0a4d561d3a61d1d4b547cd5066f32ab6a

commit 8d3583f0a4d561d3a61d1d4b547cd5066f32ab6a
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-07-27 17:47:14 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-07-28 13:15:13 +0000

    devel/lasi: Fix build
    
    - Remove OPTION EXAMPLES as those fails to build with the latest pango
    - Refresh patches and convert to modern patches
---
 devel/lasi/Makefile                                       | 15 +++++----------
 ...es+lasi.cmake => extra-patch-cmake_modules_lasi.cmake} |  0
 ...+instdirs.cmake => patch-cmake_modules_instdirs.cmake} |  0
 devel/lasi/pkg-plist                                      |  9 ---------
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index 0f7f02f43280..450bb22fe695 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lasi
-PORTVERSION=	1.1.3
-PORTREVISION=	1
+DISTVERSION=	1.1.3
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 DISTNAME=	libLASi-${PORTVERSION}
@@ -25,12 +25,12 @@ USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_DATADIR:PATH=${DATADIR}
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:devel/doxygen
-DOCS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-cmake+modules+lasi.cmake
+DOCS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-cmake_modules_lasi.cmake
 
-pre-install-EXAMPLES-off:
+post-patch:
 	@${REINPLACE_CMD} 's/^\(add_subdirectory(examples)\)/#\1/' \
 		${WRKSRC}/CMakeLists.txt
 
@@ -38,9 +38,4 @@ post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/lib/libLASi.so.2.0.0 \
 		${STAGEDIR}${PREFIX}/lib/libLASi.so.2
 
-post-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${MV} ${STAGEDIR}${DATADIR}/examples/* ${STAGEDIR}${EXAMPLESDIR}/
-	@${RMDIR} ${STAGEDIR}${DATADIR}/examples
-
 .include <bsd.port.mk>
diff --git a/devel/lasi/files/extra-patch-cmake+modules+lasi.cmake b/devel/lasi/files/extra-patch-cmake_modules_lasi.cmake
similarity index 100%
rename from devel/lasi/files/extra-patch-cmake+modules+lasi.cmake
rename to devel/lasi/files/extra-patch-cmake_modules_lasi.cmake
diff --git a/devel/lasi/files/patch-cmake+modules+instdirs.cmake b/devel/lasi/files/patch-cmake_modules_instdirs.cmake
similarity index 100%
rename from devel/lasi/files/patch-cmake+modules+instdirs.cmake
rename to devel/lasi/files/patch-cmake_modules_instdirs.cmake
diff --git a/devel/lasi/pkg-plist b/devel/lasi/pkg-plist
index ae8be8b6987a..eb8eabac9cb9 100644
--- a/devel/lasi/pkg-plist
+++ b/devel/lasi/pkg-plist
@@ -169,12 +169,3 @@ libdata/pkgconfig/lasi.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/tab_s.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/tab_sd.png
 %%PORTDOCS%%%%DOCSDIR%%/html/user/html/tabs.css
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ComplexTextLayoutExample.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ComplexTextLayoutExample.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MissingGlyphExample.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MissingGlyphExample.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SimpleLASiExample.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SimpleLASiExample.png
-%%PORTEXAMPLES%%@dir %%DATADIR%%



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