8 files changed, 46 insertions, 44 deletions

diff --git a/chinese/libpinyin/Makefile b/chinese/libpinyin/Makefile
index dda787eab2e4..6fc6eb34875a 100644
--- a/chinese/libpinyin/Makefile
+++ b/chinese/libpinyin/Makefile
@@ -2,14 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	libpinyin
-PORTVERSION=	0.7.91
-PORTREVISION=	2
+PORTVERSION=	1.1.0
 CATEGORIES=	chinese textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Library to deal with pinyin
 
+LICENSE=	GPLv2
+
 USE_BDB=	yes
 USE_GNOME=	glib20
 USES=		gettext gmake libtool pathfix pkgconfig
@@ -19,13 +20,11 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS+=CPPFLAGS="-I${LOCALBASE}/include \
 		-I${BDB_INCLUDE_DIR} -D_WITH_GETLINE" \
 		LDFLAGS="-L${LOCALBASE}/lib -l${BDB_LIB_NAME}"
+INSTALL_TARGET=install-strip
 
 PLIST_SUB+=	VER=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800107
-IGNORE=		does not compile on FreeBSD 7.X
-.endif
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpinyin.so.5.0.0
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/libpinyin/distinfo b/chinese/libpinyin/distinfo
index 9a2493ab0c93..eff50a4dbb45 100644
--- a/chinese/libpinyin/distinfo
+++ b/chinese/libpinyin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libpinyin-0.7.91.tar.gz) = 86d370d217183ec60223e71ff43002283cd7be888ceacf51c44090397b55259b
-SIZE (libpinyin-0.7.91.tar.gz) = 10466494
+SHA256 (libpinyin-1.1.0.tar.gz) = 3f2a04f4aa39cdf0db7c098805ad02c7f66b030d14144deddd04b532f4eaa103
+SIZE (libpinyin-1.1.0.tar.gz) = 19737160
diff --git a/chinese/libpinyin/files/patch-configure b/chinese/libpinyin/files/patch-configure
deleted file mode 100644
index 451b55be1a8e..000000000000
--- a/chinese/libpinyin/files/patch-configure
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure~	2012-02-06 09:07:32.410719322 -0600
-+++ configure	2012-02-06 09:26:16.354737313 -0600
-@@ -17515,11 +17515,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- #ifdef __cplusplus
- extern "C"
- #endif
--char db_create ();
-+#include <db.h>
- int
- main ()
- {
--return db_create ();
-+return db_create (0,0,0);
-   ;
-   return 0;
- }
diff --git a/chinese/libpinyin/files/patch-data_Makefile.in b/chinese/libpinyin/files/patch-data_Makefile.in
new file mode 100644
index 000000000000..6c83f868faa1
--- /dev/null
+++ b/chinese/libpinyin/files/patch-data_Makefile.in
@@ -0,0 +1,11 @@
+--- data/Makefile.in.orig	2014-06-05 14:21:55.000000000 +0800
++++ data/Makefile.in	2014-06-05 14:22:17.000000000 +0800
+@@ -288,7 +288,7 @@
+ libpinyin_db_DATA = $(binary_model_data) \
+                           table.conf
+ 
+-libpinyin_dbdir = $(libdir)/libpinyin/data
++libpinyin_dbdir = $(datadir)/libpinyin/data
+ CLEANFILES = $(binary_model_data)
+ all: all-am
+ 
diff --git a/chinese/libpinyin/files/patch-libpinyin.pc.in b/chinese/libpinyin/files/patch-libpinyin.pc.in
new file mode 100644
index 000000000000..2610935b5743
--- /dev/null
+++ b/chinese/libpinyin/files/patch-libpinyin.pc.in
@@ -0,0 +1,11 @@
+--- libpinyin.pc.in.orig	2014-06-05 14:28:26.000000000 +0800
++++ libpinyin.pc.in	2014-06-05 14:28:35.000000000 +0800
+@@ -2,7 +2,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-pkgdatadir=@libdir@/libpinyin
++pkgdatadir=@datadir@/libpinyin
+ 
+ libpinyinincludedir=${includedir}/libpinyin-@VERSION@
+ libpinyin_binary_version=@LIBPINYIN_BINARY_VERSION@
diff --git a/chinese/libpinyin/files/patch-src_pinyin_internal.h b/chinese/libpinyin/files/patch-src_pinyin_internal.h
deleted file mode 100644
index a837647d52ca..000000000000
--- a/chinese/libpinyin/files/patch-src_pinyin_internal.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pinyin_internal.h.orig	2011-12-19 23:45:40.000000000 -0600
-+++ src/pinyin_internal.h	2012-02-06 09:53:12.804569766 -0600
-@@ -47,6 +47,7 @@
- #include "flexible_ngram.h"
- 
- using namespace pinyin;
-+#define ENODATA		ENOENT
- 
- 
- #endif
diff --git a/chinese/libpinyin/pkg-descr b/chinese/libpinyin/pkg-descr
index e0fffc72dfc8..dfc46f4cadfb 100644
--- a/chinese/libpinyin/pkg-descr
+++ b/chinese/libpinyin/pkg-descr
@@ -1,4 +1,4 @@
 The libpinyin project aims to provide the algorithms core for intelligent
 sentence-based Chinese pinyin input methods.
 
-WWW:	https://github.com/libpinyin/libpinyin
+WWW: https://github.com/libpinyin/libpinyin
diff --git a/chinese/libpinyin/pkg-plist b/chinese/libpinyin/pkg-plist
index 2cc99766cb20..67eee62ee89f 100644
--- a/chinese/libpinyin/pkg-plist
+++ b/chinese/libpinyin/pkg-plist
@@ -1,22 +1,29 @@
 bin/gen_binary_files
 bin/gen_unigram
 bin/import_interpolation
-include/libpinyin-%%VER%%/chewing_enum.h
-include/libpinyin-%%VER%%/chewing_key.h
 include/libpinyin-%%VER%%/novel_types.h
 include/libpinyin-%%VER%%/pinyin.h
 include/libpinyin-%%VER%%/pinyin_custom2.h
 lib/libpinyin.a
 lib/libpinyin.so
-lib/libpinyin.so.2
-lib/libpinyin.so.2.0.0
+lib/libpinyin.so.5
+lib/libpinyin.so.5.0.0
 libdata/pkgconfig/libpinyin.pc
-man/man1/gen_binary_files.1.gz
-man/man1/gen_unigram.1.gz
-man/man1/import_interpolation.1.gz
 man/man1/libpinyin.1.gz
+%%DATADIR%%/data/art.bin
 %%DATADIR%%/data/bigram.db
+%%DATADIR%%/data/culture.bin
+%%DATADIR%%/data/economy.bin
 %%DATADIR%%/data/gb_char.bin
 %%DATADIR%%/data/gbk_char.bin
+%%DATADIR%%/data/geology.bin
+%%DATADIR%%/data/history.bin
+%%DATADIR%%/data/life.bin
+%%DATADIR%%/data/merged.bin
+%%DATADIR%%/data/nature.bin
 %%DATADIR%%/data/phrase_index.bin
 %%DATADIR%%/data/pinyin_index.bin
+%%DATADIR%%/data/scitech.bin
+%%DATADIR%%/data/society.bin
+%%DATADIR%%/data/sport.bin
+%%DATADIR%%/data/table.conf