aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-10-31 12:19:21 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-10-31 12:19:21 +0000
commit434ca574176add785ccf9248901bbea0688dead6 (patch)
tree3be73d7569bced2afbec84d1852444611288b923
parentd70fbee590f74384d536960be7b68b6d616cec4a (diff)
downloadports-434ca574176add785ccf9248901bbea0688dead6.tar.gz
ports-434ca574176add785ccf9248901bbea0688dead6.zip
cad/freecad: update to 0.17.13541
- Restore revision number lost in r467912 but not other bits as those aren't available/useful outside of VCS Changes: https://github.com/FreeCAD/FreeCAD/compare/0.17...9948ee4f1 PR: 232696 Requested by: kunda (upstream) MFH: 2018Q4 (bug fixes)
Notes
Notes: svn path=/head/; revision=483569
-rw-r--r--cad/freecad/Makefile12
-rw-r--r--cad/freecad/distinfo6
2 files changed, 10 insertions, 8 deletions
diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile
index 0e68302fddde..5a38a16ca745 100644
--- a/cad/freecad/Makefile
+++ b/cad/freecad/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= FreeCAD
-DISTVERSION= 0.17.13509
-PORTREVISION= 5
+DISTVERSION= 0.17-13541 # git rev-list --count
+DISTVERSIONSUFFIX= -g9948ee4f1
CATEGORIES= cad
MAINTAINER= ports@FreeBSD.org
@@ -33,6 +33,7 @@ RUN_DEPENDS= pivy>0:graphics/py-pivy@${PY_FLAVOR}
USES= dos2unix compiler:c++11-lib cmake:outsource eigen:3 fortran jpeg \
python:2.7 localbase qt:4
+USE_GITHUB= yes
USE_XORG= ice sm x11 xext xt
USE_GL= gl glu
USE_QT= qmake_build corelib gui moc_build network opengl rcc_build \
@@ -52,9 +53,6 @@ CFLAGS+= -I${LOCALBASE}/include/hdf5-18
CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME}
-USE_GITHUB= yes
-GH_TAGNAME= 0.17
-
OPTIONS_DEFINE= COLLADA
COLLADA_DESC= Install pycollada for Collada files import
@@ -64,8 +62,12 @@ DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data/freecad.svg" \
${PORTNAME} "Engineering;" false
post-patch:
+ @${REINPLACE_CMD} -e '/sed/s,-i,& \\"\\",' \
+ ${WRKSRC}/cMake/FindPySide*Tools.cmake
@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \
${WRKSRC}/src/Gui/CMakeLists.txt
+ @${REINPLACE_CMD} -e '/self\.rev/s/Unknown/${DISTVERSION:C/.*-//}/' \
+ ${WRKSRC}/src/Tools/SubWCRev.py
pre-configure:
# To be removed when french/med will be built against science/hdf5
diff --git a/cad/freecad/distinfo b/cad/freecad/distinfo
index d10e12ab5bec..a29292822bfd 100644
--- a/cad/freecad/distinfo
+++ b/cad/freecad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524363465
-SHA256 (FreeCAD-FreeCAD-0.17.13509-0.17_GH0.tar.gz) = ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb
-SIZE (FreeCAD-FreeCAD-0.17.13509-0.17_GH0.tar.gz) = 192379828
+TIMESTAMP = 1534399137
+SHA256 (FreeCAD-FreeCAD-0.17-13541-g9948ee4f1_GH0.tar.gz) = 9193b071ad92be3324a8dbb388e9f458f6e04989661cec30b736e0fb1bc914e9
+SIZE (FreeCAD-FreeCAD-0.17-13541-g9948ee4f1_GH0.tar.gz) = 192398607