svn commit: r344331 - in head: devel/sdl12 graphics/sdl_ttf

[Marcus von Appen]

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