Date: Fri, 03 Jul 2026 08:51:02 +0000 From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fe7f5adb698f - main - graphics/fotocx: update the port to version 26.5 Message-ID: <6a4777f6.3b2b9.6616c09d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe7f5adb698f20c9d63d9d9a036d58fd94f0acef commit fe7f5adb698f20c9d63d9d9a036d58fd94f0acef Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2026-07-03 08:49:12 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2026-07-03 08:49:12 +0000 graphics/fotocx: update the port to version 26.5 - Provide fall-back distfile mirrors as the author has a nasty habit of removing the older versions from the main site - Port internal memused() function to FreeBSD using the getrusage(2) API - Replace non-standard, GNU get_current_dir_name() call with the normal POSIX getcwd() Reported by: portscout --- graphics/fotocx/Makefile | 7 +- graphics/fotocx/distinfo | 6 +- graphics/fotocx/files/patch-zfuncs.cc | 50 ++++++++++--- graphics/fotocx/pkg-plist | 128 ++++++++-------------------------- 4 files changed, 77 insertions(+), 114 deletions(-) diff --git a/graphics/fotocx/Makefile b/graphics/fotocx/Makefile index 211d508fe2fd..366749b3fa12 100644 --- a/graphics/fotocx/Makefile +++ b/graphics/fotocx/Makefile @@ -1,7 +1,10 @@ PORTNAME= fotocx -PORTVERSION= 26.1 +PORTVERSION= 26.5 CATEGORIES= graphics -MASTER_SITES= https://kornelix.net/downloads/downloads/ +MASTER_SITES= https://kornelix.net/downloads/downloads/ \ + https://fossies.org/linux/misc/ \ + https://fossies.org/linux/misc/legacy/ + DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= danfe@FreeBSD.org diff --git a/graphics/fotocx/distinfo b/graphics/fotocx/distinfo index 15682b8024d8..26988dc0aa6b 100644 --- a/graphics/fotocx/distinfo +++ b/graphics/fotocx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1767872221 -SHA256 (fotocx-26.1-source.tar.gz) = 7b26d9d4d4f11840e1abc1b2b134c370929bb9f4b27553d83ff792585fc46adb -SIZE (fotocx-26.1-source.tar.gz) = 12526700 +TIMESTAMP = 1780511605 +SHA256 (fotocx-26.5-source.tar.gz) = ae5efc8ef1abc889616929641d6aea047ee40872be91c7e7b5cd15a6128d07f8 +SIZE (fotocx-26.5-source.tar.gz) = 11428874 diff --git a/graphics/fotocx/files/patch-zfuncs.cc b/graphics/fotocx/files/patch-zfuncs.cc index b855e047932a..177beaa528be 100644 --- a/graphics/fotocx/files/patch-zfuncs.cc +++ b/graphics/fotocx/files/patch-zfuncs.cc @@ -1,6 +1,6 @@ ---- zfuncs.cc.orig 2026-01-08 11:29:58 UTC +--- zfuncs.cc.orig 2026-06-03 18:20:58 UTC +++ zfuncs.cc -@@ -495,6 +495,7 @@ int zmalloc_test(int64 cc) +@@ -498,6 +498,7 @@ int zmalloc_test(int64 cc) double realmemory() { @@ -8,7 +8,7 @@ FILE *fid; ch buff[100], *pp; double rmem = 0; -@@ -513,15 +514,45 @@ double realmemory() +@@ -516,15 +517,45 @@ double realmemory() } fclose(fid); @@ -54,7 +54,7 @@ FILE *fid; ch buff[100], *pp; double avmem = 0; -@@ -546,6 +577,11 @@ double availmemory() +@@ -549,6 +580,11 @@ double availmemory() } fclose(fid); @@ -66,7 +66,7 @@ return avmem; } -@@ -798,7 +834,7 @@ void zappcrash(ch *format, ... ) +@@ -779,7 +815,7 @@ void zappcrash(ch *format, ... ) uname(&unbuff); // get cpu arch. 32/64 bit arch = unbuff.machine; @@ -75,7 +75,7 @@ if (fid1) { ii = fscanf(fid1,"%s %s %s",OS1,OS2,OS3); pclose(fid1); -@@ -1054,13 +1090,13 @@ double get_seconds(int init) +@@ -1035,13 +1071,13 @@ double get_seconds(int init) static double secs1 = 0, secs2, secs3; if (init == 0) { @@ -91,8 +91,27 @@ secs2 = time1.tv_sec; secs2 += time1.tv_nsec * 0.000000001; secs3 = secs2 - secs1; -@@ -2015,6 +2051,10 @@ nextrec: - return pp3; // return logical record, null terminated +@@ -1116,6 +1152,7 @@ double CPUtime() + + int memused() + { ++#if defined(__linux__) + ch buff1[100], buff2[1000]; + ch *pp = 0; + FILE *fid; +@@ -1142,6 +1179,10 @@ int memused() + } + + return MB; ++#elif defined(__FreeBSD__) ++ struct rusage ru; ++ return getrusage(RUSAGE_SELF, &ru) ? 0 : (ru.ru_maxrss + 1023) / 1024; ++#endif + } + + +@@ -2028,6 +2069,10 @@ int renamez(ch *file1, ch *file2) + return err; } +int get_nprocs() @@ -102,7 +121,7 @@ /**************************************************************************************/ -@@ -2209,7 +2249,7 @@ uint diskspace(ch *file) +@@ -2106,7 +2151,7 @@ uint diskspace(ch *file) FILE *fid; pp = zescape_quotes(file); @@ -111,7 +130,7 @@ zfree(pp); fid = popen(command,"r"); -@@ -4077,14 +4117,18 @@ ch * SearchWildCase(ch *wpath, int &uflag) +@@ -3974,14 +4019,18 @@ ch * SearchWildCase(ch *wpath, int &uflag) flist and flist[*] are subjects for zfree(). zfind() works for files containing quotes (") @@ -131,7 +150,16 @@ int ii, jj, err, cc; glob_t globdata; ch *pp; -@@ -6114,9 +6158,16 @@ int zinitapp(ch *appvers, int argc, ch *argv[]) +@@ -5984,7 +6033,7 @@ int zinitapp(ch *appvers, int argc, ch *argv[]) + STATB statB; + FILE *fid; + +- printf("current directory: %s\n",get_current_dir_name()); // do not CD $HOME 26.4 ++ printf("current directory: %s\n", getcwd(buff, sizeof buff)); + + startime = time(null); // app start time, secs. since 1970 + +@@ -6009,9 +6058,16 @@ int zinitapp(ch *appvers, int argc, ch *argv[]) if (argc > 1 && strmatchV(argv[1],"-ver","-v",null)) exit(0); // exit if nothing else wanted progexe = 0; diff --git a/graphics/fotocx/pkg-plist b/graphics/fotocx/pkg-plist index 02f8b2b1917c..6c1f3fef5702 100644 --- a/graphics/fotocx/pkg-plist +++ b/graphics/fotocx/pkg-plist @@ -37,6 +37,7 @@ share/applications/fotocx.desktop %%DATADIR%%/data/custom_scripts/voodoo %%DATADIR%%/data/grid_picklist %%DATADIR%%/data/map_regions +%%DATADIR%%/data/markup/raised text effect %%DATADIR%%/data/meta_picklist %%DATADIR%%/data/meta_report_tags %%DATADIR%%/data/palettes/Bears.gpl @@ -124,33 +125,39 @@ share/applications/fotocx.desktop %%DATADIR%%/data/plugins %%DATADIR%%/data/raw_commands %%DATADIR%%/data/slideshow-tone.oga -%%DATADIR%%/data/translations/$ AI prompt +%%DATADIR%%/data/translations/$ AI prompts %%DATADIR%%/data/translations/$ language codes -%%DATADIR%%/data/translations/$ split.com -%%DATADIR%%/data/translations/da.text -%%DATADIR%%/data/translations/de.text -%%DATADIR%%/data/translations/el.text -%%DATADIR%%/data/translations/en.text -%%DATADIR%%/data/translations/es.text -%%DATADIR%%/data/translations/fi.text -%%DATADIR%%/data/translations/fr.text -%%DATADIR%%/data/translations/hu.text -%%DATADIR%%/data/translations/it.text -%%DATADIR%%/data/translations/ja.text -%%DATADIR%%/data/translations/nl.text -%%DATADIR%%/data/translations/no.text -%%DATADIR%%/data/translations/pl.text -%%DATADIR%%/data/translations/pt.text -%%DATADIR%%/data/translations/ro.text -%%DATADIR%%/data/translations/ru.text -%%DATADIR%%/data/translations/sv.text -%%DATADIR%%/data/translations/tr.text -%%DATADIR%%/data/translations/zh.text -%%DATADIR%%/data/userguide +%%DATADIR%%/data/translations/$ undo-redo translations +%%DATADIR%%/data/translations/gui_da +%%DATADIR%%/data/translations/gui_de +%%DATADIR%%/data/translations/gui_el +%%DATADIR%%/data/translations/gui_en +%%DATADIR%%/data/translations/gui_es +%%DATADIR%%/data/translations/gui_fi +%%DATADIR%%/data/translations/gui_fr +%%DATADIR%%/data/translations/gui_hu +%%DATADIR%%/data/translations/gui_it +%%DATADIR%%/data/translations/gui_ja +%%DATADIR%%/data/translations/gui_nl +%%DATADIR%%/data/translations/gui_no +%%DATADIR%%/data/translations/gui_pl +%%DATADIR%%/data/translations/gui_pt +%%DATADIR%%/data/translations/gui_ro +%%DATADIR%%/data/translations/gui_ru +%%DATADIR%%/data/translations/gui_sv +%%DATADIR%%/data/translations/gui_tr +%%DATADIR%%/data/translations/gui_zh +%%DATADIR%%/data/translations/ug_de +%%DATADIR%%/data/translations/ug_en +%%DATADIR%%/data/translations/ug_es +%%DATADIR%%/data/translations/ug_fr +%%DATADIR%%/data/translations/ug_it +%%DATADIR%%/data/translations/ug_pl +%%DATADIR%%/data/translations/ug_pt +%%DATADIR%%/data/translations/ug_zh %%DATADIR%%/data/widgets.css %%DATADIR%%/data/worldcities.txt %%DATADIR%%/images/HDF-paint.png -%%DATADIR%%/images/HDF.jpg %%DATADIR%%/images/HDR-adjust.png %%DATADIR%%/images/HDR.jpg %%DATADIR%%/images/KB-shortcuts.jpg @@ -171,49 +178,30 @@ share/applications/fotocx.desktop %%DATADIR%%/images/amplify-contrast2.jpg %%DATADIR%%/images/anti-alias.jpg %%DATADIR%%/images/area-blend.jpg -%%DATADIR%%/images/area-blend2.jpg -%%DATADIR%%/images/area-rescale.png -%%DATADIR%%/images/area_fill.png %%DATADIR%%/images/batch-change-meta.png %%DATADIR%%/images/batch-convert.jpg -%%DATADIR%%/images/batch-copy-move.png -%%DATADIR%%/images/batch-delete-trash.png %%DATADIR%%/images/batch-geotags.png %%DATADIR%%/images/batch-keywords.jpg -%%DATADIR%%/images/batch-move-meta.png %%DATADIR%%/images/batch-overlay.png %%DATADIR%%/images/batch-photo-date1.png %%DATADIR%%/images/batch-photo-date2.png %%DATADIR%%/images/batch-purge-keywords.jpg -%%DATADIR%%/images/batch-raw.png %%DATADIR%%/images/batch-rename-keywords.png %%DATADIR%%/images/batch-report-meta.png -%%DATADIR%%/images/batch-upright.png %%DATADIR%%/images/batch.png %%DATADIR%%/images/blackball.png -%%DATADIR%%/images/blank-image.png -%%DATADIR%%/images/blobs.png -%%DATADIR%%/images/blobs2.jpg %%DATADIR%%/images/blueball.png %%DATADIR%%/images/blur.jpg -%%DATADIR%%/images/bookmarks.png -%%DATADIR%%/images/brightness-steps.png %%DATADIR%%/images/brite-ramp1.png %%DATADIR%%/images/brite-ramp2.png %%DATADIR%%/images/broken.png %%DATADIR%%/images/calibrate-printer.png %%DATADIR%%/images/cartoon.jpg -%%DATADIR%%/images/change-alpha.png %%DATADIR%%/images/choose-captions.png %%DATADIR%%/images/color-mode.png %%DATADIR%%/images/color-mode2.jpg %%DATADIR%%/images/color-negative.jpg %%DATADIR%%/images/combine.png -%%DATADIR%%/images/copy-from-image.png -%%DATADIR%%/images/copy-from-image2.jpg -%%DATADIR%%/images/copy-in-image.png -%%DATADIR%%/images/copy-move.png -%%DATADIR%%/images/copy-prior-edit.png %%DATADIR%%/images/crop-buttons.jpg %%DATADIR%%/images/crop-image.jpg %%DATADIR%%/images/crosshatch1.png @@ -222,21 +210,13 @@ share/applications/fotocx.desktop %%DATADIR%%/images/custom-menu.png %%DATADIR%%/images/custom-widgets.png %%DATADIR%%/images/custom.png -%%DATADIR%%/images/dark-bright-pixels.png %%DATADIR%%/images/defog.png %%DATADIR%%/images/defog2.jpg -%%DATADIR%%/images/delete-trash.png %%DATADIR%%/images/denoise.jpg %%DATADIR%%/images/develop.png %%DATADIR%%/images/dither1.png %%DATADIR%%/images/dither2.jpg -%%DATADIR%%/images/draw-arrow.jpg -%%DATADIR%%/images/draw-box.jpg -%%DATADIR%%/images/draw-oval.jpg -%%DATADIR%%/images/draw-text.jpg %%DATADIR%%/images/edit-any-metadata.png -%%DATADIR%%/images/edit-bookmarks.jpg -%%DATADIR%%/images/edit-hist.png %%DATADIR%%/images/edit-meta.jpg %%DATADIR%%/images/edit-selection.jpg %%DATADIR%%/images/edit.png @@ -247,13 +227,10 @@ share/applications/fotocx.desktop %%DATADIR%%/images/engrave2.png %%DATADIR%%/images/escher-spiral.png %%DATADIR%%/images/escher-spiralA.png -%%DATADIR%%/images/export-file-list.png -%%DATADIR%%/images/export-files.png %%DATADIR%%/images/file-save-as.jpg %%DATADIR%%/images/file-save.png %%DATADIR%%/images/file.png %%DATADIR%%/images/find-dups.png -%%DATADIR%%/images/first-index.jpg %%DATADIR%%/images/fix-motion-blur.png %%DATADIR%%/images/fix-motion-blur1.jpg %%DATADIR%%/images/flatten-photo1.png @@ -269,9 +246,6 @@ share/applications/fotocx.desktop %%DATADIR%%/images/fringesA.jpg %%DATADIR%%/images/fusion.png %%DATADIR%%/images/fusion2.jpg -%%DATADIR%%/images/gallery-filter.png -%%DATADIR%%/images/gallery-sort.png -%%DATADIR%%/images/gallery-view.jpg %%DATADIR%%/images/gallery.png %%DATADIR%%/images/global-retx.png %%DATADIR%%/images/global-retx2.jpg @@ -279,17 +253,14 @@ share/applications/fotocx.desktop %%DATADIR%%/images/grid-settings.jpg %%DATADIR%%/images/help.png %%DATADIR%%/images/image-array.jpg -%%DATADIR%%/images/image-diffs.png %%DATADIR%%/images/image-locations.jpg %%DATADIR%%/images/image-management.jpg %%DATADIR%%/images/index-files1.png %%DATADIR%%/images/index-files2.png %%DATADIR%%/images/inside-out1.png %%DATADIR%%/images/inside-out2.jpg -%%DATADIR%%/images/interpolation.png %%DATADIR%%/images/jpeg-artifacts.png %%DATADIR%%/images/jpeg-artifacts1.jpg -%%DATADIR%%/images/jpeg-quality.jpg %%DATADIR%%/images/local-retx.png %%DATADIR%%/images/local-retx2.jpg %%DATADIR%%/images/localcon1.jpg @@ -298,7 +269,6 @@ share/applications/fotocx.desktop %%DATADIR%%/images/magnify-image.jpg %%DATADIR%%/images/make-waves1.png %%DATADIR%%/images/make-waves2.jpg -%%DATADIR%%/images/manage-albums.png %%DATADIR%%/images/manage-keywords.png %%DATADIR%%/images/map-click.jpg %%DATADIR%%/images/map-location.png @@ -316,20 +286,13 @@ share/applications/fotocx.desktop %%DATADIR%%/images/mashup6.png %%DATADIR%%/images/mashup7.png %%DATADIR%%/images/match-colors.png -%%DATADIR%%/images/measure-image.png -%%DATADIR%%/images/menu-summary.jpg -%%DATADIR%%/images/meta-view.jpg %%DATADIR%%/images/metadata.png %%DATADIR%%/images/moncolor-small.png %%DATADIR%%/images/moncolor.png %%DATADIR%%/images/mosaic1.png %%DATADIR%%/images/mosaic2.jpg -%%DATADIR%%/images/nonlinear slider.png -%%DATADIR%%/images/number-keys.png -%%DATADIR%%/images/outboard-programs.png %%DATADIR%%/images/outlines1.png %%DATADIR%%/images/outlines2.jpg -%%DATADIR%%/images/paint-edits.png %%DATADIR%%/images/paint-image.jpg %%DATADIR%%/images/paint-transp.png %%DATADIR%%/images/paint-transp2.jpg @@ -343,15 +306,11 @@ share/applications/fotocx.desktop %%DATADIR%%/images/permissions.png %%DATADIR%%/images/perspective1.png %%DATADIR%%/images/perspective2.jpg -%%DATADIR%%/images/plugins-edit.jpg %%DATADIR%%/images/plugins.png %%DATADIR%%/images/prev-next.png -%%DATADIR%%/images/print-margins.png -%%DATADIR%%/images/print-setup.png %%DATADIR%%/images/printer-cal-study.png %%DATADIR%%/images/printer-calibrate-chart.png %%DATADIR%%/images/printer-calibrate.jpg -%%DATADIR%%/images/quit.png %%DATADIR%%/images/red-eyes1.png %%DATADIR%%/images/red-eyes2.png %%DATADIR%%/images/redball.png @@ -360,15 +319,11 @@ share/applications/fotocx.desktop %%DATADIR%%/images/remove-dust2.jpg %%DATADIR%%/images/remove-halo.png %%DATADIR%%/images/remove-halo2.png -%%DATADIR%%/images/rename-folder.png -%%DATADIR%%/images/rename.png %%DATADIR%%/images/repair.png %%DATADIR%%/images/rescale.png -%%DATADIR%%/images/resources.png %%DATADIR%%/images/retouch.png %%DATADIR%%/images/rotate-left.png %%DATADIR%%/images/rotate-right.png -%%DATADIR%%/images/rotate.png %%DATADIR%%/images/saturation.png %%DATADIR%%/images/save.png %%DATADIR%%/images/search-images-metadata.jpg @@ -408,30 +363,8 @@ share/applications/fotocx.desktop %%DATADIR%%/images/tiny-planet.jpg %%DATADIR%%/images/tools.png %%DATADIR%%/images/top-panel.png -%%DATADIR%%/images/translations.png %%DATADIR%%/images/twist1.png %%DATADIR%%/images/twist2.png -%%DATADIR%%/images/ug-albums.jpg -%%DATADIR%%/images/ug-batch.png -%%DATADIR%%/images/ug-combine.png -%%DATADIR%%/images/ug-custom.png -%%DATADIR%%/images/ug-develop.jpg -%%DATADIR%%/images/ug-edit.jpg -%%DATADIR%%/images/ug-effects.jpg -%%DATADIR%%/images/ug-file.jpg -%%DATADIR%%/images/ug-gallery.png -%%DATADIR%%/images/ug-help.png -%%DATADIR%%/images/ug-maps.jpg -%%DATADIR%%/images/ug-metadata.png -%%DATADIR%%/images/ug-prev-next.jpg -%%DATADIR%%/images/ug-refine.png -%%DATADIR%%/images/ug-repair.png -%%DATADIR%%/images/ug-save.jpg -%%DATADIR%%/images/ug-select.png -%%DATADIR%%/images/ug-tools.png -%%DATADIR%%/images/ug-undo-redo.png -%%DATADIR%%/images/ug-warp.png -%%DATADIR%%/images/ug-zoom.png %%DATADIR%%/images/unbend horz curved.png %%DATADIR%%/images/unbend horz linear.png %%DATADIR%%/images/unbend vert curved.png @@ -442,7 +375,6 @@ share/applications/fotocx.desktop %%DATADIR%%/images/unwarp-closeup1.png %%DATADIR%%/images/unwarp-closeup2.jpg %%DATADIR%%/images/upscale+sharpen.jpg -%%DATADIR%%/images/userguide.jpg %%DATADIR%%/images/view-metadata.jpg %%DATADIR%%/images/vignette.png %%DATADIR%%/images/vignette2.jpghome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a4777f6.3b2b9.6616c09d>