aboutsummaryrefslogtreecommitdiff
path: root/Mk/bsd.port.mk
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2000-07-04 08:47:50 +0000
committerSatoshi Asami <asami@FreeBSD.org>2000-07-04 08:47:50 +0000
commit5260fdf08391a68ff28f82e4ec75970f42b7b4d6 (patch)
tree015d663ce1d51f47ccc1ed8c809e2d2c585e20f6 /Mk/bsd.port.mk
parentc0b163e792f04bd2a02af1ff61073beae0fdef2a (diff)
downloadports-5260fdf08391a68ff28f82e4ec75970f42b7b4d6.tar.gz
ports-5260fdf08391a68ff28f82e4ec75970f42b7b4d6.zip
(1) Change PERL_VERSION to 5.6.0 for newer 5-current.
Submitted by: markm (and many others) (2) Move one PLIST_SUB line from the pre.mk section to post.mk section so it won't cause unwanted side effects. Spotted by: sobomax
Notes
Notes: svn path=/head/; revision=30170
Diffstat (limited to 'Mk/bsd.port.mk')
-rw-r--r--Mk/bsd.port.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 32d19624dc45..95fae7b43625 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -612,8 +612,6 @@ PREFIX?= ${X11BASE}
PREFIX?= ${LOCALBASE}
.endif
-PLIST_SUB+= PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
-
.if defined(USE_OPENSSL)
.if ${OSVERSION} >= 400014
.if !exists(/usr/lib/libcrypto.so)
@@ -683,7 +681,7 @@ WRKSRC?= ${WRKDIR}
WRKSRC?= ${WRKDIR}/${DISTNAME}
.endif
-PLIST_SUB+= OSREL=${OSREL}
+PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
CONFIGURE_ENV+= PORTOBJFORMAT=${PORTOBJFORMAT}
SCRIPTS_ENV+= PORTOBJFORMAT=${PORTOBJFORMAT}
@@ -764,6 +762,11 @@ BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
.endif
.endif
+.if ${OSVERSION} >= 500007
+PERL_VERSION= 5.6.0
+PERL_VER= 5.6.0
+PERL_ARCH= mach
+.else
.if ${OSVERSION} >= 300000
PERL_VERSION= 5.00503
.else
@@ -771,6 +774,7 @@ PERL_VERSION= 5.00502
.endif
PERL_VER= 5.005
PERL_ARCH= ${ARCH}-freebsd
+.endif
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
PERL_ARCH=${PERL_ARCH}