Catch up with master 1.585.

This commit is contained in:
Mark Linimon 2007-09-17 06:32:27 +00:00
parent 8a55edab79
commit 4d9de8bfb7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=199591

View file

@ -1439,11 +1439,6 @@ SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL}
PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION}
PERL= ${LOCALBASE}/bin/perl
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
PERL_ARCH=${PERL_ARCH} \
SITE_PERL=${SITE_PERL_REL}
.endif # !defined(_PERL_REFACTORING_COMPLETE)
.if defined(USE_LOCAL_MK)
@ -1623,7 +1618,6 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
.endif
# These do some path checks if DESTDIR is set correctly.
# You can force skipping these test by defining IGNORE_PATH_CHECKS
.if !defined(IGNORE_PATH_CHECKS)
.if (${PREFIX:C,(^.).*,\1,} != "/")
@ -2050,6 +2044,13 @@ RUN_DEPENDS+= ${_GL_${_component}_RUN_DEPENDS}
BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
.endif
.if !defined(_PERL_REFACTORING_COMPLETE)
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
PERL_ARCH=${PERL_ARCH} \
SITE_PERL=${SITE_PERL_REL}
.endif # !defined(_PERL_REFACTORING_COMPLETE)
.if defined(USE_LOCAL_MK)
.if exists(${DEVELPORTSDIR}/Mk/bsd.local.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.local.mk"