diff options
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/bsd.perl.mk | 6 | ||||
-rw-r--r-- | Mk/bsd.port.mk | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Mk/bsd.perl.mk b/Mk/bsd.perl.mk index ce142278ad34..2897951d8fe6 100644 --- a/Mk/bsd.perl.mk +++ b/Mk/bsd.perl.mk @@ -17,7 +17,6 @@ # installed from a port, but without the version number. # Use this if you need to replace "#!" lines in scripts. # PERL_VERSION - Full version of perl5 (see below for current value). -# PERL_VER - Short version of perl5 (see below for current value). # PERL_LEVEL - Perl version as an integer of the form MNNNPP, where # M is major version, N is minor version, and P is # the patch level. E.g., PERL_VERSION=5.6.1 would give @@ -86,7 +85,6 @@ PERL_Include_MAINTAINER= perl@FreeBSD.org .if defined(_PERL_REFACTORING_COMPLETE) PERL_VERSION?= 5.8.9 -PERL_VER?= 5.8.9 .if !defined(PERL_LEVEL) && defined(PERL_VERSION) perl_major= ${PERL_VERSION:C|\..*||} @@ -107,7 +105,7 @@ PERL_PORT?= perl5.8 PERL_PORT?= perl5.6 .endif -SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER} +SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VERSION} SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL} PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION} @@ -178,7 +176,7 @@ Perl_Post_Include= bsd.perl.mk .if defined(_PERL_REFACTORING_COMPLETE) PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ - PERL_VER=${PERL_VER} \ + PERL_VER=${PERL_VERSION} \ PERL_ARCH=${PERL_ARCH} \ SITE_PERL=${SITE_PERL_REL} diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 992186d16e69..839966dab118 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -327,7 +327,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # installed from a port, but without the version number. # Use this if you need to replace "#!" lines in scripts. # PERL_VERSION - Full version of perl5 (see below for current value). -# PERL_VER - Short version of perl5 (see below for current value). # PERL_LEVEL - Perl version as an integer of the form MNNNPP, where # M is major version, N is minor version, and P is # the patch level. E.g., PERL_VERSION=5.6.1 would give @@ -1408,7 +1407,6 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg .if !defined(_PERL_REFACTORING_COMPLETE) PERL_VERSION?= 5.8.9 -PERL_VER?= 5.8.9 .if !defined(PERL_LEVEL) && defined(PERL_VERSION) perl_major= ${PERL_VERSION:C|^([1-9]+).*|\1|} @@ -1434,7 +1432,7 @@ PERL_PORT?= perl5.8 PERL_PORT?= perl5.6 .endif -SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER} +SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VERSION} SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL} PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION} @@ -1920,7 +1918,7 @@ IGNORE= uses unknown USE_BISON construct .if !defined(_PERL_REFACTORING_COMPLETE) PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ - PERL_VER=${PERL_VER} \ + PERL_VER=${PERL_VERSION} \ PERL_ARCH=${PERL_ARCH} \ SITE_PERL=${SITE_PERL_REL} .endif # !defined(_PERL_REFACTORING_COMPLETE) |