Date: Sun, 8 Oct 2006 00:40:01 +0200 (CEST) From: Herve Quiroz <hq@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/104136: [MAINTAINER][PATCH] bsd.java.mk: remove deprecated syntax support Message-ID: <20061007224001.D5ABA4BCD3@copyleft.esil.univ-mrs.fr> Resent-Message-ID: <200610072250.k97MoPoh021844@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104136
>Category: ports
>Synopsis: [MAINTAINER][PATCH] bsd.java.mk: remove deprecated syntax support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 07 22:50:24 GMT 2006
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061007224001.D5ABA4BCD3>