diff options
Diffstat (limited to 'devel/apr')
| -rw-r--r-- | devel/apr/Makefile | 8 | ||||
| -rw-r--r-- | devel/apr/buildlink3.mk | 30 |
2 files changed, 34 insertions, 4 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile index da7008abb98..faf95a75977 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:36 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2004/03/07 22:32:05 minskim Exp $ PKGNAME= apr-${APR_VERSION}.${APACHE_VERSION} PKGREVISION= 1 @@ -11,7 +11,7 @@ COMMENT= Apache Portable Runtime # under that includes its own apr. apr was split out in 2.0.45nb1. CONFLICTS= apache2<=2.0.45 -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_LIBTOOL= YES WRKSRC= ${WRKDIR}/${DISTNAME}/srclib @@ -58,8 +58,8 @@ post-install: .include "../../www/apache2/Makefile.common" .if ${APR_USE_DB4} == "YES" -.include "../../databases/db4/buildlink2.mk" +.include "../../databases/db4/buildlink3.mk" .endif -.include "../../textproc/expat/buildlink2.mk" +.include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk new file mode 100644 index 00000000000..23de408c4ce --- /dev/null +++ b/devel/apr/buildlink3.mk @@ -0,0 +1,30 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 22:32:05 minskim Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= apr +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napr} +BUILDLINK_PACKAGES+= apr + +.if !empty(APR_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.apr+= apr>=0.9.5.2.0.48nb1 +BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr + +BUILDLINK_FILES.apr+= bin/apr-config +BUILDLINK_FILES.apr+= bin/apu-config +BUILDLINK_FILES.apr+= lib/*.exp + +.include "../../mk/bsd.prefs.mk" +.if ${APR_USE_DB4} == "YES" +.include "../../databases/db4/buildlink3.mk" +.endif + +.include "../../textproc/expat/buildlink3.mk" + +.endif # APR_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |