java/68516: [PATCH] bsd.kava.mk: re-apply previous PR improvements

java/68516: [PATCH] bsd.kava.mk: re-apply previous PR improvements

Post by herve.quir » Fri, 02 Jul 2004 00:00:35


System: FreeBSD arabica.esil.univ-mrs.fr 5.2.1-RELEASE-p5 i386


Mark Linimon sent a PR[1] regarding improvement to the ports system that has
been commited during January. Unfortunately, we then commited version 2.0 of
bsd.java.mk which was based on an earlier snapshot and thus we did override the
changes.

This patch implements the feature proposed by Mark for the latest version of
bsd.java.mk.

Ironically, I realized by doing this patch that the original patch from Mark
seemed to be broken regarding bsd.java.mk (a typo: "check-makevers" ->
"check-makevars"). This issue is only related to bsd.java.mk so AFAICT the
remaining of the original patch is fine.

To test the patch:

$ cd /usr/ports/java/trove4j && make -DJAVA_BUILD
trove4j-1.1b3: Makefile error: JAVA_BUILD and NO_BUILD cannot be set at the same time.
*** Error code 1

Stop in /usr/ports/java/trove4j.

$ cd /usr/ports && make java/trove4j -DJAVA_BUILD
`java/trove4j' is up to date.


[1] http://www.freebsd.org/cgi/query-pr.cgi?pr=61351

* Ernst de Haan is cc'd as he is the maintainer of bsd.java.mk
* Greg Lewis is cc'd as he is the commiter of the most recent changes to
bsd.java.mk
* Mark Linimon is cc'd as he is the originator of the initial PR



--- bsd.java.mk.original Wed Jun 30 16:04:40 2004
+++ bsd.java.mk Wed Jun 30 16:13:27 2004
@@ -231,14 +231,14 @@
. if !defined(JAVA_VERSION)
JAVA_VERSION= ${USE_JAVA}
. else
-.BEGIN:
- @${ECHO_CMD} "${PKGNAME}: The port is using bsd.java.mk 1.0 but sets a value for JAVA_VERSION. This may cause problems."
+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)
-.BEGIN:
- @${ECHO_CMD} "${PKGNAME}: NO_BUILD_DEPENDS_JAVA and NO_RUN_DEPENDS_JAVA cannot be set at the same time.";
+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)
@@ -255,8 +255,8 @@
. elif (${NEED_JAVAC} == "NO") || (${NEED_JAVAC} == "no")
JAVA_BUILD= jre
. else
-.BEGIN:
- @${ECHO_CMD} "${PKGNAME}: \"${NEED_JAVAC}\" is not a valid value for NEED_JAVAC. It should be YES or NO, or it should be undefined.";
+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
@@ -275,8 +275,8 @@
_ERROR_CHECKING_JAVA_VERSION!= ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" \
| ${GREP} -v "${_JAVA_VERSION_LIST_REGEXP}" || true
. if (${_ERROR_CHECKING_JAVA_VERSION} != "")
-.BEGIN:
- @${ECHO_CMD} "${PKGNAME}: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)";
+check-makevars::
+ @${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)";
@${FALSE}
. endif

@@ -285,8 +285,8 @@
_ERROR_CHECKING_JAVA_VENDOR!= ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" \
| ${GREP} -v "${_JAVA_VENDOR_LIS