svn commit: r358007 - head/devel/subversion

[Antoine Brodin]

On Mon, Jun 16, 2014 at 4:43 PM, Lev A. Serebryakov <lev at freebsd.org> wrote:
> Author: lev
> Date: Mon Jun 16 14:43:16 2014
> New Revision: 358007
> URL: http://svnweb.freebsd.org/changeset/ports/358007
> QAT: https://qat.redports.org/buildarchive/r358007/
>
> Log:
>    Unbreak build when "devel/subversion" doesn't have options at all.
>
> Modified:
>   head/devel/subversion/Makefile.common

Hi,

Index is still broken after this change:

[00:00:18] ====>> Calculating ports order and dependencies
"/usr/ports/devel/py-subversion/../../devel/subversion/Makefile.common",
line 71: Malformed conditional ((${PORT_OPTIONS:MFREEBSD_TEMPLATE} ||
!${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE}) && defined(ORGANIZATION))
"/usr/ports/devel/py-subversion/../../devel/subversion/Makefile.common",
line 73: if-less endif
"/usr/ports/devel/py-subversion/../../devel/subversion/Makefile.common",
line 101: Malformed conditional ((${PORT_OPTIONS:MFREEBSD_TEMPLATE} ||
!${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE}) && defined(ORGANIZATION))
"/usr/ports/devel/py-subversion/../../devel/subversion/Makefile.common",
line 103: if-less endif
make: fatal errors encountered -- cannot continue
[00:01:02] ====>> Error: Error getting PKGNAME for devel/py-subversion


Antoine

>
> Modified: head/devel/subversion/Makefile.common
> ==============================================================================
> --- head/devel/subversion/Makefile.common       Mon Jun 16 14:42:07 2014        (r358006)
> +++ head/devel/subversion/Makefile.common       Mon Jun 16 14:43:16 2014        (r358007)
> @@ -3,7 +3,7 @@
>
>  PORTNAME?=     subversion
>  PORTVERSION=   1.8.9
> -PORTREVISION?= 2
> +PORTREVISION?= 3
>  CATEGORIES+=   devel
>  MASTER_SITES=  ${MASTER_SITE_APACHE}
>  DIST_SUBDIR=   subversion18
> @@ -65,6 +65,9 @@ CONFIGURE_ARGS+=--with-apr=${APR_CONFIG}
>  CFLAGS+=       -fpic -DPIC
>  .endif
>
> +OPTIONS_FILE_UNSET?=""
> +OPTIONS_FILE_SET?=""
> +
>  .if (${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE}) && defined(ORGANIZATION)
>  CFLAGS+=       -DHAS_ORGANIZATION_NAME
>  .endif
>