From delphij@FreeBSD.org  Thu Mar 13 18:01:39 2008
Return-Path: <delphij@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A1DAB1065671;
	Thu, 13 Mar 2008 18:01:39 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 8BDCE8FC1B;
	Thu, 13 Mar 2008 18:01:39 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from freefall.freebsd.org (delphij@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m2DI1dhm097502;
	Thu, 13 Mar 2008 18:01:39 GMT
	(envelope-from delphij@freefall.freebsd.org)
Received: (from delphij@localhost)
	by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m2DI1dJw097501;
	Thu, 13 Mar 2008 18:01:39 GMT
	(envelope-from delphij)
Message-Id: <200803131801.m2DI1dJw097501@freefall.freebsd.org>
Date: Thu, 13 Mar 2008 18:01:39 GMT
From: Xin LI <delphij@FreeBSD.org>
Reply-To: Xin LI <delphij@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: gnome@FreeBSD.org
Subject: [PATCH] Update libiconv to 1.12
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         121670
>Category:       ports
>Synopsis:       [PATCH] Update converters/libiconv to 1.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 13 18:10:00 UTC 2008
>Closed-Date:    Tue Mar 03 03:41:24 UTC 2009
>Last-Modified:  Tue Mar 03 03:41:24 UTC 2009
>Originator:     Xin LI
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD freefall.freebsd.org 7.0-STABLE FreeBSD 7.0-STABLE #33: Fri Feb 29 00:53:41 UTC 2008 simon@freefall.freebsd.org:/usr/src/sys/i386/compile/FREEFALL i386


>Description:
	Attached patch updates libiconv to 1.12.
>How-To-Repeat:
>Fix:


--- libiconv-1.12.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/converters/libiconv/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile	27 Oct 2007 15:31:50 -0000	1.43
+++ Makefile	13 Mar 2008 17:27:54 -0000
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	libiconv
-PORTVERSION=	1.11
-PORTREVISION=	1
+PORTVERSION=	1.12
 CATEGORIES=	converters devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A character set conversion library
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/converters/libiconv/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo	27 Oct 2007 15:31:50 -0000	1.14
+++ distinfo	13 Mar 2008 17:28:53 -0000
@@ -1,6 +1,6 @@
-MD5 (libiconv-1.11.tar.gz) = b77a17e4a5a817100ad4b2613935055e
-SHA256 (libiconv-1.11.tar.gz) = fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
-SIZE (libiconv-1.11.tar.gz) = 4430930
-MD5 (libiconv-1.11-cp932.patch.gz) = 1d6c7711b6ec76c9c42230d8e097baa0
-SHA256 (libiconv-1.11-cp932.patch.gz) = 48ed20ab2bd59d9af9fa6d4328b363849bf0e155b70bdbe137dc8973341b65d1
-SIZE (libiconv-1.11-cp932.patch.gz) = 112830
+MD5 (libiconv-1.12.tar.gz) = c2be282595751535a618ae0edeb8f648
+SHA256 (libiconv-1.12.tar.gz) = a99e244fd78babb95ea3c9a5c88b964994edaa1d15fd8dde5b4067801e23f0cd
+SIZE (libiconv-1.12.tar.gz) = 4513309
+MD5 (libiconv-1.12-cp932.patch.gz) = b9c8ba86247f21d1a344e743bf025126
+SHA256 (libiconv-1.12-cp932.patch.gz) = 1f23a91ebb687d5283d7ca00000b09f0fd59466d40fa0aafc19b9b36ce523714
+SIZE (libiconv-1.12-cp932.patch.gz) = 107962
Index: files/patch-src::Makefile.in
===================================================================
RCS file: /home/ncvs/ports/converters/libiconv/files/patch-src::Makefile.in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src::Makefile.in
--- files/patch-src::Makefile.in	24 Oct 2007 23:35:01 -0000	1.2
+++ files/patch-src::Makefile.in	13 Mar 2008 17:55:40 -0000
@@ -1,10 +1,10 @@
---- src/Makefile.in.orig	Fri Jul 14 09:19:07 2006
-+++ src/Makefile.in	Fri Jun 29 18:31:59 2007
-@@ -96,6 +96,7 @@ install : all force
+--- src/Makefile.in.orig	2007-05-27 15:15:52.000000000 -0700
++++ src/Makefile.in	2008-03-13 10:55:15.753027701 -0700
+@@ -104,6 +104,7 @@
  	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
  	case "@host_os@" in \
- 	  hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
-+	  freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib//libiconv.la @LTLIBINTL@ -o iconv;; \
- 	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
+ 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
++	  freebsd*) $(LIBTOOL_LINK) $(CC) ${CFLAGS} $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv $(OBJECTS_RES_@WOE32@) @LTLIBINTL@ -o iconv;; \
+ 	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
  	esac
  	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
