svn commit: r327251 - in head/chinese/sunpinyin: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sat Sep 14 08:51:34 2013
New Revision: 327251
URL: http://svnweb.freebsd.org/changeset/ports/327251

Log:
  - Fix build on 10-CURRENT: disable iconv functionality by removing iconv.h detection
  - While I'm here:
    - Remove leading indefinite article from COMMENT
    - Remove LICENSE_FILE for well-known licenses
    - Covnert to new LIB_DEPENDS format
    - Use USES=gmake
  
  PR:		ports/182079
  Submitted by:	Henry Hu <henry.hu.sh at gmail.com>
  Approved by:	Zhihao Yuan <zy at miator.net> (maintainer)

Modified:
  head/chinese/sunpinyin/Makefile   (contents, props changed)
  head/chinese/sunpinyin/files/patch-SConstruct   (contents, props changed)
  head/chinese/sunpinyin/pkg-descr   (contents, props changed)

Modified: head/chinese/sunpinyin/Makefile
==============================================================================
--- head/chinese/sunpinyin/Makefile	Sat Sep 14 08:51:30 2013	(r327250)
+++ head/chinese/sunpinyin/Makefile	Sat Sep 14 08:51:34 2013	(r327251)
@@ -12,22 +12,18 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:1 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	lichray at gmail.com
-COMMENT=	A statistical language model based input method engine
+COMMENT=	Statistical language model based input method engine
 
 LICENSE=	LGPL21 CDDL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
-LICENSE_FILE_LGPL21=	${WRKSRC}/LGPL.LICENSE
-LICENSE_FILE_CDDL=	${WRKSRC}/OPENSOLARIS.LICENSE
-
-USES=		pkgconfig
 USE_XZ=		yes
 USE_SCONS=	yes
 SCONS_ARGS+=	--prefix=${PREFIX} --libdatadir=${PREFIX}/share
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 
 post-patch:
 	@${CP} ${_DISTDIR}/lm_sc.t3g.arpa.tar.bz2 \

Modified: head/chinese/sunpinyin/files/patch-SConstruct
==============================================================================
--- head/chinese/sunpinyin/files/patch-SConstruct	Sat Sep 14 08:51:30 2013	(r327250)
+++ head/chinese/sunpinyin/files/patch-SConstruct	Sat Sep 14 08:51:34 2013	(r327251)
@@ -1,6 +1,6 @@
---- SConstruct.orig	2012-07-17 23:25:59.000000000 -0500
-+++ SConstruct	2012-07-17 23:40:11.633113871 -0500
-@@ -176,10 +176,12 @@ def CreateEnvironment():
+--- SConstruct.orig	2012-07-18 12:25:59.000000000 +0800
++++ SConstruct	2013-09-14 14:44:54.603035259 +0800
+@@ -176,10 +176,12 @@
  
      libln_builder = Builder(action='ln -s ${SOURCE.name} ${TARGET.name}',
                              chdir=True)
@@ -17,7 +17,15 @@
      env.Append(BUILDERS={'InstallAsSymlink': libln_builder})
      return env
  
-@@ -420,7 +422,7 @@ def DoInstall():
+@@ -324,7 +326,6 @@
+     conf.CheckFunc('getopt_long')
+     conf.CheckFunc('getpagesize')
+     conf.CheckFunc('get_opt')
+-    conf.CheckCHeader('iconv.h')
+     conf.CheckCHeader('inttypes.h')
+     conf.CheckCHeader('locale.h')
+     conf.CheckCHeader('libintl.h')
+@@ -420,7 +421,7 @@
                                   lib_target_bin),
              ]
  

Modified: head/chinese/sunpinyin/pkg-descr
==============================================================================
--- head/chinese/sunpinyin/pkg-descr	Sat Sep 14 08:51:30 2013	(r327250)
+++ head/chinese/sunpinyin/pkg-descr	Sat Sep 14 08:51:34 2013	(r327251)
@@ -2,4 +2,4 @@ SunPinyin is a statistical language mode
 was firstly developed by Sun Beijing Globalization team, and opensource'd
 to community with opensolaris project, with LGPLv2 and CDDL dual-licenses.
 
-WWW:	http://code.google.com/p/sunpinyin/
+WWW: http://code.google.com/p/sunpinyin/