summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authoradam <adam>2014-04-18 15:08:49 +0000
committeradam <adam>2014-04-18 15:08:49 +0000
commit8295074bf8ed9fade0e778a40b8be426c780872b (patch)
tree9688c5369947f303c8e3486b8f7c9b792166ec75 /fonts
parent10b867d1858345ff20938416b1857a8ae78faf08 (diff)
downloadpkgsrc-8295074bf8ed9fade0e778a40b8be426c780872b.tar.gz
Removed options.mk, because it didn't do anything. If specific options were enabled for SDL2, they would be pulled anyway. The 'static' option was pointless.
Diffstat (limited to 'fonts')
-rw-r--r--fonts/SDL2_ttf/Makefile12
-rw-r--r--fonts/SDL2_ttf/options.mk18
2 files changed, 5 insertions, 25 deletions
diff --git a/fonts/SDL2_ttf/Makefile b/fonts/SDL2_ttf/Makefile
index 14b2a260cba..8d3497eaf54 100644
--- a/fonts/SDL2_ttf/Makefile
+++ b/fonts/SDL2_ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/03/16 01:36:51 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2014/04/18 15:08:49 adam Exp $
DISTNAME= SDL2_ttf-2.0.12
CATEGORIES= fonts
@@ -9,14 +9,12 @@ HOMEPAGE= http://www.libsdl.org/projects/SDL_ttf/
COMMENT= Sample library allowing for using TrueType fonts in SDL applications
LICENSE= zlib
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= SDL2_ttf.pc.in
-.include "options.mk"
-
-.include "../../graphics/freetype2/buildlink3.mk"
.include "../../devel/SDL2/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/SDL2_ttf/options.mk b/fonts/SDL2_ttf/options.mk
deleted file mode 100644
index 3168fa5c968..00000000000
--- a/fonts/SDL2_ttf/options.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2014/04/18 14:44:29 adam Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.SDL2_ttf
-PKG_SUPPORTED_OPTIONS= static x11
-PKG_SUGGESTED_OPTIONS+= static
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mstatic)
-CONFIGURE_ARGS+= --enable-static=yes
-.else
-CONFIGURE_ARGS+= --enable-static=no
-.endif
-
-.if !empty(PKG_OPTIONS:Mx11)
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.endif