svn commit: r343784 - head/Mk
Mathieu Arnold
mat at FreeBSD.org
Tue Feb 11 17:12:29 UTC 2014
Author: mat
Date: Tue Feb 11 17:12:28 2014
New Revision: 343784
URL: http://svnweb.freebsd.org/changeset/ports/343784
QAT: https://qat.redports.org/buildarchive/r343784/
Log:
Use default-versions.mk for Apache, PHP, MySQL And PostgreSQL.
Submitted by: Allan Jude
Reviewed by: bdrewery, ohauer (apache), mat
With hat: portmgr
Modified:
head/Mk/bsd.apache.mk
head/Mk/bsd.database.mk
head/Mk/bsd.default-versions.mk
head/Mk/bsd.fpc.mk
head/Mk/bsd.php.mk
Modified: head/Mk/bsd.apache.mk
==============================================================================
--- head/Mk/bsd.apache.mk Tue Feb 11 17:02:47 2014 (r343783)
+++ head/Mk/bsd.apache.mk Tue Feb 11 17:12:28 2014 (r343784)
@@ -80,7 +80,13 @@
Apache_Pre_Include= bsd.apache.mk
-DEFAULT_APACHE_VERSION= 22
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
+.if defined(DEFAULT_APACHE_VER)
+WARNING+= "DEFAULT_APACHE_VER is defined, consider using DEFAULT_VERSIONS=apache=${DEFAULT_APACHE_VER} instead"
+.endif
+
+DEFAULT_APACHE_VERSION?= ${APACHE_DEFAULT:S/.//}
APACHE_SUPPORTED_VERSION= 22 24 # preferred version first
# Print warnings
@@ -285,6 +291,8 @@ APACHE_MPM!= ${APXS} -q MPM_NAME
. endif
.elif defined(APACHE_PORT)
_APACHE_VERSION!= ${ECHO_CMD} ${APACHE_PORT} | ${SED} -ne 's,.*/apache\([0-9]*\).*,\1,p'
+.else
+_APACHE_VERSION:= ${DEFAULT_APACHE_VERSION}
.endif
.if defined(USE_APACHE)
@@ -335,13 +343,11 @@ IGNORE?= PREFIX must be equal to APXS_PR
. endif
.endif
-.if ${APACHE_VERSION} >= 22
AP_BUILDEXT= la
APACHEMODDIR= libexec/apache${APACHE_VERSION}
APACHEINCLUDEDIR=include/apache${APACHE_VERSION}
APACHEETCDIR= etc/apache${APACHE_VERSION}
APACHE_PORT?= www/apache${APACHE_VERSION}
-.endif
PLIST_SUB+= APACHEMODDIR="${APACHEMODDIR}" \
APACHEINCLUDEDIR="${APACHEINCLUDEDIR}" \
Modified: head/Mk/bsd.database.mk
==============================================================================
--- head/Mk/bsd.database.mk Tue Feb 11 17:02:47 2014 (r343783)
+++ head/Mk/bsd.database.mk Tue Feb 11 17:12:28 2014 (r343784)
@@ -102,8 +102,18 @@ Database_Include_MAINTAINER= ports at FreeB
# FIREBIRD_VER
# - Detected Firebird version.
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
+.if defined(DEFAULT_MYSQL_VER)
+WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead"
+.endif
+
+.if defined(DEFAULT_PGSQL_VER)
+WARNING+= "DEFAULT_PGSQL_VER is defined, consider using DEFAULT_VERSIONS=pgsql=${DEFAULT_PGSQL_VER} instead"
+.endif
+
.if defined(USE_MYSQL)
-DEFAULT_MYSQL_VER?= 55
+DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//}
# MySQL client version currently supported.
MYSQL51_LIBVER= 16
MYSQL53m_LIBVER= 16
@@ -190,7 +200,7 @@ IGNORE= cannot install: unknown MySQL v
.if defined(USE_PGSQL)
VALID_PGSQL_VER= 84 90 91 92 93
-DEFAULT_PGSQL_VER?= 90
+DEFAULT_PGSQL_VER?= ${PGSQL_DEFAULT:S/.//}
PGSQL83_LIBVER= 5
PGSQL84_LIBVER= 5
PGSQL90_LIBVER= 5
Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk Tue Feb 11 17:02:47 2014 (r343783)
+++ head/Mk/bsd.default-versions.mk Tue Feb 11 17:12:28 2014 (r343784)
@@ -17,9 +17,13 @@ _l= ${lang:C/=.*//g}
${_l:U}_DEFAULT= ${lang:C/.*=//g}
.endfor
+APACHE_DEFAULT?= 2.2
+FPC_DEFAULT?= 2.6.2
LUA_DEFAULT?= 5.2
+MYSQL_DEFAULT?= 5.5
PERL5_DEFAULT?= 5.16
PGSQL_DEFAULT?= 9.0
+PHP_DEFAULT?= 5.4
PYTHON_DEFAULT?= 2.7
PYTHON2_DEFAULT?= 2.7
PYTHON3_DEFAULT?= 3.3
Modified: head/Mk/bsd.fpc.mk
==============================================================================
--- head/Mk/bsd.fpc.mk Tue Feb 11 17:02:47 2014 (r343783)
+++ head/Mk/bsd.fpc.mk Tue Feb 11 17:12:28 2014 (r343784)
@@ -27,10 +27,16 @@
_FPCMKINCLUDED= yes
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
+.if defined(DEFAULT_FPC_VER)
+WARNING+= "DEFAULT_FPC_VER is defined, consider using DEFAULT_VERSIONS=fpc=${DEFAULT_FPC_VER} instead"
+.endif
+
FPC_Include_MAINTAINER= acm at FreeBSD.org
FPC_Pre_Include= bsd.fpc.mk
-DEFAULT_FPC_VER= 2.6.2
+DEFAULT_FPC_VER= ${FPC_DEFAULT}
FPC_VER= ${DEFAULT_FPC_VER}
FPC_ARCH= ${ARCH:S/amd64/x86_64/}
Modified: head/Mk/bsd.php.mk
==============================================================================
--- head/Mk/bsd.php.mk Tue Feb 11 17:02:47 2014 (r343783)
+++ head/Mk/bsd.php.mk Tue Feb 11 17:12:28 2014 (r343784)
@@ -39,13 +39,19 @@ PHP_Include_MAINTAINER= ale at FreeBSD.org
_PHPMKINCLUDED= yes
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
+.if defined(DEFAULT_PHP_VER)
+WARNING+= "DEFAULT_PHP_VER is defined, consider using DEFAULT_VERSIONS=php=${DEFAULT_PHP_VER} instead"
+.endif
+
PHPBASE?= ${LOCALBASE}
.if exists(${PHPBASE}/etc/php.conf)
.include "${PHPBASE}/etc/php.conf"
PHP_EXT_DIR!= ${PHPBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${PHPBASE}/lib/php/\(.*\),\1,p'
.else
-DEFAULT_PHP_VER?= 5
+DEFAULT_PHP_VER?= ${PHP_DEFAULT:S/.//}
PHP_VER?= ${DEFAULT_PHP_VER}
.if ${PHP_VER} == 52
@@ -56,6 +62,10 @@ PHP_EXT_INC= pcre spl
.elif ${PHP_VER} == 55
PHP_EXT_DIR= 20121212
PHP_EXT_INC= pcre spl
+.elif ${PHP_VER} == 54
+PHP_VER= 5
+PHP_EXT_DIR= 20100525
+PHP_EXT_INC= pcre spl
.else
PHP_EXT_DIR= 20100525
PHP_EXT_INC= pcre spl
More information about the svn-ports-head
mailing list