From nobody@FreeBSD.org  Sat Sep 14 05:22:21 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id CFDE24F0
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 14 Sep 2013 05:22:21 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id BDC76224F
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 14 Sep 2013 05:22:21 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r8E5MLdY032297
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 14 Sep 2013 05:22:21 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r8E5MLFW032229;
	Sat, 14 Sep 2013 05:22:21 GMT
	(envelope-from nobody)
Message-Id: <201309140522.r8E5MLFW032229@oldred.freebsd.org>
Date: Sat, 14 Sep 2013 05:22:21 GMT
From: Henry Hu <henry.hu.sh@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] chinese/sunpinyin: fix build
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: lichray@gmail.com

>Number:         182079
>Category:       ports
>Synopsis:       [patch] chinese/sunpinyin: fix build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sunpoet
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 14 05:30:00 UTC 2013
>Closed-Date:    Sat Sep 14 08:52:17 UTC 2013
>Last-Modified:  Sat Sep 14 09:00:00 UTC 2013
>Originator:     Henry Hu
>Release:        FreeBSD 10-CURRENT
>Organization:
Columbia University
>Environment:
FreeBSD pepsi 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r250457M: Tue Jun  4 20:59:11 PDT 2013     root@pepsi:/usr/obj/usr/src/sys/MYKERNEL  amd64

>Description:
Fix build of sunpinyin under latest 10-CURRENT.
Remove detection of iconv.h. Disable iconv functionality.

>How-To-Repeat:
Build chinese/sunpinyin with world built with WITH_ICONV=yes in src.conf.

>Fix:


Patch attached with submission follows:

Index: chinese/sunpinyin/files/patch-SConstruct
===================================================================
--- chinese/sunpinyin/files/patch-SConstruct	(版本 327212)
+++ chinese/sunpinyin/files/patch-SConstruct	(工作副本)
@@ -1,5 +1,5 @@
---- SConstruct.orig	2012-07-17 23:25:59.000000000 -0500
-+++ SConstruct	2012-07-17 23:40:11.633113871 -0500
+--- SConstruct.orig	2012-07-18 00:25:59.000000000 -0400
++++ SConstruct	2013-09-14 00:38:38.866083185 -0400
 @@ -176,10 +176,12 @@ def CreateEnvironment():
  
      libln_builder = Builder(action='ln -s ${SOURCE.name} ${TARGET.name}',
@@ -17,7 +17,15 @@
      env.Append(BUILDERS={'InstallAsSymlink': libln_builder})
      return env
  
-@@ -420,7 +422,7 @@ def DoInstall():
+@@ -324,7 +326,6 @@ def DoConfigure():
+     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 @@ def DoInstall():
                                   lib_target_bin),
              ]
  


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Sep 14 05:30:08 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182079 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: lichray@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/182079: [patch] chinese/sunpinyin: fix build
Date: Sat, 14 Sep 2013 05:30:08 UT

 Maintainer of chinese/sunpinyin,
 
 Please note that PR ports/182079 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/182079
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Zhihao Yuan <zy@miator.net>
To: bug-followup@FreeBSD.org, henry.hu.sh@gmail.com
Cc:  
Subject: Re: ports/182079: [patch] chinese/sunpinyin: fix build
Date: Sat, 14 Sep 2013 01:32:52 -0400

 Approved.  The thing is, the iconv functionality of this library is never
 being enabled or used by other ports.  It's safe to explicitly disable it.
 
 -- 
 Zhihao Yuan, ID lichray
 The best way to predict the future is to invent it.
 ___________________________________________________
 4BSD -- http://4bsd.biz/
Responsible-Changed-From-To: freebsd-ports-bugs->sunpoet 
Responsible-Changed-By: sunpoet 
Responsible-Changed-When: Sat Sep 14 08:07:49 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182079 
State-Changed-From-To: feedback->closed 
State-Changed-By: sunpoet 
State-Changed-When: Sat Sep 14 08:52:16 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182079 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182079: commit references a PR
Date: Sat, 14 Sep 2013 08:52:09 +0000 (UTC)

 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@gmail.com>
   Approved by:	Zhihao Yuan <zy@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@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/
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
