Date: Wed, 8 May 2013 14:52:55 +0000 (UTC) From: Andrej Zverev <az@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317668 - in head/lang: perl5.12 perl5.14 perl5.16 Message-ID: <201305081452.r48EqtXD049053@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: az Date: Wed May 8 14:52:55 2013 New Revision: 317668 URL: http://svnweb.freebsd.org/changeset/ports/317668 Log: Revert logic for PERL_VENDOR_PREFIX. Requested by: citrin Modified: head/lang/perl5.12/Makefile head/lang/perl5.14/Makefile head/lang/perl5.16/Makefile Modified: head/lang/perl5.12/Makefile ============================================================================== --- head/lang/perl5.12/Makefile Wed May 8 14:49:57 2013 (r317667) +++ head/lang/perl5.12/Makefile Wed May 8 14:52:55 2013 (r317668) @@ -24,7 +24,7 @@ CONFLICTS= perl-5.14.* perl-threaded-5.1 perl-5.16.* perl-threaded-5.16.* OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \ - MULTIPLICITY SITECUSTOMIZE USE_PERL VENDOR_PREFIX + MULTIPLICITY SITECUSTOMIZE USE_PERL OPTIONS_DEFAULT= PERL_64BITINT PTHREAD USE_PERL GDBM_DESC= GDBM_File extension PERL_MALLOC_DESC= Use Perl malloc @@ -34,7 +34,6 @@ PTHREAD_DESC= Build with -pthread MULTIPLICITY_DESC= Use multiplicity SITECUSTOMIZE_DESC= Run-time customization of @INC USE_PERL_DESC= Rewrite links in /usr/bin -VENDOR_PREFIX_DESC= Use vendor prefix PORTSCOUT= limitw:1,even @@ -68,7 +67,7 @@ MAKE_ENV+= ${LOCALE_CLEANUP} .include "Makefile.man" .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MVENDOR_PREFIX} +.if defined(PERL_VENDOR_PREFIX) CONFIGURE_ARGS+= \ -Dvendorprefix=${PERL_VENDOR_PREFIX} \ -Dvendorarch=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \ Modified: head/lang/perl5.14/Makefile ============================================================================== --- head/lang/perl5.14/Makefile Wed May 8 14:49:57 2013 (r317667) +++ head/lang/perl5.14/Makefile Wed May 8 14:52:55 2013 (r317668) @@ -24,7 +24,7 @@ CONFLICTS= perl-5.16.* perl-threaded-5.1 perl-5.12.* perl-threaded-5.12.* OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \ - MULTIPLICITY SITECUSTOMIZE USE_PERL VENDOR_PREFIX + MULTIPLICITY SITECUSTOMIZE USE_PERL OPTIONS_DEFAULT= PERL_64BITINT PTHREAD USE_PERL GDBM_DESC= GDBM_File extension PERL_MALLOC_DESC= Use Perl malloc @@ -34,7 +34,6 @@ PTHREAD_DESC= Build with -pthread MULTIPLICITY_DESC= Use multiplicity SITECUSTOMIZE_DESC= Run-time customization of @INC USE_PERL_DESC= Rewrite links in /usr/bin -VENDOR_PREFIX_DESC= Use vendor prefix PORTSCOUT= limitw:1,even @@ -68,7 +67,7 @@ MAKE_ENV+= ${LOCALE_CLEANUP} .include "Makefile.man" .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MVENDOR_PREFIX} +.if defined(PERL_VENDOR_PREFIX) CONFIGURE_ARGS+= \ -Dvendorprefix=${PERL_VENDOR_PREFIX} \ -Dvendorarch=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \ Modified: head/lang/perl5.16/Makefile ============================================================================== --- head/lang/perl5.16/Makefile Wed May 8 14:49:57 2013 (r317667) +++ head/lang/perl5.16/Makefile Wed May 8 14:52:55 2013 (r317668) @@ -24,7 +24,7 @@ CONFLICTS= perl-5.12.* perl-threaded-5.1 perl-5.14.* perl-threaded-5.14.* OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \ - MULTIPLICITY SITECUSTOMIZE USE_PERL VENDOR_PREFIX + MULTIPLICITY SITECUSTOMIZE USE_PERL OPTIONS_DEFAULT= PERL_64BITINT PTHREAD USE_PERL GDBM_DESC= GDBM_File extension PERL_MALLOC_DESC= Use Perl malloc @@ -34,7 +34,6 @@ PTHREAD_DESC= Build with -pthread MULTIPLICITY_DESC= Use multiplicity SITECUSTOMIZE_DESC= Run-time customization of @INC USE_PERL_DESC= Rewrite links in /usr/bin -VENDOR_PREFIX_DESC= Use vendor prefix PORTSCOUT= limitw:1,even @@ -68,7 +67,7 @@ MAKE_ENV+= ${LOCALE_CLEANUP} .include "Makefile.man" .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MVENDOR_PREFIX} +.if defined(PERL_VENDOR_PREFIX) CONFIGURE_ARGS+= \ -Dvendorprefix=${PERL_VENDOR_PREFIX} \ -Dvendorarch=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305081452.r48EqtXD049053>