From owner-svn-ports-head@freebsd.org Wed Mar 11 08:27:33 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ED084258F2C; Wed, 11 Mar 2020 08:27:33 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48clSj18MGz3NBl; Wed, 11 Mar 2020 08:27:33 +0000 (UTC) (envelope-from bapt@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F97A9AAC; Wed, 11 Mar 2020 08:27:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02B8RUfu065324; Wed, 11 Mar 2020 08:27:30 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02B8RUbK065323; Wed, 11 Mar 2020 08:27:30 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202003110827.02B8RUbK065323@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 11 Mar 2020 08:27:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528220 - head/math/oleo X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/math/oleo X-SVN-Commit-Revision: 528220 X-SVN-Commit-Repository: ports 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.29 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, 11 Mar 2020 08:27:34 -0000 Author: bapt Date: Wed Mar 11 08:27:30 2020 New Revision: 528220 URL: https://svnweb.freebsd.org/changeset/ports/528220 Log: Cleanup - Use base byacc instead of GNU bison - Prevent the detection of makeinfo which would otherwise trigger a rebuild of the texinfo documentation which is not compatible with recent texinfo - Remove a useless sed command, passing DESTDIR in argument of make(1) is enough to override the makefile definition Modified: head/math/oleo/Makefile Modified: head/math/oleo/Makefile ============================================================================== --- head/math/oleo/Makefile Wed Mar 11 08:26:04 2020 (r528219) +++ head/math/oleo/Makefile Wed Mar 11 08:27:30 2020 (r528220) @@ -13,12 +13,14 @@ COMMENT= GNU spreadsheet for X11 and terminals LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= bison localbase ncurses perl5 +USES= bison:alias localbase ncurses perl5 USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-x --without-xlt --without-SciPlot -MAKE_ENV+= DESTDIR=${STAGEDIR} +MAKE_ARGS+= DESTDIR="${STAGEDIR}" +BINARY_ALIAS= makeinfo=false # disable detecting local makeinfo + INFO= oleo OPTIONS_DEFINE= MOTIF NLS @@ -40,8 +42,6 @@ NLS_USES_OFF= gettext-tools post-patch: @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' - @${REINPLACE_CMD} -e '/^DESTDIR/s|=|?=|' \ - ${WRKSRC}/Makefile.in .for pof in en fr nl @${REINPLACE_CMD} -e "s|CHARSET|ISO-8859-1|;s|ENCODING|8bit|" \ ${WRKSRC}/po/${pof}.po