svn commit: r392958 - head/Mk/Uses

[Bryan Drewery]

On 7/26/15 10:45 PM, Hiroki Sato wrote:
> Author: hrs
> Date: Mon Jul 27 05:45:39 2015
> New Revision: 392958
> URL: https://svnweb.freebsd.org/changeset/ports/392958
> 
> Log:
>   Use -nox11-suffixed ports instead of DEPENDS_ARGS.

I would really like to remove all -nox11 ports in the tree, or at least
dependencies on them. Using dependencies on an OPTION like -nox11
creates very inconsistent dependency trees and quickly leads to the user
being unable to build the tree when using Poudriere.

The problem is that some ports depend on -nox11 and others do not.
Ignoring the X11 OPTION, other ports in the tree generally do not depend
on an OPTION-based origin name. Users are expected to set the OPTIONS
for what they want, even in dependencies. We have the global X11 OPTION
that can be UNSET by a user to avoid using any X11, thus the dependency
on -nox11 isn't needed anywhere.

> 
> Modified:
>   head/Mk/Uses/ghostscript.mk
> 
> Modified: head/Mk/Uses/ghostscript.mk
> ==============================================================================
> --- head/Mk/Uses/ghostscript.mk	Mon Jul 27 05:41:41 2015	(r392957)
> +++ head/Mk/Uses/ghostscript.mk	Mon Jul 27 05:45:39 2015	(r392958)
> @@ -85,12 +85,15 @@ IGNORE?=	Invalid ghostscript argument or
>  .endif
>  
>  # dependencies
> -_GS_PORT=	ghostscript${_GS_SELECTED}${_GS_AGPL_SUFFIX}
> +_GS_PORT=	ghostscript${_GS_SELECTED}${_GS_AGPL_SUFFIX}${_GS_NOX11_SUFFIX}
>  
> +.undef _GS_NOX11_SUFFIX
>  .if ${_GS_ARGS:Mnox11} || \
>      (defined(OPTIONS_DEFINE) && defined(PORT_OPTIONS) && \
>       ${OPTIONS_DEFINE:MX11} && ${PORT_OPTIONS:MX11} == "")
> -DEPENDS_ARGS+=	print_${_GS_PORT}_UNSET_FORCE+=X11
> +# XXX
> +#DEPENDS_ARGS+=	print_${_GS_PORT}_UNSET_FORCE+=X11
> +_GS_NOX11_SUFFIX=	-nox11
>  .endif
>  
>  .if defined(_GS_BUILD_DEP)
> 


-- 
Regards,
Bryan Drewery