diff options
| -rw-r--r-- | math/grace/Makefile | 26 | ||||
| -rw-r--r-- | x11/Xbae/Makefile | 6 | ||||
| -rw-r--r-- | x11/Xbae/buildlink3.mk | 20 |
3 files changed, 36 insertions, 16 deletions
diff --git a/math/grace/Makefile b/math/grace/Makefile index 4d6e1a53f67..f8264e262d9 100644 --- a/math/grace/Makefile +++ b/math/grace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/03/11 20:03:12 minskim Exp $ +# $NetBSD: Makefile,v 1.31 2004/04/12 04:02:14 snj Exp $ # DISTNAME= grace-5.1.14 @@ -15,7 +15,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://plasma-gate.weizmann.ac.il/Grace/ COMMENT= GRaphing, Advanced Computation and Exploration of data -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_X11BASE= YES USE_GNU_TOOLS+= make USE_FORTRAN= YES @@ -27,15 +27,15 @@ post-install: ${RM} -f ${PREFIX}/bin/xmgrace ${LN} -s ${PREFIX}/grace/bin/xmgrace ${PREFIX}/bin -.include "../../devel/netcdf/buildlink2.mk" -.include "../../fonts/t1lib/buildlink2.mk" -.include "../../graphics/jpeg/buildlink2.mk" -.include "../../graphics/png/buildlink2.mk" -.include "../../graphics/tiff/buildlink2.mk" -.include "../../graphics/xpm/buildlink2.mk" -.include "../../math/fftw2/buildlink2.mk" -.include "../../print/pdflib/buildlink2.mk" -.include "../../x11/Xbae/buildlink2.mk" -.include "../../x11/XmHTML/buildlink2.mk" -.include "../../mk/motif.buildlink2.mk" +.include "../../devel/netcdf/buildlink3.mk" +.include "../../fonts/t1lib/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" +.include "../../graphics/xpm/buildlink3.mk" +.include "../../math/fftw2/buildlink3.mk" +.include "../../print/pdflib/buildlink3.mk" +.include "../../x11/Xbae/buildlink3.mk" +.include "../../x11/XmHTML/buildlink3.mk" +.include "../../mk/motif.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile index 0c004654c71..4090c05818c 100644 --- a/x11/Xbae/Makefile +++ b/x11/Xbae/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2004/04/12 03:58:36 snj Exp $ # DISTNAME= Xbae-4.9.1 @@ -9,7 +9,7 @@ MAINTAINER= drochner@NetBSD.org HOMEPAGE= http://www.lesstif.org/Xbae.html COMMENT= Motif-compatible widgets: XbaeMatrix, XbaeCaption, XbaeInput -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_X11BASE= YES USE_LIBTOOL= YES @@ -25,5 +25,5 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/ac_find_xbae.m4 \ ${LOCALBASE}/share/aclocal/ac_find_xbae.m4 -.include "../../mk/motif.buildlink2.mk" +.include "../../mk/motif.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xbae/buildlink3.mk b/x11/Xbae/buildlink3.mk new file mode 100644 index 00000000000..6a0103839f5 --- /dev/null +++ b/x11/Xbae/buildlink3.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 03:58:36 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +XBAE_BUILDLINK3_MK:= ${XBAE_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= Xbae +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXbae} +BUILDLINK_PACKAGES+= Xbae + +.if !empty(XBAE_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.Xbae+= Xbae>=4.8.4 +BUILDLINK_PKGSRCDIR.Xbae?= ../../x11/Xbae +.endif # XBAE_BUILDLINK3_MK + +.include "../../mk/motif.buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |