From herve.quiroz@esil.univ-mrs.fr  Sat Oct  7 22:40:47 2006
Return-Path: <herve.quiroz@esil.univ-mrs.fr>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D411016A40F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Oct 2006 22:40:47 +0000 (UTC)
	(envelope-from herve.quiroz@esil.univ-mrs.fr)
Received: from copyleft.esil.univ-mrs.fr (copyleft-smtp.esil.univ-mrs.fr [139.124.44.239])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2BCE643D46
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Oct 2006 22:40:46 +0000 (GMT)
	(envelope-from herve.quiroz@esil.univ-mrs.fr)
Received: from localhost (localhost [127.0.0.1])
	by copyleft.esil.univ-mrs.fr (Texas Instruments TI-58c oldschool stylee) with ESMTP id 422B54BD1D
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 Oct 2006 00:40:45 +0200 (CEST)
Received: from copyleft.esil.univ-mrs.fr ([127.0.0.1])
	by localhost (copyleft [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 20584-07 for <FreeBSD-gnats-submit@freebsd.org>;
	Sun, 8 Oct 2006 00:40:02 +0200 (CEST)
Received: from localhost (unknown [86.69.33.155])
	by copyleft.esil.univ-mrs.fr (Texas Instruments TI-58c oldschool stylee) with ESMTP id D5ABA4BCD3
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 Oct 2006 00:40:01 +0200 (CEST)
Message-Id: <20061007224001.D5ABA4BCD3@copyleft.esil.univ-mrs.fr>
Date: Sun,  8 Oct 2006 00:40:01 +0200 (CEST)
From: Herve Quiroz <hq@FreeBSD.org>
Reply-To: Herve Quiroz <hq@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER][PATCH] bsd.java.mk: remove deprecated syntax support
X-Send-Pr-Version: 3.113
X-GNATS-Notify: glewis@FreeBSD.org

>Number:         104136
>Category:       ports
>Synopsis:       [MAINTAINER][PATCH] bsd.java.mk: remove deprecated syntax support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 07 22:50:24 GMT 2006
>Closed-Date:    Wed Jan 31 16:14:22 GMT 2007
>Last-Modified:  Wed Jan 31 16:14:22 GMT 2007
>Originator:     Herve Quiroz
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD wec.dyndns.org 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Fri Sep 29 11:30:56 CEST 2006 root@wec.dyndns.org:/usr/obj/usr/src/sys/ASSIMILATED i386

>Description:

Now that the ports tree is free of any port using bsd.java.mk 1.0 syntax, this
patch will remove 1.0 syntax backward compatibility layer in bsd.java.mk.

>How-To-Repeat:

>Fix:

Index: bsd.java.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.java.mk,v
retrieving revision 1.73
diff -u -r1.73 bsd.java.mk
--- bsd.java.mk	7 Oct 2006 20:40:07 -0000	1.73
+++ bsd.java.mk	7 Oct 2006 20:46:48 -0000
@@ -128,13 +128,11 @@
 # There are the following stages:
 #
 # Stage 1: Define constants
-# Stage 2: bsd.java.mk 1.0 backward compatibility
-# Stage 3: Determine which JDK ports are installed and which JDK ports are
+# Stage 2: Determine which JDK ports are installed and which JDK ports are
 #		   suitable
-# Stage 4: <REMOVED> (merged in stage 3)
-# Stage 5: Decide the exact JDK to use (or install)
-# Stage 6: Add any dependencies if necessary
-# Stage 7: Define all settings for the port to use
+# Stage 3: Decide the exact JDK to use (or install)
+# Stage 4: Add any dependencies if necessary
+# Stage 5: Define all settings for the port to use
 #
 
 .	if defined(USE_JAVA)
@@ -252,53 +250,7 @@
 
 
 #-------------------------------------------------------------------------------
-# Stage 2: bsd.java.mk 1.0 backward compatibility
-#
-
-# First detect if we are using bsd.java.mk v1.0
-_USE_BSD_JAVA_MK_1_0!=	${ECHO_CMD} "${_JAVA_VERSION_LIST}" \
-						| ${TR} " " "\n" \
-						| ${GREP} -q "^${USE_JAVA}$$" && ${ECHO_CMD} "yes" || ${ECHO_CMD} "no"
-.		if (${_USE_BSD_JAVA_MK_1_0} == "yes")
-# Then affect the variables so that we may use v2.0
-# USE_JAVA --> JAVA_VERSION
-.			if !defined(JAVA_VERSION)
-JAVA_VERSION=	${USE_JAVA}
-.			else
-check-makevars::
-	@${ECHO_CMD} "${PKGNAME}: Makefile error: The port is using bsd.java.mk 1.0 but sets a value for JAVA_VERSION. This may cause problems."
-	@${FALSE}
-.			endif
-# NO_{BUILD|RUN}_DEPENDS_JAVA --> JAVA_{BUILD|RUN}
-.			if defined(NO_BUILD_DEPENDS_JAVA) && defined(NO_RUN_DEPENDS_JAVA)
-check-makevars::
-	@${ECHO_CMD} "${PKGNAME}: Makefile error: NO_BUILD_DEPENDS_JAVA and NO_RUN_DEPENDS_JAVA cannot be set at the same time.";
-	@${FALSE}
-.			else
-.				if !defined(NO_BUILD_DEPENDS_JAVA) && !defined(NO_BUILD)
-JAVA_BUILD=		jdk
-.				endif
-.				if !defined(NO_RUN_DEPENDS_JAVA)
-JAVA_RUN=		jdk
-.				endif
-.			endif
-# NEED_JAVAC --> JAVA_{BUILD|RUN}={jdk|jre}
-.			if defined(NEED_JAVAC)
-.				if (${NEED_JAVAC:U} == "YES")
-JAVA_BUILD=		jdk
-.				elif (${NEED_JAVAC:U} == "NO")
-JAVA_BUILD=		jre
-.				else
-check-makevars::
-	@${ECHO_CMD} "${PKGNAME}: Makefile error: \"${NEED_JAVAC}\" is not a valid value for NEED_JAVAC. It should be YES or NO, or it should be undefined.";
-	@${FALSE}
-.				endif
-.			endif
-.		endif
-
-
-#-------------------------------------------------------------------------------
-# Stage 3: Determine which JDK ports are suitable and which JDK ports are
+# Stage 2: Determine which JDK ports are suitable and which JDK ports are
 # suitable
 #
 
@@ -394,7 +346,7 @@
 
 
 #-------------------------------------------------------------------------------
-# Stage 5: Decide the exact JDK to use (or install)
+# Stage 3: Decide the exact JDK to use (or install)
 #
 
 # Find an installed JDK port that matches the requirements of the port
@@ -429,7 +381,7 @@
 JAVA_PORT_OS_DESCRIPTION:=		${JAVA_PORT_OS:S/^/\${_JAVA_OS_/:S/$/}/}
 
 #-------------------------------------------------------------------------------
-# Stage 6: Add any dependencies if necessary
+# Stage 4: Add any dependencies if necessary
 #
 
 # Jikes support: If USE_JIKES is set to YES, then use Jikes. If USE_JIKES is
@@ -504,7 +456,7 @@
 .		endif
 
 #-----------------------------------------------------------------------------
-# Stage 7: Define all settings for the port to use
+# Stage 5: Define all settings for the port to use
 #
 # At this stage both JAVA_HOME and JAVA_PORT are definitely given a value.
 #
@@ -560,8 +512,6 @@
 # Debug target
 # Use it to check Java dependency while porting
 java-debug:
-	@${ECHO_CMD} "_USE_BSD_JAVA_MK_1_0=           ${_USE_BSD_JAVA_MK_1_0}"
-	@${ECHO_CMD}
 	@${ECHO_CMD} "# User specified parameters:"
 	@${ECHO_CMD} "JAVA_VERSION=                   ${JAVA_VERSION}	(${_JAVA_VERSION})"
 	@${ECHO_CMD} "JAVA_OS=                        ${JAVA_OS}	(${_JAVA_OS})"
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->glewis 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Oct 7 22:50:33 UTC 2006 
Responsible-Changed-Why:  
bsd.java.mk is glewis territory 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104136 
Responsible-Changed-From-To: glewis->portmgr 
Responsible-Changed-By: hq 
Responsible-Changed-When: Sat Oct 7 22:55:47 UTC 2006 
Responsible-Changed-Why:  
Request for a test build on the cluster. 

Please reassign the PR to me (hq@) when it's done. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104136 
State-Changed-From-To: open->analyzed 
State-Changed-By: pav 
State-Changed-When: Tue Jan 23 20:02:18 UTC 2007 
State-Changed-Why:  
Accepted for a test build on the cluster. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104136 
State-Changed-From-To: analyzed->closed 
State-Changed-By: pav 
State-Changed-When: Wed Jan 31 16:14:13 UTC 2007 
State-Changed-Why:  
This patch has been committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104136 
>Unformatted:
