Index: head/cad/qcad/Makefile =================================================================== --- head/cad/qcad/Makefile (revision 522791) +++ head/cad/qcad/Makefile (revision 522792) @@ -1,85 +1,81 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= qcad -PORTVERSION= 3.22.0.12 -PORTREVISION= 1 -DISTVERSIONPREFIX= v +PORTVERSION= 3.24.1.0 #PORTREVISION= +DISTVERSIONPREFIX= v CATEGORIES= cad DIST_SUBDIR= ${PORTNAME} MAINTAINER= mr@FreeBSD.org COMMENT= Professional CAD system LICENSE= GPLv3 .if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld BROKEN_i386= ld: error: relocation R_386_PC32 cannot be used against symbol ON_GetPointListBoundingBox .endif BUILD_DEPENDS= bash:shells/bash \ ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs MAKE_JOBS_UNSAFE=yes USES= compiler:c++11-lang gl gmake qmake qt:5 USE_GITHUB= yes USE_LDCONFIG= yes USE_QT= buildtools qmake_build \ designer gui help imageformats network opengl script \ scripttools sql svg uitools xml xmlpatterns webkit USE_GL= glu DESKTOP_ENTRIES="QCad" \ "" \ "${DATADIR}/scripts/qcad_icon.png" \ "${PREFIX}/bin/qcad-bin" \ "" \ true .if defined(WITH_DEBUG) RESDIR= ${WRKSRC}/debug .else RESDIR= ${WRKSRC}/release .endif SHRLIBS= qcadcore qcadecmaapi qcadentity qcadgrid qcadgui qcadoperations \ qcadsnap qcadspatialindex qcadstemmer spatialindexnavel STALIBS= dxflib stemmer SHRDIR= fonts libraries linetypes patterns plugins scripts themes ts #QSCRIPTS should not be installed to avoid conflicts with texlive-base QSCRIPTS= bbox dwg2bmp dwg2pdf dwg2svg OPTIONS_DEFINE= EXAMPLES CFLAGS_i386= -fPIC CXXFLAGS_i386= -fPIC pre-configure: - ${MKDIR} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-5.13.2 - ${CP} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-5.13.0/qt-labs-qtscriptgenerator-5.13.0.pro \ - ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-5.13.2/qt-labs-qtscriptgenerator-5.13.2.pro ${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \ ${WRKSRC}/src/core/RS.cpp ${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \ ${WRKSRC}/src/core/RSettings.cpp do-install: ${INSTALL_PROGRAM} ${RESDIR}/qcad-bin ${STAGEDIR}${PREFIX}/bin/ ${LN} -sf qcad-bin ${STAGEDIR}${PREFIX}/bin/qcad .for lib in ${SHRLIBS:C|^|lib|:C|$|.so|} ${INSTALL_LIB} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/${lib}.0 ${LN} -sf ${lib}.0 ${STAGEDIR}${PREFIX}/lib/${lib} .endfor .for lib in ${STALIBS:C|^|lib|:C|$|.a|} ${INSTALL_DATA} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/ .endfor ${MKDIR} ${STAGEDIR}${DATADIR} .for dir in ${SHRDIR} cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR} .endfor ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Index: head/cad/qcad/distinfo =================================================================== --- head/cad/qcad/distinfo (revision 522791) +++ head/cad/qcad/distinfo (revision 522792) @@ -1,3 +1,3 @@ -TIMESTAMP = 1559498626 -SHA256 (qcad/qcad-qcad-v3.22.0.12_GH0.tar.gz) = 0bf4de725144a873bc9ef2dccfc44364e5306fa4606afc969a275bc7a7593f3c -SIZE (qcad/qcad-qcad-v3.22.0.12_GH0.tar.gz) = 33288823 +TIMESTAMP = 1578831819 +SHA256 (qcad/qcad-qcad-v3.24.1.0_GH0.tar.gz) = fa5cf4a7057cb40779b3274b1a5219c244f326131f930535a63010922efd8b7d +SIZE (qcad/qcad-qcad-v3.24.1.0_GH0.tar.gz) = 33786828 Index: head/cad/qcad/files/patch-src_core_RS.cpp =================================================================== --- head/cad/qcad/files/patch-src_core_RS.cpp (revision 522791) +++ head/cad/qcad/files/patch-src_core_RS.cpp (revision 522792) @@ -1,13 +1,13 @@ ---- src/core/RS.cpp.orig 2019-05-01 14:25:33 UTC +--- src/core/RS.cpp.orig 2019-12-23 11:24:24 UTC +++ src/core/RS.cpp -@@ -146,6 +146,10 @@ QStringList RS::getDirectoryList(const QString& subDir +@@ -145,6 +145,10 @@ QStringList RS::getDirectoryList(const QString& subDir + appDir = fi.absolutePath(); } - #ifdef Q_OS_MAC +#ifdef Q_OS_FREEBSD + dirList.append("%%DATADIR%%/" + subDirectory); +#endif + + #ifdef Q_OS_MAC // Mac OS X app bundle: dirList.append(appDir + "/../Resources/" + subDirectory); - dirList.append(appDir + "/../../../" + subDirectory); Index: head/cad/qcad/files/patch-src_core_RSettings.cpp =================================================================== --- head/cad/qcad/files/patch-src_core_RSettings.cpp (revision 522791) +++ head/cad/qcad/files/patch-src_core_RSettings.cpp (revision 522792) @@ -1,16 +1,16 @@ ---- src/core/RSettings.cpp.orig 2019-05-01 14:25:33 UTC +--- src/core/RSettings.cpp.orig 2019-12-23 11:24:24 UTC +++ src/core/RSettings.cpp -@@ -346,9 +346,13 @@ QString RSettings::getApplicationPath() { +@@ -363,9 +363,13 @@ QString RSettings::getApplicationPath() { } #endif +#ifdef Q_OS_FREEBSD + ret.cd("%%DATADIR%%"); +#else if (ret.dirName() == "debug" || ret.dirName() == "release") { ret.cdUp(); } +#endif return ret.path(); } Index: head/cad/qcad/files/patch-src_core_core.pro =================================================================== --- head/cad/qcad/files/patch-src_core_core.pro (revision 522791) +++ head/cad/qcad/files/patch-src_core_core.pro (revision 522792) @@ -1,11 +1,11 @@ ---- src/core/core.pro.orig 2019-05-01 14:25:33 UTC +--- src/core/core.pro.orig 2019-12-23 11:24:24 UTC +++ src/core/core.pro -@@ -290,7 +290,7 @@ RC_FILE = core.rc +@@ -295,7 +295,7 @@ RC_FILE = core.rc OTHER_FILES += core.dox math/math.dox DEFINES += QCADCORE_LIBRARY -LIBS += -lopennurbs -lzlib +LIBS += -lopenNURBS -lz win32 { LIBS += -lRpcrt4 -lAdvapi32