Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Mar 2017 12:59:07 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r436240 - head/lang/kawa
Message-ID:  <201703151259.v2FCx7eC040810@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Wed Mar 15 12:59:07 2017
New Revision: 436240
URL: https://svnweb.freebsd.org/changeset/ports/436240

Log:
  Do not patch configure script to pass correct values of JAVA and JAVAC
  variables, do it via CONFIGURE_ENV.  Configure script modification time
  now does not get changed, which in turn does not force the rebuild of
  `kawa.info', so dependency on `print/texinfo' can be dropped (generated
  file was essentially the same modulo numeric indices).

Modified:
  head/lang/kawa/Makefile

Modified: head/lang/kawa/Makefile
==============================================================================
--- head/lang/kawa/Makefile	Wed Mar 15 12:58:06 2017	(r436239)
+++ head/lang/kawa/Makefile	Wed Mar 15 12:59:07 2017	(r436240)
@@ -11,14 +11,12 @@ COMMENT=	Java-based Scheme implementatio
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
-
 USES=		gmake readline
 USE_JAVA=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-kawa-frontend \
 		--with-java-source=${JAVA_PORT_VERSION}
-CONFIGURE_ENV=	MAKEINFO=${LOCALBASE}/bin/makeinfo
+CONFIGURE_ENV=	JAVA="${JAVA}" JAVAC="${JAVAC}"
 MAKE_ARGS=	JAR="${JAR}" READLINE_LIB_PATH="-L${LOCALBASE}/lib"
 MAKE_ENV=	JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
 TEST_TARGET=	check
@@ -28,14 +26,11 @@ TEST_ENV=	# must be empty, otherwise tes
 MAKE_JOBS_UNSAFE=yes
 
 INFO=		kawa
-
 PLIST_FILES=	bin/kawa bin/qexo \
 		share/kawa/bin/kawa share/kawa/lib/kawa.jar \
 		man/man1/kawa.1.gz man/man1/qexo.1.gz \
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|{JAVAC-javac}|{JAVAC-${JAVAC}}|g;' \
-		-e 's|{JAVA-java}|{JAVA-${JAVA}}|g;' ${WRKSRC}/configure
+post-patch:
 	@${REINPLACE_CMD} -e '/life-grid.log$$/s,>&,>,' \
 		${WRKSRC}/testsuite/Makefile.in
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703151259.v2FCx7eC040810>