diff options
| author | vanilla <vanilla@FreeBSD.org> | 2015-02-15 11:27:59 +0800 |
|---|---|---|
| committer | vanilla <vanilla@FreeBSD.org> | 2015-02-15 11:27:59 +0800 |
| commit | bd9d2c9a9af1613c005722dc8b2e6a6fcb4f049b (patch) | |
| tree | 77eb3aee6fe4a732c9355bdac033c3cb4df39537 /chinese/libchewing | |
| parent | ee462a6f91e38230e572788bc85b83764b8af903 (diff) | |
| download | freebsd-ports-gnome-bd9d2c9a9af1613c005722dc8b2e6a6fcb4f049b.tar.gz freebsd-ports-gnome-bd9d2c9a9af1613c005722dc8b2e6a6fcb4f049b.tar.zst freebsd-ports-gnome-bd9d2c9a9af1613c005722dc8b2e6a6fcb4f049b.zip | |
Fix build on 10 (makeinfo issue)
PR: 197598
Submitted by: Ting-Wei Lan <lantw44 at gmail.com>
Diffstat (limited to 'chinese/libchewing')
| -rw-r--r-- | chinese/libchewing/Makefile | 2 | ||||
| -rw-r--r-- | chinese/libchewing/files/patch-CMakeLists.txt | 26 |
2 files changed, 23 insertions, 5 deletions
diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile index 7899e79e1c21..b1e1fd78bb29 100644 --- a/chinese/libchewing/Makefile +++ b/chinese/libchewing/Makefile @@ -11,6 +11,7 @@ COMMENT= Chewing intelligent phonetic input method library LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= ${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 USES= cmake gmake libtool pathfix pkgconfig tar:bzip2 @@ -21,6 +22,7 @@ GH_PROJECT= ${PORTNAME} GH_TAGNAME= v${PORTVERSION} GH_COMMIT= 6d6e67c +CMAKE_ARGS+= -DMAKEINFO=${LOCALBASE}/bin/makeinfo CFLAGS+= -I${LOCALBASE}/include INFO= libchewing diff --git a/chinese/libchewing/files/patch-CMakeLists.txt b/chinese/libchewing/files/patch-CMakeLists.txt index 05e78f66c6be..aff7a1607bb1 100644 --- a/chinese/libchewing/files/patch-CMakeLists.txt +++ b/chinese/libchewing/files/patch-CMakeLists.txt @@ -1,14 +1,30 @@ ---- CMakeLists.txt.orig 2015-02-08 15:09:15 UTC -+++ CMakeLists.txt -@@ -103,6 +103,7 @@ set(TEST_BIN_DIR ${PROJECT_BINARY_DIR}/t +--- 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 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}/share/info) ++set(INSTALL_INFO_DIR ${CMAKE_INSTALL_PREFIX}/info) -@@ -428,5 +429,5 @@ install(FILES ${ALL_DATA} DESTINATION ${ + set(INFO_SRC ${PROJECT_SOURCE_DIR}/doc/libchewing.texi) + set(INFO_BIN ${PROJECT_BINARY_DIR}/doc/libchewing.info) +@@ -166,11 +167,7 @@ if (MAKEINFO) + add_custom_target(INFO ALL DEPENDS ${INFO_BIN}) + add_dependencies(check INFO) + +- find_program(INSTALL_INFO NAMES ginstall-info install-info) +- if (INSTALL_INFO) +- install(FILES ${INFO_BIN} DESTINATION ${INSTALL_INFO_DIR}) +- install(CODE "execute_process(COMMAND ${INSTALL_INFO} --info-dir=${INSTALL_INFO_DIR} ${INFO_BIN})") +- endif() ++ install(FILES ${INFO_BIN} DESTINATION ${INSTALL_INFO_DIR}) + 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 |