summaryrefslogtreecommitdiff
path: root/www/apache
diff options
context:
space:
mode:
authorjlam <jlam>2004-03-05 19:25:06 +0000
committerjlam <jlam>2004-03-05 19:25:06 +0000
commit13ac0c7964868b82b344e8e1434ee3e5b3cd05be (patch)
treea3daf9a5fb572d8089372ce24f3f353d4bac8d47 /www/apache
parentd79544a4b17cd7522102497daa0a175432c0dbea (diff)
downloadpkgsrc-13ac0c7964868b82b344e8e1434ee3e5b3cd05be.tar.gz
Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
Diffstat (limited to 'www/apache')
-rw-r--r--www/apache/buildlink3.mk18
1 files changed, 11 insertions, 7 deletions
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index 82c539c440b..22b3368dd22 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/11 18:35:43 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
@@ -7,22 +7,26 @@ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= apache
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napache}
+BUILDLINK_PACKAGES+= apache
+
.if !empty(APACHE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= apache
BUILDLINK_DEPENDS.apache+= apache{,6}-1.3.*
BUILDLINK_PKGSRCDIR.apache?= ../../www/apache
-. if defined(APACHE_MODULE)
+
+.if defined(APACHE_MODULE)
BUILDLINK_DEPMETHOD.apache+= full
-. else
+.else
BUILDLINK_DEPMETHOD.apache?= build
-. endif
+.endif
USE_PERL5?= build # for "apxs"
APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs
-. if defined(GNU_CONFIGURE)
+.if defined(GNU_CONFIGURE)
CONFIGURE_ARGS+= --with-apxs="${APXS}"
-. endif
+.endif
+
.endif # APACHE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}