From 3a27b25ea21373300c041004523bb73da6f6dae3 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 21 Oct 2018 23:26:29 +0000 Subject: [PATCH] cad/openscad-devel: misc fixes - Unbreak with Boost 1.69 - Drop dependency on -lcompat - Replace time.h with ctime Obtained from: upstream --- cad/openscad-devel/Makefile | 7 ++++++- cad/openscad-devel/distinfo | 6 ++++++ cad/openscad-devel/files/patch-openscad.pro | 13 ------------- cad/openscad-devel/files/patch-src-ModuleCache.h | 10 ---------- 4 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 cad/openscad-devel/files/patch-openscad.pro delete mode 100644 cad/openscad-devel/files/patch-src-ModuleCache.h diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index b5533bb452de..36048579755d 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -3,11 +3,16 @@ PORTNAME= openscad PORTVERSION= 2018.04.19 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= cad PKGNAMESUFFIX= -devel DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= ce5646179848.patch:-p1 +PATCHFILES+= 9c269c759b20.patch:-p1 +PATCHFILES+= 98e63513490b.patch:-p1 + MAINTAINER= mr@FreeBSD.org COMMENT= Programmer's solid 3D CAD modeller diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo index f81cd85cee63..9d0a1a0bc272 100644 --- a/cad/openscad-devel/distinfo +++ b/cad/openscad-devel/distinfo @@ -1,3 +1,9 @@ TIMESTAMP = 1524416781 SHA256 (openscad/openscad-openscad-2018.04.19-179074dff8c23cbc0e651ce8463737df0006f4ca_GH0.tar.gz) = 6ca736909959d72eba21a1d421fc215742d26dad5b70dabe72b37e29e025088a SIZE (openscad/openscad-openscad-2018.04.19-179074dff8c23cbc0e651ce8463737df0006f4ca_GH0.tar.gz) = 13915669 +SHA256 (openscad/ce5646179848.patch) = 30ab9ceced5f71101423752ef3a3f9c89d3a2e7b1d13671081be5ea145614c72 +SIZE (openscad/ce5646179848.patch) = 940 +SHA256 (openscad/9c269c759b20.patch) = 5b5a2f4c437a2505e6e7fe79445991ac77893fb1c7ef7ac235bf26656b4af8b3 +SIZE (openscad/9c269c759b20.patch) = 4932 +SHA256 (openscad/98e63513490b.patch) = cb6d8a4dcce3193bb7023020cef75f4c69899fc7e0f49c9c3b1e9f3cf4b27a96 +SIZE (openscad/98e63513490b.patch) = 949 diff --git a/cad/openscad-devel/files/patch-openscad.pro b/cad/openscad-devel/files/patch-openscad.pro deleted file mode 100644 index f764f845f1fa..000000000000 --- a/cad/openscad-devel/files/patch-openscad.pro +++ /dev/null @@ -1,13 +0,0 @@ ---- openscad.pro.orig 2018-04-19 22:08:08 UTC -+++ openscad.pro -@@ -105,6 +106,10 @@ mingw* { - CONFIG += qt - QT += widgets concurrent - -+freebsd* { -+ LIBS += -lcompat -+} -+ - netbsd* { - QMAKE_LFLAGS += -L/usr/X11R7/lib - QMAKE_LFLAGS += -Wl,-R/usr/X11R7/lib diff --git a/cad/openscad-devel/files/patch-src-ModuleCache.h b/cad/openscad-devel/files/patch-src-ModuleCache.h deleted file mode 100644 index 45667ac28988..000000000000 --- a/cad/openscad-devel/files/patch-src-ModuleCache.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/ModuleCache.h.orig 2018-04-19 22:08:08 UTC -+++ src/ModuleCache.h -@@ -1,6 +1,7 @@ - #pragma once - - #include -+#include - #include - - /*!