Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Sep 2020 12:24:12 +0000 (UTC)
From:      =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r550692 - in head/math/wxmaxima: . files
Message-ID:  <202009301224.08UCOCKv075220@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: se
Date: Wed Sep 30 12:24:12 2020
New Revision: 550692
URL: https://svnweb.freebsd.org/changeset/ports/550692

Log:
  Fix build
  
  A C pre-processor conditional interpreted decimal numbers with a leading
  zero as octal number, which was rejected since it included the digig 8.
  
  Removal of the leading 0 from both condition arguments causes the correct
  interpretation of these numbers as decimal values.

Added:
  head/math/wxmaxima/files/patch-src_Version.h.cin   (contents, props changed)
Modified:
  head/math/wxmaxima/Makefile

Modified: head/math/wxmaxima/Makefile
==============================================================================
--- head/math/wxmaxima/Makefile	Wed Sep 30 12:08:51 2020	(r550691)
+++ head/math/wxmaxima/Makefile	Wed Sep 30 12:24:12 2020	(r550692)
@@ -3,8 +3,8 @@
 
 PORTNAME=	wxmaxima
 PORTVERSION=	20.04.0
-PORTREVISION=	1
 DISTVERSIONPREFIX=	Version-
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,20 +16,20 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	maxima:math/maxima
 
 USES=		cmake compiler:c++11-lang desktop-file-utils shared-mime-info
-USE_WX=		3.0
 USE_GITHUB=	yes
 GH_ACCOUNT=	wxMaxima-Developers
 
-PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
+USE_WX=		3.0
 WX_COMPS=	wx
 WX_CONF_ARGS=	absolute
 
+PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
 PORTDATA=	COPYING README README.md
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-CMakeLists.txt
 NLS_USES=	gettext
+NLS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-CMakeLists.txt
 
 .include <bsd.port.mk>

Added: head/math/wxmaxima/files/patch-src_Version.h.cin
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/wxmaxima/files/patch-src_Version.h.cin	Wed Sep 30 12:24:12 2020	(r550692)
@@ -0,0 +1,11 @@
+--- src/Version.h.cin.orig	2020-04-18 07:14:02 UTC
++++ src/Version.h.cin
+@@ -2,7 +2,7 @@
+ #ifndef GITVERSION
+ #define GITVERSION "@VERSION@"
+ #endif
+-#if 0@OpenMP_CXX_SPEC_DATE@ > 0201510
++#if @OpenMP_CXX_SPEC_DATE@ > 201510
+ #define HAVE_OPENMP_TASKS 1
+ #define OPENMP_SPEC_DATE "@OpenMP_CXX_SPEC_DATE@"
+ #define HAVE_OMP_HEADER @HAVE_OMP_HEADER@



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