--- libiconv-1.12.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jadawin 
Responsible-Changed-By: jadawin 
Responsible-Changed-When: Thu Mar 13 19:14:09 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121670 
Responsible-Changed-From-To: jadawin->gnome 
Responsible-Changed-By: jadawin 
Responsible-Changed-When: Thu Mar 13 20:08:10 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer. 

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

From: "Jeremy Messenger" <mezz7@cox.net>
To: bug-followup@freebsd.org, delphij@freebsd.org
Cc:  
Subject: Re: ports/121670: [PATCH] Update libiconv to 1.12
Date: Thu, 13 Mar 2008 16:07:06 -0500

 This version has changed the license from GPLv2 to GPLv3. I am still not  
 sure what exactly for our policy of GPLv3 in ports tree.
 
 Cheers,
 Mezz
 
 
 -- 
 mezz7@cox.net  -  mezz@FreeBSD.org
 FreeBSD GNOME Team
 http://www.FreeBSD.org/gnome/  -  gnome@FreeBSD.org

From: Pav Lucistnik <pav@FreeBSD.org>
To: bug-followup@FreeBSD.org, delphij@FreeBSD.org
Cc:  
Subject: Re: ports/121670: [PATCH] Update converters/libiconv to 1.12
Date: Fri, 14 Mar 2008 09:57:07 +0100

 I think the policy is that GPLv3 ports are allowed, under the condition
 we don't distribute binaries linking the GPLv3 code with incompatibly
 licensed code.
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 Bento's Law: If It Can Break, It Will Break
 Bento's Corollary: If It Can Break, Kris Can Send Mail About It

From: "Jeremy Messenger" <mezz7@cox.net>
To: bug-followup@freebsd.org, delphij@freebsd.org
Cc:  
Subject: Re: ports/121670: [PATCH] Update converters/libiconv to 1.12
Date: Fri, 14 Mar 2008 09:24:41 -0500

 So it means that we have to check all ports that depend on  
 converters/libiconv to make sure these ports are compatible with GPLv3  
 before we can update it? Do we have the list of compatibly and  
 incompatibly license with GPLv3? I am one of people that will need the  
 list. ;-) Or should we wait until license framework comes in if someone  
 write it?
 
 Cheers,
 Mezz
 
 
 -- 
 mezz7@cox.net  -  mezz@FreeBSD.org
 FreeBSD GNOME Team
 http://www.FreeBSD.org/gnome/  -  gnome@FreeBSD.org

From: Pav Lucistnik <pav@FreeBSD.org>
To: bug-followup@FreeBSD.org, delphij@FreeBSD.org
Cc:  
Subject: Re: ports/121670: [PATCH] Update converters/libiconv to 1.12
Date: Fri, 14 Mar 2008 15:43:59 +0100

 Licensing framework is certainly something we will need. Currently we're
 looking for volunteers to work on it, so...
 
 Then we will need to inspect every file in every of 18,000+ ports.
 
 IMHO we could update libiconv now and deal with licensing issues as they
 are discovered, but I am not a lawyer.
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 The number you dialed is imaginary.
 Please turn your phone by 90 degrees and try again.
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Mar 3 03:40:29 UTC 2009 
State-Changed-Why:  
Thanks for the submission, but 131769 includes a patch to address the GPLv3 
issues.  We'll address the upgrade as part of 131769. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121670 
>Unformatted:
