From owner-svn-ports-head@freebsd.org Wed Mar 15 12:59:08 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F4DFD0C73B; Wed, 15 Mar 2017 12:59:08 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3EBA31685; Wed, 15 Mar 2017 12:59:08 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2FCx7rG040811; Wed, 15 Mar 2017 12:59:07 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2FCx7eC040810; Wed, 15 Mar 2017 12:59:07 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201703151259.v2FCx7eC040810@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 15 Mar 2017 12:59:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436240 - head/lang/kawa X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2017 12:59:08 -0000 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