Date: Fri, 6 Feb 2004 17:31:45 +0100 (CET) From: Dag-Erling Smørgrav <des@des.no> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/62441: [PATCH] correctly determine PERL_ARCH Message-ID: <20040206163145.F11EA33C68@dwp.des.no> Resent-Message-ID: <200402061640.i16Ge1kM076344@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 62441
>Category: ports
>Synopsis: [PATCH] correctly determine PERL_ARCH
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 06 08:40:01 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Dag-Erling Smørgrav
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD dwp.des.no 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Thu Feb 5 15:09:07 CET 2004 des@dwp.des.no:/usr/obj/usr/src/sys/dwp_smp i386
ports-current
>Description:
The default PERL_ARCH is currently determined as a function of OSVERSION.
It should however be a function of PERL_LEVEL since the correct value
depends on what Perl version one has installed (older Perl versions use
${ARCH}-freebsd, newer versions use mach).
>How-To-Repeat:
n/a
>Fix:
Apply the attached patch.
--- bsd.port.mk.diff begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.484
diff -u -r1.484 bsd.port.mk
--- bsd.port.mk 4 Feb 2004 04:27:04 -0000 1.484
+++ bsd.port.mk 4 Feb 2004 22:11:59 -0000
@@ -1155,17 +1155,14 @@
.if ${OSVERSION} >= 502100
PERL_VERSION?= 5.8.2
PERL_VER?= 5.8.2
-PERL_ARCH?= mach
.else
.if ${OSVERSION} >= 500032
PERL_VERSION?= 5.6.1
PERL_VER?= 5.6.1
-PERL_ARCH?= mach
.else
.if ${OSVERSION} >= 500007
PERL_VERSION?= 5.6.0
PERL_VER?= 5.6.0
-PERL_ARCH?= mach
.else
.if ${OSVERSION} >= 300000
PERL_VERSION?= 5.00503
@@ -1173,7 +1170,6 @@
PERL_VERSION?= 5.00502
.endif
PERL_VER?= 5.005
-PERL_ARCH?= ${ARCH}-freebsd
.endif
.endif
.endif
@@ -1193,6 +1189,12 @@
.else
PERL_LEVEL=0
.endif # !defined(PERL_LEVEL) && defined(PERL_VERSION)
+
+.if ${PERL_LEVEL} >= 500600
+PERL_ARCH?= mach
+.else
+PERL_ARCH?= ${ARCH}-freebsd
+.endif
.if ${PERL_LEVEL} >= 500800
PERL_PORT?= perl5.8
--- bsd.port.mk.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040206163145.F11EA33C68>