pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Completely rewrote apache.mk and apachever.mk. The ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f4f9c6437474
branches: trunk
changeset: 520026:f4f9c6437474
user: rillig <rillig%pkgsrc.org@localhost>
date: Sat Oct 14 01:09:45 2006 +0000
description:
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.
diffstat:
mk/apache.mk | 138 ++++++++++++++++++++++++++++++++++++++++++-------------
mk/apachever.mk | 130 +---------------------------------------------------
2 files changed, 107 insertions(+), 161 deletions(-)
diffs (298 lines):
diff -r da97f6f8cc64 -r f4f9c6437474 mk/apache.mk
--- a/mk/apache.mk Fri Oct 13 23:50:30 2006 +0000
+++ b/mk/apache.mk Sat Oct 14 01:09:45 2006 +0000
@@ -1,54 +1,126 @@
-# $NetBSD: apache.mk,v 1.13 2006/07/10 17:11:32 wiz Exp $
+# $NetBSD: apache.mk,v 1.14 2006/10/14 01:09:45 rillig Exp $
#
-# 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:
+# This file is meant to be included by packages that require an apache
+# web server.
+#
+# User-settable variables:
#
-# * set PKG_APACHE to the name of the apache web server used
+# PKG_APACHE_DEFAULT
+# The default apache server to use and install. If there already
+# is an apache installed, this will have no effect.
#
-# * add a full dependency on the apache server
+# Possible values: apache13 apache2
#
-# * optionally add a full dependency on apr
+# Package-settable variables:
#
-# The available user variables are:
+# PKG_APACHE_ACCEPTED
+# The list of apache packages that can be used as a dependency for
+# the package.
#
-# 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.
+# Possible values: (see PKG_APACHE_DEFAULT)
#
-# The available makefile variables are:
+# USE_APR
+# 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.
+#
+# Variables defined by this file:
#
-# 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.
+# PKG_APACHE
+# The Apache version that is actually used.
+#
+# Possible values: (see PKG_APACHE_DEFAULT)
#
-# 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.
+# APACHE_PKG_PREFIX
+# The package name prefix for apache modules.
+#
+# Possible values: ap13 ap2
#
.if !defined(APACHE_MK)
-APACHE_MK= # defined
+APACHE_MK= # defined
+
+.include "../../mk/bsd.prefs.mk"
-.include "../../mk/apachever.mk"
+# User-settable variables
+PKG_APACHE_DEFAULT?= apache2
+BUILD_DEFS+= PKG_APACHE_DEFAULT
+
+# Package-settable variables
+PKG_APACHE_ACCEPTED?= ${_PKG_APACHES}
+USE_APR?= no
+
+# The available apache packages:
+_PKG_APACHES= apache13 apache2
-# 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.
+_APACHE_PKGBASE.apache13= apache-1\*
+_APACHE_PKG_PREFIX.apache13= ap13
+_APACHE_PKGSRCDIR.apache13= ../../www/apache
+
+_APACHE_PKGBASE.apache2= apache-2\*
+_APACHE_PKG_PREFIX.apache2= ap2
+_APACHE_PKGSRCDIR.apache2= ../../www/apache2
+
#
-.if defined(_APACHE_PKGSRCDIR)
-. include "${_APACHE_BL_SRCDIR}/buildlink3.mk"
+# Sanity checks.
+#
+
+.if empty(_PKG_APACHES:M${PKG_APACHE_DEFAULT})
+PKG_FAIL_REASON+= "[apache.mk] Invalid apache package \""${PKG_APACHE_DEFAULT:Q}"\" in PKG_APACHE_DEFAULT."
+PKG_APACHE_DEFAULT= apache2
.endif
-# 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"
+.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_}}; 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 (${PKG_APACHE} == "apache2") && !empty(USE_APR:M[yY][eE][sS])
+. include "../../devel/apr/buildlink3.mk"
.endif
.endif # APACHE_MK
diff -r da97f6f8cc64 -r f4f9c6437474 mk/apachever.mk
--- a/mk/apachever.mk Fri Oct 13 23:50:30 2006 +0000
+++ b/mk/apachever.mk Sat Oct 14 01:09:45 2006 +0000
@@ -1,129 +1,3 @@
-# $NetBSD: apachever.mk,v 1.1 2006/06/02 18:27:57 joerg Exp $
-#
-# 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:
-#
-# * set PKG_APACHE to the name of the apache web server used
-#
-# * add a full dependency on the apache server
-#
-# * optionally add a full dependency on apr
-#
-# The available user variables are:
-#
-# 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.
-#
-# The available makefile variables are:
-#
-# 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.
-#
-# 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.
-#
-
-.if !defined(APACHEVER_MK)
-APACHEVER_MK= # defined
-
-.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.
+# $NetBSD: apachever.mk,v 1.2 2006/10/14 01:09:45 rillig Exp $
#
-.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
-
-.if ${_PKG_APACHE} == "apache13"
-_APACHE_PKGSRCDIR= ../../www/apache
-_APACHE_PKG_PREFIX= ap13
-.elif ${_PKG_APACHE} == "apache2"
-_APACHE_PKGSRCDIR= ../../www/apache2
-_APACHE_BL_SRCDIR= ${_APACHE_PKGSRCDIR}
-_APACHE_PKG_PREFIX= ap2
-.endif
-
-_APACHE_BL_SRCDIR?= ../../www/apache
-
-# PKG_APACHE is a publicly readable variable containing the name of the server
-# we will be using.
-#
-PKG_APACHE:= ${_PKG_APACHE}
-APACHE_PKG_PREFIX:= ${_APACHE_PKG_PREFIX}
-BUILD_DEFS+= PKG_APACHE
-
-.endif # APACHEVER_MK
+.include "${.PARSEDIR}/apache.mk"
Home |
Main Index |
Thread Index |
Old Index