Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Mar 2020 08:27:30 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r528220 - head/math/oleo
Message-ID:  <202003110827.02B8RUbK065323@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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