Date: Sun, 15 Feb 2015 03:28:00 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379027 - in head/chinese/libchewing: . files Message-ID: <201502150328.t1F3S0oS059112@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Sun Feb 15 03:27:59 2015 New Revision: 379027 URL: https://svnweb.freebsd.org/changeset/ports/379027 QAT: https://qat.redports.org/buildarchive/r379027/ Log: Fix build on 10 (makeinfo issue) PR: 197598 Submitted by: Ting-Wei Lan <lantw44 at gmail.com> Modified: head/chinese/libchewing/Makefile head/chinese/libchewing/files/patch-CMakeLists.txt Modified: head/chinese/libchewing/Makefile ============================================================================== --- head/chinese/libchewing/Makefile Sun Feb 15 03:08:36 2015 (r379026) +++ head/chinese/libchewing/Makefile Sun Feb 15 03:27:59 2015 (r379027) @@ -11,6 +11,7 @@ COMMENT= Chewing intelligent phonetic in 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 Modified: head/chinese/libchewing/files/patch-CMakeLists.txt ============================================================================== --- head/chinese/libchewing/files/patch-CMakeLists.txt Sun Feb 15 03:08:36 2015 (r379026) +++ head/chinese/libchewing/files/patch-CMakeLists.txt Sun Feb 15 03:27:59 2015 (r379027) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502150328.t1F3S0oS059112>