diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index 0645d0aa294f..f671d58fdd80 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -1,50 +1,50 @@ # Created by: Michael Reifenberger PORTNAME= openscad PORTVERSION= 2021.02.09 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= cad PKGNAMESUFFIX= -devel -#PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -#PATCHFILES+= b6c170cc5dd1.patch:-p1 +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= cc49ad8dac24.patch:-p1 MAINTAINER= mr@FreeBSD.org COMMENT= Programmer's solid 3D CAD modeller #' LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= cgal>0:math/cgal LIB_DEPENDS= libzip.so:archivers/libzip \ libhidapi.so:comms/hidapi \ libboost_regex.so:devel/boost-libs \ libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ libopencsg.so:graphics/opencsg \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libfontconfig.so:x11-fonts/fontconfig \ libdouble-conversion.so:devel/double-conversion CONFLICTS= openscad USES= bison compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \ gl gnome pkgconfig qmake qt:5 shared-mime-info xorg USE_GITHUB= yes USE_GL= gl glu glew USE_GNOME= glib20 libxml2 USE_QT= buildtools_build core concurrent_build dbus gui multimedia widgets USE_XORG= x11 GH_TAGNAME= 63a7c77740030c63d646eb0684ba6947eecb0db7 QMAKE_ARGS= CONFIG+="experimental" VERSION=${PORTVERSION} # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport) LDFLAGS+= -Wl,--as-needed post-patch: @${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf @${REINPLACE_CMD} -e 's,share/man,man,' \ ${WRKSRC}/openscad.pro .include diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo index b6a606af691d..ded771b81d20 100644 --- a/cad/openscad-devel/distinfo +++ b/cad/openscad-devel/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1612905122 SHA256 (openscad-openscad-2021.02.09-63a7c77740030c63d646eb0684ba6947eecb0db7_GH0.tar.gz) = 18342253697115d16a6d81ff9b05d8128cf8aac3138ac4d339fb722869113e4d SIZE (openscad-openscad-2021.02.09-63a7c77740030c63d646eb0684ba6947eecb0db7_GH0.tar.gz) = 15687873 +SHA256 (cc49ad8dac24.patch) = 43cebd358d152f7a6dc1fc27294c67c4938b207d6a06f26fd60117e3a3c71412 +SIZE (cc49ad8dac24.patch) = 1610 diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile index 458ea44332b8..75f8d383d61b 100644 --- a/cad/openscad/Makefile +++ b/cad/openscad/Makefile @@ -1,52 +1,49 @@ # Created by: Michael Reifenberger PORTNAME= openscad PORTVERSION= 2021.01.01 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= cad -#PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -#PATCHFILES+= b6c170cc5dd1.patch:-p1 \ -# 15acf6700674.patch:-p1 \ -# 9c4d5ae7ab05.patch:-p1 \ -# 07a56df933a3.patch:-p1 +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= cc49ad8dac24.patch:-p1 MAINTAINER= mr@FreeBSD.org COMMENT= Programmer's solid 3D CAD modeller #' LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= cgal>0:math/cgal LIB_DEPENDS= libzip.so:archivers/libzip \ libhidapi.so:comms/hidapi \ libboost_regex.so:devel/boost-libs \ libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ libopencsg.so:graphics/opencsg \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libfontconfig.so:x11-fonts/fontconfig \ libdouble-conversion.so:devel/double-conversion #CONFLICTS= openscad-devel USES= bison compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \ gl gnome pkgconfig qmake qt:5 shared-mime-info xorg USE_GITHUB= yes USE_GL= gl glu glew USE_GNOME= glib20 libxml2 USE_QT= buildtools_build core concurrent_build dbus gui multimedia widgets USE_XORG= x11 GH_TAGNAME= 41f58fe57c03457a3a8b4dc541ef5654ec3e8c78 QMAKE_ARGS= CONFIG+="experimental" VERSION=${PORTVERSION} # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport) LDFLAGS+= -Wl,--as-needed post-patch: @${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf @${REINPLACE_CMD} -e 's,share/man,man,' \ ${WRKSRC}/openscad.pro .include diff --git a/cad/openscad/distinfo b/cad/openscad/distinfo index 09f8e0e423c5..2e4d7b3164be 100644 --- a/cad/openscad/distinfo +++ b/cad/openscad/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1612904882 +TIMESTAMP = 1629893805 SHA256 (openscad-openscad-2021.01.01-41f58fe57c03457a3a8b4dc541ef5654ec3e8c78_GH0.tar.gz) = e8f94682dc3331c86d1cdc8d8bb0088a9910f1d1694ff9310524ca2d11e37ccc SIZE (openscad-openscad-2021.01.01-41f58fe57c03457a3a8b4dc541ef5654ec3e8c78_GH0.tar.gz) = 15656495 +SHA256 (cc49ad8dac24.patch) = 43cebd358d152f7a6dc1fc27294c67c4938b207d6a06f26fd60117e3a3c71412 +SIZE (cc49ad8dac24.patch) = 1610