Merge updated version from devel/SDL2_ttf into this.

5 files changed, 20 insertions, 18 deletions

diff --git a/fonts/SDL2_ttf/DESCR b/fonts/SDL2_ttf/DESCR
index 50f29a00156..36ea2b919a5 100644
--- a/fonts/SDL2_ttf/DESCR
+++ b/fonts/SDL2_ttf/DESCR
@@ -1,3 +1,5 @@
 This is a sample library which allows you to use TrueType fonts in your SDL
 applications. It comes with an example program "showfont" which displays an
 example string for a given TrueType font file.
+
+This package contains the SDL2 version of the library.
diff --git a/fonts/SDL2_ttf/Makefile b/fonts/SDL2_ttf/Makefile
index 32a445c12fc..caf95109313 100644
--- a/fonts/SDL2_ttf/Makefile
+++ b/fonts/SDL2_ttf/Makefile
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.6 2015/04/25 14:20:48 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2016/01/17 14:07:37 wiz Exp $
 
-DISTNAME=	SDL2_ttf-2.0.12
-PKGREVISION=	2
-CATEGORIES=	fonts
-MASTER_SITES=	http://www.libsdl.org/projects/SDL_ttf/release/
+DISTNAME=	SDL2_ttf-2.0.13
+CATEGORIES=	devel
+MASTER_SITES=	https://www.libsdl.org/projects/SDL_ttf/release/
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://www.libsdl.org/projects/SDL_ttf/
-COMMENT=	Sample library allowing for using TrueType fonts in SDL applications
+COMMENT=	Use TrueType fonts in your SDL2 applications
 LICENSE=	zlib
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=	SDL2_ttf.pc.in
 
 .include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/SDL2_ttf/PLIST b/fonts/SDL2_ttf/PLIST
index 0de8e139800..1fc152ebcc7 100644
--- a/fonts/SDL2_ttf/PLIST
+++ b/fonts/SDL2_ttf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/02/02 16:06:19 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/01/17 14:07:37 wiz Exp $
 include/SDL2/SDL_ttf.h
 lib/libSDL2_ttf.la
 lib/pkgconfig/SDL2_ttf.pc
diff --git a/fonts/SDL2_ttf/buildlink3.mk b/fonts/SDL2_ttf/buildlink3.mk
index 3cc8f2f55cd..b555d73073f 100644
--- a/fonts/SDL2_ttf/buildlink3.mk
+++ b/fonts/SDL2_ttf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/04/25 14:20:48 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2016/01/17 14:07:37 wiz Exp $
 
 BUILDLINK_TREE+=	SDL2_ttf
 
@@ -6,11 +6,12 @@ BUILDLINK_TREE+=	SDL2_ttf
 SDL2_TTF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.SDL2_ttf+=	SDL2_ttf>=2.0.12
-BUILDLINK_ABI_DEPENDS.SDL2_ttf?=	SDL2_ttf>=2.0.12nb2
-BUILDLINK_PKGSRCDIR.SDL2_ttf?=	../../fonts/SDL2_ttf
+BUILDLINK_ABI_DEPENDS.SDL2_ttf+=	SDL2_ttf>=2.0.12nb2
+BUILDLINK_PKGSRCDIR.SDL2_ttf?=	../../devel/SDL2_ttf
 
-.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
-.endif	# SDL2_TTF_BUILDLINK3_MK
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.endif # SDL2_TTF_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-SDL2_ttf
diff --git a/fonts/SDL2_ttf/distinfo b/fonts/SDL2_ttf/distinfo
index c6962d15996..295fde8d297 100644
--- a/fonts/SDL2_ttf/distinfo
+++ b/fonts/SDL2_ttf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 20:44:27 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/01/17 14:07:37 wiz Exp $
 
-SHA1 (SDL2_ttf-2.0.12.tar.gz) = 542865c604fe92d2f26000428ef733381caa0e8e
-RMD160 (SDL2_ttf-2.0.12.tar.gz) = ac5dee6f8e6e1aaef36c1f070b8b07b6c4582ba1
-SHA512 (SDL2_ttf-2.0.12.tar.gz) = 2dfd7d9a87d86b0446e52c78dcf4c45dba747256ff9cb4cc010818eac725410f5a1a781e6695ca0bcead756c70519d8d5b4df6c1b2935085e0356d9b4d7844fa
-Size (SDL2_ttf-2.0.12.tar.gz) = 5517665 bytes
+SHA1 (SDL2_ttf-2.0.13.tar.gz) = b20dfc67cbd52779abb298ffdc63e500e92f0413
+RMD160 (SDL2_ttf-2.0.13.tar.gz) = 13f7490ec369fa75baee9d0d5e2da2959abf1355
+SHA512 (SDL2_ttf-2.0.13.tar.gz) = 24f7d77c7d46be3c8236d6edde42f40c97c778e2fdb5d7923f1ec473ce19039c382843afe6de79f04c014d3f854cdf912cdfe1e0cf803a2fd246fd4c65360c6b
+Size (SDL2_ttf-2.0.13.tar.gz) = 4152978 bytes