sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Catch up with master 1.612.

Browse source
This commit is contained in:
Mark Linimon 2009-03-07 07:53:56 +00:00
parent 431ad10571
commit 8f7449bc4f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=229622
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ports-mgmt/portmk/Mk/bsd.port.mk
View file

@ -326,7 +326,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# installed from a port, but without the version number. # installed from a port, but without the version number.
# Use this if you need to replace "#!" lines in scripts. # Use this if you need to replace "#!" lines in scripts.
# PERL_VERSION - Full version of perl5 (see below for current value). # 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 # PERL_LEVEL - Perl version as an integer of the form MNNNPP, where
# M is major version, N is minor version, and P is # M is major version, N is minor version, and P is
# the patch level. E.g., PERL_VERSION=5.6.1 would give # the patch level. E.g., PERL_VERSION=5.6.1 would give
@ -1424,7 +1423,6 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg
.if !defined(_PERL_REFACTORING_COMPLETE) .if !defined(_PERL_REFACTORING_COMPLETE)
PERL_VERSION?= 5.8.9 PERL_VERSION?= 5.8.9
PERL_VER?= 5.8.9
.if !defined(PERL_LEVEL) && defined(PERL_VERSION) .if !defined(PERL_LEVEL) && defined(PERL_VERSION)
perl_major= ${PERL_VERSION:C|^([1-9]+).*|\1|} perl_major= ${PERL_VERSION:C|^([1-9]+).*|\1|}
@ -1450,7 +1448,7 @@ PERL_PORT?= perl5.8
PERL_PORT?= perl5.6 PERL_PORT?= perl5.6
.endif .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} SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL}
PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION} PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION}
@ -1490,13 +1488,13 @@ PERL= ${LOCALBASE}/bin/perl
.endif .endif
.endif .endif
#.if defined(USE_PERL5) || defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN) || defined(PERL_CONFIGURE) || defined(PERL_MODBUILD) .if defined(USE_PERL5) || defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN) || defined(PERL_CONFIGURE) || defined(PERL_MODBUILD)
.if exists(${DEVELPORTSDIR}/Mk/bsd.perl.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.perl.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.perl.mk" .include "${DEVELPORTSDIR}/Mk/bsd.perl.mk"
.else .else
.include "${PORTSDIR}/Mk/bsd.perl.mk" .include "${PORTSDIR}/Mk/bsd.perl.mk"
.endif .endif
#.endif .endif
.if defined(USE_PHP) .if defined(USE_PHP)
.if exists(${DEVELPORTSDIR}/Mk/bsd.php.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.php.mk)
@ -2044,7 +2042,7 @@ IGNORE= uses unknown USE_BISON construct
.if !defined(_PERL_REFACTORING_COMPLETE) .if !defined(_PERL_REFACTORING_COMPLETE)
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \ PERL_VER=${PERL_VERSION} \
PERL_ARCH=${PERL_ARCH} \ PERL_ARCH=${PERL_ARCH} \
SITE_PERL=${SITE_PERL_REL} SITE_PERL=${SITE_PERL_REL}
.endif # !defined(_PERL_REFACTORING_COMPLETE) .endif # !defined(_PERL_REFACTORING_COMPLETE)
@ -2131,13 +2129,13 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
.endif .endif
.endif .endif
#.if defined(USE_PERL5) || defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN) || defined(PERL_CONFIGURE) || defined(PERL_MODBUILD) .if defined(USE_PERL5) || defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN) || defined(PERL_CONFIGURE) || defined(PERL_MODBUILD)
.if exists(${DEVELPORTSDIR}/Mk/bsd.perl.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.perl.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.perl.mk" .include "${DEVELPORTSDIR}/Mk/bsd.perl.mk"
.else .else
.include "${PORTSDIR}/Mk/bsd.perl.mk" .include "${PORTSDIR}/Mk/bsd.perl.mk"
.endif .endif
#.endif .endif
.if defined(USE_PHP) .if defined(USE_PHP)
.if exists(${DEVELPORTSDIR}/Mk/bsd.php.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.php.mk)