ports/175752: [UPDATE] chinese/librime to 0.9.7

[Zhihao Yuan]

>Number:         175752
>Category:       ports
>Synopsis:       [UPDATE] chinese/librime to 0.9.7
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 01 07:30:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Zhihao Yuan
>Release:        FreeBSD 8.3-STABLE amd64
>Organization:
Northern Illinois University
>Environment:
System: FreeBSD elitebook.hp 8.3-STABLE FreeBSD 8.3-STABLE #6 r243757: Sat Dec 1 13:54:32 CST 2012 lichray at elitebook.hp:/usr/obj/usr/src/sys/HOUKAGO amd64


	
>Description:
	
	Please bump chinese/fcitx-rime's revision at the same time.
>How-To-Repeat:
	
>Fix:

	

--- librime-0.9.7.patch begins here ---
Index: chinese/librime/Makefile
===================================================================
--- chinese/librime/Makefile	(revision 311354)
+++ chinese/librime/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	librime
-PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTVERSION=	0.9.7
 CATEGORIES=	chinese textproc
 MASTER_SITES=	GOOGLE_CODE
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} brise-${DATA_VER}.tar.gz
@@ -21,15 +20,15 @@
 
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	pkgconfig
+USE_PKGCONFIG=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	xproto
 USE_PERL5_BUILD=	yes
 LDFLAGS+=	-lintl
 
+PLIST_SUB=	VER=${PORTVERSION}
+
 post-patch:     .SILENT
-	${REINPLACE_CMD} 's|$${LIB_INSTALL_DIR}/pkgconfig|$${prefix}/libdata/pkgconfig|' \
-		${WRKSRC}/CMakeLists.txt
 	${FIND} ${WRKSRC} \( -name '*.cc' -or -name '*.h' \) \
 		-exec ${PERL} -i -pe '$$. == 1 && s/^\xef\xbb\xbf//;' '{}' \;
 
@@ -45,7 +44,7 @@
 	${INSTALL_DATA} ${DATASRC}/*.kct ${DATASRC}/*.bin ${DATADIR}/data/
 
 PROJECTHOST=	rimeime
-DATA_VER=	0.13
+DATA_VER=	0.16
 WRKSRC=		${WRKDIR}/${PORTNAME}
 DATASRC=	${WRKDIR}/tmp
 DATADIR=	${PREFIX}/share/rime
Index: chinese/librime/distinfo
===================================================================
--- chinese/librime/distinfo	(revision 311354)
+++ chinese/librime/distinfo	(working copy)
@@ -1,4 +1,4 @@
-SHA256 (librime-0.9.4.tar.gz) = 626082f5a2954686059445e414786691ee568777104ce8e093fbfd47c0095795
-SIZE (librime-0.9.4.tar.gz) = 2300407
-SHA256 (brise-0.13.tar.gz) = 72c7ea43b5baf972a1d9a6cccce5f860b73924b36e2b3f68822ac8329d1c11f3
-SIZE (brise-0.13.tar.gz) = 5368874
+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
Index: chinese/librime/files/patch-CMakeLists.txt
===================================================================
--- chinese/librime/files/patch-CMakeLists.txt	(revision 0)
+++ chinese/librime/files/patch-CMakeLists.txt	(working copy)
@@ -0,0 +1,19 @@
+--- CMakeLists.txt.bak	2012-09-26 00:03:24.000000000 -0500
++++ CMakeLists.txt	2012-11-26 22:38:10.883043680 -0600
+@@ -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)
+@@ -107,7 +107,7 @@ if(NOT BUILD_STATIC)
+   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)
+-  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 cmake/RimeConfig.cmake DESTINATION share/cmake/rime)
+   if(BUILD_DATA)
+     install(FILES ${PROJECT_SOURCE_DIR}/data/default.yaml DESTINATION ${pkgdatadir})
Index: chinese/librime/pkg-plist
===================================================================
--- chinese/librime/pkg-plist	(revision 311354)
+++ chinese/librime/pkg-plist	(working copy)
@@ -3,7 +3,7 @@
 include/rime_api.h
 lib/librime.so
 lib/librime.so.0
-lib/librime.so.0.9.4
+lib/librime.so.%%VER%%
 libdata/pkgconfig/rime.pc
 share/cmake/rime/RimeConfig.cmake
 share/rime/data/cangjie5.prism.bin
--- librime-0.9.7.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: