diff --git a/graphics/minder/Makefile b/graphics/minder/Makefile index aaa5242e945c..d24ba7662def 100644 --- a/graphics/minder/Makefile +++ b/graphics/minder/Makefile @@ -1,38 +1,38 @@ PORTNAME= minder PORTVERSION= 1.17.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics # avoid PKGBASE collision with net-p2p/minder PKGNAMESUFFIX= -app MAINTAINER= nc@FreeBSD.org COMMENT= Mind-mapping application WWW= https://github.com/phase1geo/Minder LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= discount>0:textproc/discount LIB_DEPENDS= libgee-0.8.so:devel/libgee \ libgranite.so:x11-toolkits/granite \ libhandy-1.so:x11-toolkits/libhandy \ libmarkdown.so:textproc/discount USES= desktop-file-utils gettext gnome libarchive localbase:ldflags \ meson pkgconfig python:build shared-mime-info shebangfix vala:build USE_GITHUB= yes GH_ACCOUNT= phase1geo GH_PROJECT= Minder USE_GNOME= cairo gdkpixbuf glib20 gtk30 gtksourceview4 libxml2 pango GLIB_SCHEMAS= com.github.phase1geo.minder.gschema.xml SHEBANG_FILES= meson/post_install.py PORTDOCS= README.md OPTIONS_DEFINE= DOCS post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include diff --git a/graphics/pdfpc/Makefile b/graphics/pdfpc/Makefile index fbb329de855e..bb7c7bf553e8 100644 --- a/graphics/pdfpc/Makefile +++ b/graphics/pdfpc/Makefile @@ -1,35 +1,34 @@ PORTNAME= pdfpc +DISTVERSIONPREFIX= v DISTVERSION= 4.7.0 PORTREVISION= 2 CATEGORIES= graphics -DISTVERSIONPREFIX= v -PORTREVISION= 1 MAINTAINER= bapt@FreeBSD.org COMMENT= Keynote-like multi-monitor presentation viewer WWW= https://pdfpc.github.io/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${LOCALBASE}/lib/libmarkdown.a:textproc/discount LIB_DEPENDS= libgee-0.8.so:devel/libgee \ libharfbuzz.so:print/harfbuzz \ libjson-glib-1.0.so:devel/json-glib \ libmarkdown.so:textproc/discount \ libpoppler-glib.so:graphics/poppler-glib \ libqrencode.so:graphics/libqrencode \ libsoup-3.0.so:devel/libsoup3 \ libwebkit2gtk-4.1.so:www/webkit2-gtk@41 USES= cmake compiler:c11 gnome gstreamer pkgconfig vala:build xorg USE_GNOME= cairo gdkpixbuf gtk30 USE_XORG= x11 USE_GITHUB= yes post-install: @${MV} ${STAGEDIR}${PREFIX}/etc/pdfpcrc \ ${STAGEDIR}${PREFIX}/etc/pdfpcrc.sample .include diff --git a/math/labplot/Makefile b/math/labplot/Makefile index a2ff6b0f5b21..26f7312f48a1 100644 --- a/math/labplot/Makefile +++ b/math/labplot/Makefile @@ -1,91 +1,91 @@ PORTNAME= labplot DISTVERSION= 2.11.80 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math kde MASTER_SITES= KDE/stable/${PORTNAME}/ DIST_SUBDIR= KDE/invent.kde.org MAINTAINER= kde@FreeBSD.org COMMENT= Data plotting and function analysis tool by KDE WWW= https://labplot.kde.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-2.0-or-later.txt LIB_DEPENDS= libQXlsxQt6.so:devel/qxlsx@qt6 \ libgsl.so:math/gsl \ liblz4.so:archivers/liblz4 \ libmarkdown.so:textproc/discount \ libpoppler.so:graphics/poppler \ libpoppler-qt6.so:graphics/poppler-qt6 \ libzstd.so:archivers/zstd USES= bison cmake compiler:c++17-lang desktop-file-utils eigen:3 \ kde:6 pkgconfig qt:6 shared-mime-info xorg gettext USE_KDE= archive completion config configwidgets coreaddons crash \ i18n iconthemes kio newstuff parts purpose service \ syntaxhighlighting textwidgets userfeedback widgetsaddons \ xmlgui \ doctools:build ecm:build USE_QT= base mqtt serialport svg USE_XORG= x11 xcb KDE_INVENT= 110f258e44a45354c5219e497409a22185fa2933 education labplot CXXFLAGS+= -Wno-error=undef PLIST_SUB= SHLIB_VER=${PORTVERSION} OPTIONS_DEFINE= CANTOR FITS FFTW3 HDF5 LIBCERF MATLAB NETCDF ORCUS \ ORIGINLAB READSTAT OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} CANTOR_DESC= KDE Cantor support CANTOR_LIB_DEPENDS= libcantorlibs.so:math/cantor \ libspectre.so:print/libspectre CANTOR_CMAKE_BOOL= ENABLE_CANTOR FFTW3_DESC= Speedier FFTs in the numerical and stats lib (NSL) FFTW3_LIB_DEPENDS= libfftw3.so:math/fftw3 FFTW3_CMAKE_BOOL= ENABLE_FFTW FITS_DESC= Flexible Image Transport System (FITS) data support FITS_LIB_DEPENDS= libcfitsio.so:astro/cfitsio FITS_CMAKE_BOOL= ENABLE_FITS HDF5_DESC= Reading and writing self-describing array data HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 HDF5_CMAKE_BOOL= ENABLE_HDF5 LIBCERF_DESC= Complex error functions support LIBCERF_LIB_DEPENDS= libcerf.so:math/libcerf LIBCERF_CMAKE_BOOL= ENABLE_LIBCERF MATLAB_DESC= MATLAB MAT file support MATLAB_LIB_DEPENDS= libmatio.so:math/matio MATLAB_CMAKE_BOOL= ENABLE_MATIO NETCDF_DESC= Interfaces for array-oriented data access NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf NETCDF_CMAKE_BOOL= ENABLE_NETCDF ORCUS_DESC= Spreadsheet processing filters (via liborcus) ORCUS_LIB_DEPENDS= libixion-0.20.so:textproc/libixion \ liborcus-0.20.so:devel/liborcus ORCUS_CMAKE_BOOL= ENABLE_ORCUS ORIGINLAB_DESC= OriginLab project files support ORIGINLAB_LIB_DEPENDS= liborigin.so:math/liborigin ORIGINLAB_CMAKE_BOOL= ENABLE_LIBORIGIN READSTAT_DESC= SAS, SPSS, Stata data support READSTAT_LIB_DEPENDS= libreadstat.so:math/readstat READSTAT_USES= iconv READSTAT_CMAKE_BOOL= ENABLE_READSTAT post-patch: # workaround for undefined version, to be fixed upstream ${REINPLACE_CMD} 's,QXLSX_VERSION_STRING,"1.5.0",' \ ${WRKSRC}/src/frontend/AboutDialog.cpp .include diff --git a/misc/kookbook/Makefile b/misc/kookbook/Makefile index a40879da352e..772b6f8d65d5 100644 --- a/misc/kookbook/Makefile +++ b/misc/kookbook/Makefile @@ -1,21 +1,21 @@ PORTNAME= kookbook DISTVERSION= 0.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc kde MASTER_SITES= KDE/unstable/${PORTNAME}/ MAINTAINER= kde@FreeBSD.org COMMENT= Recipes database with Markdown support WWW= https://pusling.com/blog/?p=499 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libmarkdown.so:textproc/discount USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz USE_KDE= ecm:build USE_QT= core declarative gui network printsupport widgets \ qmake:build buildtools:build testlib:build .include diff --git a/sysutils/plasma6-discover/Makefile b/sysutils/plasma6-discover/Makefile index 09fe9069d28c..577197ffc437 100644 --- a/sysutils/plasma6-discover/Makefile +++ b/sysutils/plasma6-discover/Makefile @@ -1,26 +1,27 @@ PORTNAME= discover DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils kde kde-plasma MAINTAINER= kde@FreeBSD.org COMMENT= Plasma package management tools WWW= https://www.kde.org/plasma-desktop LIB_DEPENDS= libAppStreamQt.so:devel/appstream-qt \ libpackagekitqt6.so:ports-mgmt/packagekit-qt \ libmarkdown.so:textproc/discount \ libQCoro6Core.so:devel/qcoro RUN_DEPENDS= PackageKit>0:ports-mgmt/packagekit USES= cmake compiler:c++11-lib desktop-file-utils gettext gl kde:6 \ pkgconfig qt:6 tar:xz xorg USE_KDE= archive attica config coreaddons crash dbusaddons i18n \ idletime itemmodels jobwidgets kcmutils kio kirigami-addons \ newstuff notifications purpose service statusnotifieritem \ userfeedback widgetsaddons windowsystem \ ecm:build USE_QT= base declarative webview USE_GL= gl opengl USE_XORG= x11 .include diff --git a/textproc/discount/Makefile b/textproc/discount/Makefile index 3044d687be19..2c3b79e80cb8 100644 --- a/textproc/discount/Makefile +++ b/textproc/discount/Makefile @@ -1,45 +1,45 @@ PORTNAME= discount -PORTVERSION= 2.2.7d +PORTVERSION= 3.0.1.1 CATEGORIES= textproc devel MASTER_SITES= https://www.pell.portland.or.us/~orc/Code/discount/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= C implementation of the Markdown markup language WWW= https://www.pell.portland.or.us/~orc/Code/discount/ \ https://github.com/Orc/discount LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= cpe pathfix pkgconfig tar:bz2 CFLAGS+= -fPIC CONFIGURE_ARGS= --prefix=${PREFIX} --shared CONFIGURE_SCRIPT= configure.sh HAS_CONFIGURE= yes INSTALL_TARGET= install install.man TEST_TARGET= test USE_LDCONFIG= yes +PLIST_SUB= PORTVERSION=${PORTVERSION:R} + CONFLICTS_INSTALL= markdown CPE_VENDOR= discount_project -PORTSCOUT= skipv:2.2.7 - OPTIONS_DEFINE= EXTRA SAMPLES TAB8 OPTIONS_DEFAULT=EXTRA TAB8 OPTIONS_SUB= yes EXTRA_DESC= Enable all extra features SAMPLES_DESC= Install sample programs TAB8_DESC= Use a tabstop of 8 (default is 4) EXTRA_CONFIGURE_ON= --with-dl=both --with-fenced-code --with-github-tags --with-id-anchor SAMPLES_INSTALL_TARGET= install.samples TAB8_CONFIGURE_ON= --with-tabstops=8 post-install: ${INSTALL_DATA} ${WRKSRC}/libmarkdown.a ${STAGEDIR}${PREFIX}/lib/libmarkdown.a ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmarkdown.so .include diff --git a/textproc/discount/distinfo b/textproc/discount/distinfo index 14140f0ba5a4..bd863493744e 100644 --- a/textproc/discount/distinfo +++ b/textproc/discount/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693987425 -SHA256 (discount-2.2.7d.tar.bz2) = 12a2041e96ae8cde17e08ff1a215d331580a5c58688daa5a18842b6bb5b77b52 -SIZE (discount-2.2.7d.tar.bz2) = 106055 +TIMESTAMP = 1757436431 +SHA256 (discount-3.0.1.1.tar.bz2) = c1b1b9f37bb907aae5f4bcfc960269baeae9e6710cdd6860ee965abfa2676631 +SIZE (discount-3.0.1.1.tar.bz2) = 113052 diff --git a/textproc/discount/files/patch-clang16 b/textproc/discount/files/patch-clang16 deleted file mode 100644 index c16d5f6fae9f..000000000000 --- a/textproc/discount/files/patch-clang16 +++ /dev/null @@ -1,11 +0,0 @@ ---- main.c.orig 2022-03-30 19:34:50 UTC -+++ main.c -@@ -308,7 +308,7 @@ main(int argc, char **argv) - if ( squash ) - mkd_e_anchor(doc, (mkd_callback_t) anchor_format); - if ( use_e_codefmt ) -- mkd_e_code_format(doc, external_codefmt); -+ mkd_e_code_format(doc, (mkd_callback_t) external_codefmt); - - if ( use_e_codefmt || squash ) - mkd_e_free(doc, free_it); diff --git a/textproc/discount/files/patch-configure.inc b/textproc/discount/files/patch-configure.inc index ec33a22e576c..38d7b51efa32 100644 --- a/textproc/discount/files/patch-configure.inc +++ b/textproc/discount/files/patch-configure.inc @@ -1,10 +1,12 @@ ---- configure.inc.orig 2020-08-24 05:45:49 UTC +--- configure.inc.orig 2025-09-07 21:27:45 UTC +++ configure.inc -@@ -1501,7 +1501,6 @@ install)$PROG_INSTALL -c \$FULLNAME "\$1" +@@ -1501,9 +1501,6 @@ EOF $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME.\$MAJOR $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME EOF -- test "$LDCONFIG" && echo ' '$LDCONFIG '"$1"' >> librarian.sh +- if [ "$LDCONFIG" -a -z "$CONTAINER" ]; then +- echo ' '$LDCONFIG '"$1"' >> librarian.sh +- fi + cat >> librarian.sh << EOF ;; - esac diff --git a/textproc/discount/pkg-plist b/textproc/discount/pkg-plist index f736121635c5..317dca112032 100644 --- a/textproc/discount/pkg-plist +++ b/textproc/discount/pkg-plist @@ -1,32 +1,32 @@ %%SAMPLES%%bin/makepage bin/markdown %%SAMPLES%%bin/mkd2html %%SAMPLES%%bin/theme include/mkdio.h lib/libmarkdown.a lib/libmarkdown.so -lib/libmarkdown.so.2 -lib/libmarkdown.so.2.2.7 +lib/libmarkdown.so.3 +lib/libmarkdown.so.%%PORTVERSION%% libdata/pkgconfig/libmarkdown.pc %%SAMPLES%%share/man/man1/makepage.1.gz share/man/man1/markdown.1.gz %%SAMPLES%%share/man/man1/mkd2html.1.gz %%SAMPLES%%share/man/man1/theme.1.gz share/man/man3/markdown.3.gz share/man/man3/mkd-callbacks.3.gz share/man/man3/mkd-functions.3.gz share/man/man3/mkd-line.3.gz share/man/man3/mkd_cleanup.3.gz share/man/man3/mkd_compile.3.gz share/man/man3/mkd_css.3.gz share/man/man3/mkd_doc_author.3.gz share/man/man3/mkd_doc_date.3.gz share/man/man3/mkd_doc_title.3.gz share/man/man3/mkd_generatecss.3.gz share/man/man3/mkd_generatehtml.3.gz share/man/man3/mkd_generateline.3.gz share/man/man3/mkd_in.3.gz share/man/man3/mkd_line.3.gz share/man/man3/mkd_string.3.gz share/man/man7/markdown.7.gz share/man/man7/mkd-extensions.7.gz