Date: Sat, 29 Nov 2014 14:56:27 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373622 - in head/lang: perl5.14 perl5.16 perl5.18 perl5.20 Message-ID: <201411291456.sATEuRv9031682@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Sat Nov 29 14:56:26 2014 New Revision: 373622 URL: https://svnweb.freebsd.org/changeset/ports/373622 QAT: https://qat.redports.org/buildarchive/r373622/ Log: Really disable MULTIPLICITY if disabled in OPTIONS, and as it was always on before, add it to the OPTIONS_DEFAULT to not change the default behavior. Noticed by: ache Sponsored by: Absolight Modified: head/lang/perl5.14/Makefile head/lang/perl5.16/Makefile head/lang/perl5.18/Makefile head/lang/perl5.20/Makefile Modified: head/lang/perl5.14/Makefile ============================================================================== --- head/lang/perl5.14/Makefile Sat Nov 29 14:49:08 2014 (r373621) +++ head/lang/perl5.14/Makefile Sat Nov 29 14:56:26 2014 (r373622) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -29,7 +29,7 @@ CONFLICTS_INSTALL= perl5.*-* OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL -OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL +OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL MULTIPLICITY OPTIONS_SUB= GDBM_DESC= GDBM_File extension PERL_MALLOC_DESC= Use Perl malloc @@ -175,6 +175,8 @@ CONFIGURE_ARGS+= -Duse64bitint .if ${PORT_OPTIONS:MMULTIPLICITY} CONFIGURE_ARGS+= -Dusemultiplicity=y +.else +CONFIGURE_ARGS+= -Dusemultiplicity=n .endif .if ${PORT_OPTIONS:MSITECUSTOMIZE} Modified: head/lang/perl5.16/Makefile ============================================================================== --- head/lang/perl5.16/Makefile Sat Nov 29 14:49:08 2014 (r373621) +++ head/lang/perl5.16/Makefile Sat Nov 29 14:56:26 2014 (r373622) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -29,7 +29,7 @@ CONFLICTS_INSTALL= perl5.*-* OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL -OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL +OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL MULTIPLICITY OPTIONS_SUB= GDBM_DESC= GDBM_File extension PERL_MALLOC_DESC= Use Perl malloc @@ -175,6 +175,8 @@ CONFIGURE_ARGS+= -Duse64bitint .if ${PORT_OPTIONS:MMULTIPLICITY} CONFIGURE_ARGS+= -Dusemultiplicity=y +.else +CONFIGURE_ARGS+= -Dusemultiplicity=n .endif .if ${PORT_OPTIONS:MSITECUSTOMIZE} Modified: head/lang/perl5.18/Makefile ============================================================================== --- head/lang/perl5.18/Makefile Sat Nov 29 14:49:08 2014 (r373621) +++ head/lang/perl5.18/Makefile Sat Nov 29 14:56:26 2014 (r373622) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -29,7 +29,7 @@ OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT # it seems perl malloc has problems with threaded perl on FreeBSD OPTIONS_RADIO= EXCLUSIVE OPTIONS_RADIO_EXCLUSIVE= THREADS PERL_MALLOC -OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL +OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL MULTIPLICITY EXCLUSIVE_DESC= Exclusive OPTIONS GDBM_DESC= GDBM_File extension @@ -50,6 +50,7 @@ GDBM_CONFIGURE_OFF= -Ui_gdbm GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm PERL_64BITINT_CONFIGURE_ON= -Duse64bitint MULTIPLICITY_CONFIGURE_ON= -Dusemultiplicity=y +MULTIPLICITY_CONFIGURE_OFF= -Dusemultiplicity=n SITECUSTOMIZE_CONFIGURE_ON= -Dusesitecustomize THREADS_CONFIGURE_ON= -Dusethreads=y THREADS_CONFIGURE_OFF= -Dusethreads=n Modified: head/lang/perl5.20/Makefile ============================================================================== --- head/lang/perl5.20/Makefile Sat Nov 29 14:49:08 2014 (r373621) +++ head/lang/perl5.20/Makefile Sat Nov 29 14:56:26 2014 (r373622) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -29,7 +29,7 @@ OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT # it seems perl malloc has problems with threaded perl on FreeBSD OPTIONS_RADIO= EXCLUSIVE OPTIONS_RADIO_EXCLUSIVE= THREADS PERL_MALLOC -OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD +OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD MULTIPLICITY EXCLUSIVE_DESC= Exclusive OPTIONS GDBM_DESC= GDBM_File extension @@ -48,6 +48,7 @@ GDBM_CONFIGURE_OFF= -Ui_gdbm GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm PERL_64BITINT_CONFIGURE_ON= -Duse64bitint MULTIPLICITY_CONFIGURE_ON= -Dusemultiplicity=y +MULTIPLICITY_CONFIGURE_OFF= -Dusemultiplicity=n SITECUSTOMIZE_CONFIGURE_ON= -Dusesitecustomize THREADS_CONFIGURE_ON= -Dusethreads=y THREADS_CONFIGURE_OFF= -Dusethreads=n
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411291456.sATEuRv9031682>