3 files changed, 25 insertions, 19 deletions

diff --git a/math/curv/Makefile b/math/curv/Makefile
index c7b4f6111882..2e790af7b9d5 100644
--- a/math/curv/Makefile
+++ b/math/curv/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	curv
 DISTVERSION=	0.4-333
 DISTVERSIONSUFFIX=	-ga9a63930
+PORTREVISION=	1
 CATEGORIES=	math lang graphics
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -11,8 +12,7 @@ COMMENT=	Language for making art using mathematics
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	glm>0:math/glm \
-		replxx>0:devel/replxx
+BUILD_DEPENDS=	glm>0:math/glm
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libdouble-conversion.so:devel/double-conversion \
 		libglfw.so:graphics/glfw \
@@ -24,7 +24,8 @@ USES=		cmake compiler:c++14-lang gl localbase:ldflags xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	curv3d
 GH_TUPLE=	ocornut:imgui:e0cab56:imgui/extern/imgui \
-		Tessil:ordered-map:3c14151:om/extern/ordered-map
+		Tessil:ordered-map:3c14151:om/extern/ordered-map \
+		AmokHuginnsson:replxx:9da16bb:replxx/extern/replxx
 USE_GL=		gl
 USE_XORG=	x11
 
diff --git a/math/curv/distinfo b/math/curv/distinfo
index c8aa78b3996b..cdffba5e3b50 100644
--- a/math/curv/distinfo
+++ b/math/curv/distinfo
@@ -1,7 +1,9 @@
-TIMESTAMP = 1571525440
+TIMESTAMP = 1571604647
 SHA256 (curv3d-curv-0.4-333-ga9a63930_GH0.tar.gz) = 8d2dd636de16c504eb607fe697898c3e28f1accb2a86a09e53582a7047a9d333
 SIZE (curv3d-curv-0.4-333-ga9a63930_GH0.tar.gz) = 16480601
 SHA256 (ocornut-imgui-e0cab56_GH0.tar.gz) = 3a8aa936cf02f39fe49a17aba535b2d3e65a1611725284e62ad4445bbb7d4f2b
 SIZE (ocornut-imgui-e0cab56_GH0.tar.gz) = 1078436
 SHA256 (Tessil-ordered-map-3c14151_GH0.tar.gz) = 389d6032661b95df1e4fc16c0eb3b5fe34416d03d416d99c367e3db4c5280ed0
 SIZE (Tessil-ordered-map-3c14151_GH0.tar.gz) = 60085
+SHA256 (AmokHuginnsson-replxx-9da16bb_GH0.tar.gz) = 1c3e56db7ca2a0072ff0383e8dc1cfd60e1b5af52206e2f76cdcdccf9a140403
+SIZE (AmokHuginnsson-replxx-9da16bb_GH0.tar.gz) = 56591
diff --git a/math/curv/files/patch-CMakeLists.txt b/math/curv/files/patch-CMakeLists.txt
index c4f2b1083103..9a67dffa815b 100644
--- a/math/curv/files/patch-CMakeLists.txt
+++ b/math/curv/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2019-05-11 14:42:40 UTC
+--- CMakeLists.txt.orig	2019-10-15 23:21:21 UTC
 +++ CMakeLists.txt
-@@ -10,18 +10,14 @@ execute_process(COMMAND sh -c "${CMAKE_S
+@@ -10,18 +10,14 @@ execute_process(COMMAND sh -c "${CMAKE_SOURCE_DIR}/cma
  
  list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
  
@@ -20,27 +20,30 @@
      extern/glad)
  
  if (APPLE)
-@@ -30,19 +26,6 @@ if (APPLE)
+@@ -30,6 +26,7 @@ if (APPLE)
      link_directories(/usr/local/lib)
  endif (APPLE)
  
--# REPLxx library
--file(GLOB ReplxxSrc "extern/replxx/src/*.cxx" "extern/replxx/src/*.cpp")
--add_library(replxx ${ReplxxSrc})
--target_include_directories(replxx
--   PUBLIC extern/replxx/include
--   PRIVATE extern/replxx/src)
--set_property(TARGET replxx PROPERTY CXX_STANDARD 14)
--
++# REPLxx used to be unbundled, but due to the incompatibilities (see Bug#241205) it was bundled again
+ # REPLxx library
+ file(GLOB ReplxxSrc "extern/replxx/src/*.cxx" "extern/replxx/src/*.cpp")
+ add_library(replxx ${ReplxxSrc})
+@@ -38,10 +35,10 @@ target_include_directories(replxx
+    PRIVATE extern/replxx/src)
+ set_property(TARGET replxx PROPERTY CXX_STANDARD 14)
+ 
 -# double-conversion library
 -file(GLOB DoubleConversionSrc "extern/double-conversion/double-conversion/*.cc")
 -add_library(double-conversion ${DoubleConversionSrc})
 -set_property(TARGET double-conversion PROPERTY CXX_STANDARD 14)
--
++## double-conversion library
++#file(GLOB DoubleConversionSrc "extern/double-conversion/double-conversion/*.cc")
++#add_library(double-conversion ${DoubleConversionSrc})
++#set_property(TARGET double-conversion PROPERTY CXX_STANDARD 14)
+ 
  # glad library, an OpenGL loader
  add_library(glad
-     extern/glad/glad/glad.c)
-@@ -93,7 +76,7 @@ target_link_libraries(libcurv_geom PUBLI
+@@ -93,7 +90,7 @@ target_link_libraries(libcurv_geom PUBLIC imgui)
  
  file(GLOB Src "curv/*.c" "curv/*.cc")
  add_executable(curv ${Src})
@@ -49,7 +52,7 @@
  
  file(GLOB CurvcSrc "curvc/*.cc")
  add_executable(curvc EXCLUDE_FROM_ALL ${CurvcSrc})
-@@ -128,5 +111,3 @@ if (NOT TARGET uninstall)
+@@ -128,5 +125,3 @@ if (NOT TARGET uninstall)
  endif()
  
  add_subdirectory(extern/googletest/googletest EXCLUDE_FROM_ALL)