kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make the optional-png logics work

Browse source
This commit is contained in:
drochner 2014-03-14 19:39:52 +00:00
parent 04590e4269
commit ce7ab79180
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
graphics/freetype2/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.93 2014/03/14 14:54:02 ryoon Exp $
# $NetBSD: Makefile,v 1.94 2014/03/14 19:39:52 drochner Exp $
DISTNAME= freetype-2.5.3
PKGNAME= ${DISTNAME:S/-/2-/}
@ -56,5 +56,4 @@ post-configure:
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

5
graphics/freetype2/buildlink3.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.42 2014/03/14 14:54:02 ryoon Exp $
# $NetBSD: buildlink3.mk,v 1.43 2014/03/14 19:39:52 drochner Exp $
BUILDLINK_TREE+= freetype2
@ -15,6 +15,9 @@ BUILDLINK_FILES.freetype2+= bin/freetype-config
FREETYPE_CONFIG?= ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config
CONFIGURE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG:Q}
pkgbase := freetype2
.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.freetype2:Mpng)
CHECK_BUILTIN.freetype2:= yes
.include "../../graphics/freetype2/builtin.mk"

6
graphics/freetype2/options.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.1 2014/03/14 14:54:02 ryoon Exp $
# $NetBSD: options.mk,v 1.2 2014/03/14 19:39:52 drochner Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.freetype2
PKG_SUPPORTED_OPTIONS= png subpixel
@ -11,8 +11,8 @@ CFLAGS+= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
.endif
.if !empty(PKG_OPTIONS:Mpng)
CONFIGURE_ARGS+= --enable-png=yes
CONFIGURE_ARGS+= --with-png=yes
.include "../../graphics/png/buildlink3.mk"
.else
CONFIGURE_ARGS+= --enable-png=no
CONFIGURE_ARGS+= --with-png=no
.endif