From owner-freebsd-ports-bugs Tue Feb 4 3:20:18 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7247037B401 for ; Tue, 4 Feb 2003 03:20:15 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B6B943F85 for ; Tue, 4 Feb 2003 03:20:14 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h14BKENS045169 for ; Tue, 4 Feb 2003 03:20:14 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h14BKEX0045168; Tue, 4 Feb 2003 03:20:14 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A646737B401; Tue, 4 Feb 2003 03:19:18 -0800 (PST) Received: from topaz.mdcc.cx (topaz.mdcc.cx [212.204.230.141]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF90E43FB1; Tue, 4 Feb 2003 03:19:17 -0800 (PST) (envelope-from edwin@mavetju.org) Received: from k7.mavetju (topaz.mdcc.cx [212.204.230.141]) by topaz.mdcc.cx (Postfix) with ESMTP id 0C6F82BA9B; Tue, 4 Feb 2003 12:19:15 +0100 (CET) Received: by k7.mavetju (Postfix, from userid 1001) id 574396A712B; Tue, 4 Feb 2003 22:19:12 +1100 (EST) Message-Id: <20030204111912.574396A712B@k7.mavetju> Date: Tue, 4 Feb 2003 22:19:12 +1100 (EST) From: Edwin Groothuis Reply-To: Edwin Groothuis To: FreeBSD-gnats-submit@FreeBSD.org Cc: alane@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/47897: PERL_LEVEL doesn't work Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 47897 >Category: ports >Synopsis: PERL_LEVEL doesn't work >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Feb 04 03:20:13 PST 2003 >Closed-Date: >Last-Modified: >Originator: Edwin Groothuis >Release: FreeBSD 4.5-RELEASE i386 >Organization: - >Environment: System: FreeBSD k7.mavetju 4.5-RELEASE FreeBSD 4.5-RELEASE #4: Sat Sep 14 10:41:50 EST 2002 edwin@k7.mavetju:/usr/src/sys/compile/k7 i386 >Description: PERL_LEVEL doesn't work: [/usr/ports/www/apache13] edwin@k7>make -V PERL_LEVEL 0 The reason: (line 779 in Mk/bsd.ports.mk) .if !defined(PERL_LEVEL) && defined(PERL_VERSION) PERL_VERSION is there not defined yet, it happens later on. So then, move this set of lines to where PERL_VERSION is defined. But then, that section isn't processed by an ".include ". So move the whole detecting of PERL_VERSION in the pre-section. >How-To-Repeat: Try to test ports/47589 Thanks to Erwin Lansing for submitting that port :-) >Fix: --- bsd.port.mk 5 Dec 2002 22:43:22 -0000 1.437 +++ bsd.port.mk 4 Feb 2003 11:16:47 -0000 @@ -776,6 +776,28 @@ PREFIX?= ${LOCALBASE} .endif +.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 +.else +PERL_VERSION?= 5.00502 +.endif +PERL_VER?= 5.005 +PERL_ARCH?= ${ARCH}-freebsd +.endif +.endif + +SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} + .if !defined(PERL_LEVEL) && defined(PERL_VERSION) perl_major= ${PERL_VERSION:C|^([1-9]+).*|\1|} _perl_minor= 00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|} @@ -1165,27 +1187,7 @@ .endif .endif -.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 -.else -PERL_VERSION?= 5.00502 -.endif -PERL_VER?= 5.005 -PERL_ARCH?= ${ARCH}-freebsd -.endif -.endif -SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message