Index: Makefile =================================================================== --- Makefile (revision 507372) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= treesheets -PORTVERSION= 1.0.1 -PORTREVISION= 3 +PORTVERSION= 1.0.2 DISTVERSIONPREFIX= v CATEGORIES= deskutils @@ -13,7 +12,7 @@ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/ZLIB_LICENSE.txt -USES= compiler:c++17-lang desktop-file-utils +USES= cmake compiler:c++17-lang desktop-file-utils USE_GITHUB= yes GH_ACCOUNT= aardappel @@ -21,9 +20,8 @@ USE_WX= 3.0+ INSTALLS_ICONS= yes -BUILD_WRKSRC= ${WRKSRC}/src PACKAGE_VERSION= \"${PORTVERSION}\" -MAKE_ENV= PACKAGE_VERSION=${PACKAGE_VERSION:Q} +CXXFLAGS+= -DPACKAGE_VERSION=${PACKAGE_VERSION:Q} PORTDATA= images scripts translations/*/*.mo PORTDOCS= docs *.html @@ -38,16 +36,16 @@ post-patch: .SILENT ${REINPLACE_CMD} -e 's|sys->frame->GetPath(L"|(L"${DOCSDIR}/|' \ - ${BUILD_WRKSRC}/document.h + ${WRKSRC}/src/document.h ${REINPLACE_CMD} -e 's|wxFileName(exename).GetPath()|L"${DATADIR}"|' \ - ${BUILD_WRKSRC}/myframe.h + ${WRKSRC}/src/myframe.h ${REINPLACE_CMD} -e 's|frame->GetPath(L"examples|(L"${EXAMPLESDIR}|' \ - ${BUILD_WRKSRC}/system.h + ${WRKSRC}/src/system.h ${REINPLACE_CMD} -e 's|^\(Icon=\).*|\1${PORTNAME}|' \ ${WRKSRC}/TS/treesheets.desktop do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/TS/${PORTNAME} ${STAGEDIR}${PREFIX}/bin (cd ${WRKSRC}/TS && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}) ${INSTALL_DATA} ${WRKSRC}/TS/treesheets.desktop \ ${STAGEDIR}${PREFIX}/share/applications Index: distinfo =================================================================== --- distinfo (revision 507372) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541105162 -SHA256 (aardappel-treesheets-v1.0.1_GH0.tar.gz) = cacf0593e12c484f68adf4d462147efed202b1c2d09e58e90c9fb98cb3e7b874 -SIZE (aardappel-treesheets-v1.0.1_GH0.tar.gz) = 2316388 +TIMESTAMP = 1564766678 +SHA256 (aardappel-treesheets-v1.0.2_GH0.tar.gz) = 84eb82f122bc7be3ded399d2511536128911477a4a69c51b26b856de2160405f +SIZE (aardappel-treesheets-v1.0.2_GH0.tar.gz) = 2486893