5 files changed, 76 insertions, 45 deletions

diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile
index 637d444ccf3a..b76aabb88188 100644
--- a/chinese/librime/Makefile
+++ b/chinese/librime/Makefile
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	librime
-PORTVERSION=	0.9.7
-PORTREVISION=	2
+PORTVERSION=	1.1
 CATEGORIES=	chinese textproc
-MASTER_SITES=	GOOGLE_CODE
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} brise-${DATA_VER}.tar.gz
+MASTER_SITES=	http://github.com/rime/${PORTNAME}/archive/rime-${PORTVERSION}.tar.gz?dummy=/
+DISTNAME=	${PORTNAME}-rime-${DISTVERSION}
 
 MAINTAINER=	lichray@gmail.com
-COMMENT=	Rime Input Method Engine
+COMMENT=	Rime Input Method Engine, the core library
 
 LICENSE=	GPLv3
 
@@ -17,37 +16,20 @@ LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libglog.so:${PORTSDIR}/devel/glog \
 		libkyotocabinet.so:${PORTSDIR}/databases/kyotocabinet \
 		libopencc.so:${PORTSDIR}/chinese/opencc \
-		libyaml-cpp03.so:${PORTSDIR}/devel/yaml-cpp03
+		libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp
 
-USES=		cmake pkgconfig gettext perl5
+USES=		cmake compiler:c++11-lang pkgconfig gettext perl5
 USE_PERL5=	build patch
 USE_LDCONFIG=	yes
 USE_XORG=	xproto
 LDFLAGS+=	-lintl
 
-PLIST_SUB=	VER=${PORTVERSION}
+PLIST_SUB=	VER=${PORTVERSION}.0
+
+.include <bsd.port.options.mk>
 
 post-patch:     .SILENT
 	${FIND} ${WRKSRC} \( -name '*.cc' -or -name '*.h' \) \
 		-exec ${PERL} -i -pe '$$. == 1 && s/^\xef\xbb\xbf//;' '{}' \;
-	${REINPLACE_CMD} -e 's|yaml-cpp|&03|g' ${WRKSRC}/cmake/FindYamlCpp.cmake \
-		${WRKSRC}/src/config.cc ${WRKSRC}/src/dict/dict_settings.cc
-
-post-build:
-	@echo "building rime data."
-	@${MKDIR} ${DATASRC}
-	@(cd ${WRKDIR}/brise; ${CP} \
-	default.yaml essay.kct supplement/*.yaml preset/*.yaml ${DATASRC})
-	${WRKSRC}/bin/rime_deployer --build ${DATASRC}
-
-post-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}/data
-	${INSTALL_DATA} ${DATASRC}/*.kct ${DATASRC}/*.bin ${STAGEDIR}${DATADIR}/data/
-
-PROJECTHOST=	rimeime
-DATA_VER=	0.16
-WRKSRC=		${WRKDIR}/${PORTNAME}
-DATASRC=	${WRKDIR}/tmp
-DATADIR=	${PREFIX}/share/rime
 
 .include <bsd.port.mk>
diff --git a/chinese/librime/distinfo b/chinese/librime/distinfo
index e8861d896364..2d2ab837a4fa 100644
--- a/chinese/librime/distinfo
+++ b/chinese/librime/distinfo
@@ -1,4 +1,2 @@
-SHA256 (librime-0.9.7.tar.gz) = 670ab6535bce9c44d2293f8b857ececbea6317b563c5686e750ffdf0532d85c2
-SIZE (librime-0.9.7.tar.gz) = 2535462
-SHA256 (brise-0.16.tar.gz) = a65693ed2bbf40ec579be8124d4cb909749a5a4dcd0e312d78891522c5eb881b
-SIZE (brise-0.16.tar.gz) = 6781320
+SHA256 (librime-rime-1.1.tar.gz) = fb42324b7fa489708a0e2ffd75e90668678bd4d0ae68f9c8ff956cd3be3c7362
+SIZE (librime-rime-1.1.tar.gz) = 2633096
diff --git a/chinese/librime/files/patch-CMakeLists.txt b/chinese/librime/files/patch-CMakeLists.txt
index 04f461c02f90..848a5176ac1c 100644
--- a/chinese/librime/files/patch-CMakeLists.txt
+++ b/chinese/librime/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.bak	2012-09-26 00:03:24.000000000 -0500
-+++ CMakeLists.txt	2012-11-26 22:38:10.883043680 -0600
+--- ./CMakeLists.txt.orig	2013-12-26 17:37:25.000000000 +0900
++++ ./CMakeLists.txt	2014-03-26 13:02:33.000000000 +0900
 @@ -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)
@@ -8,7 +8,58 @@
  
  project(rime)
  cmake_minimum_required(VERSION 2.8)
-@@ -107,7 +107,7 @@ if(NOT BUILD_STATIC)
+@@ -21,6 +21,20 @@
+ 
+ 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 @@
+   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 @@
+     set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
+ endif()
+ 
+-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+   # uninstall target
+   configure_file(
+     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+@@ -120,7 +120,7 @@
    set(includedir "${CMAKE_INSTALL_PREFIX}/include")
    configure_file(${PROJECT_SOURCE_DIR}/rime.pc.in ${PROJECT_BINARY_DIR}/rime.pc)
    install(FILES include/rime_api.h DESTINATION include)
@@ -17,3 +68,12 @@
    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 @@
+     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")
+ 
+ if(BUILD_SHARED_LIBS)
+   set(RIME_LIBRARY rime)
diff --git a/chinese/librime/pkg-descr b/chinese/librime/pkg-descr
index 9ea8ab364400..5e126ef8ce02 100644
--- a/chinese/librime/pkg-descr
+++ b/chinese/librime/pkg-descr
@@ -1,4 +1,4 @@
 Rime Input Method Engine is a customizable and dialect-friendly intelligent
 Chinese input method.
 
-WWW: http://code.google.com/p/rimeime/
+WWW: https://rime.github.io/
diff --git a/chinese/librime/pkg-plist b/chinese/librime/pkg-plist
index 2856d5ea3432..755cc34e9886 100644
--- a/chinese/librime/pkg-plist
+++ b/chinese/librime/pkg-plist
@@ -2,16 +2,7 @@ bin/rime_deployer
 bin/rime_dict_manager
 include/rime_api.h
 lib/librime.so
-lib/librime.so.0
 lib/librime.so.%%VER%%
+lib/librime.so.1
 libdata/pkgconfig/rime.pc
 share/cmake/rime/RimeConfig.cmake
-%%DATADIR%%/data/cangjie5.prism.bin
-%%DATADIR%%/data/cangjie5.reverse.bin
-%%DATADIR%%/data/cangjie5.table.bin
-%%DATADIR%%/data/essay.kct
-%%DATADIR%%/data/luna_pinyin.prism.bin
-%%DATADIR%%/data/luna_pinyin.reverse.bin
-%%DATADIR%%/data/luna_pinyin.table.bin
-%%DATADIR%%/data/luna_pinyin_fluency.prism.bin
-%%DATADIR%%/data/luna_pinyin_simp.prism.bin