Tuesday, February 22, 2022

Fix cmake /usr/(local|X11R6) post-patch

That seems much more correct to me.

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 82cd17c23da..41f61e4e24e 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -8,7 +8,7 @@ VER = 3.20.3
EPOCH = 0
DISTNAME = cmake-${VER}
CATEGORIES = devel
-REVISION = 3
+REVISION = 4

HOMEPAGE = https://www.cmake.org/

@@ -68,9 +68,11 @@ SUBST_FILES = ${WRKSRC}/Source/cmLocalGenerator.cxx \

post-patch:
find ${WRKSRC}/Modules -name "*.cmake" \
- -exec perl -e 's,/usr/(local|X11R6),${LOCALBASE},g' {} +
+ -exec sed -i -e 's,/usr/local,${LOCALBASE},g' \
+ -e 's,/usr/X11R6,${X11BASE},g' {} +
find ${WRKSRC}/Tests -name "CMakeLists.txt" \
- -exec perl -e 's,/usr/(local|X11R6),${LOCALBASE},g' {} +
+ -exec perl -e -i 's,/usr/local,${LOCALBASE},g' \
+ -e 's,/usr/X11R6,${X11BASE},g' {} +
perl -e 's,/usr/local,${LOCALBASE},g' \
${SUBST_FILES}
perl -e 's,/usr/include,${LOCALBASE}/include,' \

No comments:

Post a Comment