svn commit: r405449 - in head: Mk/Uses cad/brlcad chinese/fcitx chinese/libchewing/files comms/openobex deskutils/cairo-dock devel/libftdi1 devel/libical devel/libical/files devel/ucommon/files gra...

Jason E. Hale jhale at FreeBSD.org
Thu Jan 7 14:54:06 UTC 2016 

Author: jhale
Date: Thu Jan  7 14:54:03 2016
New Revision: 405449
URL: https://svnweb.freebsd.org/changeset/ports/405449

Log:
  Add USES=pathfix support for CMake.  Some ports that use CMake to build
  already had USES=pathfix, although it did nothing.  For those ports, I
  either removed it as they were handling the pkgconfig files differently
  or I removed patches and substitutions that accomplished the same thing
  as pathfix.
  
  Differential Revision:	https://reviews.freebsd.org/D850
  Reviewed by:	antoine, bapt, tijl
  Approved by:	portmgr (bapt)

Deleted:
  head/devel/libical/files/
Modified:
  head/Mk/Uses/pathfix.mk
  head/cad/brlcad/Makefile
  head/chinese/fcitx/Makefile
  head/chinese/libchewing/files/patch-CMakeLists.txt
  head/comms/openobex/Makefile
  head/deskutils/cairo-dock/Makefile
  head/devel/libftdi1/Makefile
  head/devel/libical/Makefile
  head/devel/ucommon/files/patch-CMakeLists.txt
  head/graphics/cegui/Makefile
  head/mail/geary/Makefile

Modified: head/Mk/Uses/pathfix.mk
==============================================================================
--- head/Mk/Uses/pathfix.mk	Thu Jan  7 14:44:08 2016	(r405448)
+++ head/Mk/Uses/pathfix.mk	Thu Jan  7 14:54:03 2016	(r405449)
@@ -16,11 +16,23 @@ _INCLUDE_USES_PATHFIX_MK=	yes
 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_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
+		s|[{]LIB_INSTALL_DIR[}]/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 ; \
@@ -31,5 +43,6 @@ pathfix:
 		s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
 		s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
+.endif
 
 .endif

Modified: head/cad/brlcad/Makefile
==============================================================================
--- head/cad/brlcad/Makefile	Thu Jan  7 14:44:08 2016	(r405448)
+++ head/cad/brlcad/Makefile	Thu Jan  7 14:54:03 2016	(r405449)
@@ -40,8 +40,6 @@ BROKEN_sparc64=	does not compile: invoke
 
 post-patch:
 	@${REINPLACE_CMD} "s+-exact Tcl 8\.5\.9+Tcl 8.5+" ${WRKSRC}/src/other/tcl/library/init.tcl
-	@${REINPLACE_CMD} -e 's|{LIB_DIR}|{prefix}/libdata|' \
-			${WRKSRC}/misc/pkgconfig/CMakeLists.txt
 
 pre-install:
 	${CP} ${FILESDIR}/mged.sh ${WRKSRC}

Modified: head/chinese/fcitx/Makefile
==============================================================================
--- head/chinese/fcitx/Makefile	Thu Jan  7 14:44:08 2016	(r405448)
+++ head/chinese/fcitx/Makefile	Thu Jan  7 14:54:03 2016	(r405449)
@@ -35,7 +35,7 @@ USE_GNOME=	pango intltool libxml2 intros
 USE_XORG=	x11 xext xkbfile
 USE_LDCONFIG=	yes
 USES=		tar:xz cmake desktop-file-utils execinfo gettext iconv:wchar_t \
-		pathfix pkgconfig shared-mime-info
+		pkgconfig shared-mime-info
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC DOCS

Modified: head/chinese/libchewing/files/patch-CMakeLists.txt
==============================================================================
--- head/chinese/libchewing/files/patch-CMakeLists.txt	Thu Jan  7 14:44:08 2016	(r405448)
+++ head/chinese/libchewing/files/patch-CMakeLists.txt	Thu Jan  7 14:54:03 2016	(r405449)
@@ -1,17 +1,15 @@
---- CMakeLists.txt.orig	2014-04-11 09:25:28.000000000 +0800
-+++ CMakeLists.txt	2015-02-15 11:25:11.959775965 +0800
-@@ -103,8 +103,9 @@ set(TEST_BIN_DIR ${PROJECT_BINARY_DIR}/t
- 
+--- CMakeLists.txt.orig	2014-04-11 01:25:28 UTC
++++ CMakeLists.txt
+@@ -104,7 +104,7 @@ set(TEST_BIN_DIR ${PROJECT_BINARY_DIR}/t
  set(INSTALL_INC_DIR ${CMAKE_INSTALL_PREFIX}/include/chewing)
  set(INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-+set(INSTALL_LIBDATA_DIR ${CMAKE_INSTALL_PREFIX}/libdata)
  set(INSTALL_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/libchewing)
 -set(INSTALL_INFO_DIR ${CMAKE_INSTALL_PREFIX}/share/info)
 +set(INSTALL_INFO_DIR ${CMAKE_INSTALL_PREFIX}/info)
  
  set(INFO_SRC ${PROJECT_SOURCE_DIR}/doc/libchewing.texi)
  set(INFO_BIN ${PROJECT_BINARY_DIR}/doc/libchewing.info)
-@@ -166,11 +167,7 @@ if (MAKEINFO)
+@@ -166,11 +166,7 @@ if (MAKEINFO)
      add_custom_target(INFO ALL DEPENDS ${INFO_BIN})
      add_dependencies(check INFO)
  
@@ -24,10 +22,3 @@
  endif()
  
  
-@@ -428,5 +425,5 @@ install(FILES ${ALL_DATA} DESTINATION ${
- install(FILES ${ALL_STATIC_DATA} DESTINATION ${INSTALL_DATA_DIR})
- install(FILES ${ALL_INC} DESTINATION ${INSTALL_INC_DIR})
- install(FILES ${PROJECT_BINARY_DIR}/chewing.pc
--    DESTINATION ${INSTALL_LIB_DIR}/pkgconfig)
-+	DESTINATION ${INSTALL_LIBDATA_DIR}/pkgconfig)
- install(TARGETS ${LIBS} DESTINATION ${INSTALL_LIB_DIR})

Modified: head/comms/openobex/Makefile
==============================================================================
--- head/comms/openobex/Makefile	Thu Jan  7 14:44:08 2016	(r405448)
+++ head/comms/openobex/Makefile	Thu Jan  7 14:54:03 2016	(r405449)
@@ -11,7 +11,7 @@ MAINTAINER=	madpilot at FreeBSD.org
 COMMENT=	Open source implementation of the OBEX protocol
 
 USE_LDCONFIG=	yes
-USES=		pathfix cmake dos2unix
+USES=		cmake dos2unix
 DOS2UNIX_FILES=	CMakeLists.txt
 CMAKE_ARGS+=	-DPKGCONFIG_INSTALL_DIR:STRING="${PREFIX}/libdata/pkgconfig"
 

Modified: head/deskutils/cairo-dock/Makefile
==============================================================================
--- head/deskutils/cairo-dock/Makefile	Thu Jan  7 14:44:08 2016	(r405448)
+++ head/deskutils/cairo-dock/Makefile	Thu Jan  7 14:54:03 2016	(r405449)
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk30 librsvg2 libxml2
 USE_LDCONFIG=	yes
 USE_XORG=	xrender xtst
-USES=		cmake gettext pathfix pkgconfig
+USES=		cmake gettext pkgconfig
 LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS+=	-Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig"
 CMAKE_ARGS+=	-DROOT_PREFIX:PATH=${STAGEDIR}

Modified: head/devel/libftdi1/Makefile
==============================================================================
--- head/devel/libftdi1/Makefile	Thu Jan  7 14:44:08 2016	(r405448)
+++ head/devel/libftdi1/Makefile	Thu Jan  7 14:54:03 2016	(r405449)
@@ -19,7 +19,7 @@ OPTIONS_SUB=		yes
 BOOST_DESC=	Build with boost
 PYTHON_DESC=	Build Python bindings
 
-USES=		pathfix pkgconfig cmake tar:bzip2
+USES=		cmake pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 
 PORTDOCS=	COPYING.LIB ChangeLog README

Modified: head/devel/libical/Makefile
==============================================================================
--- head/devel/libical/Makefile	Thu Jan  7 14:44:08 2016	(r405448)
+++ head/devel/libical/Makefile	Thu Jan  7 14:54:03 2016	(r405449)
@@ -14,7 +14,7 @@ LICENSE=	MPL LGPL21
 USE_GITHUB=	yes
 GH_TAGNAME=	da69aae
 
-USES=		cmake gmake pathfix perl5
+USES=		cmake pathfix perl5
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 

Modified: head/devel/ucommon/files/patch-CMakeLists.txt
==============================================================================
--- head/devel/ucommon/files/patch-CMakeLists.txt	Thu Jan  7 14:44:08 2016	(r405448)
+++ head/devel/ucommon/files/patch-CMakeLists.txt	Thu Jan  7 14:54:03 2016	(r405449)
@@ -66,17 +66,3 @@
      endforeach()
      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc)
      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config)
-@@ -594,11 +611,11 @@
- endif()
- 
- if(NOT WIN32)
--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig)
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION libdata/pkgconfig)
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ucommon-config DESTINATION ${INSTALL_BINDIR})
-     if(BUILD_STDLIB)
-         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/commoncpp-config DESTINATION ${INSTALL_BINDIR})
--        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/commoncpp.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig)
-+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/commoncpp.pc DESTINATION libdata/pkgconfig)
-     endif()
- endif(NOT WIN32)
- 

Modified: head/graphics/cegui/Makefile
==============================================================================
--- head/graphics/cegui/Makefile	Thu Jan  7 14:44:08 2016	(r405448)
+++ head/graphics/cegui/Makefile	Thu Jan  7 14:54:03 2016	(r405449)
@@ -17,7 +17,7 @@ CONFIGURE_ENV+=	TOLUA_INC="${LUA_INCDIR}
 CMAKE_ARGS=	-DCEGUI_SAMPLES_ENABLED:BOOL=OFF \
 		-DCEGUI_BUILD_TESTS=OFF
 USE_LDCONFIG=	yes
-USES=		compiler:c++11-lib cmake execinfo pathfix pkgconfig tar:bzip2
+USES=		compiler:c++11-lib cmake execinfo pkgconfig tar:bzip2
 
 PORTDOCS=	*
 

Modified: head/mail/geary/Makefile
==============================================================================
--- head/mail/geary/Makefile	Thu Jan  7 14:44:08 2016	(r405448)
+++ head/mail/geary/Makefile	Thu Jan  7 14:54:03 2016	(r405449)
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libgmime-2.6.so:${PORTSDIR}
 		libgcr-3.so:${PORTSDIR}/security/gcr
 
 USES=		cmake desktop-file-utils gettext gmake \
-		libtool pathfix pkgconfig shebangfix tar:xz
+		libtool pkgconfig shebangfix tar:xz
 USE_GNOME=	gnomedocutils gnomeprefix gtk30 intlhack
 SHEBANG_FILES=	desktop/geary-attach
 USE_LDCONFIG=	yes

More information about the svn-ports-all mailing list