Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/databases/db4/buildlink3.mk,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- pkgsrc/databases/db4/buildlink3.mk 2008/09/06 20:53:51 1.34 +++ pkgsrc/databases/db4/buildlink3.mk 2009/03/20 19:24:04 1.35 @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.34 2008/09/06 20:53:51 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.35 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+ +BUILDLINK_TREE+= db4 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= db4 -.endif +.if !defined(DB4_BUILDLINK3_MK) +DB4_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb4} -BUILDLINK_PACKAGES+= db4 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db4 - -.if !empty(DB4_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.db4+= db4>=4.7.25.1 BUILDLINK_ABI_DEPENDS.db4?= db4>=4.7.25.1 BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4 @@ -30,6 +23,6 @@ BUILDLINK_TRANSFORM+= l:db:db4 PTHREAD_OPTS+= native . include "../../mk/pthread.buildlink3.mk" . endif -.endif # DB4_BUILDLINK3_MK +.endif # DB4_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -db4