Index: head/graphics/qgis/Makefile =================================================================== --- head/graphics/qgis/Makefile (revision 526916) +++ head/graphics/qgis/Makefile (revision 526917) @@ -1,170 +1,167 @@ # Created by: Laurent Courty # $FreeBSD$ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 3_10_1 PORTREVISION= 2 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de COMMENT= Free and Open Source Geographic Information System LICENSE= GPLv2 BUILD_DEPENDS= gpsbabel>=1.5.4:astro/gpsbabel \ txt2tags:textproc/txt2tags \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} RUN_DEPENDS= astyle:devel/astyle \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gdal>=2.4.1:graphics/py-gdal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nbformat>=4.4.0:devel/py-nbformat@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.5:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=6.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.6.3:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.4:graphics/py-pyrsgis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qt5-quick>=5.12.2:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.2_2:graphics/py-scikit-image@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libexpat.so:textproc/expat2 \ libgdal.so:graphics/gdal \ libgeos.so:graphics/geos \ libgsl.so:math/gsl \ libhdf5.so:science/hdf5 \ libnetcdf.so:science/netcdf \ libproj.so:graphics/proj \ libqca-qt5.so:devel/qca \ libqjson-qt5.so:devel/qjson \ libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ libqt5keychain.so:security/qtkeychain \ libqwt6.so:x11-toolkits/qwt6 \ libspatialindex.so:devel/spatialindex \ libspatialite.so:databases/spatialite \ libsz.so:science/szip \ libxerces-c.so:textproc/xerces-c3 \ libzip.so:archivers/libzip ### Fortran is needed by numpy, GRASS, etc. USES= bison cmake compiler:features cpe desktop-file-utils \ fortran gl gmake gnome pgsql pyqt:5 python:3.6+ qt:5 \ shebangfix sqlite:3 USE_GNOME= libxml2 USE_GL= gl USE_QT= 3d buildtools_build core concurrent dbus declarative \ designer doc gamepad gui linguist_build location \ network printsupport qmake_build script serialport \ sql sql-pgsql sql-sqlite3 svg testlib uitools \ webengine widgets webkit xml USE_PYQT= core gui network qml quickwidgets qscintilla2 \ sip sql svg webkit_run webkitwidgets_run xml USE_LDCONFIG= yes CONFLICTS_INSTALL= qgis-ltr USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tu} CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \ -DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \ -DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \ -DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \ -DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \ -DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \ -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \ -DUSE_OPENCL:BOOL=FALSE CMAKE_ON= BUILD_TESTING ENABLE_TESTS WITH_3D WITH_ASTYLE \ WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_INTERNAL_MDAL \ WITH_POSTGRESQL CMAKE_OFF= WITH_GLOBE WITH_QWTPOLAR .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev CMAKE_OFF+= SUPPRESS_QT_WARNINGS .endif SHEBANG_FILES= src/plugins/grass/scripts/*.py OPTIONS_DEFINE= GRASS SERVER OPTIONS_DEFAULT= GRASS SERVER NO_OPTIONS_SORT= yes OPTIONS_SUB= yes SERVER_DESC= Enable QGIS server GRASS_BUILD_DEPENDS= grass7:databases/grass7 GRASS_RUN_DEPENDS= ${GRASS_BUILD_DEPENDS} GRASS_CMAKE_BOOL= WITH_GRASS7 SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE PLIST_SUB= DISTVERSION=${PORTVERSION} .include post-patch: @${REINPLACE_CMD} -e 's|markupsafe ||g' \ ${WRKSRC}/python/ext-libs/CMakeLists.txt # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances # See bugs 242557 and 241687. .if ${OPSYS} == FreeBSD && ${ARCH} == "i386" @${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \ ${WRKSRC}/src/core/CMakeLists.txt .endif -# Build failure with txt2tags > 3 (dropped --css-sugar & --css-inside) -# https://github.com/qgis/QGIS/issues/33516 - @${REINPLACE_CMD} -e 's|--css-sugar --css-inside||' ${WRKSRC}/doc/INSTALL.t2t ${WRKSRC}/doc/news.t2t pre-configure: ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3 post-install: @${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak @${RM} /tmp/srs.db check: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include Index: head/graphics/qgis/files/patch-cmake_Txt2Tags.cmake =================================================================== --- head/graphics/qgis/files/patch-cmake_Txt2Tags.cmake (nonexistent) +++ head/graphics/qgis/files/patch-cmake_Txt2Tags.cmake (revision 526917) @@ -0,0 +1,20 @@ +--- cmake/Txt2Tags.cmake.orig 2019-12-06 12:02:59 UTC ++++ cmake/Txt2Tags.cmake +@@ -42,7 +42,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources) + ADD_CUSTOM_COMMAND( + OUTPUT ${_out} + COMMAND ${TXT2TAGS_EXECUTABLE} +- ARGS --encoding=utf-8 -o${_out} -t txt ${_in} ++ ARGS -o${_out} -t txt ${_in} + DEPENDS ${_in} + COMMENT "Building ${_out} from ${_in}" + ) +@@ -50,7 +50,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources) + ADD_CUSTOM_COMMAND( + OUTPUT ${_out}.html + COMMAND ${TXT2TAGS_EXECUTABLE} +- ARGS --encoding=utf-8 -o${_out}.html -t html ${_in} ++ ARGS -o${_out}.html -t html ${_in} + DEPENDS ${_in} + COMMENT "Building ${_out}.html from ${_in}" + ) Property changes on: head/graphics/qgis/files/patch-cmake_Txt2Tags.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/qgis/files/patch-doc_INSTALL.html =================================================================== --- head/graphics/qgis/files/patch-doc_INSTALL.html (nonexistent) +++ head/graphics/qgis/files/patch-doc_INSTALL.html (revision 526917) @@ -0,0 +1,9 @@ +--- doc/INSTALL.html.orig 2019-12-06 12:02:59 UTC ++++ doc/INSTALL.html +@@ -3130,5 +3130,5 @@ The following people have contributed to this document + + + +- ++ + Property changes on: head/graphics/qgis/files/patch-doc_INSTALL.html ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/html \ No newline at end of property Index: head/graphics/qgis/files/patch-doc_INSTALL.t2t =================================================================== --- head/graphics/qgis/files/patch-doc_INSTALL.t2t (nonexistent) +++ head/graphics/qgis/files/patch-doc_INSTALL.t2t (revision 526917) @@ -0,0 +1,28 @@ +--- doc/INSTALL.t2t.orig 2019-12-06 12:02:59 UTC ++++ doc/INSTALL.t2t +@@ -4,14 +4,14 @@ Building QGIS from source - step by step + + %! target : html + %! style : style.css +-%! Options : --toc --toc-level 2 --enum-title --css-sugar --css-inside ++%! Options : --toc --toc-level 2 --enum-title + %! preproc : TUT_URL https://qgis.org + %! PostProc(html): '(?i)(
)' '
\1'
+ %! PostProc(html): '(?i)(
)' '\1' + %! PostProc(html): \(R\) ® + % Next line will replace tabs with 2 spaces in txt generated outputs + %! PostProc(txt): '(?i)(\t)' ' ' +-%! encoding: iso-8859-1 ++%! encoding: utf-8 + % + % Tex processing + % +@@ -36,7 +36,7 @@ Building QGIS from source - step by step + %! PostProc(tex): NEWPAGE '\\newpage' + % Give alternating table rows different colors and use a smaller font in tables (\tiny) + %! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}' +-%! encoding: iso-8859-1 ++%! encoding: utf-8 + + %! PostProc(tex): WALLPAPER-IMAGE 'qgis-footer.png' + % These are comments and will not be generated in any output Property changes on: head/graphics/qgis/files/patch-doc_INSTALL.t2t ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/qgis/files/patch-doc_news.html =================================================================== --- head/graphics/qgis/files/patch-doc_news.html (nonexistent) +++ head/graphics/qgis/files/patch-doc_news.html (revision 526917) @@ -0,0 +1,9 @@ +--- doc/news.html.orig 2019-12-06 12:02:59 UTC ++++ doc/news.html +@@ -3651,5 +3651,5 @@ July 6, 2002 + + + +- ++ + Property changes on: head/graphics/qgis/files/patch-doc_news.html ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/qgis/files/patch-doc_news.t2t =================================================================== --- head/graphics/qgis/files/patch-doc_news.t2t (nonexistent) +++ head/graphics/qgis/files/patch-doc_news.t2t (revision 526917) @@ -0,0 +1,18 @@ +--- doc/news.t2t.orig 2019-12-06 12:02:59 UTC ++++ doc/news.t2t +@@ -4,13 +4,13 @@ Change history for the QGIS Project + + %! target : html + %! style : style.css +-%! Options : --toc --toc-level 1 --enum-title --css-sugar --css-inside ++%! Options : --toc --toc-level 1 --enum-title + %! preproc : TUT_URL https://qgis.org + %! PostProc(html): '(?i)(
)' '
\1'
+ %! PostProc(html): '(?i)(
)' '\1' + % Next line will replace tabs with 2 spaces in txt generated outputs + %! PostProc(txt): '(?i)(\t)' ' ' +-%! encoding: iso-8859-1 ++%! encoding: utf-8 + % + % These are comments and will not be generated in any output + % ------------------- Property changes on: head/graphics/qgis/files/patch-doc_news.t2t ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/qgis/files/patch-scripts_release.pl =================================================================== --- head/graphics/qgis/files/patch-scripts_release.pl (nonexistent) +++ head/graphics/qgis/files/patch-scripts_release.pl (revision 526917) @@ -0,0 +1,13 @@ +--- scripts/release.pl.orig 2019-12-06 12:02:59 UTC ++++ scripts/release.pl +@@ -182,8 +182,8 @@ run( "cp debian/changelog /tmp", "backup changelog fai + unless( $dopoint ) { + run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) if $doltr; + run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) unless $doltr; +- run( "txt2tags --encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" ); +- run( "txt2tags --encoding=utf-8 -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" ); ++ run( "txt2tags -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" ); ++ run( "txt2tags -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" ); + + run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" ); + run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" ); Property changes on: head/graphics/qgis/files/patch-scripts_release.pl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/qgis/files/patch-scripts_update-news.pl =================================================================== --- head/graphics/qgis/files/patch-scripts_update-news.pl (nonexistent) +++ head/graphics/qgis/files/patch-scripts_update-news.pl (revision 526917) @@ -0,0 +1,13 @@ +--- scripts/update-news.pl.orig 2019-12-06 12:02:59 UTC ++++ scripts/update-news.pl +@@ -61,8 +61,8 @@ close $in; + + copy($tempfile, "doc/news.t2t"); + +-system "txt2tags --encoding=utf-8 -odoc/news.html -t html doc/news.t2t"; +-system "txt2tags --encoding=utf-8 -oNEWS -t txt doc/news.t2t"; ++system "txt2tags -odoc/news.html -t html doc/news.t2t"; ++system "txt2tags -oNEWS -t txt doc/news.t2t"; + + =head1 NAME + Property changes on: head/graphics/qgis/files/patch-scripts_update-news.pl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/qgis-ltr/Makefile =================================================================== --- head/graphics/qgis-ltr/Makefile (revision 526916) +++ head/graphics/qgis-ltr/Makefile (revision 526917) @@ -1,165 +1,162 @@ # Created by: Laurent Courty # $FreeBSD$ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 3_4_11 PORTREVISION= 4 CATEGORIES= graphics geography PKGNAMESUFFIX= -ltr MAINTAINER= rhurlin@gwdg.de COMMENT= Free and Open Source Geographic Information System LICENSE= GPLv2 BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ gpsbabel>=1.5.4:astro/gpsbabel \ txt2tags:textproc/txt2tags \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} RUN_DEPENDS= astyle:devel/astyle \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gdal>=2.4.1:graphics/py-gdal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nbformat>=4.4.0:devel/py-nbformat@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=6.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.2_2:graphics/py-scikit-image@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libexpat.so:textproc/expat2 \ libgdal.so:graphics/gdal \ libgeos.so:graphics/geos \ libgsl.so:math/gsl \ libhdf5.so:science/hdf5 \ libnetcdf.so:science/netcdf \ libproj.so:graphics/proj \ libqca-qt5.so:devel/qca \ libqjson-qt5.so:devel/qjson \ libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ libqt5keychain.so:security/qtkeychain \ libqwt6.so:x11-toolkits/qwt6 \ libspatialindex.so:devel/spatialindex \ libspatialite.so:databases/spatialite \ libsz.so:science/szip \ libxerces-c.so:textproc/xerces-c3 \ libzip.so:archivers/libzip ### Fortran is needed by numpy, GRASS, etc. USES= bison cmake compiler:features cpe desktop-file-utils \ fortran gmake gnome pgsql pyqt:5 python:3.6+ qt:5 \ shebangfix sqlite:3 USE_GNOME= libxml2 USE_QT= 3d buildtools_build core concurrent dbus declarative \ designer doc gamepad gui linguist_build location \ network printsupport qmake_build script serialport \ sql sql-pgsql sql-sqlite3 svg testlib uitools \ webengine widgets webkit xml USE_PYQT= core gui network qml qscintilla2 sip sql svg xml \ webkit_run webkitwidgets_run USE_LDCONFIG= yes CONFLICTS_INSTALL= qgis USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tu} CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \ -DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \ -DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \ -DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \ -DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \ -DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \ -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW CMAKE_ON= BUILD_TESTING ENABLE_TESTS WITH_3D WITH_ASTYLE \ WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_POSTGRESQL CMAKE_OFF= WITH_GLOBE WITH_QWTPOLAR .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev CMAKE_OFF+= SUPPRESS_QT_WARNINGS .endif SHEBANG_FILES= src/plugins/grass/scripts/*.py OPTIONS_DEFINE= GRASS SERVER OPTIONS_DEFAULT= GRASS SERVER NO_OPTIONS_SORT= yes OPTIONS_SUB= yes SERVER_DESC= Enable QGIS server GRASS_BUILD_DEPENDS= grass7:databases/grass7 GRASS_RUN_DEPENDS= ${GRASS_BUILD_DEPENDS} GRASS_CMAKE_BOOL= WITH_GRASS7 GRASS_FORCE_MAKE_JOBS= NO SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi SERVER_CMAKE_BOOL= WITH_SERVER PLIST_SUB= DISTVERSION=${PORTVERSION} .include # make describe needs them here, after bsd.port.pre.mk CPP= clang-cpp${LLVM_DEFAULT} CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} post-patch: @${REINPLACE_CMD} -e 's|markupsafe ||g' \ ${WRKSRC}/python/ext-libs/CMakeLists.txt -# Build failure with txt2tags > 3 (dropped --css-sugar & --css-inside) -# https://github.com/qgis/QGIS/issues/33516 - @${REINPLACE_CMD} -e 's|--css-sugar --css-inside||' ${WRKSRC}/doc/INSTALL.t2t ${WRKSRC}/doc/news.t2t pre-configure: ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3 post-install: @${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak @${RM} /tmp/srs.db check: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include Index: head/graphics/qgis-ltr/files/patch-cmake_Txt2Tags.cmake =================================================================== --- head/graphics/qgis-ltr/files/patch-cmake_Txt2Tags.cmake (nonexistent) +++ head/graphics/qgis-ltr/files/patch-cmake_Txt2Tags.cmake (revision 526917) @@ -0,0 +1,20 @@ +--- cmake/Txt2Tags.cmake.orig 2019-08-16 12:03:55 UTC ++++ cmake/Txt2Tags.cmake +@@ -42,7 +42,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources) + ADD_CUSTOM_COMMAND( + OUTPUT ${_out} + COMMAND ${TXT2TAGS_EXECUTABLE} +- ARGS --encoding=utf-8 -o${_out} -t txt ${_in} ++ ARGS -o${_out} -t txt ${_in} + DEPENDS ${_in} + COMMENT "Building ${_out} from ${_in}" + ) +@@ -50,7 +50,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources) + ADD_CUSTOM_COMMAND( + OUTPUT ${_out}.html + COMMAND ${TXT2TAGS_EXECUTABLE} +- ARGS --encoding=utf-8 -o${_out}.html -t html ${_in} ++ ARGS -o${_out}.html -t html ${_in} + DEPENDS ${_in} + COMMENT "Building ${_out}.html from ${_in}" + ) Property changes on: head/graphics/qgis-ltr/files/patch-cmake_Txt2Tags.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/qgis-ltr/files/patch-doc_INSTALL.html =================================================================== --- head/graphics/qgis-ltr/files/patch-doc_INSTALL.html (nonexistent) +++ head/graphics/qgis-ltr/files/patch-doc_INSTALL.html (revision 526917) @@ -0,0 +1,9 @@ +--- doc/INSTALL.html.orig 2019-08-16 12:03:55 UTC ++++ doc/INSTALL.html +@@ -3113,5 +3113,5 @@ The following people have contributed to this document + + + +- ++ + Property changes on: head/graphics/qgis-ltr/files/patch-doc_INSTALL.html ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/qgis-ltr/files/patch-doc_INSTALL.t2t =================================================================== --- head/graphics/qgis-ltr/files/patch-doc_INSTALL.t2t (nonexistent) +++ head/graphics/qgis-ltr/files/patch-doc_INSTALL.t2t (revision 526917) @@ -0,0 +1,28 @@ +--- doc/INSTALL.t2t.orig 2019-08-16 12:03:55 UTC ++++ doc/INSTALL.t2t +@@ -4,14 +4,14 @@ Building QGIS from source - step by step + + %! target : html + %! style : style.css +-%! Options : --toc --toc-level 2 --enum-title --css-sugar --css-inside ++%! Options : --toc --toc-level 2 --enum-title + %! preproc : TUT_URL https://qgis.org + %! PostProc(html): '(?i)(
)' '
\1'
+ %! PostProc(html): '(?i)(
)' '\1' + %! PostProc(html): \(R\) ® + % Next line will replace tabs with 2 spaces in txt generated outputs + %! PostProc(txt): '(?i)(\t)' ' ' +-%! encoding: iso-8859-1 ++%! encoding: utf-8 + % + % Tex processing + % +@@ -36,7 +36,7 @@ Building QGIS from source - step by step + %! PostProc(tex): NEWPAGE '\\newpage' + % Give alternating table rows different colors and use a smaller font in tables (\tiny) + %! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}' +-%! encoding: iso-8859-1 ++%! encoding: utf-8 + + %! PostProc(tex): WALLPAPER-IMAGE 'qgis-footer.png' + % These are comments and will not be generated in any output Property changes on: head/graphics/qgis-ltr/files/patch-doc_INSTALL.t2t ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/qgis-ltr/files/patch-doc_news.html =================================================================== --- head/graphics/qgis-ltr/files/patch-doc_news.html (nonexistent) +++ head/graphics/qgis-ltr/files/patch-doc_news.html (revision 526917) @@ -0,0 +1,9 @@ +--- doc/news.html.orig 2019-08-16 12:03:55 UTC ++++ doc/news.html +@@ -3447,5 +3447,5 @@ July 6, 2002 + + + +- ++ + Property changes on: head/graphics/qgis-ltr/files/patch-doc_news.html ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/html \ No newline at end of property Index: head/graphics/qgis-ltr/files/patch-doc_news.t2t =================================================================== --- head/graphics/qgis-ltr/files/patch-doc_news.t2t (nonexistent) +++ head/graphics/qgis-ltr/files/patch-doc_news.t2t (revision 526917) @@ -0,0 +1,18 @@ +--- doc/news.t2t.orig 2019-08-16 12:03:55 UTC ++++ doc/news.t2t +@@ -4,13 +4,13 @@ Change history for the QGIS Project + + %! target : html + %! style : style.css +-%! Options : --toc --toc-level 1 --enum-title --css-sugar --css-inside ++%! Options : --toc --toc-level 1 --enum-title + %! preproc : TUT_URL https://qgis.org + %! PostProc(html): '(?i)(
)' '
\1'
+ %! PostProc(html): '(?i)(
)' '\1' + % Next line will replace tabs with 2 spaces in txt generated outputs + %! PostProc(txt): '(?i)(\t)' ' ' +-%! encoding: iso-8859-1 ++%! encoding: utf-8 + % + % These are comments and will not be generated in any output + % ------------------- Property changes on: head/graphics/qgis-ltr/files/patch-doc_news.t2t ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/qgis-ltr/files/patch-scripts_release.pl =================================================================== --- head/graphics/qgis-ltr/files/patch-scripts_release.pl (nonexistent) +++ head/graphics/qgis-ltr/files/patch-scripts_release.pl (revision 526917) @@ -0,0 +1,13 @@ +--- scripts/release.pl.orig 2019-08-16 12:03:55 UTC ++++ scripts/release.pl +@@ -183,8 +183,8 @@ run( "cp debian/changelog /tmp", "backup changelog fai + unless( $dopoint ) { + run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) if $doltr; + run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) unless $doltr; +- run( "txt2tags --encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" ); +- run( "txt2tags --encoding=utf-8 -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" ); ++ run( "txt2tags -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" ); ++ run( "txt2tags -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" ); + + run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" ); + run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" ); Property changes on: head/graphics/qgis-ltr/files/patch-scripts_release.pl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/qgis-ltr/files/patch-scripts_update-news.pl =================================================================== --- head/graphics/qgis-ltr/files/patch-scripts_update-news.pl (nonexistent) +++ head/graphics/qgis-ltr/files/patch-scripts_update-news.pl (revision 526917) @@ -0,0 +1,13 @@ +--- scripts/update-news.pl.orig 2019-08-16 12:03:55 UTC ++++ scripts/update-news.pl +@@ -61,8 +61,8 @@ close $in; + + copy($tempfile, "doc/news.t2t"); + +-system "txt2tags --encoding=utf-8 -odoc/news.html -t html doc/news.t2t"; +-system "txt2tags --encoding=utf-8 -oNEWS -t txt doc/news.t2t"; ++system "txt2tags -odoc/news.html -t html doc/news.t2t"; ++system "txt2tags -oNEWS -t txt doc/news.t2t"; + + =head1 NAME + Property changes on: head/graphics/qgis-ltr/files/patch-scripts_update-news.pl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property