From edwin@mavetju.org  Thu Oct  4 06:51:09 2007
Return-Path: <edwin@mavetju.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C6CBA16A479
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Oct 2007 06:51:09 +0000 (UTC)
	(envelope-from edwin@mavetju.org)
Received: from mail5out.barnet.com.au (mail5.barnet.com.au [202.83.178.78])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F42913C481
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Oct 2007 06:51:09 +0000 (UTC)
	(envelope-from edwin@mavetju.org)
Received: by mail5out.barnet.com.au (Postfix, from userid 1001)
	id 002F92219D45; Thu,  4 Oct 2007 16:51:07 +1000 (EST)
Received: from mail5auth.barnet.com.au (mail5.barnet.com.au [202.83.178.78])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by mail5.barnet.com.au (Postfix) with ESMTP id B69D621B11B9
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Oct 2007 16:51:07 +1000 (EST)
Received: from k7.mavetju (k7.mavetju.org [10.251.1.18])
	by mail5auth.barnet.com.au (Postfix) with ESMTP id 8A0BD2219D74
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Oct 2007 16:50:58 +1000 (EST)
Received: by k7.mavetju (Postfix, from userid 1001)
	id 522FE2D7; Thu,  4 Oct 2007 16:50:58 +1000 (EST)
Message-Id: <20071004065058.522FE2D7@k7.mavetju>
Date: Thu,  4 Oct 2007 16:50:58 +1000 (EST)
From: Edwin Groothuis <edwin@mavetju.org>
Reply-To: Edwin Groothuis <edwin@mavetju.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] bsd.java.mk - Remove always-true statement
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         116890
>Category:       ports
>Synopsis:       [patch] bsd.java.mk - Remove always-true statement
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    glewis
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 04 07:00:05 GMT 2007
>Closed-Date:    Sun Oct 07 14:42:25 GMT 2007
>Last-Modified:  Sun Oct  7 14:50:01 GMT 2007
>Originator:     Edwin Groothuis
>Release:        FreeBSD 6.2-RELEASE-p4 i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:55:55 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/SMP i386


>Description:

Since OSVERSION is always bigger than 500000, the following statement
can be removed:

>How-To-Repeat:
>Fix:

Index: bsd.java.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.java.mk,v
retrieving revision 1.80
diff -u -r1.80 bsd.java.mk
--- bsd.java.mk	5 Aug 2007 21:19:47 -0000	1.80
+++ bsd.java.mk	4 Oct 2007 06:49:20 -0000
@@ -214,7 +214,7 @@
 
 # Enforce preferred Java ports according to OS
 .		if (${ARCH} == "amd64" && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000) || \
-		   (${ARCH} == "i386" && ${OSVERSION} >= 500000 && ${OSVERSION} < 700000)
+		   (${ARCH} == "i386" && ${OSVERSION} < 700000)
 _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_5
 .		else
 _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->glewis 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Oct 4 07:00:18 UTC 2007 
Responsible-Changed-Why:  
bsd.java.mk is glewis territory (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116890 
State-Changed-From-To: open->closed 
State-Changed-By: glewis 
State-Changed-When: Sun Oct 7 14:42:23 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116890 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/116890: commit references a PR
Date: Sun,  7 Oct 2007 14:42:14 +0000 (UTC)

 glewis      2007-10-07 14:42:03 UTC
 
   FreeBSD ports repository
 
   Modified files:
     Mk                   bsd.java.mk 
   Log:
   . Remove a check for OSVERSION >= 500000 since this is now true for all
     supported versions of FreeBSD.
   
   PR:             116890
   Submitted by:   edwin
   
   Revision  Changes    Path
   1.81      +2 -2      ports/Mk/bsd.java.mk
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
