diff options
| author | jlam <jlam@pkgsrc.org> | 2001-05-28 03:16:44 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-05-28 03:16:44 +0000 |
| commit | 88a22cb3bd2db4a8e51c4e641fb86ba1c1731935 (patch) | |
| tree | 07c9bdf563cdcfb327f1d71d8c98291012cb6f98 | |
| parent | 3fff6740099b41fd034717298e0d8e385d9ead9c (diff) | |
| download | pkgsrc-88a22cb3bd2db4a8e51c4e641fb86ba1c1731935.tar.gz | |
Rework build to use buildlink.mk files so that it won't pick up installed
headers and libraries during a "make build".
| -rw-r--r-- | graphics/freetype-lib/Makefile | 11 | ||||
| -rw-r--r-- | graphics/freetype-lib/Makefile.common | 18 | ||||
| -rw-r--r-- | graphics/freetype-utils/Makefile | 8 |
3 files changed, 16 insertions, 21 deletions
diff --git a/graphics/freetype-lib/Makefile b/graphics/freetype-lib/Makefile index 3247e206ef5..d14e256df8f 100644 --- a/graphics/freetype-lib/Makefile +++ b/graphics/freetype-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/03/16 13:28:38 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/05/28 03:16:44 jlam Exp $ PKGNAME= freetype-lib-${FT_VERS} @@ -9,13 +9,4 @@ CONFIGURE_ARGS+= --without-x ALL_TARGET= ttlib ttpo INSTALL_TARGET= install-ttlib install-ttpo -pre-build: - @if ${PKG_INFO} -qe 'freetype-lib<${FT_VERS}'; then \ - ${ECHO} "**** An older version of freetype-lib is installed"; \ - ${ECHO} "**** ${PKGNAME} cannot be built with it installed."; \ - ${ECHO} "**** Please delete it before building"; \ - ${ECHO} "**** or use \"${MAKE} update\"."; \ - ${FALSE}; \ - fi - .include "../../graphics/freetype-lib/Makefile.common" diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common index 663a63d6e31..06179d020e5 100644 --- a/graphics/freetype-lib/Makefile.common +++ b/graphics/freetype-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2001/05/03 04:28:25 jlam Exp $ +# $NetBSD: Makefile.common,v 1.11 2001/05/28 03:16:44 jlam Exp $ DISTNAME= freetype-${FT_VERS} FT_VERS= 1.3.1 @@ -11,19 +11,25 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.freetype.org/ BUILD_USES_MSGFMT= # defined -USE_LIBINTL= # defined USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-locale-dir=${PREFIX}/${PKGLOCALEDIR}/locale -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" - -CFLAGS+= -I${LOCALBASE}/include -CPPFLAGS+= -I${LOCALBASE}/include DISTINFO_FILE= ${.CURDIR}/../../graphics/freetype-lib/distinfo PATCHDIR= ${.CURDIR}/../../graphics/freetype-lib/patches +.include "../../devel/gettext-lib/buildlink.mk" + +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +CONFIGURE_ENV+= LIBS="${LIBS}" + +CPPFLAGS+= -I${BUILDLINK_INCDIR} +CFLAGS+= -I${BUILDLINK_INCDIR} +LDFLAGS+= -L${BUILDLINK_LIBDIR} + +pre-configure: ${BUILDLINK_TARGETS} + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile index c1c101855d6..b7b45bf05d6 100644 --- a/graphics/freetype-utils/Makefile +++ b/graphics/freetype-utils/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 15:22:19 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/05/28 03:16:44 jlam Exp $ PKGNAME= freetype-utils-${FT_VERS} COMMENT= Utilities for manipulating TrueType fonts -DEPENDS+= freetype-lib-${FT_VERS}:../../graphics/freetype-lib +FREETYPE_REQD= ${FT_VERS} USE_X11= # defined CONFIGURE_ARGS+= --with-x @@ -12,7 +12,5 @@ CONFIGURE_ARGS+= --with-x ALL_TARGET= tttest INSTALL_TARGET= install-tttest -pre-build: - ${TOUCH} ${WRKSRC}/lib/libttf.la - +.include "../../graphics/freetype-lib/buildlink.mk" .include "../../graphics/freetype-lib/Makefile.common" |