[Midnightbsd-cvs] mports [22232] trunk/Mk/extensions/pathfix.mk: update pathfix to handle additional cases

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Jan 25 20:09:27 EST 2017


Revision: 22232
          http://svnweb.midnightbsd.org/mports/?rev=22232
Author:   laffer1
Date:     2017-01-25 20:09:27 -0500 (Wed, 25 Jan 2017)
Log Message:
-----------
update pathfix to handle additional cases

Modified Paths:
--------------
    trunk/Mk/extensions/pathfix.mk

Modified: trunk/Mk/extensions/pathfix.mk
===================================================================
--- trunk/Mk/extensions/pathfix.mk	2017-01-26 00:49:42 UTC (rev 22231)
+++ trunk/Mk/extensions/pathfix.mk	2017-01-26 01:09:27 UTC (rev 22232)
@@ -6,21 +6,51 @@
 .if !defined(_INCLUDE_USES_PATHFIX_MK)
 _INCLUDE_USES_PATHFIX_MK=	yes
 
+.if !empty(pathfix_ARGS)
+IGNORE=	USES=pathfix does not require args
+.endif
+
+PATHFIX_CMAKELISTSTXT?=	CMakeLists.txt
+.if ${USES:Mautoreconf*}
+PATHFIX_MAKEFILEIN?=	Makefile.am Makefile.in
+.else
 PATHFIX_MAKEFILEIN?=	Makefile.in
+.endif
+PATHFIX_WRKSRC?=	${WRKSRC}
 
 pre-patch: pathfix-pre-patch
 
 pathfix-pre-patch:
-	@${FIND} ${WRKSRC} -name "${PATHFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} -e \
+.if ${USES:Mcmake*}
+.for file in ${PATHFIX_CMAKELISTSTXT}
+	@${FIND} ${PATHFIX_WRKSRC} -name "${file}" -type f | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[{]CMAKE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
+		s|[{]INSTALL_LIB_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
+		s|[{]INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
+		s|[{]LIB_DESTINATION[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
+		s|[{]LIB_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
+		s|[{]LIB_INSTALL_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
+		s|[{]KDE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
+		s|[{]LIBRARY_INSTALL_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
+		s|[{]libdir[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
+		s|lib/pkgconfig|libdata/pkgconfig|g'
+.endfor
+.else
+.for file in ${PATHFIX_MAKEFILEIN}
+	@${FIND} ${PATHFIX_WRKSRC} -name "${file}" -type f | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
 		s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+		s|[(]LIBDIR[)]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \
+		s|@libdir@/locale|@prefix@/share/locale|g ; \
+		s|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g ; \
 		s|[{]libdir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+		s|[{]LIBDIR[}]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \
 		s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+		s|[{]datadir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+		s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g; \
 		s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
-			s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' ; \
-	${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
-		's|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-		s|{libdir}/locale|{prefix}/share/locale|g'
-
+		s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
+.endfor
 .endif
+.endif



More information about the Midnightbsd-cvs mailing list