Add build dependency on pkgconfig.

While here, rearrange paragraphs so that buildlink3.mk files are
included before overriding targets.

4 files changed, 18 insertions, 11 deletions

diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index eaa39ff4df9..956833f3390 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/12/03 15:14:59 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2004/12/14 20:36:54 minskim Exp $
 #
 
 DISTNAME=		gfract-0.30
@@ -23,6 +23,10 @@ SUBST_STAGE.prefix=	post-extract
 SUBST_FILES.prefix=	main.cpp
 SUBST_SED.prefix=	-e "s,/usr/local,${PREFIX},g"
 
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
 post-extract:
 	${MV} ${WRKDIR}/monk2\'.map ${WRKDIR}/monk2.map
 
@@ -33,6 +37,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/gfract.xpm ${PREFIX}/share/gfract/
 	${INSTALL_PROGRAM} ${WRKSRC}/gfract ${PREFIX}/bin/
 
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/blccc/Makefile b/misc/blccc/Makefile
index 25d9b6b5303..25c5ad22b4a 100644
--- a/misc/blccc/Makefile
+++ b/misc/blccc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/10/03 00:12:58 tv Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/14 20:36:54 minskim Exp $
 #
 
 DISTNAME=		blccc-1.99
@@ -17,6 +17,9 @@ SHLIBTOOL_OVERRIDE=	libtool
 
 EGDIR=			${PREFIX}/share/examples/blccc
 
+.include "../../devel/blib/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}/movies
@@ -28,6 +31,4 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/examples/$${f} ${EGDIR}/$${f};\
 	done
 
-.include "../../devel/blib/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kanjipad/Makefile b/misc/kanjipad/Makefile
index fdb98df56ca..5480178009a 100644
--- a/misc/kanjipad/Makefile
+++ b/misc/kanjipad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:12:59 tv Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/14 20:36:55 minskim Exp $
 #
 
 DISTNAME=		kanjipad-2.0.0
@@ -14,9 +14,11 @@ USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kanjipad
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/kanjipad
 
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index b953527dae4..3ac0c9cd138 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/10/03 00:18:16 tv Exp $
+# $NetBSD: Makefile,v 1.21 2004/12/14 20:36:55 minskim Exp $
 #
 
 DISTNAME=	rox-1.2.0
@@ -22,6 +22,10 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-gtk2
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.libxml2}/include/libxml2/libxml
 
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
 post-patch:
 	${SED} -e "s:@PREFIX@:"${PREFIX}":g" < ${FILESDIR}/rox > \
 		${WRKDIR}/${DISTNAME}/rox
@@ -45,6 +49,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/rox ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/rox.1 ${PREFIX}/man/man1
 
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"