chinese/librime: 1.1 -> 1.2.9

PR:		210781
Submitted by:	Iblis Lin <iblis@hs.ntnu.edu.tw>
Approved by:	lichray@gmail.com (maintainer)

3 files changed, 18 insertions, 66 deletions

diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile
index 5c53b27e52db..75f9a70fa1f1 100644
--- a/chinese/librime/Makefile
+++ b/chinese/librime/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	librime
-PORTVERSION=	1.1
+PORTVERSION=	1.2.9
 DISTVERSIONPREFIX=	rime-
-PORTREVISION=	1
 CATEGORIES=	chinese textproc
 
 MAINTAINER=	lichray@gmail.com
@@ -13,8 +12,10 @@ COMMENT=	Rime Input Method Engine, the core library
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
-		libkyotocabinet.so:databases/kyotocabinet \
+		libleveldb.so:databases/leveldb \
+		libmarisa.so:devel/marisa-trie \
 		libopencc.so:chinese/opencc \
 		libyaml-cpp.so:devel/yaml-cpp
 
@@ -26,7 +27,7 @@ LDFLAGS+=	-lintl
 USE_GITHUB=	yes
 GH_ACCOUNT=	rime
 
-PLIST_SUB=	VER=${PORTVERSION}.0
+PLIST_SUB=	VER=${PORTVERSION}
 
 BROKEN_powerpc64=	Does not build on powerpc64
 
diff --git a/chinese/librime/distinfo b/chinese/librime/distinfo
index 19533961d9da..1439caa3b0d2 100644
--- a/chinese/librime/distinfo
+++ b/chinese/librime/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rime-librime-rime-1.1_GH0.tar.gz) = fb42324b7fa489708a0e2ffd75e90668678bd4d0ae68f9c8ff956cd3be3c7362
-SIZE (rime-librime-rime-1.1_GH0.tar.gz) = 2633096
+TIMESTAMP = 1467479749
+SHA256 (rime-librime-rime-1.2.9_GH0.tar.gz) = d9f0e732b5bf0ee9d8872d00c79322eec7682139a898a65555f794795ac5f410
+SIZE (rime-librime-rime-1.2.9_GH0.tar.gz) = 5516609
diff --git a/chinese/librime/files/patch-CMakeLists.txt b/chinese/librime/files/patch-CMakeLists.txt
index 2e10913cf103..be56ba257543 100644
--- a/chinese/librime/files/patch-CMakeLists.txt
+++ b/chinese/librime/files/patch-CMakeLists.txt
@@ -1,79 +1,29 @@
---- CMakeLists.txt.orig	2013-12-26 08:37:25 UTC
+--- CMakeLists.txt.orig	2014-12-21 11:46:44 UTC
 +++ CMakeLists.txt
-@@ -1,5 +1,5 @@
--set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake)
--set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_flag_overrides.cmake)
-+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
-+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
- 
- project(rime)
- cmake_minimum_required(VERSION 2.8)
-@@ -21,6 +21,20 @@ endif(WIN32)
- 
- set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
- 
-+include_directories(${PROJECT_SOURCE_DIR}/include)
-+include_directories(${PROJECT_SOURCE_DIR}/thirdparty/include)
-+link_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib)
-+if(MSVC)
-+  if(MSVC10)
-+    # stdint.h is missing from VS2010
-+    include_directories(${PROJECT_SOURCE_DIR}/thirdparty/include/msvc)
-+  endif(MSVC10)
-+  add_definitions("/wd4244 /wd4996")
-+endif(MSVC)
-+if(UNIX)
-+  add_definitions("-std=c++11")
-+endif(UNIX)
-+
- set(Boost_USE_STATIC_LIBS ${BUILD_STATIC})
- set(Gflags_STATIC ${BUILD_STATIC})
- set(Glog_STATIC ${BUILD_STATIC})
-@@ -82,20 +96,6 @@ else(X11Keysym)
-   message(WARNING "X11/keysym.h not found.")
- endif(X11Keysym)
- 
--include_directories(${PROJECT_SOURCE_DIR}/include)
--include_directories(${PROJECT_SOURCE_DIR}/thirdparty/include)
--link_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib)
--if(MSVC)
--  if(MSVC10)
--    # stdint.h is missing from VS2010
--    include_directories(${PROJECT_SOURCE_DIR}/thirdparty/include/msvc)
--  endif(MSVC10)
--  add_definitions("/wd4244 /wd4996")
--endif(MSVC)
--if(UNIX)
--  add_definitions("-std=c++11")
--endif(UNIX)
--
- if(NOT DEFINED LIB_INSTALL_DIR)
-     set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
- endif()
-@@ -104,7 +104,7 @@ if(NOT DEFINED BIN_INSTALL_DIR)
+@@ -123,7 +123,7 @@ if(NOT DEFINED BIN_INSTALL_DIR)
      set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
  endif()
  
 -if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
++if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|DragonFly")
    # uninstall target
    configure_file(
      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-@@ -120,7 +120,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-   set(includedir "${CMAKE_INSTALL_PREFIX}/include")
-   configure_file(${PROJECT_SOURCE_DIR}/rime.pc.in ${PROJECT_BINARY_DIR}/rime.pc)
+@@ -142,7 +142,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+       ${PROJECT_BINARY_DIR}/rime.pc
+       @ONLY)
    install(FILES include/rime_api.h DESTINATION include)
 -  install(FILES ${PROJECT_BINARY_DIR}/rime.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-+  install(FILES ${PROJECT_BINARY_DIR}/rime.pc DESTINATION ${prefix}/libdata/pkgconfig)
++  install(FILES ${PROJECT_BINARY_DIR}/rime.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
    install(FILES cmake/RimeConfig.cmake DESTINATION share/cmake/rime)
    if(BUILD_DATA)
      install(FILES ${PROJECT_SOURCE_DIR}/data/default.yaml DESTINATION ${pkgdatadir})
-@@ -131,7 +131,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+@@ -153,7 +153,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
      file(GLOB supplement_schema ${PROJECT_SOURCE_DIR}/data/supplement/*.yaml)
      install(FILES ${supplement_schema} DESTINATION ${pkgdatadir})
    endif(BUILD_DATA)
 -endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+endif(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
++endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|DragonFly")
  
  if(BUILD_SHARED_LIBS)
-   set(RIME_LIBRARY rime)
+   add_definitions(-DRIME_BUILD_SHARED_LIBS)