From 452ff23192f79423bc127a0c056a1fd3a745df1e Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 23 Nov 2004 00:37:04 +0000 Subject: We don't need to check for APR_USE_* or generate our own _APR_OPTIONS variable since the apr/buildlink3.mk file does the right thing for us already; we simply need to include it and check the value of PKG_OPTIONS.apr. --- devel/subversion/buildlink3.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'devel/subversion') diff --git a/devel/subversion/buildlink3.mk b/devel/subversion/buildlink3.mk index da7e3b2db6f..b99f056991b 100644 --- a/devel/subversion/buildlink3.mk +++ b/devel/subversion/buildlink3.mk @@ -1,8 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:13:33 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/11/23 00:37:04 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SUBVERSION_BASE_BUILDLINK3_MK:= ${SUBVERSION_BASE_BUILDLINK3_MK}+ +.include "../../mk/bsd.prefs.mk" .include "../../devel/subversion/Makefile.version" .if !empty(BUILDLINK_DEPTH:M+) @@ -20,11 +21,6 @@ BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion-base BUILDLINK_FILES.subversion-base+= bin/svn-config .endif # SUBVERSION_BASE_BUILDLINK3_MK -.include "../../mk/bsd.prefs.mk" -.if !empty(APR_USE_DB4:M[yY][eE][sS]) -. include "../../databases/db4/buildlink3.mk" -.endif - .include "../../devel/apr/buildlink3.mk" .include "../../www/neon/buildlink3.mk" -- cgit v1.2.3