From tijl@coosemans.org  Tue Feb 11 22:25:15 2014
Return-Path: <tijl@coosemans.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 18823C5C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Feb 2014 22:25:15 +0000 (UTC)
Received: from mailrelay003.isp.belgacom.be (mailrelay003.isp.belgacom.be [195.238.6.53])
	by mx1.freebsd.org (Postfix) with ESMTP id A2D2F19A9
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Feb 2014 22:25:14 +0000 (UTC)
Received: from 37.145-176-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.176.145.37])
  by relay.skynet.be with ESMTP; 11 Feb 2014 23:25:13 +0100
Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1])
	by kalimero.tijl.coosemans.org (8.14.7/8.14.7) with ESMTP id s1BMPBxM071666
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Feb 2014 23:25:12 +0100 (CET)
	(envelope-from tijl@kalimero.tijl.coosemans.org)
Received: (from tijl@localhost)
	by kalimero.tijl.coosemans.org (8.14.7/8.14.7/Submit) id s1BMPBPe071665;
	Tue, 11 Feb 2014 23:25:11 +0100 (CET)
	(envelope-from tijl)
Message-Id: <201402112225.s1BMPBPe071665@kalimero.tijl.coosemans.org>
Date: Tue, 11 Feb 2014 23:25:11 +0100 (CET)
From: Tijl Coosemans <tijl@FreeBSD.org>
Reply-To: Tijl Coosemans <tijl@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] devel/sdl12: fix libiconv detection
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         186665
>Category:       ports
>Synopsis:       [patch] devel/sdl12: fix libiconv detection
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mva
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 11 22:30:00 UTC 2014
>Closed-Date:    Sat Feb 15 09:00:56 UTC 2014
>Last-Modified:  Sat Feb 15 09:10:00 UTC 2014
>Originator:     Tijl Coosemans
>Release:        FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
- Patch the SDL configure script so it no longer adds -liconv to
  LDFLAGS when converters/libiconv is installed on FreeBSD 10.
- Add USES=iconv to graphics/sdl_ttf.  The file showfont.c includes
  iconv.h.
>How-To-Repeat:
>Fix:

--- sdl12.patch begins here ---
Index: devel/sdl12/Makefile
===================================================================
--- devel/sdl12/Makefile	(revision 343722)
+++ devel/sdl12/Makefile	(working copy)
@@ -70,6 +70,10 @@ PKGMESSAGE=		none
 DISPLAY_MSG=		${DO_NADA}
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/EXTRA_LDFLAGS/s/-liconv/${ICONV_LIB}/' \
+		${WRKSRC}/configure
+
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} &&\
 		${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ &&\
Index: graphics/sdl_ttf/Makefile
===================================================================
--- graphics/sdl_ttf/Makefile	(revision 343722)
+++ graphics/sdl_ttf/Makefile	(working copy)
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/
 
 USE_AUTOTOOLS=	libtool
 USE_SDL=	sdl
-USES=		gmake pathfix pkgconfig
+USES=		gmake iconv pathfix pkgconfig
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- sdl12.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mva 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Feb 11 22:30:07 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186665 
State-Changed-From-To: open->closed 
State-Changed-By: mva 
State-Changed-When: Sat Feb 15 09:00:56 UTC 2014 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186665: commit references a PR
Date: Sat, 15 Feb 2014 09:00:26 +0000 (UTC)

 Author: mva
 Date: Sat Feb 15 09:00:19 2014
 New Revision: 344331
 URL: http://svnweb.freebsd.org/changeset/ports/344331
 QAT: https://qat.redports.org/buildarchive/r344331/
 
 Log:
   - Patch the SDL configure script so it no longer adds -liconv to LDFLAGS when
     converters/libiconv is installed on FreeBSD 10
   - Add USES=iconv to graphics/sdl_ttf. The file showfont utility uses iconv.h
   
   PR:		ports/186665
   Submitted by:	tijl@
 
 Modified:
   head/devel/sdl12/Makefile
   head/graphics/sdl_ttf/Makefile
 
 Modified: head/devel/sdl12/Makefile
 ==============================================================================
 --- head/devel/sdl12/Makefile	Sat Feb 15 08:56:27 2014	(r344330)
 +++ head/devel/sdl12/Makefile	Sat Feb 15 09:00:19 2014	(r344331)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	sdl
  PORTVERSION=	1.2.15
 -PORTREVISION=	2
 +PORTREVISION=	3
  PORTEPOCH=	2
  CATEGORIES=	devel
  MASTER_SITES=	http://www.libsdl.org/release/
 @@ -70,6 +70,10 @@ PKGMESSAGE=		none
  DISPLAY_MSG=		${DO_NADA}
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} -e '/EXTRA_LDFLAGS/s/-liconv/${ICONV_LIB}/' \
 +		${WRKSRC}/configure
 +
  post-install:
  	${MKDIR} ${STAGEDIR}${DOCSDIR} &&\
  		${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ &&\
 
 Modified: head/graphics/sdl_ttf/Makefile
 ==============================================================================
 --- head/graphics/sdl_ttf/Makefile	Sat Feb 15 08:56:27 2014	(r344330)
 +++ head/graphics/sdl_ttf/Makefile	Sat Feb 15 09:00:19 2014	(r344331)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	sdl_ttf
  PORTVERSION=	2.0.11
 +PORTREVISION=	1
  CATEGORIES=	graphics
  MASTER_SITES=	http://www.libsdl.org/projects/SDL_ttf/release/
  DISTNAME=	SDL_ttf-${PORTVERSION}
 @@ -16,7 +17,7 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/
  
  USE_AUTOTOOLS=	libtool
  USE_SDL=	sdl
 -USES=		gmake pathfix pkgconfig
 +USES=		gmake iconv pathfix pkgconfig
  USE_XORG=	x11
  GNU_CONFIGURE=	yes
  CPPFLAGS+=	-I${LOCALBASE}/include
 _______________________________________________
 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:
