diff --git a/graphics/tiled/Makefile b/graphics/tiled/Makefile index a2a984344acd..a520a9d7e69a 100644 --- a/graphics/tiled/Makefile +++ b/graphics/tiled/Makefile @@ -1,49 +1,110 @@ PORTNAME= tiled -PORTVERSION= 1.8.6 +PORTVERSION= 1.12.2 DISTVERSIONPREFIX= v CATEGORIES= graphics editors games +USE_GITHUB= yes +GH_ACCOUNT= bjorn + MAINTAINER= ports@FreeBSD.org COMMENT= General purpose tile map editor WWW= https://www.mapeditor.org/ -LICENSE= BSD2CLAUSE BSD3CLAUSE GPLv2+ +LICENSE= BSD2CLAUSE BSD3CLAUSE GPLv2+ APACHE20 LGPL20 LICENSE_COMB= multi +BUILD_DEPENDS= qbs:devel/qbs LIB_DEPENDS= libzstd.so:archivers/zstd -USE_GITHUB= yes -GH_ACCOUNT= bjorn - -USES= compiler:c++14-lang desktop-file-utils gl qmake qt:5 \ - pkgconfig shared-mime-info xorg -USE_QT= core gui widgets opengl network declarative \ - buildtools:build linguisttools:build +USES= compiler:c++17-lang desktop-file-utils gl pkgconfig qt:6 \ + shared-mime-info +USE_QT= base declarative tools:build USE_GL= gl USE_LDCONFIG= yes -QMAKE_ARGS= SYSTEM_ZSTD=yes -PORTDOCS= * +QBS_SETTINGS= ${WRKDIR}/.qbs +QBS_ARGS= --settings-dir ${QBS_SETTINGS} \ + projects.Tiled.useRPaths:false \ + qbs.installPrefix:${PREFIX} \ + qbs.buildVariant:release OPTIONS_DEFINE= PYTHON DBUS DOCS OPTIONS_DEFAULT=PYTHON DBUS OPTIONS_SUB= yes -PYTHON_DESC= Enable python plugin -PYTHON_USES= pkgconfig python -PYTHON_QMAKE_OFF= DISABLE_PYTHON_PLUGIN=yes +PYTHON_DESC= Enable python scripting plugin +PYTHON_USES= pkgconfig python:3.8+ -DBUS_USE= QT=dbus -DBUS_QMAKE_OFF= DISABLE_DBUS=yes +DBUS_DESC= D-Bus support (single-instance and MPRIS) -post-patch-PYTHON-on: - @${REINPLACE_CMD} -e 's|python3|python-${PYTHON_VER}|' \ - ${WRKSRC}/src/plugins/python/find_python.pri +.include + +.if ${PORT_OPTIONS:MPYTHON} +QBS_ARGS+= projects.Tiled.pythonPkgConfigName:python-${PYTHON_VER}-embed +.else +QBS_ARGS+= projects.Tiled.pythonPkgConfigName:disabled-python +.endif +.if !${PORT_OPTIONS:MDBUS} +QBS_ARGS+= projects.Tiled.dbus:false +.endif + +do-configure: + @${MKDIR} ${QBS_SETTINGS} + @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + qbs setup-toolchains --settings-dir ${QBS_SETTINGS} --detect + @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + qbs setup-qt --settings-dir ${QBS_SETTINGS} ${QMAKE} qt6 + +do-build: + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + qbs build --jobs ${MAKE_JOBS_NUMBER} profile:qt6 ${QBS_ARGS} + +do-install: + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + qbs install --install-root ${STAGEDIR} profile:qt6 ${QBS_ARGS} + +post-install: +# The Qbs install target does not install the desktop integration +# files; install them manually like the old qmake build did. + @${MKDIR} ${STAGEDIR}${PREFIX}/share/applications \ + ${STAGEDIR}${PREFIX}/share/metainfo \ + ${STAGEDIR}${PREFIX}/share/mime/packages \ + ${STAGEDIR}${PREFIX}/share/thumbnailers \ + ${STAGEDIR}${PREFIX}/share/man/man1 \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/mimetypes \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/mimetypes \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/mimetypes + ${INSTALL_DATA} ${WRKSRC}/org.mapeditor.Tiled.desktop \ + ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/org.mapeditor.Tiled.appdata.xml \ + ${STAGEDIR}${PREFIX}/share/metainfo + ${INSTALL_DATA} ${WRKSRC}/mime/org.mapeditor.Tiled.xml \ + ${STAGEDIR}${PREFIX}/share/mime/packages + ${INSTALL_DATA} ${WRKSRC}/mime/tiled.thumbnailer \ + ${STAGEDIR}${PREFIX}/share/thumbnailers + ${INSTALL_DATA} ${WRKSRC}/src/tiledapp/images/16/tiled.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps + ${INSTALL_DATA} ${WRKSRC}/src/tiledapp/images/16/application-x-tiled.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/mimetypes + ${INSTALL_DATA} ${WRKSRC}/src/tiledapp/images/32/tiled.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps + ${INSTALL_DATA} ${WRKSRC}/src/tiledapp/images/32/application-x-tiled.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/mimetypes + ${INSTALL_DATA} ${WRKSRC}/src/tiledapp/images/scalable/tiled.svg \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps + ${INSTALL_DATA} ${WRKSRC}/src/tiledapp/images/scalable/application-x-tiled.svg \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/mimetypes +.for m in tiled tmxrasterizer tmxviewer + ${INSTALL_MAN} ${WRKSRC}/man/${m}.1 ${STAGEDIR}${PREFIX}/share/man/man1 +.endfor post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in AUTHORS README.md NEWS.md ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor -.include +.include diff --git a/graphics/tiled/distinfo b/graphics/tiled/distinfo index 73def18a8861..3c98f27ce9cd 100644 --- a/graphics/tiled/distinfo +++ b/graphics/tiled/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655297478 -SHA256 (bjorn-tiled-v1.8.6_GH0.tar.gz) = 4af8359bd6803a8e14540bcef7acd9b74afd76a3f5c91f9c958705d7fc5fd885 -SIZE (bjorn-tiled-v1.8.6_GH0.tar.gz) = 17053221 +TIMESTAMP = 1789006065 +SHA256 (bjorn-tiled-v1.12.2_GH0.tar.gz) = 3564bd1601b1b170dc894c7e66a2e5c61849b3fb8612e944c84fd97115cce248 +SIZE (bjorn-tiled-v1.12.2_GH0.tar.gz) = 17866060 diff --git a/graphics/tiled/pkg-plist b/graphics/tiled/pkg-plist index e67c3b8f7454..5836cd4c29aa 100644 --- a/graphics/tiled/pkg-plist +++ b/graphics/tiled/pkg-plist @@ -1,60 +1,65 @@ bin/terraingenerator bin/tiled bin/tmxrasterizer bin/tmxviewer lib/libtiled.so -lib/libtiled.so.1 -lib/libtiled.so.1.0 -lib/libtiled.so.1.0.0 +lib/libtilededitor.so lib/tiled/plugins/libcsv.so lib/tiled/plugins/libdefold.so lib/tiled/plugins/libdefoldcollection.so lib/tiled/plugins/libdroidcraft.so lib/tiled/plugins/libflare.so lib/tiled/plugins/libgmx.so lib/tiled/plugins/libjson.so lib/tiled/plugins/libjson1.so lib/tiled/plugins/liblua.so -%%PYTHON%%lib/tiled/plugins/libpython.so +lib/tiled/plugins/libpython.so lib/tiled/plugins/libreplicaisland.so +lib/tiled/plugins/librpd.so +lib/tiled/plugins/librpmap.so lib/tiled/plugins/libtbin.so lib/tiled/plugins/libtengine.so +lib/tiled/plugins/libtscn.so lib/tiled/plugins/libyy.so share/applications/org.mapeditor.Tiled.desktop +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/NEWS.md +%%PORTDOCS%%%%DOCSDIR%%/README.md share/icons/hicolor/16x16/apps/tiled.png share/icons/hicolor/16x16/mimetypes/application-x-tiled.png share/icons/hicolor/32x32/apps/tiled.png share/icons/hicolor/32x32/mimetypes/application-x-tiled.png share/icons/hicolor/scalable/apps/tiled.svg share/icons/hicolor/scalable/mimetypes/application-x-tiled.svg share/man/man1/tiled.1.gz share/man/man1/tmxrasterizer.1.gz share/man/man1/tmxviewer.1.gz share/metainfo/org.mapeditor.Tiled.appdata.xml share/mime/packages/org.mapeditor.Tiled.xml share/thumbnailers/tiled.thumbnailer %%DATADIR%%/translations/tiled_ar_DZ.qm %%DATADIR%%/translations/tiled_bg.qm %%DATADIR%%/translations/tiled_cs.qm %%DATADIR%%/translations/tiled_de.qm %%DATADIR%%/translations/tiled_en.qm %%DATADIR%%/translations/tiled_es.qm %%DATADIR%%/translations/tiled_fi.qm %%DATADIR%%/translations/tiled_fr.qm %%DATADIR%%/translations/tiled_he.qm %%DATADIR%%/translations/tiled_hu.qm %%DATADIR%%/translations/tiled_it.qm %%DATADIR%%/translations/tiled_ja.qm %%DATADIR%%/translations/tiled_ko.qm %%DATADIR%%/translations/tiled_nb.qm %%DATADIR%%/translations/tiled_nl.qm %%DATADIR%%/translations/tiled_pl.qm %%DATADIR%%/translations/tiled_pt.qm %%DATADIR%%/translations/tiled_pt_PT.qm %%DATADIR%%/translations/tiled_ru.qm %%DATADIR%%/translations/tiled_sv.qm +%%DATADIR%%/translations/tiled_ta.qm %%DATADIR%%/translations/tiled_th.qm %%DATADIR%%/translations/tiled_tr.qm %%DATADIR%%/translations/tiled_uk.qm %%DATADIR%%/translations/tiled_zh_CN.qm %%DATADIR%%/translations/tiled_zh_TW.qm