Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 May 2024 21:54:09 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d780766fef98 - main - graphics/openjpeg: Convert post-patch to EXTRACT_AFTER_ARGS
Message-ID:  <202405202154.44KLs9Pw092269@gitrepo.freebsd.org>

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

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

commit d780766fef98ca7b1fb21ea53357b0aefb433207
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-05-20 21:44:40 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2024-05-20 21:53:52 +0000

    graphics/openjpeg: Convert post-patch to EXTRACT_AFTER_ARGS
    
    Instead of extracted files to later discard them just skip extracting
    
    PR:             278777
    Approved by:    portmgr (maintainer timeout, 2+ weeks)
---
 graphics/openjpeg/Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index 00f8e12f97fc..d811361b5321 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -18,6 +18,15 @@ LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 
 USES=		cmake cpe localbase:ldflags jpeg pathfix pkgconfig
 
+# Clean up bundled libraries
+EXTRACT_AFTER_ARGS=	--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/thirdparty/astyle \
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/thirdparty/include \
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/thirdparty/liblcms2 \
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/thirdparty/libpng \
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/thirdparty/libtiff \
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/thirdparty/libz \
+			--no-same-owner --no-same-permissions
+
 CMAKE_OFF=	BUILD_DOC \
 		BUILD_JAVA \
 		BUILD_JPIP \
@@ -40,13 +49,4 @@ USE_GITHUB=	yes
 
 CPE_VENDOR=	uclouvain
 
-post-patch:
-# Clean up bundled libraries
-	@${RM} -r ${WRKSRC}/thirdparty/astyle/
-	@${RM} -r ${WRKSRC}/thirdparty/include/
-	@${RM} -r ${WRKSRC}/thirdparty/liblcms2/
-	@${RM} -r ${WRKSRC}/thirdparty/libpng/
-	@${RM} -r ${WRKSRC}/thirdparty/libtiff/
-	@${RM} -r ${WRKSRC}/thirdparty/libz/
-
 .include <bsd.port.mk>



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