From owner-p4-projects@FreeBSD.ORG  Thu Aug  9 13:42:10 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7E87616A46D; Thu,  9 Aug 2007 13:42:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 43BF216A46B
	for <perforce@freebsd.org>; Thu,  9 Aug 2007 13:42:10 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 262C013C45A
	for <perforce@freebsd.org>; Thu,  9 Aug 2007 13:42:10 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l79DgARJ051096
	for <perforce@freebsd.org>; Thu, 9 Aug 2007 13:42:10 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l79Dg9eb051092
	for perforce@freebsd.org; Thu, 9 Aug 2007 13:42:09 GMT
	(envelope-from gabor@freebsd.org)
Date: Thu, 9 Aug 2007 13:42:09 GMT
Message-Id: <200708091342.l79Dg9eb051092@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 124948 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2007 13:42:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=124948

Change 124948 by gabor@gabor_server on 2007/08/09 13:41:47

	- Change to a more convenient form of USE_PERL5.  Now the following
	  can be used:
	
		5.8.8		- Exactly Perl 5.8.8. is required
		5.8.8+		- At least Perl 5.8.8 is required
		5.8.8-		- Only usable with Perl 5.8.8 or earlier

Affected files ...

.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.perl.mk#12 edit

Differences ...

==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.perl.mk#12 (text+ko) ====

@@ -48,18 +48,30 @@
 __prefix=${USE_PERL5:C/[^[:digit:].]+$//}
 __suffix=${USE_PERL5:C/^[0-9.]+//}
 
+_u_perl_major=		${__prefix:C|^([1-9]+).*|\1|}
+_u__perl_minor=		00${__prefix:C|^([1-9]+)\.([0-9]+).*|\2|}
+_u_perl_minor=		${_u__perl_minor:C|^.*(...)|\1|}
+.if ${_u_perl_minor} >= 100
+_u_perl_minor=		${__prefix:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+_u_perl_patch=		${__prefix:C|^.*(..)|\1|}
+.else # ${_u_perl_minor} < 100
+_u__perl_patch=		0${__prefix:C|^([1-9]+)\.([0-9]+)\.*|0|}
+_u_perl_patch=		${_u__perl_patch:C|^.*(..)|\1|}
+.endif # ${_u_perl_minor} < 100
+USE_PERL5_LEVEL=	${_u_perl_major}${_u_perl_minor}${_u_perl_patch}
+
 .if ${__suffix} == "+"
-.if ${__prefix} > ${PERL_LEVEL}
+.if ${USE_PERL5_LEVEL} > ${PERL_LEVEL}
 USE_PERL5_REASON?=	You need Perl ${__prefix} or newer, please install latest lang/perl5.8
 IGNORE=	${USE_PERL5_REASON)
 .endif
 .elif ${__suffix} == ""
-.if ${__prefix} != ${PERL_LEVEL}
+.if ${USE_PERL5_LEVEL} != ${PERL_LEVEL}
 USE_PERL5_REASON?=	You need Perl ${__prefix} exactly
 IGNORE=	${USE_PERL5_REASON)
 .endif
 .elif ${__suffix} == "-"
-.if ${__prefix} < ${PERL_LEVEL}
+.if ${USE_PERL5_LEVEL} < ${PERL_LEVEL}
 USE_PERL5_REASON?=	You need Perl ${__prefix} or earlier
 IGNORE=	${USE_PERL5_REASON)
 .endif