svn commit: r502975 - head/lang/erlang-java

[Jimmy Olgeni]

Author: olgeni
Date: Wed May 29 17:26:55 2019
New Revision: 502975
URL: https://svnweb.freebsd.org/changeset/ports/502975

Log:
  lang/erlang-java: improve APP_VERSION check and move it to catch errors earlier.

Modified:
  head/lang/erlang-java/Makefile

Modified: head/lang/erlang-java/Makefile
==============================================================================
--- head/lang/erlang-java/Makefile	Wed May 29 17:14:05 2019	(r502974)
+++ head/lang/erlang-java/Makefile	Wed May 29 17:26:55 2019	(r502975)
@@ -33,6 +33,9 @@ CONFIGURE_ARGS+=--enable-threads --without-odbc --with
 CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
 
 pre-configure:
+	@if [ ! $$(${CAT} ${WRKSRC}/lib/jinterface/vsn.mk | ${GREP} -E "JINTERFACE_VSN *=" | ${CUT} -w -f3) = ${APP_VERSION} ]; then \
+		${ECHO_MSG} "===>  APP_VERSION (${APP_VERSION}) in Makefile does not match value in lib/jinterface/vsn.mk"; exit 1; \
+	fi
 	@cd ${WRKSRC} && ./otp_build autoconf
 
 do-build:
@@ -41,9 +44,6 @@ do-build:
 	${RM} -r ${WRKSRC}/lib/jinterface/priv/com
 
 do-install:
-	@if [ ! $$(${CAT} ${WRKSRC}/lib/jinterface/vsn.mk | ${CUT} -w -f3) = ${APP_VERSION} ]; then \
-		${ECHO_MSG} "===>  APP_VERSION (${APP_VERSION}) in Makefile does not match value in lib/jinterface/vsn.mk"; exit 1; \
-	fi
 	@${MKDIR} ${STAGEDIR}${APP_DIR}
 	@${MKDIR} ${STAGEDIR}${APP_DIR}/priv
 	cd ${WRKSRC}/lib/jinterface && ${COPYTREE_SHARE} ebin ${STAGEDIR}${APP_DIR}