bl3ify

2 files changed, 33 insertions, 9 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index cdfbd959076..5ff8525c509 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/01/22 08:38:29 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/24 01:57:01 jlam Exp $
 #
 
 DISTNAME=	fontconfig-2.2.1
@@ -14,8 +14,10 @@ COMMENT=	Library for configuring and customizing font access
 # sure to keep in step
 BUILDLINK_DEPENDS.freetype2=  freetype2>=2.0.9
 
+.include "../../mk/bsd.prefs.mk"
+
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 USE_GNU_TOOLS+=		make
@@ -32,10 +34,10 @@ CONFIGURE_ARGS+=	--with-expat-includes=${BUILDLINK_PREFIX.expat}/include
 CONFIGURE_ARGS+=	--with-expat-lib=${BUILDLINK_PREFIX.expat}/lib
 CONFIGURE_ARGS+=	--with-confdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-x
-FONT_PATH=		${X11PREFIX}/lib/X11/fonts/TTF,${X11PREFIX}/lib/X11/fonts/Type1
-.include "../../mk/bsd.prefs.mk"
-.if ${X11BASE} != ${X11PREFIX}
-FONT_PATH2=		,${X11BASE}/lib/X11/fonts,${X11BASE}/lib/X11/fonts/TTF,${X11BASE}/lib/X11/fonts/Type1
+
+FONT_PATH=	${X11PREFIX}/lib/X11/fonts/TTF,${X11PREFIX}/lib/X11/fonts/Type1
+.if ${X11PREFIX} != ${X11BASE}
+FONT_PATH2=	,${X11BASE}/lib/X11/fonts,${X11BASE}/lib/X11/fonts/TTF,${X11BASE}/lib/X11/fonts/Type1
 .endif
 CONFIGURE_ARGS+=	--with-add-fonts=${FONT_PATH}${FONT_PATH2}
 
@@ -44,7 +46,7 @@ CONF_FILES=	${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf
 CONF_FILES+=	${EGDIR}/fonts.dtd ${PKG_SYSCONFDIR}/fonts.dtd
 CONF_FILES+=	${EGDIR}/local.conf ${PKG_SYSCONFDIR}/local.conf
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../textproc/expat/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk
new file mode 100644
index 00000000000..bd6ee0a0d02
--- /dev/null
+++ b/fonts/fontconfig/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/01/24 01:57:01 jlam Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+FONTCONFIG_BUILDLINK3_MK:=	${FONTCONFIG_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	fontconfig
+.endif
+
+.if !empty(FONTCONFIG_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			fontconfig
+BUILDLINK_DEPENDS.fontconfig?=		fontconfig>=2.1nb1
+BUILDLINK_PKGSRCDIR.fontconfig?=	../../fonts/fontconfig
+
+BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.0.9
+
+.  include "../../devel/zlib/buildlink3.mk"
+.  include "../../graphics/freetype2/buildlink3.mk"
+.  include "../../textproc/expat/buildlink3.mk"
+.endif # FONTCONFIG_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}