Fix dependencies in buildlinks and Makefiles.

This commit is contained in:
Jason Bacon 2012-03-27 17:47:59 +00:00 committed by Thomas Klausner
parent f20c131b61
commit a1a275b4fc
5 changed files with 13 additions and 29 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2012/03/27 14:28:22 outpaddling Exp $
# $NetBSD: Makefile,v 1.5 2012/03/27 17:47:59 outpaddling Exp $
#
DISTNAME= meep-1.1.1
@ -20,7 +20,7 @@ CONFIGURE_ARGS+=--with-libctl=${PREFIX}/share/libctl
DEPENDS+= bash:../../shells/bash
.include "../../jb-wip/harminv/buildlink3.mk"
.include "../../wip/harminv/buildlink3.mk"
.include "../../wip/libctl/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
.include "../../devel/hdf5/buildlink3.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.1.1.1 2012/03/27 15:49:51 outpaddling Exp $
# $NetBSD: buildlink3.mk,v 1.2 2012/03/27 17:48:00 outpaddling Exp $
BUILDLINK_TREE+= py26-ufl
@ -6,7 +6,7 @@ BUILDLINK_TREE+= py26-ufl
PY26_UFL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.py26-ufl+= py26-ufl>=1.0.0
BUILDLINK_PKGSRCDIR.py26-ufl?= ../../jb-wip/py-ufl
BUILDLINK_PKGSRCDIR.py26-ufl?= ../../wip/py-ufl
.endif # PY26_UFL_BUILDLINK3_MK
BUILDLINK_TREE+= -py26-ufl

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2012/03/27 16:19:22 outpaddling Exp $
# $NetBSD: Makefile,v 1.2 2012/03/27 17:48:00 outpaddling Exp $
# FreeBSD Id: ports/math/suitesparse/Makefile,v 1.38 2011/07/20 16:17:35 bf Exp
DISTNAME= SuiteSparse-3.6.1
@ -101,6 +101,6 @@ do-install:
.include "../../math/blas/buildlink3.mk"
.include "../../math/lapack/buildlink3.mk"
.if defined (WITH_METIS)
.include "../../jb-wip/metis/buildlink3.mk"
.include "../../wip/metis/buildlink3.mk"
.endif
.include "../../mk/bsd.pkg.mk"

View file

@ -1,14 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.1.1.1 2012/03/27 16:19:22 outpaddling Exp $
# XXX
# XXX This file was created automatically using createbuildlink-3.16.
# XXX After this file has been verified as correct, the comment lines
# XXX beginning with "XXX" should be removed. Please do not commit
# XXX unverified buildlink3.mk files.
# XXX
# XXX Packages that only install static libraries or headers should
# XXX include the following line:
# XXX
# XXX BUILDLINK_DEPMETHOD.suitesparse?= build
# $NetBSD: buildlink3.mk,v 1.2 2012/03/27 17:48:00 outpaddling Exp $
BUILDLINK_TREE+= suitesparse
@ -16,17 +6,11 @@ BUILDLINK_TREE+= suitesparse
SUITESPARSE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.suitesparse+= suitesparse>=3.6.1
BUILDLINK_PKGSRCDIR.suitesparse?= ../../jb-wip/suitesparse
BUILDLINK_PKGSRCDIR.suitesparse?= ../../wip/suitesparse
# XXX
# XXX Uncomment and keep only the buildlink3 lines below which are directly
# XXX needed for dependencies to compile, link, and run. If this package
# XXX provides a wrappered API or otherwise does not expose the APIs of the
# XXX buildlink3 lines below to dependencies, remove them.
# XXX
#.include "../../math/blas/buildlink3.mk"
#.include "../../math/lapack/buildlink3.mk"
#.include "../../jb-wip/metis/buildlink3.mk"
.include "../../math/blas/buildlink3.mk"
.include "../../math/lapack/buildlink3.mk"
.include "../../wip/metis/buildlink3.mk"
.endif # SUITESPARSE_BUILDLINK3_MK
BUILDLINK_TREE+= -suitesparse

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.1.1.1 2012/03/27 16:09:28 outpaddling Exp $
# $NetBSD: buildlink3.mk,v 1.2 2012/03/27 17:48:00 outpaddling Exp $
BUILDLINK_TREE+= swig
@ -6,7 +6,7 @@ BUILDLINK_TREE+= swig
SWIG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.swig+= swig>=2.0.4
BUILDLINK_PKGSRCDIR.swig?= ../../jb-wip/swig2
BUILDLINK_PKGSRCDIR.swig?= ../../wip/swig2
.include "../../devel/pcre/buildlink3.mk"
.endif # SWIG_BUILDLINK3_MK