D850.id1795.diff
No OneTemporary
Actions

Size

11 KB

Referenced Files

None

Subscribers

None

D850.id1795.diff
View Options

	Index: Mk/Uses/pathfix.mk
	===================================================================
	--- Mk/Uses/pathfix.mk
	+++ Mk/Uses/pathfix.mk
	@@ -16,9 +16,20 @@
	IGNORE= USES=pathfix does not require args
	.endif

	+PATHFIX_CMAKE?= CMakeLists.txt
	PATHFIX_MAKEFILEIN?= Makefile.in

	pathfix:
	+.if defined(_INCLUDE_USES_CMAKE_MK)
	+ @${FIND} ${WRKSRC} -name "${PATHFIX_CMAKE}" -type f \| ${XARGS} ${REINPLACE_CMD} -e \
	+ 's\|[{]CMAKE_INSTALL_LIBDIR[}]/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} ${WRKSRC} -name "${PATHFIX_MAKEFILEIN}" -type f \| ${XARGS} ${REINPLACE_CMD} -e \
	's\|[(]libdir[)]/locale\|(prefix)/share/locale\|g ; \
	s\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g ; \
	@@ -29,5 +40,6 @@
	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
	Index: cad/brlcad/Makefile
	===================================================================
	--- cad/brlcad/Makefile
	+++ cad/brlcad/Makefile
	@@ -23,7 +23,7 @@
	USE_GL= gl glu
	USE_XORG= ice inputproto sm x11 xau xcb xdamage xdmcp xext xfixes xft xi \
	xproto xrender xscrnsaver xt xxf86vm
	-USES= tar:bzip2 bison pathfix cmake:outsource pkgconfig tk:85
	+USES= tar:bzip2 bison cmake:outsource pathfix pkgconfig tk:85
	USE_LDCONFIG= yes

	PREFIX?= ${LOCALBASE}/${PORTNAME}
	@@ -40,8 +40,6 @@

	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}
	Index: chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt
	===================================================================
	--- chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt
	+++ chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt
	@@ -1,11 +0,0 @@
	---- src/lib/fcitx-config/CMakeLists.txt.orig 2011-10-02 05:43:11.000000000 -0500
	-+++ src/lib/fcitx-config/CMakeLists.txt 2011-11-13 16:02:26.681232301 -0600
	-@@ -23,7 +23,7 @@ set_target_properties(fcitx-config
	- configure_file(fcitx-config.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc)
	-
	- install(TARGETS fcitx-config DESTINATION ${libdir})
	--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc DESTINATION "${libdir}/pkgconfig")
	-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc DESTINATION "libdata/pkgconfig")
	- install(FILES ${FCITX_CONFIG_HEADERS} DESTINATION "${includedir}/fcitx-config")
	-
	- if (ENABLE_STATIC)
	Index: chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt
	===================================================================
	--- chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt
	+++ chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt
	@@ -1,18 +0,0 @@
	---- src/lib/fcitx-gclient/CMakeLists.txt~ 2012-07-17 15:21:04.000000000 -0500
	-+++ src/lib/fcitx-gclient/CMakeLists.txt 2012-07-18 00:46:13.209418264 -0500
	-@@ -46,7 +46,7 @@ target_link_libraries(fcitx-gclient ${GI
	- configure_file(fcitx-gclient.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc)
	-
	- install(TARGETS fcitx-gclient LIBRARY DESTINATION "${libdir}")
	--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc DESTINATION "${libdir}/pkgconfig")
	-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc DESTINATION "libdata/pkgconfig")
	- install(FILES ${FCITX_GCLIENT_HEADERS} DESTINATION "${includedir}/fcitx-gclient")
	-
	- if (ENABLE_GIR)
	-@@ -86,4 +86,4 @@ install(TARGETS fcitx-gclient-static
	- )
	- endif (ENABLE_STATIC)
	-
	--add_subdirectory(test)
	-\ No newline at end of file
	-+add_subdirectory(test)
	Index: chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt
	===================================================================
	--- chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt
	+++ chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt
	@@ -1,11 +0,0 @@
	---- src/lib/fcitx-utils/CMakeLists.txt.orig 2011-10-02 05:43:11.000000000 -0500
	-+++ src/lib/fcitx-utils/CMakeLists.txt 2011-11-13 16:02:51.201489333 -0600
	-@@ -34,7 +34,7 @@ endif (LIBKVM_FOUND)
	- configure_file(fcitx-utils.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc)
	-
	- install(TARGETS fcitx-utils LIBRARY DESTINATION "${libdir}")
	--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc DESTINATION "${libdir}/pkgconfig")
	-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc DESTINATION "libdata/pkgconfig")
	- install(FILES ${FCITX_UTILS_HEADERS} DESTINATION "${includedir}/fcitx-utils")
	-
	- if (ENABLE_STATIC)
	Index: chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt
	===================================================================
	--- chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt
	+++ chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt
	@@ -1,11 +0,0 @@
	---- src/lib/fcitx/CMakeLists.txt.orig 2011-10-02 05:43:11.000000000 -0500
	-+++ src/lib/fcitx/CMakeLists.txt 2011-11-13 16:01:32.246665458 -0600
	-@@ -41,7 +41,7 @@ configure_file(fcitx.pc.in ${CMAKE_CURRE
	-
	- target_link_libraries(fcitx-core fcitx-config fcitx-utils ${DL_LIBRARIES} ${PTHREAD_LIBRARIES})
	- install(TARGETS fcitx-core LIBRARY DESTINATION "${libdir}")
	--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx.pc DESTINATION "${libdir}/pkgconfig")
	-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx.pc DESTINATION "libdata/pkgconfig")
	- install(FILES ${FCITX_HEADERS} DESTINATION "${includedir}/fcitx")
	-
	- if (ENABLE_STATIC)
	Index: comms/openobex/Makefile
	===================================================================
	--- comms/openobex/Makefile
	+++ comms/openobex/Makefile
	@@ -11,7 +11,7 @@
	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"

	Index: deskutils/cairo-dock/Makefile
	===================================================================
	--- deskutils/cairo-dock/Makefile
	+++ deskutils/cairo-dock/Makefile
	@@ -23,7 +23,7 @@
	USE_GNOME= glib20 gtk20 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}
	Index: devel/libftdi1/Makefile
	===================================================================
	--- devel/libftdi1/Makefile
	+++ devel/libftdi1/Makefile
	@@ -19,7 +19,7 @@
	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
	Index: devel/libical/Makefile
	===================================================================
	--- devel/libical/Makefile
	+++ devel/libical/Makefile
	@@ -12,7 +12,7 @@
	LICENSE_COMB= dual
	LICENSE= MPL LGPL21

	-USES= cmake gmake pathfix perl5
	+USES= cmake pathfix perl5
	USE_PERL5= build
	USE_LDCONFIG= yes

	@@ -24,7 +24,4 @@
	CFLAGS+= -fPIC
	.endif

	-post-install:
	- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libical*.so.1.0.0
	-
	.include <bsd.port.post.mk>
	Index: devel/libical/files/patch-CMakeLists.txt
	===================================================================
	--- devel/libical/files/patch-CMakeLists.txt
	+++ devel/libical/files/patch-CMakeLists.txt
	@@ -1,8 +0,0 @@
	---- CMakeLists.txt.orig 2013-05-04 23:25:27.000000000 +0200
	-+++ CMakeLists.txt 2013-12-01 00:16:33.000000000 +0100
	-@@ -201,4 +201,4 @@
	- set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
	-
	- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libical.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libical.pc @ONLY)
	--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libical.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
	-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libical.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
	Index: devel/libical/files/patch-configure
	===================================================================
	--- devel/libical/files/patch-configure
	+++ devel/libical/files/patch-configure
	@@ -1,11 +0,0 @@
	---- configure.orig 2013-11-30 20:59:36.000000000 +0100
	-+++ configure 2013-11-30 20:59:36.000000000 +0100
	-@@ -15429,7 +15429,7 @@
	- use_builtin_timezone=yes
	- os_win32=yes
	- ;;
	--linux)
	-+linux\|dragonfly\|freebsd)
	- use_builtin_timezone=no
	- os_win32=no
	- ;;
	Index: devel/ucommon/Makefile
	===================================================================
	--- devel/ucommon/Makefile
	+++ devel/ucommon/Makefile
	@@ -12,7 +12,7 @@

	LICENSE= LGPL3

	-USES= pathfix pkgconfig cmake:outsource
	+USES= cmake:outsource pathfix pkgconfig
	CMAKE_ARGS+= -DBUILD_TESTING:BOOL=ON \
	-DINSTALL_BINDIR:STRING=bin/${PORTNAME}
	USE_LDCONFIG= yes
	Index: devel/ucommon/files/patch-CMakeLists.txt
	===================================================================
	--- devel/ucommon/files/patch-CMakeLists.txt
	+++ devel/ucommon/files/patch-CMakeLists.txt
	@@ -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)
	-
	Index: graphics/cegui/Makefile
	===================================================================
	--- graphics/cegui/Makefile
	+++ graphics/cegui/Makefile
	@@ -19,7 +19,7 @@
	CMAKE_ARGS= -DCEGUI_SAMPLES_ENABLED:BOOL=OFF \
	-DCEGUI_BUILD_TESTS=OFF
	USE_LDCONFIG= yes
	-USES= cmake pathfix pkgconfig compiler:c++11-lib
	+USES= cmake pkgconfig compiler:c++11-lib

	PORTDOCS= *

	Index: science/netcdf/Makefile
	===================================================================
	--- science/netcdf/Makefile
	+++ science/netcdf/Makefile
	@@ -47,7 +47,7 @@
	.endif

	post-patch:
	- @${REINPLACE_CMD} -e '/man4/d; s\|share/cmake\|&/Modules\|; s\|$${CMAKE_INSTALL_LIBDIR}/pkgconfig\|libdata/pkgconfig\|' ${WRKSRC}/CMakeLists.txt
	+ @${REINPLACE_CMD} -e '/man4/d; s\|share/cmake\|&/Modules\|' ${WRKSRC}/CMakeLists.txt
	@${REINPLACE_CMD} -e 's\|share/man\|man\|' ${WRKSRC}/libsrc/CMakeLists.txt ${WRKSRC}/ncdump/CMakeLists.txt ${WRKSRC}/ncgen/CMakeLists.txt ${WRKSRC}/ncgen3/CMakeLists.txt
	@${REINPLACE_CMD} -e 's\|mmap\|_&\|g' ${WRKSRC}/nc_test/tst_diskless.c ${WRKSRC}/nc_test/tst_diskless3.c

File Metadata

Mime Type: text/plain
Expires: Tue, Apr 28, 4:02 AM (7 h, 16 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 32249553
Default Alt Text: D850.id1795.diff (11 KB)

D850.id1795.diffNo OneTemporaryActions

D850.id1795.diffView Options

File Metadata

Event Timeline

D850.id1795.diff
No OneTemporary
Actions

D850.id1795.diff
View Options