diff options
Diffstat (limited to 'devel/apr')
| -rw-r--r-- | devel/apr/Makefile | 7 | ||||
| -rw-r--r-- | devel/apr/buildlink3.mk | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 05652c6ce13..ba1d1e03c6b 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2011/11/30 19:28:56 alnsn Exp $ +# $NetBSD: Makefile,v 1.67 2011/12/02 07:13:28 sbd Exp $ DISTNAME= apr-1.4.5 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE:=apr/} EXTRACT_SUFX= .tar.bz2 @@ -30,5 +30,8 @@ post-install: ${RM} ${DESTDIR}${PREFIX}/libexec/apr/libtool ${INSTALL_SCRIPT} ${PKG_LIBTOOL} ${DESTDIR}${PREFIX}/libexec/apr/libtool +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" .include "../../devel/libuuid/buildlink3.mk" +.endif .include "../../mk/bsd.pkg.mk" diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk index 7da8b958260..9fffa6cac9a 100644 --- a/devel/apr/buildlink3.mk +++ b/devel/apr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.32 2009/03/20 19:24:09 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.33 2011/12/02 07:13:28 sbd Exp $ BUILDLINK_TREE+= apr @@ -6,6 +6,7 @@ BUILDLINK_TREE+= apr APR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.apr+= apr>=1.2.8 +BUILDLINK_ABI_DEPENDS.apr?= apr>=1.4.5nb3 BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr BUILDLINK_INCDIRS.apr?= include/apr-1 @@ -16,6 +17,11 @@ ${BUILDLINK_DIR}/bin/apr-config: buildlink-directories ${MKDIR} ${BUILDLINK_DIR}/bin && ${LN} -fs apr-1-config ${BUILDLINK_DIR}/bin/apr-config buildlink-apr-cookie: ${BUILDLINK_DIR}/bin/apr-config + +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" +.include "../../devel/libuuid/buildlink3.mk" +.endif .endif # APR_BUILDLINK3_MK BUILDLINK_TREE+= -apr |