diff --git a/deskutils/joplin-desktop/Makefile b/deskutils/joplin-desktop/Makefile index 21eca7675444..d1eeef763a38 100644 --- a/deskutils/joplin-desktop/Makefile +++ b/deskutils/joplin-desktop/Makefile @@ -1,176 +1,176 @@ PORTNAME= joplin DISTVERSIONPREFIX= v DISTVERSION= 3.5.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils PKGNAMESUFFIX= -desktop DISTFILES= ${DEFAULT_PLUGINS_NODE_MODULES_FILE}:prefetch \ ${APP_CLIPPER_NODE_MODULES_FILE}:prefetch MAINTAINER= tagattie@FreeBSD.org COMMENT= Note taking and to-do application with synchronisation capabilities WWW= https://joplinapp.org LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE FETCH_DEPENDS= npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX} BUILD_DEPENDS= 7zz:archivers/7-zip \ git:devel/git \ rsync:net/rsync \ npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX} LIB_DEPENDS= libvips.so:graphics/vips \ libsecret-1.so:security/libsecret USES= cargo electron:39 gmake localbase:ldflags nodejs:22,build \ python:build USE_GITHUB= yes GH_ACCOUNT= laurent22 GH_TUPLE= rollup:rollup:v4.9.1:rollup/rollup \ rustwasm:wasm-pack:v0.13.1:wasm_pack/wasm-pack # See ${WRKSRC}/packages/default-plugins/pluginRepositories.json for GH_TUPLEs for default plugins GH_TUPLE+= JackGruber:joplin-plugin-backup:2c3da7056e7ac39c86c2051a4fdb99d9534dd0a1:joplin_plugin_backup/packages/default-plugins/plugin-sources/io.github.jackgruber.backup CARGO_CARGOTOML_ROLLUP= ${WRKSRC}/rollup/rust/Cargo.toml CARGO_CARGOLOCK_ROLLUP= ${WRKSRC}/rollup/rust/Cargo.lock CARGO_CARGOTOML_WASM_PACK= ${WRKSRC}/wasm-pack/Cargo.toml CARGO_CARGOLOCK_WASM_PACK= ${WRKSRC}/wasm-pack/Cargo.lock CARGO_CARGOTOML= ${CARGO_CARGOTOML_ROLLUP} CARGO_CARGOLOCK= ${CARGO_CARGOLOCK_ROLLUP} CARGO_CARGOLOCKS= ${CARGO_CARGOLOCK_ROLLUP} \ ${CARGO_CARGOLOCK_WASM_PACK} CARGO_BUILD= no CARGO_INSTALL= no CARGO_TEST= no BINARY_ALIAS= python3=${PYTHON_CMD} SUB_FILES= ${PORTNAME}${PKGNAMESUFFIX} BUILD_WRKSRC= ${WRKSRC}/packages/app-desktop TEST_WRKSRC= ${WRKSRC}/packages/app-desktop PORTDOCS= README.md SECURITY.md OPTIONS_DEFINE= DOCS USE_ELECTRON= npm:yarn4 appbuilder prefetch extract build:builder DEFAULT_PLUGINS_NODE_MODULES_FILE= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-default-plugins-node-modules${EXTRACT_SUFX} APP_CLIPPER_NODE_MODULES_FILE= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-app-clipper-node-modules${EXTRACT_SUFX} pre-fetch: @if [ ! -f ${DISTDIR}/${DEFAULT_PLUGINS_NODE_MODULES_FILE} ]; then \ ${ECHO_MSG} "===> Prefetching and archiving node modules for default plugins"; \ ${MKDIR} ${WRKDIR}/node-modules-cache; \ ${CP} -R ${FILESDIR}/default-plugins/* ${WRKDIR}/node-modules-cache; \ for dir in `${FIND} ${FILESDIR}/default-plugins -type d -depth 1 -print | ${SED} -e 's|${FILESDIR}/default-plugins||'`; do \ cd ${WRKDIR}/node-modules-cache/$${dir} && \ ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \ npm ci --ignore-scripts --no-progress --no-audit --no-fund --no-update-notifier --loglevel=error; \ ${RM} package.json package-lock.json; \ done; \ cd ${WRKDIR} && \ ${SETENV} SCRIPTSDIR=${SCRIPTSDIR} WRKDIR=${WRKDIR} \ ${SH} ${SCRIPTSDIR}/electron-create-mtree.sh node-modules-cache > \ node-modules-cache.mtree && \ ${SETENV} LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 \ ${TAR} -cz --options 'gzip:!timestamp' \ -f ${DISTDIR}/${DEFAULT_PLUGINS_NODE_MODULES_FILE} @node-modules-cache.mtree; \ ${RM} -r ${WRKDIR}/node-modules-cache; \ fi @if [ ! -f ${DISTDIR}/${APP_CLIPPER_NODE_MODULES_FILE} ]; then \ ${ECHO_MSG} "===> Prefetching and archiving node modules for app-clipper"; \ ${MKDIR} ${WRKDIR}/node-modules-cache-app-clipper; \ ${CP} -R ${FILESDIR}/app-clipper/* ${WRKDIR}/node-modules-cache-app-clipper; \ cd ${WRKDIR}/node-modules-cache-app-clipper && \ ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \ npm ci --ignore-scripts --no-progress --no-audit --no-fund --no-update-notifier --loglevel=error && \ ${RM} package.json package-lock.json; \ cd ${WRKDIR} && \ ${SETENV} SCRIPTSDIR=${SCRIPTSDIR} WRKDIR=${WRKDIR} \ ${SH} ${SCRIPTSDIR}/electron-create-mtree.sh node-modules-cache-app-clipper > \ node-modules-cache-app-clipper.mtree && \ ${SETENV} LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 \ ${TAR} -cz --options 'gzip:!timestamp' \ -f ${DISTDIR}/${APP_CLIPPER_NODE_MODULES_FILE} @node-modules-cache-app-clipper.mtree; \ ${RM} -r ${WRKDIR}/node-modules-cache-app-clipper; \ fi post-extract: @${ECHO_MSG} "===> Moving prefetched node modules for default plugins to ${WRKSRC}" @for dir in `${FIND} ${WRKDIR}/node-modules-cache -type d -depth 1 -print | ${SED} -e 's|${WRKDIR}/node-modules-cache||'`; do \ ${MV} ${WRKDIR}/node-modules-cache/$${dir}/node_modules \ ${WRKSRC}/packages/default-plugins/plugin-sources/$${dir}; \ done @${ECHO_MSG} "===> Moving prefetched node modules for app-clipper to ${WRKSRC}" @${MV} ${WRKDIR}/node-modules-cache-app-clipper/node_modules \ ${WRKSRC}/packages/app-clipper/popup post-configure: @${ECHO_MSG} "===> Updating Cargo.lock for ${CARGO_CARGOTOML_WASM_PACK}" @${CARGO_CARGO_RUN} update --manifest-path ${CARGO_CARGOTOML_WASM_PACK} \ --verbose --verbose ${CARGO_UPDATE_ARGS} pre-build: cd ${WRKSRC}/rollup/rust && \ ${SETENV} ${MAKE_ENV} ${CARGO_ENV} ${CARGO} build \ --manifest-path ${CARGO_CARGOTOML_ROLLUP} \ --release --verbose --verbose ${CP} ${CARGO_TARGET_DIR}/*/libbindings_napi.so \ ${WRKSRC}/packages/turndown/node_modules/rollup/dist/rollup.freebsd-${ELECTRON_ARCH}.node cd ${WRKSRC}/wasm-pack && \ ${SETENV} ${MAKE_ENV} ${CARGO_ENV} ${CARGO} build \ --manifest-path ${CARGO_CARGOTOML_WASM_PACK} \ --release --verbose --verbose @${MKDIR} ${WRKSRC}/packages/onenote-converter/node_modules/binary-install/node_modules/.bin ${CP} ${CARGO_TARGET_DIR}/*/wasm-pack \ ${WRKSRC}/packages/onenote-converter/node_modules/binary-install/node_modules/.bin @${MKDIR} ${WRKSRC}/packages/app-desktop/node_modules/7zip-bin/freebsd/${ELECTRON_ARCH} ${CP} ${LOCALBASE}/bin/7zz \ ${WRKSRC}/packages/app-desktop/node_modules/7zip-bin/freebsd/${ELECTRON_ARCH}/7za cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn exec gulp build cd ${BUILD_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${ELECTRON_REBUILD_ENV} yarn run electronRebuild cd ${BUILD_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${ELECTRON_REBUILD_ENV} yarn exec gulp before-dist # dirty hack to avoid "EACCES: permission denied" error during electron-builder execution @${RM} ${WRKDIR}/.bin/python3 @${CP} ${PYTHON_CMD} ${WRKDIR}/.bin/python3 @${CHMOD} u+w ${WRKDIR}/.bin/python3 do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX} ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}${PKGNAMESUFFIX}.desktop ${STAGEDIR}${DESKTOPDIR} .for size in 16 24 32 48 72 96 128 144 256 512 1024 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps ${INSTALL_DATA} ${BUILD_WRKSRC}/build/icons/${size}x${size}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}.png .endfor @${MKDIR} ${STAGEDIR}${DATADIR} cd ${BUILD_WRKSRC}/dist/${ELECTRON_BUILDER_APP_OUT_DIR} && \ ${COPYTREE_SHARE} resources ${STAGEDIR}${DATADIR} ${FIND} ${STAGEDIR}${DATADIR}/resources -type f -exec ${FILE} {} ';' | \ ${GREP} 'ELF.*FreeBSD' | ${AWK} -F ': ' '{print $$1}' | ${XARGS} ${STRIP_CMD} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} do-test: cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} yarn run test # # targets for port maintainer(s) # cargo-crates-from-multiple-lockfiles: extract @for lf in ${CARGO_CARGOLOCKS}; do \ ${_CARGO_AWK} ${SCRIPTSDIR}/cargo-crates.awk $${lf}; \ done | \ ${SED} -E 's/^CARGO_CRATES=\t+/\t\t/; s/ \\$$//' | \ ${SORT} | \ uniq | \ ${SED} -e '1s/^\t\t/CARGO_CRATES=\t/; s/$$/ \\/' | \ ${SED} -e '$$s/ \\//' .include diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index 538728ffb0a2..08aa392b89f1 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,310 +1,311 @@ PORTNAME= vscode DISTVERSION= ${VSCODE_VERSION} +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:node_modules DISTFILES= vscode-node-modules-${DISTVERSION}${EXTRACT_SUFX}:node_modules \ vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX}:node_modules DIST_SUBDIR= ${PORTNAME} MAINTAINER= tagattie@FreeBSD.org COMMENT= Visual Studio Code - Open Source ("Code - OSS") WWW= https://code.visualstudio.com/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= amd64 EXTRACT_DEPENDS=jq:textproc/jq \ node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} BUILD_DEPENDS= zip:archivers/zip \ tsgo:lang/typescript-go \ jq:textproc/jq \ rg:textproc/ripgrep LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ libasound.so:audio/alsa-lib \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ libsndio.so:audio/sndio \ libdbus-1.so:devel/dbus \ libepoll-shim.so:devel/libepoll-shim \ libevent.so:devel/libevent \ libffi.so:devel/libffi \ libnotify.so:devel/libnotify \ libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libpcre2-8.so:devel/pcre2 \ libre2.so:devel/re2 \ liblcms2.so:graphics/lcms2 \ libdrm.so:graphics/libdrm \ libpng.so:graphics/png \ libwayland-client.so:graphics/wayland \ libwebp.so:graphics/webp \ libdav1d.so:multimedia/dav1d \ libvpx.so:multimedia/libvpx \ libopenh264.so:multimedia/openh264 \ libpipewire-0.3.so:multimedia/pipewire \ libcups.so:print/cups \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libxkbcommon.so:x11/libxkbcommon \ libxshmfence.so:x11/libxshmfence \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils \ bash:shells/bash TEST_DEPENDS= bash:shells/bash USES= desktop-file-utils display:test electron:39,build,test gl \ gmake gnome gssapi:mit iconv:wchar_t jpeg localbase:ldflags \ nodejs:22,build pkgconfig python:build shebangfix xorg USE_GITHUB= yes GH_ACCOUNT= microsoft BINARY_ALIAS= python=${PYTHON_CMD} USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ xrandr xrender xscrnsaver xtst USE_GL= gbm gl glesv2 USE_GNOME= atk cairo pango gdkpixbuf gtk30 libxml2 libxslt USE_ELECTRON= npm:npm SHEBANG_REGEX= ./(extensions|node_modules|resources|scripts|src)/.*(\.(pl|py|sh)|makeBlacker|makeFF)$$ PATHFIX_FILES= src/vs/workbench/contrib/debug/node/terminals.ts DATADIR= ${PREFIX}/share/code-oss TMPDIR= ${WRKDIR} BUNDLE_LIBS= yes MAKE_ENV+= BUILD_SOURCEVERSION=${SOURCE_COMMIT_HASH} # Don't create __pycache__ directory when executing node-gyp # This is a workaround to avoid filesystem violations during poudriere build MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 TEST_ENV= ${MAKE_ENV:C/TMPDIR=.*//} \ VSCODE_SKIP_PRELAUNCH=1 UPSTREAM_ELECTRON_VER= ${ELECTRON_VER} .include "Makefile.version" .include NODEJS_DIR= ${.CURDIR:H:H}/www/node${NODEJS_VERSION} .include "${NODEJS_DIR}/Makefile.version" pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "The limit imposed by poudriere(8) for the maximum number of files allowed to be" @${ECHO_MSG} "opened by a jail (default 1024) is exceeded during the build of ${PORTNAME}." @${ECHO_MSG} "To successfully build ${PORTNAME} with poudriere(8), you must add the following" @${ECHO_MSG} "line to poudriere.conf:" @${ECHO_MSG} "MAX_FILES_${PORTNAME}=8192" @${ECHO_MSG} "" post-extract: @${CP} ${WRKSRC}/build/.moduleignore.linux \ ${WRKSRC}/build/.moduleignore.freebsd @${ECHO_MSG} "===> Installing node modules in ${WRKSRC}" @${TAR} -xzf ${WRKDIR}/vscode-.-node-modules${EXTRACT_SUFX} -C ${WRKSRC} @for dir in `node --input-type=module -e "console.log(JSON.stringify((await import('${WRKSRC}/build/npm/dirs.ts')).dirs))" | jq -r '.[]'`; do \ if [ -f ${WRKDIR}/vscode-`echo $${dir} | tr _ __ | tr / _`-node-modules${EXTRACT_SUFX} ]; then \ ${ECHO_MSG} "===> Installing node modules in ${WRKSRC}/$${dir}"; \ ${TAR} -xzf ${WRKDIR}/vscode-`echo $${dir} | tr _ __ | tr / _`-node-modules${EXTRACT_SUFX} -C ${WRKSRC}/$${dir}; \ fi; \ done post-patch: @${REINPLACE_CMD} -E 's|^(target=").*(")$$|\1${ELECTRON_VER}\2|' \ ${WRKSRC}/.npmrc @${REINPLACE_CMD} -E 's|^(target=").*(")$$|\1${NODEJS_PORTVERSION}\2|' \ ${WRKSRC}/remote/.npmrc @${REINPLACE_CMD} -e 's/%%DISTVERSION%%/${DISTVERSION}/g' \ ${WRKSRC}/build/gulpfile.reh.ts \ ${WRKSRC}/build/gulpfile.vscode.ts @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/node_modules/@typescript/native-preview/lib/getExePath.js @(cd ${WRKSRC} && \ ${FIND} -E . -type f -iregex '${SHEBANG_REGEX}' \ -exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';') @(cd ${WRKSRC} && \ ${FIND} ${PATHFIX_FILES} -type f \ -exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';') @${REINPLACE_CMD} -e 's/@@NAME_LONG@@/Code - OSS/; \ s/@@NAME_SHORT@@/Code - OSS/; \ s/@@PRODNAME@@/Code - OSS/; \ s/@@NAME@@/code-oss/g; \ s|@@EXEC@@|${PREFIX}/bin/code-oss|; \ s/@@ICON@@/com.visualstudio.code.oss/; \ s/@@URLPROTOCOL@@/code-oss/; \ s/@@LICENSE@@/MIT/; \ s/@@APPNAME@@/code-oss/g; \ s|/usr/share|${PREFIX}/share|' \ ${WRKSRC}/resources/completions/bash/code \ ${WRKSRC}/resources/completions/zsh/_code \ ${WRKSRC}/resources/linux/bin/code.sh \ ${WRKSRC}/resources/linux/code.appdata.xml \ ${WRKSRC}/resources/linux/code.desktop \ ${WRKSRC}/resources/linux/code-url-handler.desktop @(cd ${WRKDIR}/builtInExtensions && \ ${FIND} . -type f -name '*.sh' \ -exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" \ -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' {} ';') @${SETENV} FILESDIR=${FILESDIR} \ ${SH} ${FILESDIR}/update-product-json.sh ${WRKSRC} pre-build: # rebuild native node modules in top directory @for subdir in `${FIND} ${WRKSRC}/node_modules -type f -name binding.gyp -exec ${DIRNAME} {} ';'`; do \ ${ECHO_MSG} "===> Rebuilding native modules in $${subdir}"; \ cd $${subdir} && \ ${SETENV} ${MAKE_ENV} \ npm_config_runtime=electron \ npm_config_target=${ELECTRON_VER} \ npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \ node-gyp --userconfig=${WRKSRC}/.npmrc rebuild; \ done # rebuild native node modules in subdirectories @for dir in `node --input-type=module -e "console.log(JSON.stringify((await import('${WRKSRC}/build/npm/dirs.ts')).dirs))" | jq -r '.[]'`; do \ for subdir in `${FIND} ${WRKSRC}/$${dir}/node_modules -type f -name binding.gyp -exec ${DIRNAME} {} ';' 2> /dev/null`; do \ ${ECHO_MSG} "===> Rebuilding native modules in $${subdir}"; \ if [ "`${ECHO_CMD} $${subdir} | ${GREP} /build/`" ]; then \ cd $${subdir} && \ ${SETENV} ${MAKE_ENV} \ npm_config_runtime=node \ npm_config_target=${NODEJS_PORTVERSION} \ npm_config_nodedir=${LOCALBASE} \ node-gyp --userconfig=${WRKSRC}/build/.npmrc rebuild; \ elif [ "`${ECHO_CMD} $${subdir} | ${GREP} /remote/`" ]; then \ cd $${subdir} && \ ${SETENV} ${MAKE_ENV} \ npm_config_runtime=node \ npm_config_target=${NODEJS_PORTVERSION} \ npm_config_nodedir=${LOCALBASE} \ node-gyp --userconfig=${WRKSRC}/remote/.npmrc rebuild; \ else \ cd $${subdir} && \ ${SETENV} ${MAKE_ENV} \ npm_config_runtime=electron \ npm_config_target=${ELECTRON_VER} \ npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \ node-gyp --userconfig=${WRKSRC}/.npmrc rebuild; \ fi; \ done; \ done # copy rg binary file to @vscode/ripgrep node module directory @${MKDIR} ${WRKSRC}/node_modules/@vscode/ripgrep/bin @${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/node_modules/@vscode/ripgrep/bin @${MKDIR} ${WRKSRC}/build/node_modules/@vscode/ripgrep/bin @${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/build/node_modules/@vscode/ripgrep/bin @${MKDIR} ${WRKSRC}/remote/node_modules/@vscode/ripgrep/bin @${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/remote/node_modules/@vscode/ripgrep/bin do-build: # remove backup files so that they are not included in the package @${FIND} ${WRKSRC} -type f \( -name '*.bak' -o -name '*.orig' -o -name '*~' \) -delete # build and package vscode cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} \ npm_config_runtime=electron \ npm_config_target=${ELECTRON_VER} \ npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \ npm --userconfig=${WRKSRC}/.npmrc run gulp vscode-linux-${ELECTRON_ARCH}-min # move marketplace extensions @${MV} ${WRKDIR}/builtInExtensions/* ${WRKDIR}/VSCode-linux-${ELECTRON_ARCH}/resources/app/extensions do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKSRC}/resources/completions/bash/code \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d/code-oss @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKSRC}/resources/completions/zsh/_code \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_code-oss @${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata ${INSTALL_DATA} ${WRKSRC}/resources/linux/code.appdata.xml \ ${STAGEDIR}${PREFIX}/share/appdata/code-oss.appdata.xml @${MKDIR} ${STAGEDIR}${PREFIX}/share/applications .for f in code.desktop code-url-handler.desktop ${INSTALL_DATA} ${WRKSRC}/resources/linux/${f} \ ${STAGEDIR}${PREFIX}/share/applications/${f:S/code/code-oss/} .endfor @${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/resources/linux/code.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/com.visualstudio.code.oss.png @${MKDIR} ${STAGEDIR}${DATADIR} ${TAR} -cf - -C ${WRKDIR}/VSCode-linux-${ELECTRON_ARCH} . | \ ${TAR} -xf - -C ${STAGEDIR}${DATADIR} @${FIND} ${STAGEDIR}${DATADIR}/resources/app -type f -exec ${FILE} {} ';' | \ ${GREP} 'ELF.*FreeBSD' | ${AWK} -F ': ' '{print $$1}' | ${XARGS} ${STRIP_CMD} .for f in chromedriver mksnapshot v8_context_snapshot_generator @${RM} ${STAGEDIR}${DATADIR}/${f} .endfor @${RM} -r ${STAGEDIR}${DATADIR}/gen @${RM} -r ${STAGEDIR}${DATADIR}/node_headers @${RM} -r ${STAGEDIR}${DATADIR}/resources/completions ${RLN} ${STAGEDIR}${DATADIR}/bin/code-oss ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} pre-test: # setup electron dependency for unit tests @${MKDIR} ${WRKSRC}/.build/electron @${TAR} -cf - -C ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} . | \ ${TAR} -xf - -C ${WRKSRC}/.build/electron @cd ${WRKSRC}/.build/electron && ${MV} -f electron code-oss do-test: # unit tests cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ./scripts/test.sh --build || ${TRUE} # UI smoke tests cd ${WRKSRC} && ${SETENV} ${TEST_ENV} npm run smoketest build-remote-extension-host: configure pre-build # setup download cache for node @${MKDIR} ${WRKSRC}/.build/node/v${NODEJS_PORTVERSION}/linux-${ELECTRON_ARCH} @${CP} ${LOCALBASE}/bin/node ${WRKSRC}/.build/node/v${NODEJS_PORTVERSION}/linux-${ELECTRON_ARCH} # build vscode remote extension host cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ npm_config_runtime=node \ npm_config_target=${NODEJS_PORTVERSION} \ npm_config_nodedir=${LOCALBASE} \ npm --userconfig=${WRKSRC}/remote/.npmrc run gulp vscode-reh-linux-${ELECTRON_ARCH}-min @${MKDIR} ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH} ${TAR} -cf - -C ${WRKDIR}/vscode-reh-linux-${ELECTRON_ARCH} . | \ ${TAR} -xf - -C ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH} @${FIND} ${WRKDIR}/vscode-reh -type f -exec ${FILE} {} ';' | \ ${GREP} 'ELF.*FreeBSD' | ${AWK} -F ': ' '{print $$1}' | ${XARGS} ${STRIP_CMD} ${TAR} -czf ${WRKDIR}/vscode-reh-${DISTVERSION}-${OPSYS:tl}${OSREL:R}-${ARCH}.tar.gz -C ${WRKDIR}/vscode-reh . # cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm run gulp vscode-reh-web-linux-${ELECTRON_ARCH}-min ### targets for port maintainer(s) patch-package-json: extract # add node module for signature verification of extensions from Open VSX Registry @${PATCH} -s -p0 -d ${WRKSRC} < ${FILESDIR}/patch-package.json make-node-modules-archive: extract patch-package-json @${ECHO_MSG} "===> Fetching and installing node modules in ${WRKSRC}" @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} npm install \ --ignore-scripts --no-progress --no-audit --no-fund --no-update-notifier && \ ${TAR} -czf ${WRKDIR}/vscode-.-node-modules${EXTRACT_SUFX} node_modules @for dir in `node --input-type=module -e "console.log(JSON.stringify((await import('${WRKSRC}/build/npm/dirs.ts')).dirs))" | jq -r '.[]'`; do \ cd ${WRKSRC}/$${dir} && \ ${ECHO_MSG} "===> Fetching and installing node modules in ${WRKSRC}/$${dir}" && \ ${SETENV} ${MAKE_ENV} npm install \ --ignore-scripts --no-progress --no-audit --no-fund --no-update-notifier && \ if [ -d node_modules ]; then \ ${TAR} -czf ${WRKDIR}/vscode-`echo $${dir} | tr _ __ | tr / _`-node-modules${EXTRACT_SUFX} node_modules; \ fi; \ done @cd ${WRKDIR} && \ ${TAR} -czf vscode-node-modules-${DISTVERSION}${EXTRACT_SUFX} vscode-*-node-modules.tar.gz make-marketplace-exts-archive: extract @${RM} -r ${WRKSRC}/.build/builtInExtensions @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} npm run download-builtin-extensions @${TAR} -czf ${WRKDIR}/vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} -C ${WRKSRC}/.build builtInExtensions .include diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 633d5e4a5aa6..fb742439fb18 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -1,196 +1,197 @@ PORTNAME= signal-desktop DISTVERSIONPREFIX= v DISTVERSION= 8.2.0 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= LOCAL/mikael/signal-desktop/:npm \ https://registry.npmjs.org/@esbuild/freebsd-arm64/-/:esbuildarm64 \ https://registry.npmjs.org/@esbuild/freebsd-x64/-/:esbuildx64 DISTFILES= signal-desktop-${DISTVERSION}-npm-cache.tar.gz:npm \ freebsd-arm64-${ESBUILD_VERS}.tgz:esbuildarm64 \ freebsd-x64-${ESBUILD_VERS}.tgz:esbuildx64 MAINTAINER= mikael@FreeBSD.org COMMENT= Cross-platform centralized encrypted messaging service WWW= https://signal.org/ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 BUILD_DEPENDS= ${LOCALBASE}/lib/libringrtc.so:multimedia/ringrtc \ ${LOCALBASE}/lib/libsignal_node.so:net-im/libsignal-node \ ${LOCALBASE}/lib/libsignal_sqlcipher_extension.a:devel/signal-sqlcipher-extension \ ${LOCALBASE}/lib/node_sqlcipher.node:security/node-sqlcipher \ app-builder>0:devel/app-builder \ electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \ npm:www/npm${NODEJS_SUFFIX} LIB_DEPENDS= libasound.so:audio/alsa-lib \ libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ libcups.so:print/cups \ libdbus-1.so:devel/dbus \ libdrm.so:graphics/libdrm \ libepoll-shim.so:devel/libepoll-shim \ libevent.so:devel/libevent \ libexpat.so:textproc/expat2 \ libFLAC.so:audio/flac \ libffi.so:devel/libffi \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libicuuc.so:devel/icu \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libopenh264.so:multimedia/openh264 \ libopus.so:audio/opus \ libpci.so:devel/libpci \ libpipewire-0.3.so:multimedia/pipewire \ libpng16.so:graphics/png \ libpulse.so:audio/pulseaudio \ libsnappy.so:archivers/snappy \ libsndio.so:audio/sndio \ libwayland-client.so:graphics/wayland \ libwebp.so:graphics/webp \ libxkbcommon.so:x11/libxkbcommon \ libxshmfence.so:x11/libxshmfence USES= desktop-file-utils gettext-runtime gl gnome jpeg nodejs:22,build pkgconfig ssl xorg USE_GITHUB= yes GH_ACCOUNT= signalapp GH_PROJECT= Signal-Desktop USE_GL= gbm gl USE_GNOME= atk cairo gdkpixbuf glib20 gtk30 libxml2 libxslt pango USE_XORG= x11 xcb xcomposite xdamage xext xfixes xi xrandr xrender xtst PACKAGE_ENV= SIGNAL_ENV=production \ npm_config_runtime=electron \ npm_config_target=${ELECTRON_VER_MAJOR} \ npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers MAKE_ENV+= ELECTRON_OVERRIDE_DIST_PATH=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} \ HOME=${WRKDIR} \ USE_SYSTEM_APP_BUILDER=true \ SOURCE_DATE_EPOCH=${_BUILD_DATE} \ PATH=${WRKSRC}/node_modules/.bin:${WRKSRC}/pnpmbin/node_modules/.bin:${LOCALBASE}/bin:${PATH} # Don't download electron binary distribution on electron node_modules installation MAKE_ENV+= ELECTRON_SKIP_BINARY_DOWNLOAD=1 # Don't create __pycache__ directory when executing node-gyp # This is a workaround to avoid filesystem violations during poudriere build MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 ESBUILD_BINARY_PATH=${WRKSRC}/node_modules/.pnpm/@esbuild+freebsd-${ESBUILD_ARCH}@${ESBUILD_VERS}/node_modules/@esbuild/freebsd-${ESBUILD_ARCH}/package/bin/esbuild _BUILD_DATE= $$(date +'%s') ELECTRON_VER_MAJOR= 39 ESBUILD_VERS= 0.25.9 PNPM_VERS= 10.18.1 NODE_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/} ESBUILD_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/} APP_OUT_DIR= linux-${ARCH:S/aarch64/arm64-/:S/amd64//}unpacked PLIST_SUB= NODE_ARCH=${NODE_ARCH} \ SHARP_ARCH=${ARCH:S/aarch64/arm64v8/:S/amd64/x64/} .include .if ${ARCH} == aarch64 PLIST_SUB+= NOT_AARCH64="@comment " .elif ${ARCH} == amd64 PLIST_SUB+= NOT_AARCH64="" .endif do-build: # electron-builder is stupid and tries to open ${LOCALBASE}/share/electron39/electron with WRITE priv # copy ${LOCALBASE}/share/electron39 in WRKDIR # it's needed for the do-install phase, it's here because of this issue # https://github.com/MikaelUrankar/signal-desktop/issues/6 (I don't know why it fails though) @${RM} -r ${WRKDIR}/electron${ELECTRON_VER_MAJOR} @${CP} -pR ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} ${WRKDIR}/electron${ELECTRON_VER_MAJOR} ${CHMOD} -R a+w ${WRKDIR}/electron${ELECTRON_VER_MAJOR} ${ECHO_CMD} offline=true >> ${WRKSRC}/.npmrc ${ECHO_CMD} store-dir=true >> ${WRKSRC}/.pnpm-store ${CP} ${FILESDIR}/pnpm-lock.yaml ${WRKSRC} ${CP} ${FILESDIR}/pnpmfile.cjs ${WRKSRC}/.pnpmfile.cjs # Install pnpm in its own dir otherwise all hell breaks loose ${MKDIR} ${WRKSRC}/pnpmbin ${CP} ${FILESDIR}/pnpm/package* ${WRKSRC}/pnpmbin cd ${WRKSRC}/pnpmbin && \ ${SETENV} ${MAKE_ENV} npm install --ignore-scripts pnpm@${PNPM_VERS} cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ESBUILD_BINARY_PATH=${ESBUILD_BINARY_PATH} npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers pnpm install --ignore-scripts || ${TRUE} # Install libsignal_node.so, libringrtc.so and node_sqlcipher.node binaries in node_modules ${MKDIR} ${WRKSRC}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH} \ ${WRKSRC}/node_modules/@signalapp/ringrtc/build/freebsd \ ${WRKSRC}/node_modules/@signalapp/sqlcipher/prebuilds/freebsd-${NODE_ARCH} ${CP} ${LOCALBASE}/lib/libsignal_node.so \ ${WRKSRC}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH}/@signalapp+libsignal-client.node ${CP} ${LOCALBASE}/lib/libringrtc.so \ ${WRKSRC}/node_modules/@signalapp/ringrtc/build/freebsd/libringrtc-${NODE_ARCH}.node ${CP} ${LOCALBASE}/lib/node_sqlcipher.node \ ${WRKSRC}/node_modules/@signalapp/sqlcipher/prebuilds/freebsd-${NODE_ARCH} # don't ask me why ${MKDIR} ${WRKSRC}/node_modules/.pnpm/@esbuild+freebsd-${ESBUILD_ARCH}@${ESBUILD_VERS}/node_modules/@esbuild/freebsd-${ESBUILD_ARCH} ${TAR} xf ${DISTDIR}/freebsd-${ESBUILD_ARCH}-${ESBUILD_VERS}.tgz -C ${WRKSRC}/node_modules/.pnpm/@esbuild+freebsd-${ESBUILD_ARCH}@${ESBUILD_VERS}/node_modules/@esbuild/freebsd-${ESBUILD_ARCH} cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ESBUILD_BINARY_PATH=${ESBUILD_BINARY_PATH} npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers pnpm install cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} pnpm run clean-transpile # found in reproducible-builds/docker-entrypoint.sh cd ${WRKSRC}/sticker-creator && \ ${SETENV} ${MAKE_ENV} pnpm install --frozen-lock cd ${WRKSRC}/sticker-creator && \ ${SETENV} ${MAKE_ENV} pnpm run build cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} pnpm run generate do-install: # taken from https://github.com/tagattie/FreeBSD-Electron/blob/master/Mk/Uses/electron.mk#L387 # and editors/vscode cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${PACKAGE_ENV} npm run build:electron -- \ --linux --dir --config.npmRebuild=false \ --config.electronDist=${WRKDIR}/electron${ELECTRON_VER_MAJOR} ${MKDIR} ${STAGEDIR}${DATADIR} cd ${BUILD_WRKSRC}/dist/${APP_OUT_DIR} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/images/signal-logo-desktop-linux.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/signal-desktop.png ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \ ${STAGEDIR}${PREFIX}/share/applications .for f in chromedriver mksnapshot v8_context_snapshot_generator ${RM} ${STAGEDIR}${DATADIR}/${f} .endfor ${RM} -r ${STAGEDIR}${DATADIR}/gen ${RM} -r ${STAGEDIR}${DATADIR}/node_headers ${RM} -r ${STAGEDIR}${DATADIR}/resources/completions ${RLN} ${STAGEDIR}${DATADIR}/signal-desktop ${STAGEDIR}${PREFIX}/bin ${RM} -r ${STAGEDIR}${DATADIR}/resources/app.asar.unpacked/node_modules/pnpm create-caches-tarball: # do some cleanup first ${RM} -r ${WRKDIR}/.npm/_logs ${WRKDIR}/.npm/_update-notifier-last-checked cd ${WRKDIR} && \ ${TAR} czf signal-desktop-${DISTVERSION}-npm-cache.tar.gz .npm pnpm .cache .include diff --git a/net-im/teams/Makefile b/net-im/teams/Makefile index 9c8315fe924f..baa973b61591 100644 --- a/net-im/teams/Makefile +++ b/net-im/teams/Makefile @@ -1,47 +1,48 @@ PORTNAME= teams DISTVERSIONPREFIX= v DISTVERSION= 2.7.9 +PORTREVISION= 1 CATEGORIES= net-im MAINTAINER= tagattie@FreeBSD.org COMMENT= Unofficial Microsoft Teams client WWW= https://github.com/IsmaelMartinez/teams-for-linux LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= desktop-file-utils electron:39 localbase:ldflags \ nodejs:22,build python:build USE_GITHUB= yes GH_ACCOUNT= IsmaelMartinez GH_PROJECT= teams-for-linux SUB_FILES= ${PORTNAME} PORTDOCS= CONTRIBUTING.md HISTORY.md README.md SECURITY.md OPTIONS_DEFINE= DOCS USE_ELECTRON= npm:npm appbuilder:devel prefetch extract rebuild build:builder do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} .for size in 16 24 32 48 64 96 128 256 512 1024 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps ${INSTALL_DATA} ${WRKSRC}/build/icons/${size}x${size}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}.png .endfor @${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC}/dist/${ELECTRON_BUILDER_APP_OUT_DIR} && \ ${COPYTREE_SHARE} resources ${STAGEDIR}${DATADIR} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} do-test: cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} npm run test:unit .include diff --git a/textproc/obsidian/Makefile b/textproc/obsidian/Makefile index 44cd3563ae24..97867caf6f5e 100644 --- a/textproc/obsidian/Makefile +++ b/textproc/obsidian/Makefile @@ -1,44 +1,44 @@ # This port will not be packaged by the official FreeBSD build cluster, because # its license doesn't permit redistribution. # # To build this port locally with minimal effort use # cd /textproc/obsidian # pkg install -A electron`make -V electronfix_ARGS` # make USE_PACKAGE_DEPENDS_ONLY=yes install clean PORTNAME= obsidian PORTVERSION= 1.11.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc # Icon is taken from the Nix build recipe # https://github.com/NixOS/nixpkgs/blob/de5448dab588ad41aef40f8c7c0c230981656698/pkgs/applications/misc/obsidian/default.nix#L31-L34 MASTER_SITES= https://github.com/obsidianmd/obsidian-releases/releases/download/v${PORTVERSION}/ \ https://forum.obsidian.md/uploads/default/original/1X/:icon DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png:icon EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= arrowd@FreeBSD.org COMMENT= Powerful and extensible knowledge base application WWW= https://obsidian.md LICENSE= EULA LICENSE_NAME= End User License Agreement LICENSE_TEXT= See https://obsidian.md/terms LICENSE_PERMS= USES= electronfix:39 ELECTRONFIX_MAIN_EXECUTABLE= obsidian SUB_FILES= obsidian NO_BUILD= yes do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/obsidian ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${PATCHDIR}/obsidian.desktop ${STAGEDIR}${DESKTOPDIR}/obsidian.desktop ${INSTALL_DATA} ${DISTDIR}/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png ${STAGEDIR}${PREFIX}/share/pixmaps/obsidian.png @${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo ${INSTALL_DATA} ${FILESDIR}/md.obsidian.obsidian.appdata.xml ${STAGEDIR}${PREFIX}/share/metainfo/ .include