From 006fadb5e68929508c8a2ab97d4eafdb9218aa22 Mon Sep 17 00:00:00 2001 From: vanilla Date: Mon, 9 Feb 2015 03:21:39 +0000 Subject: 1: Upgrade to 0.4.0. 2: add LICENSE & LICENSE_FILE 3: add LIB_DEPENDS to sqlite3 4: sort USES 5: switch to cmake. --- chinese/libchewing/Makefile | 22 ++++++++++++++-------- chinese/libchewing/distinfo | 4 ++-- chinese/libchewing/files/patch-CMakeLists.txt | 17 +++++++++++++++++ chinese/libchewing/files/patch-data_Makefile.in | 11 ----------- chinese/libchewing/files/patch-plat_path.c | 15 --------------- .../files/patch-src_porting_layer_Makefile.in | 10 ---------- chinese/libchewing/pkg-plist | 11 ++++------- 7 files changed, 37 insertions(+), 53 deletions(-) create mode 100644 chinese/libchewing/files/patch-CMakeLists.txt delete mode 100644 chinese/libchewing/files/patch-data_Makefile.in delete mode 100644 chinese/libchewing/files/patch-plat_path.c delete mode 100644 chinese/libchewing/files/patch-src_porting_layer_Makefile.in (limited to 'chinese') diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile index aecc709282f8..7899e79e1c21 100644 --- a/chinese/libchewing/Makefile +++ b/chinese/libchewing/Makefile @@ -2,20 +2,26 @@ # $FreeBSD$ PORTNAME= libchewing -PORTVERSION= 0.3.4 -PORTREVISION= 1 +PORTVERSION= 0.4.0 CATEGORIES= chinese textproc -MASTER_SITES= GOOGLE_CODE MAINTAINER= ports@FreeBSD.org -COMMENT= The Chewing intelligent phonetic input method library +COMMENT= Chewing intelligent phonetic input method library -USES= tar:bzip2 gmake pkgconfig pathfix libtool -GNU_CONFIGURE= yes +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 + +USES= cmake gmake libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= chewing +GH_PROJECT= ${PORTNAME} +GH_TAGNAME= v${PORTVERSION} +GH_COMMIT= 6d6e67c -DATADIR= ${PREFIX}/share/chewing -PROJECTHOST= chewing +CFLAGS+= -I${LOCALBASE}/include INFO= libchewing .include diff --git a/chinese/libchewing/distinfo b/chinese/libchewing/distinfo index 78ce8dc59f8d..546a7b4c7be1 100644 --- a/chinese/libchewing/distinfo +++ b/chinese/libchewing/distinfo @@ -1,2 +1,2 @@ -SHA256 (libchewing-0.3.4.tar.bz2) = f940734d514d52f0375cb1afa5d4d7536a93fd8ff0c3ce4a002ab1698dd07ff6 -SIZE (libchewing-0.3.4.tar.bz2) = 1926898 +SHA256 (libchewing-0.4.0.tar.bz2) = ab60e54b35479f8278cf795e988cec707d0321c94817356430cfde9744556767 +SIZE (libchewing-0.4.0.tar.bz2) = 3368029 diff --git a/chinese/libchewing/files/patch-CMakeLists.txt b/chinese/libchewing/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..05e78f66c6be --- /dev/null +++ b/chinese/libchewing/files/patch-CMakeLists.txt @@ -0,0 +1,17 @@ +--- CMakeLists.txt.orig 2015-02-08 15:09:15 UTC ++++ CMakeLists.txt +@@ -103,6 +103,7 @@ 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) + +@@ -428,5 +429,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 +- DESTINATION ${INSTALL_LIB_DIR}/pkgconfig) ++ DESTINATION ${INSTALL_LIBDATA_DIR}/pkgconfig) + install(TARGETS ${LIBS} DESTINATION ${INSTALL_LIB_DIR}) diff --git a/chinese/libchewing/files/patch-data_Makefile.in b/chinese/libchewing/files/patch-data_Makefile.in deleted file mode 100644 index 62bee924a8f9..000000000000 --- a/chinese/libchewing/files/patch-data_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- data/Makefile.in.orig 2013-02-10 19:20:34.000000000 -0500 -+++ data/Makefile.in 2013-02-10 19:20:40.000000000 -0500 -@@ -261,7 +261,7 @@ - tsi.src \ - $(NULL) - --chewing_datadir = $(pkglibdir) -+chewing_datadir = $(datadir)/chewing - chewing_data_DATA = \ - $(static_tables) \ - $(datas) \ diff --git a/chinese/libchewing/files/patch-plat_path.c b/chinese/libchewing/files/patch-plat_path.c deleted file mode 100644 index 80b8a49d8804..000000000000 --- a/chinese/libchewing/files/patch-plat_path.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/porting_layer/src/plat_path.c.orig 2013-02-10 19:57:20.000000000 -0500 -+++ src/porting_layer/src/plat_path.c 2013-02-10 19:57:35.000000000 -0500 -@@ -37,10 +37,10 @@ - home = getenv( "HOME" ); - if ( home ) { - snprintf( path, path_len, "%s/.chewing" SEARCH_PATH_SEP -- LIBDIR "/libchewing", home ); -+ DATADIR "/chewing", home ); - } else { - // No HOME ? -- strncpy( path, SEARCH_PATH_SEP LIBDIR "/libchewing", path_len ); -+ strncpy( path, SEARCH_PATH_SEP DATADIR "/chewing", path_len ); - } - } - diff --git a/chinese/libchewing/files/patch-src_porting_layer_Makefile.in b/chinese/libchewing/files/patch-src_porting_layer_Makefile.in deleted file mode 100644 index b1aacdb2939c..000000000000 --- a/chinese/libchewing/files/patch-src_porting_layer_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- src/porting_layer/src/Makefile.in.orig 2013-02-10 19:59:20.000000000 -0500 -+++ src/porting_layer/src/Makefile.in 2013-02-10 19:59:33.000000000 -0500 -@@ -113,6 +113,7 @@ - AM_CFLAGS = @AM_CFLAGS@ - AM_CPPFLAGS = \ - -DLIBDIR=\"@libdir@\" \ -+ -DDATADIR=\"@datadir@\" \ - $(NULL) - - AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ diff --git a/chinese/libchewing/pkg-plist b/chinese/libchewing/pkg-plist index 5c3db87434f6..0a701f36354e 100644 --- a/chinese/libchewing/pkg-plist +++ b/chinese/libchewing/pkg-plist @@ -1,18 +1,15 @@ include/chewing/chewing.h include/chewing/chewingio.h +include/chewing/chewing-compat.h include/chewing/global.h include/chewing/mod_aux.h lib/libchewing.a lib/libchewing.so lib/libchewing.so.3 -lib/libchewing.so.3.0.1 +lib/libchewing.so.3.2.0 libdata/pkgconfig/chewing.pc -%%DATADIR%%/ch_index_begin.dat -%%DATADIR%%/ch_index_phone.dat -%%DATADIR%%/dict.dat -%%DATADIR%%/fonetree.dat -%%DATADIR%%/ph_index.dat +%%DATADIR%%/dictionary.dat +%%DATADIR%%/index_tree.dat %%DATADIR%%/pinyin.tab %%DATADIR%%/swkb.dat %%DATADIR%%/symbols.dat -%%DATADIR%%/us_freq.dat -- cgit