head 1.32; access; symbols pkgsrc-2023Q4:1.32.0.34 pkgsrc-2023Q4-base:1.32 pkgsrc-2023Q3:1.32.0.32 pkgsrc-2023Q3-base:1.32 pkgsrc-2023Q2:1.32.0.30 pkgsrc-2023Q2-base:1.32 pkgsrc-2023Q1:1.32.0.28 pkgsrc-2023Q1-base:1.32 pkgsrc-2022Q4:1.32.0.26 pkgsrc-2022Q4-base:1.32 pkgsrc-2022Q3:1.32.0.24 pkgsrc-2022Q3-base:1.32 pkgsrc-2022Q2:1.32.0.22 pkgsrc-2022Q2-base:1.32 pkgsrc-2022Q1:1.32.0.20 pkgsrc-2022Q1-base:1.32 pkgsrc-2021Q4:1.32.0.18 pkgsrc-2021Q4-base:1.32 pkgsrc-2021Q3:1.32.0.16 pkgsrc-2021Q3-base:1.32 pkgsrc-2021Q2:1.32.0.14 pkgsrc-2021Q2-base:1.32 pkgsrc-2021Q1:1.32.0.12 pkgsrc-2021Q1-base:1.32 pkgsrc-2020Q4:1.32.0.10 pkgsrc-2020Q4-base:1.32 pkgsrc-2020Q3:1.32.0.8 pkgsrc-2020Q3-base:1.32 pkgsrc-2020Q2:1.32.0.6 pkgsrc-2020Q2-base:1.32 pkgsrc-2020Q1:1.32.0.2 pkgsrc-2020Q1-base:1.32 pkgsrc-2019Q4:1.32.0.4 pkgsrc-2019Q4-base:1.32 pkgsrc-2019Q3:1.31.0.14 pkgsrc-2019Q3-base:1.31 pkgsrc-2019Q2:1.31.0.12 pkgsrc-2019Q2-base:1.31 pkgsrc-2019Q1:1.31.0.10 pkgsrc-2019Q1-base:1.31 pkgsrc-2018Q4:1.31.0.8 pkgsrc-2018Q4-base:1.31 pkgsrc-2018Q3:1.31.0.6 pkgsrc-2018Q3-base:1.31 pkgsrc-2018Q2:1.31.0.4 pkgsrc-2018Q2-base:1.31 pkgsrc-2018Q1:1.31.0.2 pkgsrc-2018Q1-base:1.31 pkgsrc-2017Q4:1.30.0.10 pkgsrc-2017Q4-base:1.30 pkgsrc-2017Q3:1.30.0.8 pkgsrc-2017Q3-base:1.30 pkgsrc-2017Q2:1.30.0.4 pkgsrc-2017Q2-base:1.30 pkgsrc-2017Q1:1.30.0.2 pkgsrc-2017Q1-base:1.30 pkgsrc-2016Q4:1.29.0.20 pkgsrc-2016Q4-base:1.29 pkgsrc-2016Q3:1.29.0.18 pkgsrc-2016Q3-base:1.29 pkgsrc-2016Q2:1.29.0.16 pkgsrc-2016Q2-base:1.29 pkgsrc-2016Q1:1.29.0.14 pkgsrc-2016Q1-base:1.29 pkgsrc-2015Q4:1.29.0.12 pkgsrc-2015Q4-base:1.29 pkgsrc-2015Q3:1.29.0.10 pkgsrc-2015Q3-base:1.29 pkgsrc-2015Q2:1.29.0.8 pkgsrc-2015Q2-base:1.29 pkgsrc-2015Q1:1.29.0.6 pkgsrc-2015Q1-base:1.29 pkgsrc-2014Q4:1.29.0.4 pkgsrc-2014Q4-base:1.29 pkgsrc-2014Q3:1.29.0.2 pkgsrc-2014Q3-base:1.29 pkgsrc-2014Q2:1.28.0.2 pkgsrc-2014Q2-base:1.28 pkgsrc-2014Q1:1.27.0.16 pkgsrc-2014Q1-base:1.27 pkgsrc-2013Q4:1.27.0.14 pkgsrc-2013Q4-base:1.27 pkgsrc-2013Q3:1.27.0.12 pkgsrc-2013Q3-base:1.27 pkgsrc-2013Q2:1.27.0.10 pkgsrc-2013Q2-base:1.27 pkgsrc-2013Q1:1.27.0.8 pkgsrc-2013Q1-base:1.27 pkgsrc-2012Q4:1.27.0.6 pkgsrc-2012Q4-base:1.27 pkgsrc-2012Q3:1.27.0.4 pkgsrc-2012Q3-base:1.27 pkgsrc-2012Q2:1.27.0.2 pkgsrc-2012Q2-base:1.27 pkgsrc-2012Q1:1.26.0.10 pkgsrc-2012Q1-base:1.26 pkgsrc-2011Q4:1.26.0.8 pkgsrc-2011Q4-base:1.26 pkgsrc-2011Q3:1.26.0.6 pkgsrc-2011Q3-base:1.26 pkgsrc-2011Q2:1.26.0.4 pkgsrc-2011Q2-base:1.26 pkgsrc-2011Q1:1.26.0.2 pkgsrc-2011Q1-base:1.26 pkgsrc-2010Q4:1.25.0.30 pkgsrc-2010Q4-base:1.25 pkgsrc-2010Q3:1.25.0.28 pkgsrc-2010Q3-base:1.25 pkgsrc-2010Q2:1.25.0.26 pkgsrc-2010Q2-base:1.25 pkgsrc-2010Q1:1.25.0.24 pkgsrc-2010Q1-base:1.25 pkgsrc-2009Q4:1.25.0.22 pkgsrc-2009Q4-base:1.25 pkgsrc-2009Q3:1.25.0.20 pkgsrc-2009Q3-base:1.25 pkgsrc-2009Q2:1.25.0.18 pkgsrc-2009Q2-base:1.25 pkgsrc-2009Q1:1.25.0.16 pkgsrc-2009Q1-base:1.25 pkgsrc-2008Q4:1.25.0.14 pkgsrc-2008Q4-base:1.25 pkgsrc-2008Q3:1.25.0.12 pkgsrc-2008Q3-base:1.25 cube-native-xorg:1.25.0.10 cube-native-xorg-base:1.25 pkgsrc-2008Q2:1.25.0.8 pkgsrc-2008Q2-base:1.25 cwrapper:1.25.0.6 pkgsrc-2008Q1:1.25.0.4 pkgsrc-2008Q1-base:1.25 pkgsrc-2007Q4:1.25.0.2 pkgsrc-2007Q4-base:1.25 pkgsrc-2007Q3:1.23.0.2 pkgsrc-2007Q3-base:1.23 pkgsrc-2007Q2:1.22.0.2 pkgsrc-2007Q2-base:1.22 pkgsrc-2007Q1:1.19.0.4 pkgsrc-2007Q1-base:1.19 jlam-pkgviews:1.19.0.2 jlam-pkgviews-base:1.19 pkgsrc-2006Q4:1.18.0.2 pkgsrc-2006Q4-base:1.18 pkgsrc-2006Q3:1.13.0.2 pkgsrc-2006Q3-base:1.13 pkgsrc-2006Q2:1.12.0.2 pkgsrc-2006Q2-base:1.12 tv-derecurse-eol:1.6.4.2 pkgsrc-2006Q1:1.9.0.8 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.9.0.6 pkgsrc-2005Q4-base:1.9 pkgsrc-2005Q3:1.9.0.4 pkgsrc-2005Q3-base:1.9 pkgsrc-2005Q2:1.9.0.2 pkgsrc-2005Q2-base:1.9 tv-derecurse-merge:1.9 pkgsrc-2005Q1:1.7.0.2 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.6.0.6 pkgsrc-2004Q4-base:1.6 tv-derecurse:1.6.0.4 tv-derecurse-base:1.7 pkgsrc-2004Q3:1.6.0.2 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.5.0.4 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.2 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3; locks; strict; comment @# @; 1.32 date 2019.12.28.11.43.58; author wiz; state Exp; branches; next 1.31; commitid wbjd2Vwhnpy31tQB; 1.31 date 2018.01.01.10.23.09; author wiz; state Exp; branches; next 1.30; commitid zjUBNlZlngYbU9lA; 1.30 date 2017.03.11.18.29.24; author maya; state Exp; branches; next 1.29; commitid 69yBEeCLN7TQ6aJz; 1.29 date 2014.07.04.21.20.52; author dholland; state Exp; branches; next 1.28; commitid BYN4dnwPJ0DBA6Hx; 1.28 date 2014.06.10.15.22.13; author joerg; state Exp; branches; next 1.27; commitid djgMkPoOrhNxnZDx; 1.27 date 2012.04.14.12.58.19; author adam; state Exp; branches; next 1.26; 1.26 date 2011.03.12.14.07.13; author wiz; state Exp; branches; next 1.25; 1.25 date 2007.12.17.22.09.58; author tron; state Exp; branches; next 1.24; 1.24 date 2007.10.17.10.43.36; author rillig; state Exp; branches; next 1.23; 1.23 date 2007.08.13.09.31.43; author rillig; state Exp; branches; next 1.22; 1.22 date 2007.05.11.08.35.52; author rillig; state Exp; branches; next 1.21; 1.21 date 2007.05.09.19.56.18; author joerg; state Exp; branches; next 1.20; 1.20 date 2007.05.07.09.32.29; author rillig; state Exp; branches; next 1.19; 1.19 date 2007.01.24.19.48.44; author epg; state Exp; branches; next 1.18; 1.18 date 2006.12.09.08.24.10; author wiz; state Exp; branches; next 1.17; 1.17 date 2006.12.08.23.58.46; author xtraeme; state Exp; branches; next 1.16; 1.16 date 2006.12.08.23.33.15; author xtraeme; state Exp; branches; next 1.15; 1.15 date 2006.11.09.02.05.08; author rillig; state Exp; branches; next 1.14; 1.14 date 2006.10.14.01.09.45; author rillig; state Exp; branches; next 1.13; 1.13 date 2006.07.10.17.11.32; author wiz; state Exp; branches; next 1.12; 1.12 date 2006.06.02.18.27.57; author joerg; state Exp; branches; next 1.11; 1.11 date 2006.05.09.10.05.04; author tron; state Exp; branches; next 1.10; 1.10 date 2006.04.06.06.23.05; author reed; state Exp; branches; next 1.9; 1.9 date 2005.04.21.23.05.41; author sketch; state Exp; branches; next 1.8; 1.8 date 2005.03.24.17.46.00; author tv; state Exp; branches; next 1.7; 1.7 date 2005.01.03.13.20.28; author seb; state Exp; branches; next 1.6; 1.6 date 2004.07.06.22.49.16; author wiz; state Exp; branches 1.6.4.1; next 1.5; 1.5 date 2003.12.11.13.51.28; author grant; state Exp; branches; next 1.4; 1.4 date 2003.11.25.11.42.09; author jlam; state Exp; branches; next 1.3; 1.3 date 2003.11.21.07.04.43; author grant; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2003.10.19.07.46.50; author grant; state Exp; branches; next 1.1; 1.1 date 2003.09.04.03.00.19; author erh; state Exp; branches; next ; 1.6.4.1 date 2005.01.10.16.15.25; author tv; state Exp; branches; next 1.6.4.2; 1.6.4.2 date 2005.05.17.18.29.44; author tv; state Exp; branches; next 1.6.4.3; 1.6.4.3 date 2006.06.07.15.25.38; author tv; state dead; branches; next ; 1.3.2.1 date 2003.12.12.11.44.05; author agc; state Exp; branches; next ; desc @@ 1.32 log @apache.mk: update comment, apache22 is gone, so is the "ap22" prefix @ text @# $NetBSD: apache.mk,v 1.31 2018/01/01 10:23:09 wiz Exp $ # # This file is meant to be included by packages that require an apache # web server. # # User-settable variables: # # PKG_APACHE_DEFAULT # The default apache server to use and install. If there already # is an apache installed, this will have no effect. # # Possible values: apache24 # # Package-settable variables: # # PKG_APACHE_ACCEPTED # The list of apache packages that can be used as a dependency for # the package. # # Possible values: (see PKG_APACHE_DEFAULT) # # USE_APR # If this variable is set to "yes", a full dependency to the # Apache Portable Runtime library will be added. # # Variables defined by this file: # # PKG_APACHE # The Apache version that is actually used. # # Possible values: (see PKG_APACHE_DEFAULT) # # APACHE_PKG_PREFIX # The package name prefix for apache modules. # # Possible values: ap24 # .if !defined(APACHE_MK) APACHE_MK= # defined _VARGROUPS+= apache _USER_VARS.apache= PKG_APACHE_DEFAULT _PKG_VARS.apache= PKG_APACHE_ACCEPTED USE_APR _SYS_VARS.apache= PKG_APACHE APACHE_PKG_PREFIX .include "bsd.fast.prefs.mk" PKG_APACHE_DEFAULT?= apache24 BUILD_DEFS+= PKG_APACHE_DEFAULT BUILD_DEFS_EFFECTS+= PKG_APACHE APACHE_PKG_PREFIX # Package-settable variables PKG_APACHE_ACCEPTED?= ${_PKG_APACHES} USE_APR?= no # The available apache packages: _PKG_APACHES= apache24 _APACHE_PKGBASE.apache24= apache-2.[456789]* _APACHE_PKG_PREFIX.apache24= ap24 _APACHE_PKGSRCDIR.apache24= ../../www/apache24 # # Sanity checks. # .if empty(_PKG_APACHES:M${PKG_APACHE_DEFAULT}) _PKG_APACHE_MESSAGE:= "[apache.mk] Invalid apache package \""${PKG_APACHE_DEFAULT:Q}"\" in PKG_APACHE_DEFAULT." PKG_FAIL_REASON+= ${_PKG_APACHE_MESSAGE} PKG_APACHE_DEFAULT= apache24 .endif .for _ap_ in ${PKG_APACHE_ACCEPTED} . if empty(_PKG_APACHES:M${_ap_}) PKG_FAIL_REASON+= "[apache.mk] Invalid apache package \""${_ap_:Q}"\" in PKG_APACHE_ACCEPTED." PKG_APACHE_ACCEPTED= # none . endif .endfor # Mark the acceptable apaches and check which apache packages are installed. .for _ap_ in ${PKG_APACHE_ACCEPTED} _APACHE_OK.${_ap_}= yes _APACHE_INSTALLED.${_ap_}!= \ if ${PKG_INFO} -qe ${_APACHE_PKGBASE.${_ap_}:Q}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ fi .endfor .for ap in ${_PKG_APACHES} _APACHE_OK.${ap}?= no .endfor .undef PKG_APACHE # Use one of the installed apaches, ... .for _ap_ in ${PKG_APACHE_ACCEPTED} . if ${_APACHE_INSTALLED.${_ap_}} == "yes" PKG_APACHE?= ${_ap_} . endif .endfor # ... otherwise, prefer the default one if it's accepted, ... .if ${_APACHE_OK.${PKG_APACHE_DEFAULT}} == "yes" PKG_APACHE?= ${PKG_APACHE_DEFAULT} .endif # ... otherwise, just use the first accepted apache. .for ap in ${PKG_APACHE_ACCEPTED} PKG_APACHE?= ${ap} .endfor .if defined(PKG_APACHE) . include "${_APACHE_PKGSRCDIR.${PKG_APACHE}}/buildlink3.mk" .else PKG_FAIL_REASON+= "[apache.mk] No acceptable apache package found." PKG_APACHE= none .endif APACHE_PKG_PREFIX= ${_APACHE_PKG_PREFIX.${PKG_APACHE}} .if !empty(USE_APR:M[Yy][Ee][Ss]) . include "../../devel/apr/buildlink3.mk" . include "../../devel/apr-util/buildlink3.mk" .endif # # Variable assignment for multi-apache packages MULTI+= PKG_APACHE=${PKG_APACHE} .endif # APACHE_MK @ 1.31 log @apache22: remove, it was eol'd in June 2017 Remove packages that only work with apache22. Remove apache22 references. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.30 2017/03/11 18:29:24 maya Exp $ d36 1 a36 1 # Possible values: ap22 ap24 @ 1.30 log @default to apache24 (not 22) @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.29 2014/07/04 21:20:52 dholland Exp $ d12 1 a12 1 # Possible values: apache22 apache24 d58 1 a58 5 _PKG_APACHES= apache22 apache24 _APACHE_PKGBASE.apache22= apache-2.[23]* _APACHE_PKG_PREFIX.apache22= ap22 _APACHE_PKGSRCDIR.apache22= ../../www/apache22 d71 1 a71 1 PKG_APACHE_DEFAULT= apache22 @ 1.29 log @Generate a correct error message, instead of referring to a variable that gets changed on the next line. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.28 2014/06/10 15:22:13 joerg Exp $ d49 1 a49 1 PKG_APACHE_DEFAULT?= apache22 @ 1.28 log @Retire Apache 1.3 and 2.0. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.27 2012/04/14 12:58:19 adam Exp $ d73 2 a74 1 PKG_FAIL_REASON+= "[apache.mk] Invalid apache package \""${PKG_APACHE_DEFAULT:Q}"\" in PKG_APACHE_DEFAULT." @ 1.27 log @Added support for apache24 @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.26 2011/03/12 14:07:13 wiz Exp $ d12 1 a12 1 # Possible values: apache13 apache2 apache22 apache24 d23 2 a24 3 # If apache2 is chosen by this file and this variable is set to # "yes", a full dependency to the Apache Portable Runtime library # will be added. d36 1 a36 1 # Possible values: ap13 ap2 ap22 ap24 d58 1 a58 9 _PKG_APACHES= apache13 apache2 apache22 apache24 _APACHE_PKGBASE.apache13= apache-1* _APACHE_PKG_PREFIX.apache13= ap13 _APACHE_PKGSRCDIR.apache13= ../../www/apache _APACHE_PKGBASE.apache2= apache-2.0* _APACHE_PKG_PREFIX.apache2= ap2 _APACHE_PKGSRCDIR.apache2= ../../www/apache2 d74 1 a74 1 PKG_APACHE_DEFAULT= apache2 d126 1 a126 3 .if (${PKG_APACHE} == "apache2") && !empty(USE_APR:M[yY][eE][sS]) . include "../../devel/apr0/buildlink3.mk" .elif (${PKG_APACHE} != "apache13") && !empty(USE_APR:M[Yy][Ee][Ss]) @ 1.26 log @Add MULTI variable, and add it to BUILD_DEFS, to more easily find variable settings affecting binary packages. From Aleksey Cheusov in PR 44695. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.25 2007/12/17 22:09:58 tron Exp $ d12 1 a12 1 # Possible values: apache13 apache2 apache22 d37 1 a37 1 # Possible values: ap13 ap2 ap22 d59 1 a59 1 _PKG_APACHES= apache13 apache2 apache22 d69 1 a69 1 _APACHE_PKGBASE.apache22= apache-2.[23456789]* d73 4 d137 1 a137 1 .elif (${PKG_APACHE} == "apache22") && !empty(USE_APR:M[Yy][Ee][Ss]) @ 1.25 log @Make Apache 2.2.x the default as discussed on "tech-pkg" mailing list. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.24 2007/10/17 10:43:36 rillig Exp $ d138 4 @ 1.24 log @Made the .include lines simpler. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.23 2007/08/13 09:31:43 rillig Exp $ d50 1 a50 1 PKG_APACHE_DEFAULT?= apache2 @ 1.23 log @APACHE_PKG_PREFIX can be ap22. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.22 2007/05/11 08:35:52 rillig Exp $ d48 1 a48 1 .include "../../mk/bsd.prefs.mk" @ 1.22 log @PKGBASE must not include a backslash. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.21 2007/05/09 19:56:18 joerg Exp $ d37 1 a37 1 # Possible values: ap13 ap2 @ 1.21 log @Fix prefix for Apache 2.2 packages. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.20 2007/05/07 09:32:29 rillig Exp $ d61 1 a61 1 _APACHE_PKGBASE.apache13= apache-1\* d69 1 a69 1 _APACHE_PKGBASE.apache22= apache-2.[23456789]\* d93 1 a93 1 if ${PKG_INFO} -qe ${_APACHE_PKGBASE.${_ap_}}; then \ @ 1.20 log @Added variable descriptions. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.19 2007/01/24 19:48:44 epg Exp $ d70 1 a70 1 _APACHE_PKG_PREFIX.apache22= ap2 @ 1.19 log @Oops, this was meant to go in with the rest of the apr changes. Use devel/apr0 for apache2 and devel/apr and devel/apr-util for apache22. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.18 2006/12/09 08:24:10 wiz Exp $ d43 5 @ 1.18 log @".else if" -> ".elif", from David A. Holland in PR 35218. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.17 2006/12/08 23:58:46 xtraeme Exp $ d127 2 d130 1 a130 2 .elif (${PKG_APACHE} == "apache22") && !empty(USE_APR:M[Yy][Ee][Ss]) . include "../../devel/apr1/buildlink3.mk" @ 1.17 log @tyop @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.16 2006/12/08 23:33:15 xtraeme Exp $ d128 1 a128 1 .else if (${PKG_APACHE} == "apache22") && !empty(USE_APR:M[Yy][Ee][Ss]) @ 1.16 log @apache.mk now knows about apache22, available for PKG_APACHE_DEFAULT. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.15 2006/11/09 02:05:08 rillig Exp $ d129 1 a129 1 . include "../../devel/apr22/buildlink3.mk" @ 1.15 log @Added BUILD_DEFS_EFFECTS. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.14 2006/10/14 01:09:45 rillig Exp $ d12 1 a12 1 # Possible values: apache13 apache2 d54 1 a54 1 _PKG_APACHES= apache13 apache2 d60 1 a60 1 _APACHE_PKGBASE.apache2= apache-2\* d64 4 d128 2 @ 1.14 log @Completely rewrote apache.mk and apachever.mk. The latter is now an alias for apache.mk, since I don't see a reason why a package should query the apache version without also adding a dependency on apache. Fixed the documentation to match the code. Made the code simpler. Added sanity checks for both package-settable and user-settable variables. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.13 2006/07/10 17:11:32 wiz Exp $ a44 1 # User-settable variables d47 1 @ 1.13 log @Remove reference to buildlink2. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.12 2006/06/02 18:27:57 joerg Exp $ d3 2 a4 3 # This Makefile fragment handles Apache dependencies and make variables, # and is meant to be included by packages that require Apache either at # build-time or at run-time. apache.mk will: d6 1 a6 1 # * set PKG_APACHE to the name of the apache web server used d8 3 a10 1 # * add a full dependency on the apache server d12 1 a12 1 # * optionally add a full dependency on apr d14 1 a14 1 # The available user variables are: d16 3 a18 4 # PKG_APACHE_DEFAULT is a user-settable variable whose value is the default # apache server to use. Possible values are apache13 and apache2. # If there is already a version of apache installed this will have no # effect. d20 1 a20 1 # The available makefile variables are: d22 4 a25 3 # PKG_APACHE_ACCEPTED is a package-settable list of servers that may be used as # possible dependencies for the package. Possible values are the same as # for PKG_APACHE_DEFAULT. d27 11 a37 4 # USE_APR is used to note that the package requires the Apache Portable # runtime to build and execute. This is only takes effect if apache2 # is chosen (by this file) as the web server to use. This adds a full # dependency on apr. d41 7 a47 1 APACHE_MK= # defined d49 14 a62 1 .include "../../mk/apachever.mk" a63 3 # Add a runtime dependency on the apache server. # This may or may not create an actual dependency depending on # what the apache buildlink3.mk file does. d65 6 a70 2 .if defined(_APACHE_PKGSRCDIR) . include "${_APACHE_BL_SRCDIR}/buildlink3.mk" d73 27 a99 6 # If we are building apache modules, then we might need a build-time # dependency on apr, and the apache sources? # .if ${_PKG_APACHE} == "apache2" . if defined(USE_APR) && !empty(USE_APR:M[yY][eE][sS]) . include "../../devel/apr/buildlink3.mk" d101 23 @ 1.12 log @Rename all PHP 4 packages to php4-*, all PHP 5 packages to php5-*, all PEAR packages to php?-pear-* and all Apache packages to ap13-* or ap2-* respectively. Add new variables to simplify the Makefile handling. Add CONFLICTS on the old names. Reset revisions of bumped packages. ap-php will now depend on the default Apache and PHP version. All programs using it have an implicit option of the Apache version as well. OK from jlam@@ and adrianp@@. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.11 2006/05/09 10:05:04 tron Exp $ d39 1 a39 1 # what the apache buildlink[23].mk file does. @ 1.11 log @Make the "apache2" package the default. Apache 1.3.x is very outdated. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.10 2006/04/06 06:23:05 reed Exp $ d35 1 a35 87 .include "../../mk/bsd.prefs.mk" PKG_APACHE_DEFAULT?= # empty _PKG_APACHES?= apache13 apache2 .if defined(PKG_APACHE_ACCEPTED) . for _ap_ in ${PKG_APACHE_ACCEPTED} . if !empty(_PKG_APACHES:M${_ap_}) _PKG_APACHE_ACCEPTED+= ${PKG_APACHE_ACCEPTED:M${_ap_}} . endif . endfor .endif _PKG_APACHE_ACCEPTED?= ${_PKG_APACHES} # Set the default apache for this platform. # .if !empty(PKG_APACHE_DEFAULT) _PKG_APACHE_DEFAULT= ${PKG_APACHE_DEFAULT} .endif .if !defined(_PKG_APACHE_DEFAULT) _PKG_APACHE_DEFAULT?= apache2 .endif _APACHE_PKGBASE.apache13= apache-1\* _APACHE_PKGBASE.apache2= apache-2\* # Mark the acceptable apaches and check which apache packages are installed. .for _ap_ in ${_PKG_APACHE_ACCEPTED} _PKG_APACHE_OK.${_ap_}= yes _PKG_APACHE_INSTALLED.${_ap_}!= \ if ${PKG_INFO} -qe ${_APACHE_PKGBASE.${_ap_}}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ fi .endfor # Use one of the installed apaches,... # .if !defined(_PKG_APACHE) . for _ap_ in ${_PKG_APACHE_ACCEPTED} . if !empty(_PKG_APACHE_INSTALLED.${_ap_}:M[yY][eE][sS]) _PKG_APACHE?= ${_ap_} . else _PKG_APACHE_FIRSTACCEPTED?= ${_ap_} . endif . endfor .endif # # ...otherwise, prefer the default one if it's accepted,... # .if !defined(_PKG_APACHE) . if defined(_PKG_APACHE_OK.${_PKG_APACHE_DEFAULT}) && \ !empty(_PKG_APACHE_OK.${_PKG_APACHE_DEFAULT}:M[yY][eE][sS]) _PKG_APACHE= ${_PKG_APACHE_DEFAULT} . endif .endif # # ...otherwise, just use the first accepted apache. # .if !defined(_PKG_APACHE) . if defined(_PKG_APACHE_FIRSTACCEPTED) _PKG_APACHE= ${_PKG_APACHE_FIRSTACCEPTED} . endif .endif # # If there are no acceptable apaches, then generate an error. # .if !defined(_PKG_APACHE) # force an error PKG_FAIL_REASON= "no acceptable apache found" _PKG_APACHE= "none" .endif BUILDLINK_API_DEPENDS.apache13?= apache-1.3* BUILDLINK_API_DEPENDS.apache2?= apache-2* .if ${_PKG_APACHE} == "apache13" _APACHE_PKGSRCDIR= ../../www/apache .elif ${_PKG_APACHE} == "apache2" _APACHE_PKGSRCDIR= ../../www/apache2 _APACHE_BL_SRCDIR= ${_APACHE_PKGSRCDIR} .endif _APACHE_BL_SRCDIR?= ../../www/apache a53 6 # PKG_APACHE is a publicly readable variable containing the name of the server # we will be using. # PKG_APACHE:= ${_PKG_APACHE} BUILD_DEFS+= PKG_APACHE @ 1.10 log @Over 1200 files touched but no revisions bumped :) RECOMMENDED is removed. It becomes ABI_DEPENDS. BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo. BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo. BUILDLINK_DEPENDS does not change. IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS which defaults to "yes". Added to obsolete.mk checking for IGNORE_RECOMMENDED. I did not manually go through and fix any aesthetic tab/spacing issues. I have tested the above patch on DragonFly building and packaging subversion and pkglint and their many dependencies. I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I have used IGNORE_RECOMMENDED for a long time). I have been an active user of IGNORE_RECOMMENDED since it was available. As suggested, I removed the documentation sentences suggesting bumping for "security" issues. As discussed on tech-pkg. I will commit to revbump, pkglint, pkg_install, createbuildlink separately. Note that if you use wip, it will fail! I will commit to pkgsrc-wip later (within day). @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.9 2005/04/21 23:05:41 sketch Exp $ d57 1 a57 1 _PKG_APACHE_DEFAULT?= apache13 @ 1.9 log @Fix typo. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.8 2005/03/24 17:46:00 tv Exp $ d111 2 a112 2 BUILDLINK_DEPENDS.apache13?= apache-1.3* BUILDLINK_DEPENDS.apache2?= apache-2* @ 1.8 log @USE_BUILDLINK3 is no longer optional (and cannot be turned off). Per mail to tech-pkg: ===== * USE_BUILDLINK3=YES will be unconditional. (In fact, USE_BUILDLINK3 will be ignored altogether by mk/; but see below.) * NO_BUILDLINK and NO_WRAPPER will be ignored by mk/. If a build happens, these phases will happen. * The existing NO_BUILD will imply the previous NO_BUILDLINK and NO_WRAPPER. If no build happens, those phases are not needed. * NO_TOOLS will be ignored by mk/. The tools phase, which provides much more than just the C compiler, will always happen regardless of package. This will make metapackage builds only slightly slower, in trade for far less user error. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.7 2005/01/03 13:20:28 seb Exp $ d7 1 a7 1 # * set PKG_APACHE to the name of the apache web serverused @ 1.7 log @Apache6 package was removed on 2004/11/22: remove code to support it in mk/apache.mk and references to it in mk/defaults/mk.conf. It is now only referenced in some CONFLICTS specifications and some dependencies specifications (for www/ap-dav and www/ap-jserv; should theses be removed too?) @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.6 2004/07/06 22:49:16 wiz Exp $ a122 2 _APACHE_DEPENDENCY?= ${BUILDLINK_DEPENDS.${_PKG_APACHE}}:${_APACHE_PKGSRCDIR} d128 1 a128 5 . if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) . include "${_APACHE_BL_SRCDIR}/buildlink3.mk" . else DEPENDS+= ${_APACHE_DEPENDENCY} . endif a133 8 .if defined(_APACHE_PKGSRCDIR) . if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) . include "${_APACHE_BL_SRCDIR}/buildlink3.mk" . else BUILD_DEPENDS+= ${_APACHE_DEPENDENCY} . endif .endif d136 1 a136 3 . if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) . include "../../devel/apr/buildlink3.mk" . endif @ 1.6 log @Retire buildlink2, now that all packages using it have been converted to buildlink3. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.5 2003/12/11 13:51:28 grant Exp $ d16 1 a16 1 # apache server to use. Possible values are apache13, apache2 and apache6. d39 1 a39 1 _PKG_APACHES?= apache13 apache2 apache6 a61 1 _APACHE_PKGBASE.apache6= apache6 a112 1 BUILDLINK_DEPENDS.apache6?= apache6* a118 2 .elif ${_PKG_APACHE} == "apache6" _APACHE_PKGSRCDIR= ../../www/apache6 @ 1.6.4.1 log @sync with HEAD @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.6 2004/07/06 22:49:16 wiz Exp $ d16 1 a16 1 # apache server to use. Possible values are apache13 and apache2. d39 1 a39 1 _PKG_APACHES?= apache13 apache2 d62 1 d114 1 d121 2 @ 1.6.4.2 log @sync [all but bsd.pkg.mk] with HEAD @ text @d1 1 a1 1 # $NetBSD$ d7 1 a7 1 # * set PKG_APACHE to the name of the apache web server used d123 2 d130 5 a134 1 . include "${_APACHE_BL_SRCDIR}/buildlink3.mk" d140 8 d150 3 a152 1 . include "../../devel/apr/buildlink3.mk" @ 1.6.4.3 log @EOL the tv-derecurse branch; it has become too outdated. The last live revision can be fetched at the tv-derecurse-eol tag. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.6.4.2 2005/05/17 18:29:44 tv Exp $ @ 1.5 log @add missing }. from Aidan Kehoe in PR pkg/23676. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.4 2003/11/25 11:42:09 jlam Exp $ a135 2 . elif defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) . include "${_APACHE_BL_SRCDIR}/buildlink2.mk" a146 2 . elif defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) . include "${_APACHE_BL_SRCDIR}/buildlink2.mk" a155 2 . elif defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) . include "../../devel/apr/buildlink2.mk" @ 1.4 log @Support buildlink3. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.3 2003/11/21 07:04:43 grant Exp $ d127 1 a127 1 _APACHE_DEPENDENCY?= ${BUILDLINK_DEPENDS.${_PKG_APACHE}:${_APACHE_PKGSRCDIR} @ 1.3 log @apache6 has no buildlink2.mk as it is handled automagically by apache/buildlink2.mk, so include that instead. makes this actually work with apache6. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.2 2003/10/19 07:46:50 grant Exp $ d131 2 a132 1 # what the apache buildlink2.mk file does. d134 3 a136 1 . if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) d145 5 a149 2 .if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) . if defined(_APACHE_PKGSRCDIR) d151 2 a153 2 .else BUILD_DEPENDS+= ${_APACHE_DEPENDENCY} d156 5 a160 3 .if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) . if ${_PKG_APACHE} == "apache2" . if defined(USE_APR) && !empty(USE_APR:M[yY][eE][sS]) @ 1.3.2.1 log @Pullup a typo fix to the pkgsrc-2003Q4 branch, requested by Grant Beattie. Module Name: pkgsrc Committed By: grant Date: Thu Dec 11 13:51:28 UTC 2003 Modified Files: pkgsrc/mk: apache.mk Log Message: add missing }. from Aidan Kehoe in PR pkg/23676. @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.5 2003/12/11 13:51:28 grant Exp $ d127 1 a127 1 _APACHE_DEPENDENCY?= ${BUILDLINK_DEPENDS.${_PKG_APACHE}}:${_APACHE_PKGSRCDIR} @ 1.2 log @style/whitespace fixes @ text @d1 1 a1 1 # $NetBSD: apache.mk,v 1.1 2003/09/04 03:00:19 erh Exp $ d120 1 d125 2 d134 1 a134 1 . include "${_APACHE_PKGSRCDIR}/buildlink2.mk" d144 1 a144 1 . include "${_APACHE_PKGSRCDIR}/buildlink2.mk" @ 1.1 log @Add an apache.mk, similar to java-vm.mk and emacs.mk, that allows apache modules that will work with more than one version of the apache web server to not require a separate package for each version of apache. This was originally based on java-vm.mk Makefile variables added: PKG_APACHE_ACCEPTED : Contains the list of valid versions of apache. USE_APR : If set, the package required apr to run. User variabled added: PKG_APACHE_DEFAULT : The version of apache to install, if there is none yet. Defaults to apache13 Variables set: PKG_APACHE : Which version of apache is being used. @ text @d1 1 a1 1 # $NetBSD: $ d42 5 a46 5 . for _ap_ in ${PKG_APACHE_ACCEPTED} . if !empty(_PKG_APACHES:M${_ap_}) _PKG_APACHE_ACCEPTED+=${PKG_APACHE_ACCEPTED:M${_ap_}} . endif . endfor d60 3 a62 3 _APACHE_PKGBASE.apache13 = apache-1\* _APACHE_PKGBASE.apache2 = apache-2\* _APACHE_PKGBASE.apache6 = apache6 d80 1 a80 1 _PKG_APACHE?= ${_ap_} d82 1 a82 1 _PKG_APACHE_FIRSTACCEPTED?= ${_ap_} d113 2 a114 2 BUILDLINK_DEPENDS.apache2?= apache-2* BUILDLINK_DEPENDS.apache6?= apache6* d117 1 a117 1 _APACHE_PKGSRCDIR= ../../www/apache d119 1 a119 1 _APACHE_PKGSRCDIR= ../../www/apache2 d121 1 a121 1 _APACHE_PKGSRCDIR= ../../www/apache6 d130 3 a132 3 .if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) . include "${_APACHE_PKGSRCDIR}/buildlink2.mk" .else d134 1 a134 1 .endif d140 3 a142 3 . if defined(_APACHE_PKGSRCDIR) . include "${_APACHE_PKGSRCDIR}/buildlink2.mk" . endif d148 3 a150 4 . if ${_PKG_APACHE} == "apache2" . if defined(USE_APR) && !empty(USE_APR:M[yY][eE][sS]) . include "../../devel/apr/buildlink2.mk" . endif d152 1 @