diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2016-01-07 14:54:03 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2016-01-07 14:54:03 +0000 |
| commit | 42b0bae34ff92cc7167eae163af6202f56373487 (patch) | |
| tree | 4c39cc3e209fa61d7dc838b0786cec751eee2548 /chinese | |
| parent | - Clarify LICENSE (diff) | |
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)
Notes
Notes:
svn path=/head/; revision=405449
Diffstat (limited to 'chinese')
| -rw-r--r-- | chinese/fcitx/Makefile | 2 | ||||
| -rw-r--r-- | chinese/libchewing/files/patch-CMakeLists.txt | 17 |
2 files changed, 5 insertions, 14 deletions
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile index 65f5c6641ee0..c45648232442 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -35,7 +35,7 @@ USE_GNOME= pango intltool libxml2 introspection 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 diff --git a/chinese/libchewing/files/patch-CMakeLists.txt b/chinese/libchewing/files/patch-CMakeLists.txt index aff7a1607bb1..a365d2f90d4d 100644 --- a/chinese/libchewing/files/patch-CMakeLists.txt +++ b/chinese/libchewing/files/patch-CMakeLists.txt @@ -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}) |