From d756b84f47fb730a46963016133056df46730628 Mon Sep 17 00:00:00 2001 From: jlam <jlam@pkgsrc.org> Date: Wed, 11 Sep 2002 08:52:57 +0000 Subject: Move USE_BUILDLINK2 definition into the common Makefile as we need to include buildlink2.mk files from there. --- graphics/freetype-lib/Makefile | 11 +++++------ graphics/freetype-lib/Makefile.common | 3 ++- graphics/freetype-utils/Makefile | 11 +++++------ 3 files changed, 12 insertions(+), 13 deletions(-) (limited to 'graphics') diff --git a/graphics/freetype-lib/Makefile b/graphics/freetype-lib/Makefile index 8423cd65168..172d5a774c8 100644 --- a/graphics/freetype-lib/Makefile +++ b/graphics/freetype-lib/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.8 2002/08/25 18:38:59 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/09/11 08:52:57 jlam Exp $ -PKGNAME= freetype-lib-${FT_VERS} -COMMENT= TrueType font rendering engine and library API +.include "Makefile.common" -USE_BUILDLINK2= # defined -CONFIGURE_ARGS+= --without-x +PKGNAME= freetype-lib-${FT_VERS} +COMMENT= TrueType font rendering engine and library API -.include "Makefile.common" +CONFIGURE_ARGS+= --without-x ALL_TARGET= ttlib ttpo INSTALL_TARGET= install-ttlib install-ttpo diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common index 34a53bc5f73..12d3aaaeab9 100644 --- a/graphics/freetype-lib/Makefile.common +++ b/graphics/freetype-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2002/08/25 18:38:59 jlam Exp $ +# $NetBSD: Makefile.common,v 1.21 2002/09/11 08:52:57 jlam Exp $ DISTNAME= freetype-${FT_VERS} FT_VERS= 1.3.1 @@ -14,6 +14,7 @@ CONFLICTS= freetype-1.[12]* BUILD_USES_MSGFMT= # defined +USE_BUILDLINK2= # defined USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile index 88ea129c098..fb9d2439476 100644 --- a/graphics/freetype-utils/Makefile +++ b/graphics/freetype-utils/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.11 2002/08/25 21:49:53 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/09/11 08:52:58 jlam Exp $ -PKGNAME= freetype-utils-${FT_VERS} -COMMENT= Utilities for manipulating TrueType fonts +.include "../freetype-lib/Makefile.common" + +PKGNAME= freetype-utils-${FT_VERS} +COMMENT= Utilities for manipulating TrueType fonts BUILDLINK_DEPENDS.freetype= freetype-lib>=${FT_VERS} -USE_BUILDLINK2= # defined USE_X11= # defined -.include "../freetype-lib/Makefile.common" - CONFIGURE_ARGS+= --with-x ALL_TARGET= tttest INSTALL_TARGET= install-tttest -- cgit v1.2.3