Index: head/Mk/Uses/pathfix.mk =================================================================== --- head/Mk/Uses/pathfix.mk (revision 424423) +++ head/Mk/Uses/pathfix.mk (revision 424424) @@ -1,50 +1,54 @@ # $FreeBSD$ # # Lookup common paths in Makefile.in, configure and similar files, and replace # their values to respect FreeBSD hier(7) for file installation. # # Feature: pathfix # Usage: USES=pathfix # Valid ARGS: does not require args # # MAINTAINER: portmgr@FreeBSD.org .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 PATHFIX_MAKEFILEIN?= Makefile.in PATHFIX_WRKSRC?= ${WRKSRC} _USES_patch+= 190:pathfix pathfix: .if ${USES:Mcmake*} @${FIND} ${PATHFIX_WRKSRC} -name "${PATHFIX_CMAKELISTSTXT}" -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' .else @${FIND} ${PATHFIX_WRKSRC} -name "${PATHFIX_MAKEFILEIN}" -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' .endif .endif