diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile index d7db47ab7888..fb699aef2063 100644 --- a/astro/stellarium/Makefile +++ b/astro/stellarium/Makefile @@ -1,123 +1,123 @@ PORTNAME= stellarium PORTVERSION= 23.4 CATEGORIES= astro MASTER_SITES= https://github.com/Stellarium/stellarium/releases/download/v${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${_DISTFILES:Nstars_*.cat:N*.pdf} MAINTAINER= danfe@FreeBSD.org COMMENT= 3D photo-realistic sky renderer (planetarium) WWW= https://stellarium.org/ LICENSE= GPLv2+ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libnlopt.so:math/nlopt@minimal USES= cmake compiler:c++11-lang desktop-file-utils \ perl5 qt:5 shared-mime-info tar:xz USE_PERL5= build USE_QT= qmake:build buildtools:build \ charts concurrent core gui network opengl widgets CMAKE_OFF= ENABLE_QT6 GUIDE_VERSION= ${PORTVERSION} PORTDOCS= CREDITS.md ChangeLog README.md \ stellarium_user_guide-${GUIDE_VERSION}-1.pdf OPTIONS_DEFINE= DOCS GPS MORE_STARS MULTIMEDIA NLS SCRIPTS \ SHOWMYSKY TELESCOPE TEST TEXTURES WEBENGINE XLSX OPTIONS_DEFAULT= GPS MULTIMEDIA SCRIPTS SHOWMYSKY TELESCOPE \ WEBENGINE XLSX OPTIONS_SUB= yes GPS_DESC= GPS (NMEA handling) support MORE_STARS_DESC= Install additional star catalogs (1.0GB) MULTIMEDIA_DESC= Sound and video support SCRIPTS_DESC= Remote control and scripting support SHOWMYSKY_DESC= Realistic atmosphere light scattering TELESCOPE_DESC= Build telescope control plugin TEXTURES_DESC= Install better quality textures WEBENGINE_DESC= Get and show extra object information XLSX_DESC= Data export to Excel files support DOCS_MASTER_SITES= https://github.com/Stellarium/stellarium/releases/download/v${GUIDE_VERSION}/:ug DOCS_DISTFILES= stellarium_user_guide-${GUIDE_VERSION}-1.pdf:ug GPS_LIB_DEPENDS= libgps.so:astro/gpsd GPS_USE= QT=location,serialport GPS_CMAKE_OFF= -DENABLE_GPS:BOOL=OFF MULTIMEDIA_USE= QT=multimedia MULTIMEDIA_CMAKE_OFF= -DENABLE_MEDIA:BOOL=OFF NLS_USE= QT=linguisttools:build NLS_CMAKE_OFF= -DENABLE_NLS:BOOL=OFF SCRIPTS_USE= QT=script SCRIPTS_CMAKE_OFF= -DENABLE_SCRIPTING:BOOL=OFF SHOWMYSKY_BUILD_DEPENDS= ${LOCALBASE}/include/ShowMySky/AtmosphereRenderer.hpp:astro/calcmysky SHOWMYSKY_RUN_DEPENDS= ${LOCALBASE}/lib/libShowMySky-Qt5.so:astro/calcmysky SHOWMYSKY_CMAKE_OFF= -DENABLE_SHOWMYSKY:BOOL=OFF TELESCOPE_BUILD_DEPENDS= ${LOCALBASE}/lib/libindiclient.a:devel/indi TELESCOPE_USE= QT=serialport TELESCOPE_CMAKE_OFF= -DUSE_PLUGIN_TELESCOPECONTROL:BOOL=OFF TEST_USE= QT=testlib:build TEST_CMAKE_ON= -DENABLE_TESTING:BOOL=ON TEXTURES_MASTER_SITES= SF/${PORTNAME}/Extra-data-files/textures:gfx TEXTURES_DISTFILES= textures-1K.zip:gfx WEBENGINE_USE= QT=declarative,webchannel,webengine WEBENGINE_CMAKE_OFF= -DENABLE_QTWEBENGINE:BOOL=OFF -XLSX_LIB_DEPENDS= libQXlsx.so:devel/qxlsx +XLSX_LIB_DEPENDS= libQXlsxQt5.so:devel/qxlsx@qt5 XLSX_CMAKE_OFF= -DENABLE_XLSX:BOOL=OFF .include .if ${PORT_OPTIONS:MMORE_STARS} . for i in 4 5 6 7 8 MASTER_SITES+= SF/${PORTNAME}/Extra-data-files/stars${i}:stars${i} . endfor DISTFILES+= stars_4_1v0_2.cat:stars4 stars_5_2v0_1.cat:stars5 \ stars_6_2v0_1.cat:stars6 stars_7_2v0_1.cat:stars7 \ stars_8_2v0_1.cat:stars8 .endif post-extract-DOCS-on: @${LN} -sf ${_DISTDIR}/stellarium_user_guide-${GUIDE_VERSION}-1.pdf \ ${WRKSRC} post-install: @${RMDIR} ${STAGEDIR}${DATADIR}/skycultures/greek_almagest/almstars post-install-MORE_STARS-on: ${INSTALL_DATA} ${DISTDIR}/stars_4_1v0_2.cat \ ${DISTDIR}/stars_[5678]_2v0_1.cat \ ${STAGEDIR}${DATADIR}/stars/default post-install-TEXTURES-on: (cd ${WRKDIR} && for f in *.png; do \ ${TEST} -z "$${f%neb*}" && continue ; \ new=`${STAT} -f '%z' $$f` ; \ existing=`${STAT} -f '%z' \ ${STAGEDIR}${DATADIR}/textures/$$f` ; \ ${TEST} $$new -gt $$existing || continue ; \ ${ECHO_CMD} "-- Replacing texture: $$f\ (has larger file size: $$new > $$existing)" ; \ ${INSTALL_DATA} $$f ${STAGEDIR}${DATADIR}/textures ; \ done) post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} do-test-TEST-on: @cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS} .include diff --git a/devel/qxlsx/Makefile b/devel/qxlsx/Makefile index b63b06082aab..bb87c1adc98e 100644 --- a/devel/qxlsx/Makefile +++ b/devel/qxlsx/Makefile @@ -1,26 +1,40 @@ PORTNAME= ${GH_PROJECT:tl} -PORTVERSION= 1.4.4 +PORTVERSION= 1.4.7 DISTVERSIONPREFIX= v CATEGORIES= devel -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 8e83402db866ae7a67582da28aa68c83545f13c8.patch:-p2 - MAINTAINER= danfe@FreeBSD.org COMMENT= Excel file reader/writer library using Qt WWW= https://qtexcel.github.io/QXlsx/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/../LICENSE -USES= cmake qt:5 +USES= cmake USE_GITHUB= yes GH_ACCOUNT= QtExcel GH_PROJECT= QXlsx USE_LDCONFIG= yes -USE_QT= buildtools:build qmake:build core gui CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_ARGS= -DQT_VERSION_MAJOR:STRING=${_QT_LIBVER} WRKSRC_SUBDIR= ${GH_PROJECT} +PLIST_SUB= QTVER=${_QT_LIBVER} + +FLAVORS= qt5 qt6 + +.if ${FLAVOR:U} == qt6 +USES+= qt:6 +USE_QT= base +PKGNAMESUFFIX= -${FLAVOR} +.else +USES+= qt:5 +USE_QT= buildtools:build qmake:build core gui +.endif + +post-patch: +# Sanitize SOVERSION (we know about lack of ABI guarantees but don't care) + @${REINPLACE_CMD} -E '/SOVERSION/s,([[:digit:]]+)\..*,\1,' \ + ${WRKSRC}/CMakeLists.txt .include diff --git a/devel/qxlsx/distinfo b/devel/qxlsx/distinfo index 40ddec859331..b7e4372ef4a4 100644 --- a/devel/qxlsx/distinfo +++ b/devel/qxlsx/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1658513489 -SHA256 (QtExcel-QXlsx-v1.4.4_GH0.tar.gz) = 5c6f7117000c7559d6557d00a2f7b836bee670f9bc16309a72bc23aaedf994d9 -SIZE (QtExcel-QXlsx-v1.4.4_GH0.tar.gz) = 4703732 -SHA256 (8e83402db866ae7a67582da28aa68c83545f13c8.patch) = a3d0a12b093cebc8a27e156c67871e43f020d6db207b3d7ab447562b042107fc -SIZE (8e83402db866ae7a67582da28aa68c83545f13c8.patch) = 749 +TIMESTAMP = 1702873179 +SHA256 (QtExcel-QXlsx-v1.4.7_GH0.tar.gz) = 6f2de3e3bcfd09b7be0f9ad06c363cfe29a7a4c14280b36a91d8968f54be796a +SIZE (QtExcel-QXlsx-v1.4.7_GH0.tar.gz) = 4705261 diff --git a/devel/qxlsx/pkg-plist b/devel/qxlsx/pkg-plist index aa548777b0b7..026bf60c3f4a 100644 --- a/devel/qxlsx/pkg-plist +++ b/devel/qxlsx/pkg-plist @@ -1,26 +1,26 @@ -include/QXlsx/xlsxabstractooxmlfile.h -include/QXlsx/xlsxabstractsheet.h -include/QXlsx/xlsxabstractsheet_p.h -include/QXlsx/xlsxcell.h -include/QXlsx/xlsxcellformula.h -include/QXlsx/xlsxcelllocation.h -include/QXlsx/xlsxcellrange.h -include/QXlsx/xlsxcellreference.h -include/QXlsx/xlsxchart.h -include/QXlsx/xlsxchartsheet.h -include/QXlsx/xlsxconditionalformatting.h -include/QXlsx/xlsxdatavalidation.h -include/QXlsx/xlsxdatetype.h -include/QXlsx/xlsxdocument.h -include/QXlsx/xlsxformat.h -include/QXlsx/xlsxglobal.h -include/QXlsx/xlsxrichstring.h -include/QXlsx/xlsxworkbook.h -include/QXlsx/xlsxworksheet.h -lib/cmake/QXlsx/QXlsxConfig.cmake -lib/cmake/QXlsx/QXlsxConfigVersion.cmake -lib/cmake/QXlsx/QXlsxTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/QXlsx/QXlsxTargets.cmake -lib/libQXlsx.so -lib/libQXlsx.so.0 -lib/libQXlsx.so.1.4.4 +include/QXlsxQt%%QTVER%%/xlsxabstractooxmlfile.h +include/QXlsxQt%%QTVER%%/xlsxabstractsheet.h +include/QXlsxQt%%QTVER%%/xlsxabstractsheet_p.h +include/QXlsxQt%%QTVER%%/xlsxcell.h +include/QXlsxQt%%QTVER%%/xlsxcellformula.h +include/QXlsxQt%%QTVER%%/xlsxcelllocation.h +include/QXlsxQt%%QTVER%%/xlsxcellrange.h +include/QXlsxQt%%QTVER%%/xlsxcellreference.h +include/QXlsxQt%%QTVER%%/xlsxchart.h +include/QXlsxQt%%QTVER%%/xlsxchartsheet.h +include/QXlsxQt%%QTVER%%/xlsxconditionalformatting.h +include/QXlsxQt%%QTVER%%/xlsxdatavalidation.h +include/QXlsxQt%%QTVER%%/xlsxdatetype.h +include/QXlsxQt%%QTVER%%/xlsxdocument.h +include/QXlsxQt%%QTVER%%/xlsxformat.h +include/QXlsxQt%%QTVER%%/xlsxglobal.h +include/QXlsxQt%%QTVER%%/xlsxrichstring.h +include/QXlsxQt%%QTVER%%/xlsxworkbook.h +include/QXlsxQt%%QTVER%%/xlsxworksheet.h +lib/cmake/QXlsxQt%%QTVER%%/QXlsxQt%%QTVER%%Config.cmake +lib/cmake/QXlsxQt%%QTVER%%/QXlsxQt%%QTVER%%ConfigVersion.cmake +lib/cmake/QXlsxQt%%QTVER%%/QXlsxQt%%QTVER%%Targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/QXlsxQt%%QTVER%%/QXlsxQt%%QTVER%%Targets.cmake +lib/libQXlsxQt%%QTVER%%.so +lib/libQXlsxQt%%QTVER%%.so.0 +lib/libQXlsxQt%%QTVER%%.so.1.4.4