Date: Fri, 08 Nov 2013 21:34:32 -0500 From: Allan Jude <freebsd@allanjude.com> To: freebsd-ports@freebsd.org Cc: flo@FreeBSD.org, apache@FreeBSD.org, clement@FreeBSD.org, ohauer@FreeBSD.org, acm@FreeBSD.org, ports@FreeBSD.org, pgsql@FreeBSD.org, ale@FreeBSD.org Subject: ports default version system Message-ID: <527D9F38.20105@allanjude.com>
next in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--PTW3pHK34g7KGubgpK9aTmw6CwC3uD51q
Content-Type: multipart/mixed;
boundary="------------000504020107060309020007"
This is a multi-part message in MIME format.
--------------000504020107060309020007
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Attached is a proposed patch for Mk/bsd.default-versions.mk
Currently, perl, python, ruby and tcl are supported
The patch adds support for apache, fpc, mysql, pgsql, and php
Users can specify in /etc/make.conf
DEFAULT_VERSIONS=3D perl5=3D5.18 ruby=3D2.0 php=3D5.3 mysql=3D55p
and change the default version of php from lang/php5 to lang/php53
and mysql from database/mysql55-server to database/perconba55-server
etc.
The apache part of the patch might also consider deprecating the
APACHE_PORT make.conf variable.
Using the 'old way' produces a warning the same way it does for ruby,
perl etc.
--=20
Allan Jude
--------------000504020107060309020007
Content-Type: text/plain; charset=windows-1252;
name="ports_default-options.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="ports_default-options.patch"
Index: Mk/bsd.apache.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Mk/bsd.apache.mk (revision 333272)
+++ Mk/bsd.apache.mk (working copy)
@@ -80,7 +80,13 @@
=20
Apache_Pre_Include=3D bsd.apache.mk
=20
-DEFAULT_APACHE_VERSION=3D 22
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
+.if defined(DEFAULT_APACHE_VER)
+WARNING+=3D "DEFAULT_APACHE_VER is defined, consider using DEFAULT_VERSI=
ONS=3Dapache=3D${DEFAULT_APACHE_VER} instead"
+.endif
+
+DEFAULT_APACHE_VERSION?=3D ${APACHE_DEFAULT:S/.//}
APACHE_SUPPORTED_VERSION=3D 22 24 # preferred version first
=20
# Print warnings
@@ -335,19 +341,17 @@
. endif
.endif
=20
-.if ${APACHE_VERSION} >=3D 22
AP_BUILDEXT=3D la
-APACHEMODDIR=3D libexec/apache${APACHE_VERSION}
-APACHEINCLUDEDIR=3Dinclude/apache${APACHE_VERSION}
-APACHEETCDIR=3D etc/apache${APACHE_VERSION}
-APACHE_PORT?=3D www/apache${APACHE_VERSION}
-.endif
+APACHEMODDIR=3D libexec/apache${DEFAULT_APACHE_VERSION}
+APACHEINCLUDEDIR=3Dinclude/apache${DEFAULT_APACHE_VERSION}
+APACHEETCDIR=3D etc/apache${DEFAULT_APACHE_VERSION}
+APACHE_PORT?=3D www/apache${DEFAULT_APACHE_VERSION}
=20
PLIST_SUB+=3D APACHEMODDIR=3D"${APACHEMODDIR}" \
APACHEINCLUDEDIR=3D"${APACHEINCLUDEDIR}" \
APACHEETCDIR=3D"${APACHEETCDIR}"
=20
-APACHE_PKGNAMEPREFIX=3D ap${APACHE_VERSION}-
+APACHE_PKGNAMEPREFIX=3D ap${DEFAULT_APACHE_VERSION}-
.if defined(AP_FAST_BUILD)
PKGNAMEPREFIX?=3D ${APACHE_PKGNAMEPREFIX}
.endif
Index: Mk/bsd.database.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Mk/bsd.database.mk (revision 333272)
+++ Mk/bsd.database.mk (working copy)
@@ -102,8 +102,18 @@
# FIREBIRD_VER
# - Detected Firebird version.
=20
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
+.if defined(DEFAULT_MYSQL_VER)
+WARNING+=3D "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIO=
NS=3Dmysql=3D${DEFAULT_MYSQL_VER} instead"
+.endif
+
+.if defined(DEFAULT_PGSQL_VER)
+WARNING+=3D "DEFAULT_PGSQL_VER is defined, consider using DEFAULT_VERSIO=
NS=3Dpgsql=3D${DEFAULT_PGSQL_VER} instead"
+.endif
+
.if defined(USE_MYSQL)
-DEFAULT_MYSQL_VER?=3D 55
+DEFAULT_MYSQL_VER?=3D ${MYSQL_DEFAULT:S/.//}
# MySQL client version currently supported.
MYSQL51_LIBVER=3D 16
MYSQL53m_LIBVER=3D 16
@@ -190,7 +200,7 @@
=20
.if defined(USE_PGSQL)
VALID_PGSQL_VER=3D 84 90 91 92 93
-DEFAULT_PGSQL_VER?=3D 90
+DEFAULT_PGSQL_VER?=3D ${PGSQL_DEFAULT:S/.//}
PGSQL83_LIBVER=3D 5
PGSQL84_LIBVER=3D 5
PGSQL90_LIBVER=3D 5
Index: Mk/bsd.default-versions.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Mk/bsd.default-versions.mk (revision 333272)
+++ Mk/bsd.default-versions.mk (working copy)
@@ -17,11 +17,16 @@
${_l:U}_DEFAULT=3D ${lang:C/.*=3D//g}
.endfor
=20
+APACHE_DEFAULT?=3D 2.2
+FPC_DEFAULT?=3D 2.6.2
+MYSQL_DEFAULT?=3D 5.5
PERL5_DEFAULT?=3D 5.16
-RUBY_DEFAULT?=3D 1.9
-TCLTK_DEFAULT?=3D 8.6
+PGSQL_DEFAULT?=3D 9.0
+PHP_DEFAULT?=3D 5.4
PYTHON_DEFAULT?=3D 2.7
PYTHON2_DEFAULT?=3D 2.7
PYTHON3_DEFAULT?=3D 3.3
+RUBY_DEFAULT?=3D 1.9
+TCLTK_DEFAULT?=3D 8.6
=20
.endif
Index: Mk/bsd.fpc.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Mk/bsd.fpc.mk (revision 333272)
+++ Mk/bsd.fpc.mk (working copy)
@@ -27,10 +27,16 @@
=20
_FPCMKINCLUDED=3D yes
=20
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
+.if defined(DEFAULT_FPC_VER)
+WARNING+=3D "DEFAULT_FPC_VER is defined, consider using DEFAULT_VERSIONS=
=3Dfpc=3D${DEFAULT_FPC_VER} instead"
+.endif
+
FPC_Include_MAINTAINER=3D acm@FreeBSD.org
FPC_Pre_Include=3D bsd.fpc.mk
=20
-DEFAULT_FPC_VER=3D 2.6.2
+DEFAULT_FPC_VER=3D ${FPC_DEFAULT}
FPC_VER=3D ${DEFAULT_FPC_VER}
FPC_ARCH=3D ${ARCH:S/amd64/x86_64/}
=20
Index: Mk/bsd.php.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Mk/bsd.php.mk (revision 333272)
+++ Mk/bsd.php.mk (working copy)
@@ -39,13 +39,19 @@
=20
_PHPMKINCLUDED=3D yes
=20
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
+.if defined(DEFAULT_PHP_VER)
+WARNING+=3D "DEFAULT_PHP_VER is defined, consider using DEFAULT_VERSIONS=
=3Dphp=3D${DEFAULT_PHP_VER} instead"
+.endif
+
PHPBASE?=3D ${LOCALBASE}
.if exists(${PHPBASE}/etc/php.conf)
.include "${PHPBASE}/etc/php.conf"
PHP_EXT_DIR!=3D ${PHPBASE}/bin/php-config --extension-dir | ${SED} -ne '=
s,^${PHPBASE}/lib/php/\(.*\),\1,p'
=20
.else
-DEFAULT_PHP_VER?=3D 5
+DEFAULT_PHP_VER?=3D ${PHP_DEFAULT:S/.//}
=20
PHP_VER?=3D ${DEFAULT_PHP_VER}
.if ${PHP_VER} =3D=3D 52
@@ -56,6 +62,10 @@
.elif ${PHP_VER} =3D=3D 55
PHP_EXT_DIR=3D 20121212
PHP_EXT_INC=3D pcre spl
+.elif ${PHP_VER} =3D=3D 54
+PHP_VER=3D 5
+PHP_EXT_DIR=3D 20100525
+PHP_EXT_INC=3D pcre spl
.else
PHP_EXT_DIR=3D 20100525
PHP_EXT_INC=3D pcre spl
--------------000504020107060309020007--
--PTW3pHK34g7KGubgpK9aTmw6CwC3uD51q
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBAgAGBQJSfZ87AAoJEJrBFpNRJZKfRE8P/iW3RZu3Mtv8vG5UZ50tUim9
/GHVFK34/DYeoMajyCamCV9sWBJZnz98LzowpU3NqDPDP6RzcN/mufL4251W/rAK
BpWiqqAF3xRc5tD3bisfvZN2ouCKVrFSmGYEAZIAY71iqAQ8HOkdsNC+Ypj9i0Wn
XV383WWjd2vhv4bWcjX9eWf2BmTZGuCF8oM1CQIIpDDMGAKhRurisepVsBe+LAoK
uBIcpToE6KznuVrGeIaWf2qZFTK3Oo7UnVECwAc5j/EQmIZYa4YFRpmhQ7/eLm60
Z8KEeAJXA2ihk1BoC8x5NkrpcrXXRw8HREux8zaffWdte1finkqycMxMPBAdH0w9
0hCLWxzyy5xP1b/8jqQUTnwfRwvhl9gnd81F5UP9R6m94Bm6DyuhkCuiCH/Gm2Lk
oJ+JhGA9i911Ai4s/F2lnOGlmKATlD/Z2pgeTUETEaFeSroygEMliNioRlinTD8M
ZhbeDbfVnGvk5Jel2TTGyHtY0oZDnWyqcGB2x2V226iHu8JqGGu2gp2PB7YrbZhP
FrAB9c3Fvc+7hXb9P3Bna5ioSkNrErmaR6Ot4S1h3HdYK/4MHI6o9D0MZHW7UlMH
xiRaicYiDTOP+vDsndSUq2Wk0Daxsv6EHPZqFLKmi/V9V24qw4P0yxmPQiDFgUrx
YOjAe69LlrYwGkyFNK03
=84VE
-----END PGP SIGNATURE-----
--PTW3pHK34g7KGubgpK9aTmw6CwC3uD51q--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?527D9F38.20105>