Attachment 172815 Details for Bug 210666 – patch-v2

[patch] patch-v2

default-versions.diff (text/plain), 8.28 KB, created by Mathieu Arnold on 2016-07-21 22:35:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2016-07-21 22:35:45 UTC

Size: 8.28 KB

patch

obsolete

>diff --git a/Mk/Uses/bdb.mk b/Mk/Uses/bdb.mk
>index 3b87200..3f3839a 100644
>--- a/Mk/Uses/bdb.mk
>+++ b/Mk/Uses/bdb.mk
>@@ -65,8 +65,6 @@ WARNING+=	"WITH_BDB_VER is deprecated and will be removed on 2016-08-01. Use DEF
> BDB_DEFAULT:=${WITH_BDB_VER}
> .endif
> 
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
>-
> _BDB_DEFAULT_save:=${BDB_DEFAULT}
> 
> _DB_PORTS=		48 5 6
>diff --git a/Mk/Uses/firebird.mk b/Mk/Uses/firebird.mk
>index 07437f3..49eb5c4 100644
>--- a/Mk/Uses/firebird.mk
>+++ b/Mk/Uses/firebird.mk
>@@ -7,7 +7,6 @@
> 
> .if !defined(_INCLUDE_USES_FIREBIRD_MK)
> _INCLUDE_USES_FIREBIRD_MK=	yes
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
> 
> .if !empty(firebird_ARGS)
> FIREBIRD_VER=	${firebird_ARGS}
>diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk
>index 751b22d..9265e1e 100644
>--- a/Mk/Uses/fortran.mk
>+++ b/Mk/Uses/fortran.mk
>@@ -16,7 +16,6 @@ fortran_ARGS=	gcc
> .endif
> 
> .if ${fortran_ARGS} == gcc
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
> _GCC_VER=	${GCC_DEFAULT:S/.//}
> .if ${GCC_DEFAULT} == ${LANG_GCC_IS}
> BUILD_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc
>diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk
>index 28ac66f..925729b 100644
>--- a/Mk/Uses/ghostscript.mk
>+++ b/Mk/Uses/ghostscript.mk
>@@ -38,9 +38,6 @@ _GS_ARGS=		${ghostscript_ARGS}
> IGNORE?=	Unknown ghostscript argument ${_GS_ARGS}
> .endif
> 
>-# Determine version number of Ghostscript to use
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
>-
> .if ${GHOSTSCRIPT_DEFAULT:N[789]:Nagpl}
> IGNORE?=	Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION}
> .endif
>diff --git a/Mk/Uses/lua.mk b/Mk/Uses/lua.mk
>index 7bc11f1..98f3647 100644
>--- a/Mk/Uses/lua.mk
>+++ b/Mk/Uses/lua.mk
>@@ -14,7 +14,6 @@ _INCLUDE_USES_LUA_MK=	yes
> # Mk/bsd.default-versions.mk in sync.
> _LUA_VALID_VERSIONS=	53 52 51
> 
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
> _LUA_DEFAULT_VERSION=	${LUA_DEFAULT:S/.//}
> .if ! ${_LUA_VALID_VERSIONS:M${_LUA_DEFAULT_VERSION}}
> IGNORE=	Invalid lua version ${LUA_DEFAULT}
>diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
>index 548802a..b8a40eb 100644
>--- a/Mk/Uses/mysql.mk
>+++ b/Mk/Uses/mysql.mk
>@@ -26,8 +26,6 @@
> .if !defined(_INCLUDE_USES_MYSQL_MK)
> _INCLUDE_USES_MYSQL_MK=	yes
> 
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
>-
> .if !empty(mysql_ARGS)
> .undef _WANT_MYSQL_VER
> .undef _WANT_MYSQL_SERVER
>diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
>index c8dc83a..8d3b0b7 100644
>--- a/Mk/Uses/perl5.mk
>+++ b/Mk/Uses/perl5.mk
>@@ -51,7 +51,6 @@ THIS_IS_OLD_PERL=	yes
> # end of remove
> # When adding a version, please keep the comment in
> # Mk/bsd.default-versions.mk in sync.
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
> .if ${PERL5_DEFAULT} == 5.18
> .include "${PORTSDIR}/lang/perl5.18/version.mk"
> .elif ${PERL5_DEFAULT} == 5.20
>diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
>index d72a8b4..f5fde3e 100644
>--- a/Mk/Uses/pgsql.mk
>+++ b/Mk/Uses/pgsql.mk
>@@ -43,8 +43,6 @@ PGSQL_LIBVER=	5
> PGSQL$v_LIBVER?=	${PGSQL_LIBVER}
> .endfor
> 
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
>-
> .for v in ${PGSQL_DEFAULT}
> .  if ! ${VALID_PGSQL_VER:M$v}
> IGNORE=		Invalid PGSQL default version ${PGSQL_DEFAULT}; valid versions are ${VALID_PGSQL_VER}
>diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk
>index 32b4505..3a36d6b 100644
>--- a/Mk/Uses/php.mk
>+++ b/Mk/Uses/php.mk
>@@ -38,8 +38,6 @@ PHP_Include_MAINTAINER=	ale@FreeBSD.org
> 
> _INCLUDE_USES_PHP_MK=	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
>diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
>index 3877fde..4a68ef5 100644
>--- a/Mk/Uses/python.mk
>+++ b/Mk/Uses/python.mk
>@@ -260,9 +260,6 @@ _PYTHON_RUN_DEP=	yes
> _PYTHON_TEST_DEP=	yes
> .endif
> 
>-# Determine version number of Python to use
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
>-
> .if defined(PYTHON_DEFAULT_VERSION)
> WARNING+=	"PYTHON_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//} instead"
> .endif
>diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk
>index 5980521..7c568f0 100644
>--- a/Mk/Uses/ssl.mk
>+++ b/Mk/Uses/ssl.mk
>@@ -28,8 +28,6 @@
> .if !defined(_INCLUDE_USES_SSL_MK)
> _INCLUDE_USES_SSL_MK=	yes
> 
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
>-
> .if ${SSL_DEFAULT} == base
> OPENSSLBASE=		/usr
> OPENSSLDIR?=		/etc/ssl
>diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
>index 11fb368..3766ec2 100644
>--- a/Mk/Uses/tcl.mk
>+++ b/Mk/Uses/tcl.mk
>@@ -78,7 +78,6 @@ _TCLTK_VALID_VERSIONS=	84 85 86
> # Bring in the default and check that the specified version is in the list of
> # valid versions.
> #
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
> _TCLTK_DEFAULT_VERSION=	${TCLTK_DEFAULT:S/.//}
> .if ! ${_TCLTK_VALID_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
> IGNORE=	Invalid tcltk version ${TCLTK_DEFAULT}
>diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk
>index ced4fc7..768cb2c 100644
>--- a/Mk/bsd.apache.mk
>+++ b/Mk/bsd.apache.mk
>@@ -85,8 +85,6 @@
> 
> Apache_Pre_Include=		bsd.apache.mk
> 
>-.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
>diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk
>index 3bec79f..5568d72 100644
>--- a/Mk/bsd.fpc.mk
>+++ b/Mk/bsd.fpc.mk
>@@ -30,8 +30,6 @@
> 
> _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
>diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk
>index e3754ea..e6a6055 100644
>--- a/Mk/bsd.gcc.mk
>+++ b/Mk/bsd.gcc.mk
>@@ -31,8 +31,6 @@
> 
> GCC_Include_MAINTAINER=		gerald@FreeBSD.org
> 
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
>-
> # All GCC versions supported by the ports framework.  Keep them in
> # ascending order and in sync with the table below. 
> # When adding a version, please keep the comment in
>diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
>index c9e9f3b..bde550e 100644
>--- a/Mk/bsd.port.mk
>+++ b/Mk/bsd.port.mk
>@@ -1266,6 +1266,8 @@ WITH_DEBUG=	yes
> 
> .include "${PORTSDIR}/Mk/bsd.options.mk"
> 
>+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
>+
> # Start of pre-makefile section.
> .if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)
> 
>diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
>index dc177df..b1b6394 100644
>--- a/Mk/bsd.ruby.mk
>+++ b/Mk/bsd.ruby.mk
>@@ -128,8 +128,6 @@ Ruby_Include_MAINTAINER=	ruby@FreeBSD.org
> # RUBY_ELISPDIR		- Installation path for emacs lisp files.
> #
> 
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
>-
> .if defined(RUBY_DEFAULT_VER)
> WARNING+=	"RUBY_DEFAULT_VER is defined, consider using DEFAULT_VERSIONS=ruby=${RUBY_DEFAULT_VER} instead"
> .endif
>diff --git a/devel/efl/Makefile b/devel/efl/Makefile
>index 82cc85a..92308ca 100644
>--- a/devel/efl/Makefile
>+++ b/devel/efl/Makefile
>@@ -94,6 +94,8 @@ OPENGL_USE=			GL=gl
> SDL_USE=			SDL=sdl2
> SDL_CONFIGURE_ENABLE=		sdl
> 
>+SSL_VARS=	WITH_OPENSSL_PORT=yes
>+
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MNVIDIA}
>@@ -109,7 +111,6 @@ PLIST_SUB+=			AUDIO="@comment "
> 
> .if ${PORT_OPTIONS:MSSL}
> USE_OPENSSL=			yes
>-WITH_OPENSSL_PORT=		yes
> .else
> CONFIGURE_ARGS+=		--with-crypto=none
> .endif
>diff --git a/www/node/Makefile b/www/node/Makefile
>index b3a209e..06ea24a 100644
>--- a/www/node/Makefile
>+++ b/www/node/Makefile
>@@ -42,16 +42,7 @@ MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
> LIB_DEPENDS+=	libcares.so:dns/c-ares\
> 		libuv.so:devel/libuv
> 
>-.include <bsd.port.options.mk>
>-
>-.if empty(PORT_OPTIONS:MBUNDLED_SSL)
>-
>-.if ${OSVERSION} < 1100085
>-# node.js requires openssl 1.0.2, use the port since base isn't new enough
>-WITH_OPENSSL_PORT=	yes
>-.endif
>-
>-.endif
>+BUNDLED_SSL_VARS_OFF=	WITH_OPENSSL_PORT=yes
> 
> .include <bsd.port.pre.mk>
> 
>diff --git a/www/node4/Makefile b/www/node4/Makefile
>index 1f8c095..4e555bc 100644
>--- a/www/node4/Makefile
>+++ b/www/node4/Makefile
>@@ -42,16 +42,7 @@ MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
> 
> LIB_DEPENDS+=	libuv.so:devel/libuv
> 
>-.include <bsd.port.options.mk>
>-
>-.if empty(PORT_OPTIONS:MBUNDLED_SSL)
>-
>-.if ${OSVERSION} < 1100085
>-# node.js requires openssl 1.0.2, use the port since base isn't new enough
>-WITH_OPENSSL_PORT=yes
>-.endif
>-
>-.endif
>+BUNDLED_SSL_VARS_OFF=	WITH_OPENSSL_PORT=yes
> 
> .include <bsd.port.pre.mk>
>

Actions: View | Diff

Attachments on bug 210666: 171914 | 172815 | 173041