I'm looking at updating fltk to 1.4.x (current stable version upstream).
Various ports in-tree fail with it, I have patches for some already.
Currently undecided whether it's better done by de-conflicting as a
separate or to try and push through with the direct update but thought
I'd send some things out in case others are using dependent software
and want to help out.
comms/fldigi - upstream has support in the 4.2 branch, however that also
adds HID support, using libhidraw which we don't have libhidraw
www/dillo - needs an "--enable-experimental-fltk" flag. upstream warns
of some visual issues though I didn't spot them in quick testing.
x11/ede/{desktop,lib} - upstream seem to have given up on releases but
still reasonably active with commits. diff below builds with 1.3 and
1.4, but I've not tested runtime yet. might be worth updating these
anyway if they're ok.
x11/fleditor - does build with 1.4, but can't test runtime as it just
provides a widget library used by nothing in ports. looks dead upstream
so I propose removing.
x11/flvw - fails with 1.4. provides a widget library used by nothing
in ports, also propose removing.
x11/tigervnc - no support upstream yet, possibly some diffs floating
around.
www/dillo/Makefile |
7
x11/ede/desktop/Makefile |
20
x11/ede/desktop/distinfo |
4
x11/ede/desktop/patches/patch-Jamconfig_in |
20
x11/ede/desktop/patches/patch-build_Doc_jam |
15
x11/ede/desktop/patches/patch-build_Svg_jam |
12
x11/ede/desktop/patches/patch-configure |
147 -------
x11/ede/desktop/patches/patch-data_pekwm_scripts_Jamfile |
8
x11/ede/desktop/patches/patch-ede-bug-tools_ede-bug-report_Jamfile |
11
x11/ede/desktop/patches/patch-ede-desktop_Jamfile |
9
x11/ede/desktop/patches/patch-ede-keyboard-conf_ede-keyboard-conf_cpp |
9
x11/ede/desktop/patches/patch-ede-notify-daemon_Jamfile |
11
x11/ede/desktop/patches/patch-ede-panel_applets_cpu-monitor_CpuMonitor_cpp |
27 -
x11/ede/desktop/patches/patch-evoke_EvokeService_cpp |
17
x11/ede/desktop/patches/patch-evoke_Jamfile |
11
x11/ede/desktop/patches/patch-m4_pkg_m4 |
20
x11/ede/desktop/pkg/PLIST |
1
x11/ede/lib/Makefile |
12
x11/ede/lib/distinfo |
4
x11/ede/lib/patches/patch-Jamrules |
39 -
x11/ede/lib/patches/patch-configure |
43 --
x11/ede/lib/patches/patch-configure_in |
12
x11/ede/lib/patches/patch-m4_datetime_m4 |
12
x11/ede/lib/patches/patch-m4_pkg_m4 |
20
x11/ede/lib/patches/patch-pc_edelib-dbus_pc_in |
11
x11/ede/lib/patches/patch-pc_edelib-gui-no-images_pc_in |
11
x11/ede/lib/patches/patch-pc_edelib-gui_pc_in |
11
x11/ede/lib/patches/patch-pc_edelib_pc_in |
11
x11/ede/lib/patches/patch-src_WindowUtils_cpp |
39 -
x11/ede/lib/pkg/PLIST |
4
x11/fltk/Makefile |
13
x11/fltk/distinfo |
4
x11/fltk/patches/patch-Makefile |
12
x11/fltk/patches/patch-configure_ac |
55 +-
x11/fltk/patches/patch-documentation_Makefile |
35 -
x11/fltk/patches/patch-makeinclude_in |
2
x11/fltk/patches/patch-src_Fl_Preferences_cxx |
27 -
x11/fltk/pkg/PLIST |
207 +++++++++-
38 files changed, 462 insertions(+), 471 deletions(-)
Index: x11/fltk/Makefile
===================================================================
RCS file: /cvs/ports/x11/fltk/Makefile,v
diff -u -p -r1.63 Makefile
--- x11/fltk/Makefile 7 Jul 2026 12:37:29 -0000 1.63
+++ x11/fltk/Makefile 7 Jul 2026 14:57:23 -0000
@@ -3,7 +3,7 @@ NOT_FOR_ARCHS= m88k
COMMENT= Fast-Light Tool Kit
-VER= 1.3.11
+VER= 1.4.5
DISTNAME= fltk-${VER}
EXTRACT_SUFX= -source.tar.gz
@@ -20,7 +20,7 @@ HOMEPAGE= https://www.fltk.org/
# LGPLv2 with exceptions (see COPYING)
PERMIT_PACKAGE= Yes
-WANTLIB += GL GLU X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xinerama Xrender
+WANTLIB += GL GLU X11 Xcursor Xfixes Xft Xinerama Xrender
WANTLIB += c fontconfig jpeg m png pthread z ${COMPILER_LIBCXX}
COMPILER= base-clang ports-gcc base-gcc
@@ -32,11 +32,14 @@ NO_TEST= Yes
CONFIGURE_STYLE=autoconf no-autoheader
AUTOCONF_VERSION=2.71
CONFIGURE_ARGS= --enable-shared \
- --enable-threads
+ --enable-threads \
+ --disable-wayland
+# if building with wayland, it's probably (a lot) easier to use libdecor as
+# a system dependency, rather than using the bundled one
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
FL_DSO_VERSION="${LIBfltk_VERSION}"
MAKE_FLAGS= FL_DSO_VERSION="${LIBfltk_VERSION}"
@@ -47,5 +50,7 @@ pre-build:
post-install:
rm ${PREFIX}/lib/lib*.so
+ mv ${PREFIX}/share/doc/fltk/examples ${PREFIX}/share/examples/fltk
+ rmdir ${PREFIX}/share/doc/fltk
.include <bsd.port.mk>
Index: x11/fltk/distinfo
===================================================================
RCS file: /cvs/ports/x11/fltk/distinfo,v
diff -u -p -r1.16 distinfo
--- x11/fltk/distinfo 7 Jul 2026 12:37:29 -0000 1.16
+++ x11/fltk/distinfo 7 Jul 2026 14:57:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (fltk-1.3.11-source.tar.gz) =
koBavIRQXj5+J67HdasHVOy0GC/i2P8qnVaMzcsoEaw=
-SIZE (fltk-1.3.11-source.tar.gz) = 5575411
+SHA256 (fltk-1.4.5-source.tar.gz) =
7t4fsrjpwuWB53CC4VJSFFhVx5qtMAcO47JKq+L5JvE=
+SIZE (fltk-1.4.5-source.tar.gz) = 9292393
Index: x11/fltk/patches/patch-Makefile
===================================================================
RCS file: x11/fltk/patches/patch-Makefile
diff -N x11/fltk/patches/patch-Makefile
--- x11/fltk/patches/patch-Makefile 15 Oct 2024 16:51:26 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -16,7 +16,7 @@
-
- include makeinclude
-
--DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
-+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
-
- all: makeinclude fltk-config
- for dir in $(DIRS); do\
Index: x11/fltk/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/x11/fltk/patches/patch-configure_ac,v
diff -u -p -r1.2 patch-configure_ac
--- x11/fltk/patches/patch-configure_ac 7 Jul 2026 12:37:29 -0000 1.2
+++ x11/fltk/patches/patch-configure_ac 7 Jul 2026 14:57:23 -0000
@@ -4,48 +4,39 @@
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -52,7 +52,7 @@ dnl FLTK library versions, currently 1.3.11
- FLTK_VERSION_MAJOR=1
- FLTK_VERSION_MINOR=3
- FLTK_VERSION_PATCH=11
--FL_DSO_VERSION=${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
-+dnl FL_DSO_VERSION=${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
- FL_ABI_VERSION=${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}.0
- FLTK_VERSION=${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}.${FLTK_VERSION_PATCH}
+@@ -28,7 +28,7 @@ FLTK_VERSION_MAJOR=$(echo AC_PACKAGE_VERSION | awk -F.
+ FLTK_VERSION_MINOR=$(echo AC_PACKAGE_VERSION | awk -F. '{print $2}')
+ FLTK_VERSION_PATCH=$(echo AC_PACKAGE_VERSION | awk -F. '{print $3}')
-@@ -968,7 +968,7 @@ case $host_os_gui in
- AC_MSG_WARN([Ignoring libraries "$X_PRE_LIBS" requested by
configure.])
- fi
+-FL_DSO_VERSION="${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}"
++dnl FL_DSO_VERSION="${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}"
+ FL_ABI_VERSION="${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}.0"
-- LIBS="$LIBS -lX11 $X_EXTRA_LIBS"
-+ LIBS="$LIBS -lX11 -lXdmcp -lXau $X_EXTRA_LIBS"
- CFLAGS="$CFLAGS $X_CFLAGS"
- CXXFLAGS="$CXXFLAGS $X_CFLAGS"
- LDFLAGS="$X_LIBS $LDFLAGS"
-@@ -1293,7 +1293,7 @@ if test -n "$GCC"; then
- if test "x$with_optim" != x; then
- OPTIM="$with_optim $OPTIM"
- else
-- OPTIM="-Os $OPTIM"
-+ : # OPTIM="-Os $OPTIM"
- fi
- fi
+ AC_SUBST(FLTK_VERSION)
+@@ -1607,7 +1607,7 @@ AS_IF([test -n "$GCC"], [
+ AS_IF([test "x$with_optim" != x], [
+ OPTIM="$with_optim $OPTIM"
+ ], [
+- OPTIM="-Os $OPTIM"
++ : OPTIM="-Os $OPTIM"
+ ])
+ ])
-@@ -1323,18 +1323,6 @@ if test -n "$GCC"; then
- AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)])
+@@ -1637,18 +1637,6 @@ AS_IF([test -n "$GCC"], [
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)])
CFLAGS="$OLDCFLAGS"
-
--dnl Make sure that shared libraries don't have undefined references
+- dnl Make sure that shared libraries don't have undefined references
- # See if ld supports -no-undefined...
- AC_MSG_CHECKING([if ld supports -no-undefined])
- OLDLDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -Wl,-no-undefined"
- AC_LINK_IFELSE(
-- [AC_LANG_PROGRAM([[]], [[]])],
-- [DSOFLAGS="$DSOFLAGS -Wl,-no-undefined"
-- AC_MSG_RESULT(yes)],
-- [AC_MSG_RESULT(no)])
+- [AC_LANG_PROGRAM([[]], [[]])],
+- [DSOFLAGS="$DSOFLAGS -Wl,-no-undefined"
+- AC_MSG_RESULT(yes)],
+- [AC_MSG_RESULT(no)])
- LDFLAGS="$OLDLDFLAGS"
# See if ld supports -Bsymbolic-functions...
Index: x11/fltk/patches/patch-documentation_Makefile
===================================================================
RCS file: /cvs/ports/x11/fltk/patches/patch-documentation_Makefile,v
diff -u -p -r1.4 patch-documentation_Makefile
--- x11/fltk/patches/patch-documentation_Makefile 15 Oct 2024 16:51:26
-0000 1.4
+++ x11/fltk/patches/patch-documentation_Makefile 7 Jul 2026 14:57:23
-0000
@@ -1,35 +1,38 @@
+don't generate/install catpages
+
Index: documentation/Makefile
--- documentation/Makefile.orig
+++ documentation/Makefile
-@@ -52,7 +52,7 @@ MANPAGES = $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(SRC_DOCDIR)
- $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(SRC_DOCDIR)/blocks.$(CAT6EXT) \
- $(SRC_DOCDIR)/checkers.$(CAT6EXT)
$(SRC_DOCDIR)/sudoku.$(CAT6EXT)
+@@ -66,7 +66,7 @@ MANPAGES = $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(SRC_DOCDIR)
+
+ FLTK_GIT_REVISION := "`( (git rev-parse HEAD || cat ../fltk_git_rev.dat;) ||
echo 'unknown'; ) 2>/dev/null`"
-all: $(MANPAGES)
+all:
# Use `make docs' to create all docs for distribution files.
# You need installed versions of Doxygen and LaTeX for this.
-@@ -73,9 +73,8 @@ clean:
+@@ -93,9 +93,8 @@ clean:
depend:
-install: $(MANPAGES)
+install:
echo "Installing documentation files in $(DESTDIR)$(docdir) ..."
-- -$(INSTALL_DIR) $(DESTDIR)$(docdir)
+- -$(INSTALL_DIR) "$(DESTDIR)$(docdir)"
if test -f html/index.html ; then \
for file in html/* ; do \
- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \
-@@ -86,11 +85,6 @@ install: $(MANPAGES)
- $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
+ $(INSTALL_DATA) $$file "$(DESTDIR)$(docdir)"; \
+@@ -106,12 +105,6 @@ install: $(MANPAGES)
+ $(INSTALL_DATA) fltk.pdf "$(DESTDIR)$(docdir)"; \
fi
echo "Installing man pages in $(DESTDIR)$(mandir) ..."
-- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
-- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
-- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT)
$(DESTDIR)$(mandir)/cat1
-- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
-- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man
$(DESTDIR)$(mandir)/man1/fltk-config.1
+- -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/cat1"
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) "$(DESTDIR)$(mandir)/cat1"
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT)
"$(DESTDIR)$(mandir)/cat1"
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-options.$(CAT1EXT)
"$(DESTDIR)$(mandir)/cat1"
+- -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/cat3"
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) "$(DESTDIR)$(mandir)/cat3"
+ -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
+ $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man
"$(DESTDIR)$(mandir)/man1/fluid.1"
+ $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man
"$(DESTDIR)$(mandir)/man1/fltk-config.1"
Index: x11/fltk/patches/patch-makeinclude_in
===================================================================
RCS file: /cvs/ports/x11/fltk/patches/patch-makeinclude_in,v
diff -u -p -r1.7 patch-makeinclude_in
--- x11/fltk/patches/patch-makeinclude_in 15 Oct 2024 16:51:26 -0000
1.7
+++ x11/fltk/patches/patch-makeinclude_in 7 Jul 2026 14:57:23 -0000
@@ -1,7 +1,7 @@
Index: makeinclude.in
--- makeinclude.in.orig
+++ makeinclude.in
-@@ -144,9 +144,6 @@ INSTALL_SCRIPT = $(INSTALL) -m 755
+@@ -161,9 +161,6 @@ INSTALL_SCRIPT = $(INSTALL) -m 755
INSTALL_DESKTOP = @INSTALL_DESKTOP@
UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
Index: x11/fltk/patches/patch-src_Fl_Preferences_cxx
===================================================================
RCS file: /cvs/ports/x11/fltk/patches/patch-src_Fl_Preferences_cxx,v
diff -u -p -r1.7 patch-src_Fl_Preferences_cxx
--- x11/fltk/patches/patch-src_Fl_Preferences_cxx 15 Oct 2024 16:51:26
-0000 1.7
+++ x11/fltk/patches/patch-src_Fl_Preferences_cxx 7 Jul 2026 14:57:23
-0000
@@ -1,12 +1,21 @@
Index: src/Fl_Preferences.cxx
--- src/Fl_Preferences.cxx.orig
+++ src/Fl_Preferences.cxx
-@@ -1049,7 +1049,7 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *pr
- break;
- }
- case SYSTEM:
-- strcpy(filename, "/etc/fltk/");
-+ strlcpy(filename, "${SYSCONFDIR}/fltk/", sizeof(filename));
- break;
- }
- snprintf(filename + strlen(filename), sizeof(filename) - strlen(filename),
+@@ -1487,7 +1487,7 @@ int Fl_Preferences::RootNode::write() {
+ fclose( f );
+ if (Fl::system_driver()->preferences_need_protection_check()) {
+ // unix: make sure that system prefs are user-readable
+- if (strncmp(filename_, "/etc/fltk/", 10) == 0) {
++ if (strncmp(filename_, "${SYSCONFDIR}/fltk/", 10) == 0) {
+ char *p;
+ p = filename_ + 9;
+ do { // for each directory to the pref file
+@@ -1546,7 +1546,7 @@ char Fl_Preferences::RootNode::getPath( char *path, in
+
+ char ret = fl_make_path( path );
+ // unix: make sure that system prefs dir. is user-readable
+- if (Fl::system_driver()->preferences_need_protection_check() &&
strncmp(path, "/etc/fltk/", 10) == 0) {
++ if (Fl::system_driver()->preferences_need_protection_check() &&
strncmp(path, "${SYSCONFDIR}/fltk/", 10) == 0) {
+ fl_chmod(path, 0755); // rwxr-xr-x
+ }
+ strlcat( path, "/", pathlen );
Index: x11/fltk/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/fltk/pkg/PLIST,v
diff -u -p -r1.16 PLIST
--- x11/fltk/pkg/PLIST 15 Oct 2024 16:51:26 -0000 1.16
+++ x11/fltk/pkg/PLIST 7 Jul 2026 14:57:23 -0000
@@ -1,9 +1,11 @@
bin/fltk-config
+@bin bin/fltk-options
@bin bin/fluid
include/FL/
include/FL/Enumerations.H
include/FL/Fl.H
include/FL/Fl_Adjuster.H
+include/FL/Fl_Anim_GIF_Image.H
include/FL/Fl_BMP_Image.H
include/FL/Fl_Bitmap.H
include/FL/Fl_Box.H
@@ -30,12 +32,15 @@ include/FL/Fl_File_Icon.H
include/FL/Fl_File_Input.H
include/FL/Fl_Fill_Dial.H
include/FL/Fl_Fill_Slider.H
+include/FL/Fl_Flex.H
include/FL/Fl_Float_Input.H
include/FL/Fl_FormsBitmap.H
include/FL/Fl_FormsPixmap.H
include/FL/Fl_Free.H
include/FL/Fl_GIF_Image.H
include/FL/Fl_Gl_Window.H
+include/FL/Fl_Graphics_Driver.H
+include/FL/Fl_Grid.H
include/FL/Fl_Group.H
include/FL/Fl_Help_Dialog.H
include/FL/Fl_Help_View.H
@@ -44,6 +49,7 @@ include/FL/Fl_Hor_Fill_Slider.H
include/FL/Fl_Hor_Nice_Slider.H
include/FL/Fl_Hor_Slider.H
include/FL/Fl_Hor_Value_Slider.H
+include/FL/Fl_ICO_Image.H
include/FL/Fl_Image.H
include/FL/Fl_Image_Surface.H
include/FL/Fl_Input.H
@@ -68,6 +74,7 @@ include/FL/Fl_Nice_Slider.H
include/FL/Fl_Object.H
include/FL/Fl_Output.H
include/FL/Fl_Overlay_Window.H
+include/FL/Fl_PDF_File_Surface.H
include/FL/Fl_PNG_Image.H
include/FL/Fl_PNM_Image.H
include/FL/Fl_Pack.H
@@ -83,16 +90,22 @@ include/FL/Fl_RGB_Image.H
include/FL/Fl_Radio_Button.H
include/FL/Fl_Radio_Light_Button.H
include/FL/Fl_Radio_Round_Button.H
+include/FL/Fl_Rect.H
include/FL/Fl_Repeat_Button.H
include/FL/Fl_Return_Button.H
include/FL/Fl_Roller.H
include/FL/Fl_Round_Button.H
include/FL/Fl_Round_Clock.H
+include/FL/Fl_SVG_File_Surface.H
+include/FL/Fl_SVG_Image.H
+include/FL/Fl_Scheme.H
+include/FL/Fl_Scheme_Choice.H
include/FL/Fl_Scroll.H
include/FL/Fl_Scrollbar.H
include/FL/Fl_Secret_Input.H
include/FL/Fl_Select_Browser.H
include/FL/Fl_Shared_Image.H
+include/FL/Fl_Shortcut_Button.H
include/FL/Fl_Simple_Counter.H
include/FL/Fl_Single_Window.H
include/FL/Fl_Slider.H
@@ -101,6 +114,7 @@ include/FL/Fl_Sys_Menu_Bar.H
include/FL/Fl_Table.H
include/FL/Fl_Table_Row.H
include/FL/Fl_Tabs.H
+include/FL/Fl_Terminal.H
include/FL/Fl_Text_Buffer.H
include/FL/Fl_Text_Display.H
include/FL/Fl_Text_Editor.H
@@ -120,18 +134,22 @@ include/FL/Fl_Value_Input.H
include/FL/Fl_Value_Output.H
include/FL/Fl_Value_Slider.H
include/FL/Fl_Widget.H
+include/FL/Fl_Widget_Surface.H
include/FL/Fl_Window.H
include/FL/Fl_Wizard.H
include/FL/Fl_XBM_Image.H
include/FL/Fl_XPM_Image.H
-include/FL/abi-version.h
-include/FL/dirent.h
include/FL/filename.H
include/FL/fl_ask.H
+include/FL/fl_attr.h
+include/FL/fl_callback_macros.H
+include/FL/fl_casts.H
+include/FL/fl_config.h
include/FL/fl_draw.H
include/FL/fl_message.H
include/FL/fl_show_colormap.H
include/FL/fl_show_input.H
+include/FL/fl_string_functions.h
include/FL/fl_types.h
include/FL/fl_utf8.h
include/FL/forms.H
@@ -144,8 +162,11 @@ include/FL/mac.H
include/FL/math.h
include/FL/names.h
include/FL/platform.H
+include/FL/platform_types.h
+include/FL/wayland.H
include/FL/win32.H
include/FL/x.H
+include/FL/x11.H
@static-lib lib/libfltk.a
@lib lib/libfltk.so.${LIBfltk_VERSION}
@static-lib lib/libfltk_forms.a
@@ -155,5 +176,187 @@ include/FL/x.H
@static-lib lib/libfltk_images.a
@lib lib/libfltk_images.so.${LIBfltk_images_VERSION}
@man man/man1/fltk-config.1
+@man man/man1/fltk-options.1
@man man/man1/fluid.1
@man man/man3/fltk.3
+share/examples/fltk/
+share/examples/fltk/CubeMain.cxx
+share/examples/fltk/CubeView.cxx
+share/examples/fltk/CubeView.h
+share/examples/fltk/CubeViewUI.cxx
+share/examples/fltk/CubeViewUI.fl
+share/examples/fltk/CubeViewUI.h
+share/examples/fltk/adjuster.cxx
+share/examples/fltk/animated.cxx
+share/examples/fltk/arc.cxx
+share/examples/fltk/ask.cxx
+share/examples/fltk/bitmap.cxx
+share/examples/fltk/blocks.cxx
+share/examples/fltk/boxtype.cxx
+share/examples/fltk/browser.cxx
+share/examples/fltk/button.cxx
+share/examples/fltk/buttons.cxx
+share/examples/fltk/cairo_test.cxx
+share/examples/fltk/checkers.cxx
+share/examples/fltk/checkers_pieces.cxx
+share/examples/fltk/checkers_pieces.fl
+share/examples/fltk/checkers_pieces.h
+share/examples/fltk/clipboard.cxx
+share/examples/fltk/clock.cxx
+share/examples/fltk/colbrowser.cxx
+share/examples/fltk/color_chooser.cxx
+share/examples/fltk/contrast.cxx
+share/examples/fltk/coordinates.cxx
+share/examples/fltk/cube.cxx
+share/examples/fltk/cursor.cxx
+share/examples/fltk/curve.cxx
+share/examples/fltk/demo.cxx
+share/examples/fltk/demo.menu
+share/examples/fltk/device.cxx
+share/examples/fltk/doublebuffer.cxx
+share/examples/fltk/editor.cxx
+share/examples/fltk/fast_slow.cxx
+share/examples/fltk/fast_slow.fl
+share/examples/fltk/fast_slow.h
+share/examples/fltk/file_chooser.cxx
+share/examples/fltk/flex_demo.cxx
+share/examples/fltk/flex_login.cxx
+share/examples/fltk/fltk-versions.cxx
+share/examples/fltk/fonts.cxx
+share/examples/fltk/forms.cxx
+share/examples/fltk/fractals.cxx
+share/examples/fltk/fracviewer.cxx
+share/examples/fltk/fracviewer.h
+share/examples/fltk/fullscreen.cxx
+share/examples/fltk/gl_overlay.cxx
+share/examples/fltk/glpuzzle.cxx
+share/examples/fltk/glut_test.cxx
+share/examples/fltk/grid_alignment.cxx
+share/examples/fltk/grid_buttons.cxx
+share/examples/fltk/grid_dialog.cxx
+share/examples/fltk/grid_login.cxx
+share/examples/fltk/handle_events.cxx
+share/examples/fltk/handle_keys.cxx
+share/examples/fltk/hello.cxx
+share/examples/fltk/help_dialog.cxx
+share/examples/fltk/icon.cxx
+share/examples/fltk/iconize.cxx
+share/examples/fltk/image.cxx
+share/examples/fltk/inactive.cxx
+share/examples/fltk/inactive.fl
+share/examples/fltk/inactive.h
+share/examples/fltk/input.cxx
+share/examples/fltk/input_choice.cxx
+share/examples/fltk/keyboard.cxx
+share/examples/fltk/keyboard.h
+share/examples/fltk/keyboard_ui.cxx
+share/examples/fltk/keyboard_ui.fl
+share/examples/fltk/keyboard_ui.h
+share/examples/fltk/label.cxx
+share/examples/fltk/line_style.cxx
+share/examples/fltk/line_style_docs.cxx
+share/examples/fltk/list_visuals.cxx
+share/examples/fltk/mandelbrot.cxx
+share/examples/fltk/mandelbrot.h
+share/examples/fltk/mandelbrot_ui.cxx
+share/examples/fltk/mandelbrot_ui.fl
+share/examples/fltk/mandelbrot_ui.h
+share/examples/fltk/menubar.cxx
+share/examples/fltk/message.cxx
+share/examples/fltk/minimum.cxx
+share/examples/fltk/native-filechooser.cxx
+share/examples/fltk/navigation.cxx
+share/examples/fltk/offscreen.cxx
+share/examples/fltk/output.cxx
+share/examples/fltk/overlay.cxx
+share/examples/fltk/pack.cxx
+share/examples/fltk/pixmap.cxx
+share/examples/fltk/pixmap_browser.cxx
+share/examples/fltk/pixmaps/
+share/examples/fltk/pixmaps/blast.xpm
+share/examples/fltk/pixmaps/blue.xpm
+share/examples/fltk/pixmaps/blue_bomb.xpm
+share/examples/fltk/pixmaps/cyan.xpm
+share/examples/fltk/pixmaps/cyan_bomb.xpm
+share/examples/fltk/pixmaps/gray.xpm
+share/examples/fltk/pixmaps/gray_bomb.xpm
+share/examples/fltk/pixmaps/green.xpm
+share/examples/fltk/pixmaps/green_bomb.xpm
+share/examples/fltk/pixmaps/magenta.xpm
+share/examples/fltk/pixmaps/magenta_bomb.xpm
+share/examples/fltk/pixmaps/porsche.xpm
+share/examples/fltk/pixmaps/porsche1.xpm
+share/examples/fltk/pixmaps/red.xpm
+share/examples/fltk/pixmaps/red_bomb.xpm
+share/examples/fltk/pixmaps/sorceress.xbm
+share/examples/fltk/pixmaps/sudoku.xbm
+share/examples/fltk/pixmaps/tile.xpm
+share/examples/fltk/pixmaps/yellow.xpm
+share/examples/fltk/pixmaps/yellow_bomb.xpm
+share/examples/fltk/preferences.cxx
+share/examples/fltk/preferences.fl
+share/examples/fltk/preferences.h
+share/examples/fltk/radio.cxx
+share/examples/fltk/radio.fl
+share/examples/fltk/radio.h
+share/examples/fltk/resize-arrows.cxx
+share/examples/fltk/resize-arrows.h
+share/examples/fltk/resize-example1.cxx
+share/examples/fltk/resize-example2.cxx
+share/examples/fltk/resize-example3a.cxx
+share/examples/fltk/resize-example3b.cxx
+share/examples/fltk/resize-example3c.cxx
+share/examples/fltk/resize-example4a.cxx
+share/examples/fltk/resize-example4b.cxx
+share/examples/fltk/resize-example5a.cxx
+share/examples/fltk/resize-example5b.cxx
+share/examples/fltk/resize-example5c.cxx
+share/examples/fltk/resize.cxx
+share/examples/fltk/resize.fl
+share/examples/fltk/resize.h
+share/examples/fltk/resizebox.cxx
+share/examples/fltk/rotated_text.cxx
+share/examples/fltk/scroll.cxx
+share/examples/fltk/shadow_variables.cxx
+share/examples/fltk/shape.cxx
+share/examples/fltk/subwindow.cxx
+share/examples/fltk/sudoku.cxx
+share/examples/fltk/symbols.cxx
+share/examples/fltk/table.cxx
+share/examples/fltk/tabs.cxx
+share/examples/fltk/tabs.fl
+share/examples/fltk/tabs.h
+share/examples/fltk/terminal.cxx
+share/examples/fltk/terminal.fl
+share/examples/fltk/terminal.h
+share/examples/fltk/threads.cxx
+share/examples/fltk/threads.h
+share/examples/fltk/tile.cxx
+share/examples/fltk/tiled_image.cxx
+share/examples/fltk/trackball.h
+share/examples/fltk/tree.cxx
+share/examples/fltk/tree.fl
+share/examples/fltk/tree.h
+share/examples/fltk/twowin.cxx
+share/examples/fltk/unittest_about.cxx
+share/examples/fltk/unittest_circles.cxx
+share/examples/fltk/unittest_complex_shapes.cxx
+share/examples/fltk/unittest_core.cxx
+share/examples/fltk/unittest_fast_shapes.cxx
+share/examples/fltk/unittest_images.cxx
+share/examples/fltk/unittest_points.cxx
+share/examples/fltk/unittest_schemes.cxx
+share/examples/fltk/unittest_scrollbarsize.cxx
+share/examples/fltk/unittest_symbol.cxx
+share/examples/fltk/unittest_terminal.cxx
+share/examples/fltk/unittest_text.cxx
+share/examples/fltk/unittest_unicode.cxx
+share/examples/fltk/unittest_viewport.cxx
+share/examples/fltk/unittests.cxx
+share/examples/fltk/unittests.h
+share/examples/fltk/utf8.cxx
+share/examples/fltk/valuators.cxx
+share/examples/fltk/valuators.fl
+share/examples/fltk/valuators.h
+share/examples/fltk/windowfocus.cxx
+share/examples/fltk/wizard.cxx
Index: www/dillo/Makefile
===================================================================
RCS file: /cvs/ports/www/dillo/Makefile,v
diff -u -p -r1.72 Makefile
--- www/dillo/Makefile 6 May 2026 13:05:39 -0000 1.72
+++ www/dillo/Makefile 7 Jul 2026 14:57:23 -0000
@@ -11,8 +11,8 @@ HOMEPAGE = https://dillo-browser.org/
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} X11 Xau Xcursor Xdmcp Xext Xfixes
-WANTLIB += Xft Xinerama Xrender c crypto fltk fontconfig iconv
+WANTLIB += ${COMPILER_LIBCXX} X11 Xcursor Xfixes Xft
+WANTLIB += Xinerama Xrender c crypto fltk fontconfig iconv
WANTLIB += jpeg m png ssl webp z brotlidec
COMPILER = base-clang ports-gcc base-gcc
@@ -34,7 +34,8 @@ RUN_DEPENDS = devel/desktop-file-utils \
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-ipv6 \
- --enable-tls
+ --enable-tls \
+ --enable-experimental-fltk
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: x11/ede/lib/Makefile
===================================================================
RCS file: /cvs/ports/x11/ede/lib/Makefile,v
diff -u -p -r1.21 Makefile
--- x11/ede/lib/Makefile 19 Oct 2025 15:50:06 -0000 1.21
+++ x11/ede/lib/Makefile 7 Jul 2026 14:57:23 -0000
@@ -1,7 +1,8 @@
COMMENT = equinox desktop library
-DISTNAME = edelib-${V}
-REVISION = 11
+DISTNAME = edelib-${V}pl20260217
+GH_PROJECT = edelib
+GH_COMMIT = b184b7df031aa8677aee326b10e8aeb0b67d646a
API_VER = 1.0
.for l in edelib edelib_dbus edelib_gui
@@ -19,10 +20,15 @@ MODULES = lang/python
BUILD_DEPENDS = devel/jam
LIB_DEPENDS = x11/fltk \
x11/dbus
+# rsvg-convert used in edelib-convert-icontheme
+RUN_DEPENDS = x11/gnome/librsvg
MAKE_ENV = EDE_VERSION="${FULL_V}"
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = autoreconf
+AUTORECONF = ${WRKSRC}/autogen.sh
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.16
CONFIGURE_ARGS += --enable-shared
CONFIGURE_ENV = API_VER="${API_VER}" \
ac_cv_path_DOXYGEN=""
Index: x11/ede/lib/distinfo
===================================================================
RCS file: /cvs/ports/x11/ede/lib/distinfo,v
diff -u -p -r1.2 distinfo
--- x11/ede/lib/distinfo 11 Jul 2014 21:39:04 -0000 1.2
+++ x11/ede/lib/distinfo 7 Jul 2026 14:57:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (edelib-2.1.tar.gz) = OAMNlkr/7OU2Ptr46PGsJEHxqGBHJTegUB9oROOD81w=
-SIZE (edelib-2.1.tar.gz) = 1054649
+SHA256 (edelib-2.1pl20260217-b184b7df.tar.gz) =
sQ6LQ6xqEzdDYz/l0EqNjRiQCv2HNo3u//3IP0xKIIo=
+SIZE (edelib-2.1pl20260217-b184b7df.tar.gz) = 777291
Index: x11/ede/lib/patches/patch-Jamrules
===================================================================
RCS file: /cvs/ports/x11/ede/lib/patches/patch-Jamrules,v
diff -u -p -r1.3 patch-Jamrules
--- x11/ede/lib/patches/patch-Jamrules 11 Mar 2022 20:15:27 -0000 1.3
+++ x11/ede/lib/patches/patch-Jamrules 7 Jul 2026 14:57:23 -0000
@@ -1,6 +1,7 @@
---- Jamrules.orig Sat Jun 21 23:24:06 2014
-+++ Jamrules Fri Jul 11 18:46:15 2014
-@@ -69,7 +69,7 @@ EDELIB_DBUS = edelib_dbus ;
+Index: Jamrules
+--- Jamrules.orig
++++ Jamrules
+@@ -68,7 +68,7 @@ EDELIB_DBUS = edelib_dbus ;
EDELIB_DBUS_NAME = libedelib_dbus ;
# directory name for installed documentation
@@ -9,35 +10,3 @@
# Haiku jam have builtin LocalClean and LocalDepends
if ! $(INVOCATION_SUBDIR_SET) {
-@@ -208,7 +208,7 @@ rule SharedLibraryFromObjects
- LINKFLAGS on $(_l) = -h $(_l_so) -G [ on $(_l) return
$(LINKFLAGS) ] ;
- } else {
- # let linker knows we are making shared library by adding
-shared and -Wl,-soname libname.so flags
-- LINKFLAGS on $(_l) = -Wl,-soname,$(_l_so) -shared [ on $(_l)
return $(LINKFLAGS) ] ;
-+ LINKFLAGS on $(_l) = -shared [ on $(_l) return $(LINKFLAGS) ] ;
- }
-
- # make it
-@@ -361,22 +361,6 @@ rule InstallSharedLibrary
-
- # install .la file
- MakeInstallPrivate $(dir) : $(2:S=$(SUFLA_SHARED)) ;
--
-- # install .so by making symbolic link; first remove all those directory
parts
-- # from variables (including grist)
-- o = $(s:G=) ;
-- o = $(o:D=) ;
-- sh = $(sh:D=) ;
--
-- # mark it as not file since it is just a name (e.g. ln -s foo.so.2
<target>)
-- NotFile $(o) ;
-- SymLink $(sh) : $(o) ;
--
-- # tell jam to put it in installation folder
-- MakeLocate $(sh) : $(dir) ;
--
-- LocalDepends install : $(sh) ;
-- UninstallSharedLibrary1 uninstall : $(sh) ;
- }
-
- actions InstallSharedLibrary1
Index: x11/ede/lib/patches/patch-configure
===================================================================
RCS file: x11/ede/lib/patches/patch-configure
diff -N x11/ede/lib/patches/patch-configure
--- x11/ede/lib/patches/patch-configure 7 Jul 2026 11:57:16 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-Index: configure
---- configure.orig
-+++ configure
-@@ -2211,7 +2211,7 @@ ac_config_headers="$ac_config_headers config.h:config.
- EDELIB_MAJOR_VERSION=2
- EDELIB_MINOR_VERSION=1
- EDELIB_PATCH_VERSION=0
--EDELIB_API_VERSION=$PACKAGE_VERSION
-+EDELIB_API_VERSION=$API_VER
-
- user_cflags="$CFLAGS"
- user_cxxflags="$CXXFLAGS"
-@@ -4311,7 +4311,6 @@ int
- main ()
- {
-
-- extern int daylight;
- int d = daylight;
-
- ;
-@@ -5506,12 +5505,7 @@ $as_echo "$DBUS_CFLAGS" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5
- $as_echo_n "checking DBUS_LIBS... " >&6; }
- ## don't use --libs since that can do evil things like add
-Wl,--export-dynamic
-- if test "$SHELL" = "/bin/ksh"; then
-- ## ksh does not do escaping properly
-- DBUS_LIBS="`$PKG_CONFIG --libs-only-L "dbus-1 >= 1.0"`
`$PKG_CONFIG --libs-only-l "dbus-1 >= 1.0"`"
-- else
-- DBUS_LIBS="`$PKG_CONFIG --libs-only-L \"dbus-1 >= 1.0\"`
`$PKG_CONFIG --libs-only-l \"dbus-1 >= 1.0\"`"
-- fi
-+ DBUS_LIBS="`$PKG_CONFIG --libs-only-L 'dbus-1 >= 1.0'`
`$PKG_CONFIG --libs-only-l 'dbus-1 >= 1.0'`"
-
- DBUS_VERSION=`$PKG_CONFIG --modversion "dbus-1 >= 1.0"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5
-@@ -5764,7 +5758,7 @@ $as_echo "yes" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes"
>&5
- $as_echo "yes" >&6; }
- ;;
-- "1.3."[0123456789])
-+ "1.3."[0123456789]*)
- HAVE_FL_TREE=1
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes"
>&5
- $as_echo "yes" >&6; }
Index: x11/ede/lib/patches/patch-configure_in
===================================================================
RCS file: x11/ede/lib/patches/patch-configure_in
diff -N x11/ede/lib/patches/patch-configure_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/ede/lib/patches/patch-configure_in 7 Jul 2026 14:57:23 -0000
@@ -0,0 +1,12 @@
+Index: configure.in
+--- configure.in.orig
++++ configure.in
+@@ -29,7 +29,7 @@ AC_CONFIG_HEADER(config.h:config.h.in)
+ EDELIB_MAJOR_VERSION=edelib_major_version
+ EDELIB_MINOR_VERSION=edelib_minor_version
+ EDELIB_PATCH_VERSION=edelib_patch_version
+-EDELIB_API_VERSION=$PACKAGE_VERSION
++EDELIB_API_VERSION=$API_VER
+
+ dnl configure fuck up CFLAGS/CXXFLAG by adding '-O2' and '-g' after
AC_PROG_CC and AC_PROG_CXX
+ dnl and there is no way to remove them without knowing if user added them
Index: x11/ede/lib/patches/patch-m4_datetime_m4
===================================================================
RCS file: x11/ede/lib/patches/patch-m4_datetime_m4
diff -N x11/ede/lib/patches/patch-m4_datetime_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/ede/lib/patches/patch-m4_datetime_m4 7 Jul 2026 14:57:23 -0000
@@ -0,0 +1,12 @@
+Index: m4/datetime.m4
+--- m4/datetime.m4.orig
++++ m4/datetime.m4
+@@ -43,7 +43,7 @@ AC_DEFUN([EDELIB_DATETIME], [
+ AC_TRY_LINK([
+ #include <time.h>
+ ],[
+- extern int daylight;
++ extern int daylight; // XXX was removed
+ int d = daylight;
+ ],[have_daylight=yes],[have_daylight=no])
+ AC_LANG_RESTORE
Index: x11/ede/lib/patches/patch-m4_pkg_m4
===================================================================
RCS file: x11/ede/lib/patches/patch-m4_pkg_m4
diff -N x11/ede/lib/patches/patch-m4_pkg_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/ede/lib/patches/patch-m4_pkg_m4 7 Jul 2026 14:57:23 -0000
@@ -0,0 +1,20 @@
+Index: m4/pkg.m4
+--- m4/pkg.m4.orig
++++ m4/pkg.m4
+@@ -33,14 +33,9 @@ AC_DEFUN([EDELIB_PKG_CHECK_MODULES], [
+
+ AC_MSG_CHECKING($1_LIBS)
+ ## don't use --libs since that can do evil things like add
-Wl,--export-dynamic
+- if test "$SHELL" = "/bin/ksh"; then
+- ## ksh does not do escaping properly
+- $1_LIBS="`$PKG_CONFIG --libs-only-L "$2"` `$PKG_CONFIG
--libs-only-l "$2"`"
+- else
+- $1_LIBS="`$PKG_CONFIG --libs-only-L \"$2\"` `$PKG_CONFIG
--libs-only-l \"$2\"`"
+- fi
++ $1_LIBS="`$PKG_CONFIG --libs-only-L '$2'` `$PKG_CONFIG
--libs-only-l '$2'`"
+
+- $1_VERSION=`$PKG_CONFIG --modversion "$2"`
++ $1_VERSION=`$PKG_CONFIG --modversion '$2'`
+ AC_MSG_RESULT($$1_LIBS)
+ else
+ $1_CFLAGS=""
Index: x11/ede/lib/patches/patch-pc_edelib-dbus_pc_in
===================================================================
RCS file: x11/ede/lib/patches/patch-pc_edelib-dbus_pc_in
diff -N x11/ede/lib/patches/patch-pc_edelib-dbus_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/ede/lib/patches/patch-pc_edelib-dbus_pc_in 7 Jul 2026 14:57:23
-0000
@@ -0,0 +1,11 @@
+Index: pc/edelib-dbus.pc.in
+--- pc/edelib-dbus.pc.in.orig
++++ pc/edelib-dbus.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${libdir}
++libdir=${prefix}/lib
+ includedir=${prefix}/include
+
+ Name: edelib-dbus
Index: x11/ede/lib/patches/patch-pc_edelib-gui-no-images_pc_in
===================================================================
RCS file: x11/ede/lib/patches/patch-pc_edelib-gui-no-images_pc_in
diff -N x11/ede/lib/patches/patch-pc_edelib-gui-no-images_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/ede/lib/patches/patch-pc_edelib-gui-no-images_pc_in 7 Jul 2026
14:57:23 -0000
@@ -0,0 +1,11 @@
+Index: pc/edelib-gui-no-images.pc.in
+--- pc/edelib-gui-no-images.pc.in.orig
++++ pc/edelib-gui-no-images.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${libdir}
++libdir=${prefix}/lib
+ includedir=${prefix}/include
+
+ Name: edelib-gui
Index: x11/ede/lib/patches/patch-pc_edelib-gui_pc_in
===================================================================
RCS file: x11/ede/lib/patches/patch-pc_edelib-gui_pc_in
diff -N x11/ede/lib/patches/patch-pc_edelib-gui_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/ede/lib/patches/patch-pc_edelib-gui_pc_in 7 Jul 2026 14:57:23
-0000
@@ -0,0 +1,11 @@
+Index: pc/edelib-gui.pc.in
+--- pc/edelib-gui.pc.in.orig
++++ pc/edelib-gui.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${libdir}
++libdir=${prefix}/lib
+ includedir=${prefix}/include
+
+ Name: edelib-gui
Index: x11/ede/lib/patches/patch-pc_edelib_pc_in
===================================================================
RCS file: x11/ede/lib/patches/patch-pc_edelib_pc_in
diff -N x11/ede/lib/patches/patch-pc_edelib_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/ede/lib/patches/patch-pc_edelib_pc_in 7 Jul 2026 14:57:23 -0000
@@ -0,0 +1,11 @@
+Index: pc/edelib.pc.in
+--- pc/edelib.pc.in.orig
++++ pc/edelib.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${libdir}
++libdir=${prefix}/lib
+ includedir=${prefix}/include
+ edelibdocdir=${prefix}/share/doc/edelib-@EDELIB_API_VERSION@
+
Index: x11/ede/lib/patches/patch-src_WindowUtils_cpp
===================================================================
RCS file: x11/ede/lib/patches/patch-src_WindowUtils_cpp
diff -N x11/ede/lib/patches/patch-src_WindowUtils_cpp
--- x11/ede/lib/patches/patch-src_WindowUtils_cpp 11 Mar 2022 20:15:27
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-http://sourceforge.net/p/ede/code/3592/
-
---- src/WindowUtils.cpp.orig Sat Jun 27 18:54:25 2015
-+++ src/WindowUtils.cpp Sat Jun 27 18:55:47 2015
-@@ -33,8 +33,10 @@
- * These are defined in FLTK as hidden variables for some internal hacks, but
are used here.
- * XXX: possible changes in future FLTK versions
- */
-+#if 0
- extern char fl_show_iconic;
- extern int fl_disable_transient_for;
-+#endif
-
- EDELIB_NS_BEGIN
-
-@@ -165,7 +167,7 @@ void window_xid_create(Fl_Window* win, void (*before_m
- XChangeProperty(fl_display, xp->xid, XA_WM_CLASS,
XA_STRING, 8, 0, (unsigned char *)buffer, p-buffer-1);
- }
-
-- if(win->non_modal() && xp->next && !fl_disable_transient_for) {
-+ if(win->non_modal() && xp->next /* && !fl_disable_transient_for
*/) {
- // find some other window to be "transient for":
- Fl_Window* wp = xp->next->w;
- while(wp->parent())
-@@ -194,12 +196,14 @@ void window_xid_create(Fl_Window* win, void (*before_m
- hints->input = True;
- hints->flags = InputHint;
-
-+#if 0
- if(fl_show_iconic) {
- hints->flags |= StateHint;
- hints->initial_state = IconicState;
- fl_show_iconic = 0;
- showit = 0;
- }
-+#endif
-
- // This is not removed so it can be used with windows inherited
from Fl_Window
- if(win->icon()) {
Index: x11/ede/lib/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/ede/lib/pkg/PLIST,v
diff -u -p -r1.6 PLIST
--- x11/ede/lib/pkg/PLIST 11 Mar 2022 20:15:27 -0000 1.6
+++ x11/ede/lib/pkg/PLIST 7 Jul 2026 14:57:23 -0000
@@ -94,8 +94,8 @@ lib/pkgconfig/edelib-gui.pc
lib/pkgconfig/edelib.pc
share/doc/edelib-${FULL_V}/
share/doc/edelib-${FULL_V}/COPYING
-share/doc/edelib-${FULL_V}/INSTALL
-share/doc/edelib-${FULL_V}/README
+share/doc/edelib-${FULL_V}/INSTALL.md
+share/doc/edelib-${FULL_V}/README.md
share/edelib/
share/edelib/colors/
share/edelib/colors/rgb.txt
Index: x11/ede/desktop/Makefile
===================================================================
RCS file: /cvs/ports/x11/ede/desktop/Makefile,v
diff -u -p -r1.28 Makefile
--- x11/ede/desktop/Makefile 26 Oct 2025 22:11:42 -0000 1.28
+++ x11/ede/desktop/Makefile 7 Jul 2026 14:57:23 -0000
@@ -1,7 +1,9 @@
COMMENT = Equinox desktop environment
-DISTNAME = ede-${V}
-REVISION = 15
+DISTNAME = ede-2.2.0pre20260218
+GH_PROJECT = ede
+GH_COMMIT = 97ff635d363c9874ed70aebbc2af35e2d116b3b1
+FULL_V = 2.2.0
WANTLIB += X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xinerama Xpm c crypto
WANTLIB += curl dbus-1 edelib edelib_dbus edelib_gui fltk fltk_images
@@ -16,7 +18,8 @@ MODULES = lang/python
BUILD_DEPENDS = devel/gettext,-tools \
devel/jam \
misc/shared-mime-info \
- textproc/asciidoc
+ textproc/asciidoc \
+ www/tidy
LIB_DEPENDS = devel/startup-notification \
graphics/jpeg \
@@ -31,23 +34,24 @@ RUN_DEPENDS = devel/desktop-file-utils
FAKE_FLAGS = sysconfdir="${TRUEPREFIX}/share/examples/ede"
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = autoreconf
+AUTORECONF = ${WRKSRC}/autogen.sh
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.16
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
PTHREAD_LIBS="-pthread" PTHREAD_CFLAGS="-pthread"
-MAKE_ENV = ASCIIDOC="${LOCALBASE}/bin/asciidoc"
-
NO_TEST = Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/ede-keyboard-conf/ede-keyboard-conf.cpp
do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} jam -d x
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} jam -sBUILD_ICON_THEMES=1 -d x
do-install:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${ALL_FAKE_FLAGS} \
- DESTDIR="${WRKINST}" jam -d x install
+ DESTDIR="${WRKINST}" jam -sBUILD_ICON_THEMES=1 -d x install
.include <bsd.port.mk>
Index: x11/ede/desktop/distinfo
===================================================================
RCS file: /cvs/ports/x11/ede/desktop/distinfo,v
diff -u -p -r1.2 distinfo
--- x11/ede/desktop/distinfo 11 Jul 2014 21:39:04 -0000 1.2
+++ x11/ede/desktop/distinfo 7 Jul 2026 14:57:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (ede-2.1.tar.gz) = M2GvB9F/eb0NEtrzQFnJ5kSd3yOohD8rbhcmioApig4=
-SIZE (ede-2.1.tar.gz) = 12854852
+SHA256 (ede-2.2.0pre20260218-97ff635d.tar.gz) =
lmhH7CF3NRsGMzR2mruGSZy8M2oRRIBU2epnRz0cwU8=
+SIZE (ede-2.2.0pre20260218-97ff635d.tar.gz) = 8844879
Index: x11/ede/desktop/patches/patch-Jamconfig_in
===================================================================
RCS file: x11/ede/desktop/patches/patch-Jamconfig_in
diff -N x11/ede/desktop/patches/patch-Jamconfig_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/ede/desktop/patches/patch-Jamconfig_in 7 Jul 2026 14:57:23 -0000
@@ -0,0 +1,20 @@
+Index: Jamconfig.in
+--- Jamconfig.in.orig
++++ Jamconfig.in
+@@ -24,7 +24,7 @@ sysconfdir ?= "@sysconfdir@" ;
+ # compiler
+ CC = @CC@ ;
+ C++ = @CXX@ ;
+-LINK = $(CC) ;
++LINK = @CXX@ ;
+
+ # tools used by jam rules
+ XGETTEXT ?= @XGETTEXT@ ;
+@@ -86,7 +86,6 @@ if $(SUN_COMPILER) {
+
+ # global flags used to be passed to every target
+ GLOBALFLAGS ?= $(WALL) $(PEDANTIC) -DHAVE_CONFIG_H -I$(TOP) $(OPTIMFLAGS)
$(DEBUGFLAGS) $(LARGEFILEFLAGS) ;
+-STDLIB ?= -lstdc++ ;
+ LIBM ?= -lm ;
+
+ # Note that REMOVE_UNUSED_DEPENDENCIES_TRICK _does not_ works when
Index: x11/ede/desktop/patches/patch-build_Doc_jam
===================================================================
RCS file: x11/ede/desktop/patches/patch-build_Doc_jam
diff -N x11/ede/desktop/patches/patch-build_Doc_jam
--- x11/ede/desktop/patches/patch-build_Doc_jam 26 Oct 2025 22:11:42 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-Allow use of external asciidoc instead of the embedded
-copy which is Python 2 code.
-
-Index: build/Doc.jam
---- build/Doc.jam.orig
-+++ build/Doc.jam
-@@ -8,7 +8,7 @@
- # GNU General Public License version 2 or newer.
- # See COPYING for details.
-
--ASCIIDOC = "$(TOP)/doc/asciidoc/asciidoc.py" ;
-+ASCIIDOC ?= "$(TOP)/doc/asciidoc/asciidoc.py" ;
- DOCDIR = "$(TOP)/doc" ;
- MANUALDIR = "$(DOCDIR)/manual" ;
-
Index: x11/ede/desktop/patches/patch-build_Svg_jam
===================================================================
RCS file: x11/ede/desktop/patches/patch-build_Svg_jam
diff -N x11/ede/desktop/patches/patch-build_Svg_jam
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/ede/desktop/patches/patch-build_Svg_jam 7 Jul 2026 14:57:23 -0000
@@ -0,0 +1,12 @@
+Index: build/Svg.jam
+--- build/Svg.jam.orig
++++ build/Svg.jam
+@@ -69,7 +69,7 @@ rule SvgToPngDirectory
+
+ actions SvgToPng1
+ {
+- $(SVG_CONVERTOR) -w $(PNG_WIDTH) -h $(PNG_HEIGHT) -f png "$(>)" "$(<)"
++ $(SVG_CONVERTOR) -w $(PNG_WIDTH) -h $(PNG_HEIGHT) -f png "$(>)" -o
"$(<)"
+ }
+
+ NotFile icons ;
Index: x11/ede/desktop/patches/patch-configure
===================================================================
RCS file: x11/ede/desktop/patches/patch-configure
diff -N x11/ede/desktop/patches/patch-configure
--- x11/ede/desktop/patches/patch-configure 7 Jul 2026 11:57:16 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,147 +0,0 @@
-Index: configure
---- configure.orig
-+++ configure
-@@ -5171,12 +5171,7 @@ $as_echo "$COMPOSITE_CFLAGS" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking COMPOSITE_LIBS"
>&5
- $as_echo_n "checking COMPOSITE_LIBS... " >&6; }
- ## don't use --libs since that can do evil things like add
-Wl,--export-dynamic
-- if test "$SHELL" = "/bin/ksh"; then
-- ## ksh does not do escaping properly
-- COMPOSITE_LIBS="`$PKG_CONFIG --libs-only-L "xcomposite,
xdamage, xext"` `$PKG_CONFIG --libs-only-l "xcomposite, xdamage, xext"`"
-- else
-- COMPOSITE_LIBS="`$PKG_CONFIG --libs-only-L \"xcomposite,
xdamage, xext\"` `$PKG_CONFIG --libs-only-l \"xcomposite, xdamage, xext\"`"
-- fi
-+ COMPOSITE_LIBS="`$PKG_CONFIG --libs-only-L 'xcomposite, xdamage,
xext'` `$PKG_CONFIG --libs-only-l 'xcomposite, xdamage, xext'`"
-
- COMPOSITE_VERSION=`$PKG_CONFIG --modversion "xcomposite, xdamage,
xext"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPOSITE_LIBS"
>&5
-@@ -5408,12 +5403,7 @@ $as_echo "$LIBSTARTUP_NOTIFICATION_CFLAGS" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking
LIBSTARTUP_NOTIFICATION_LIBS" >&5
- $as_echo_n "checking LIBSTARTUP_NOTIFICATION_LIBS... " >&6; }
- ## don't use --libs since that can do evil things like add
-Wl,--export-dynamic
-- if test "$SHELL" = "/bin/ksh"; then
-- ## ksh does not do escaping properly
-- LIBSTARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs-only-L
"libstartup-notification-1.0"` `$PKG_CONFIG --libs-only-l
"libstartup-notification-1.0"`"
-- else
-- LIBSTARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs-only-L
\"libstartup-notification-1.0\"` `$PKG_CONFIG --libs-only-l
\"libstartup-notification-1.0\"`"
-- fi
-+ LIBSTARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs-only-L
'libstartup-notification-1.0'` `$PKG_CONFIG --libs-only-l
'libstartup-notification-1.0'`"
-
- LIBSTARTUP_NOTIFICATION_VERSION=`$PKG_CONFIG --modversion
"libstartup-notification-1.0"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$LIBSTARTUP_NOTIFICATION_LIBS" >&5
-@@ -5531,12 +5521,7 @@ $as_echo "$EDELIB_CFLAGS" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking EDELIB_LIBS" >&5
- $as_echo_n "checking EDELIB_LIBS... " >&6; }
- ## don't use --libs since that can do evil things like add
-Wl,--export-dynamic
-- if test "$SHELL" = "/bin/ksh"; then
-- ## ksh does not do escaping properly
-- EDELIB_LIBS="`$PKG_CONFIG --libs-only-L "edelib"`
`$PKG_CONFIG --libs-only-l "edelib"`"
-- else
-- EDELIB_LIBS="`$PKG_CONFIG --libs-only-L \"edelib\"`
`$PKG_CONFIG --libs-only-l \"edelib\"`"
-- fi
-+ EDELIB_LIBS="`$PKG_CONFIG --libs-only-L 'edelib'` `$PKG_CONFIG
--libs-only-l 'edelib'`"
-
- EDELIB_VERSION=`$PKG_CONFIG --modversion "edelib"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EDELIB_LIBS" >&5
-@@ -5645,12 +5630,7 @@ $as_echo "$EDELIB_GUI_CFLAGS" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking
EDELIB_GUI_LIBS" >&5
- $as_echo_n "checking EDELIB_GUI_LIBS... " >&6; }
- ## don't use --libs since that can do evil things like add
-Wl,--export-dynamic
-- if test "$SHELL" = "/bin/ksh"; then
-- ## ksh does not do escaping properly
-- EDELIB_GUI_LIBS="`$PKG_CONFIG --libs-only-L "edelib-gui"`
`$PKG_CONFIG --libs-only-l "edelib-gui"`"
-- else
-- EDELIB_GUI_LIBS="`$PKG_CONFIG --libs-only-L \"edelib-gui\"`
`$PKG_CONFIG --libs-only-l \"edelib-gui\"`"
-- fi
-+ EDELIB_GUI_LIBS="`$PKG_CONFIG --libs-only-L 'edelib-gui'`
`$PKG_CONFIG --libs-only-l 'edelib-gui'`"
-
- EDELIB_GUI_VERSION=`$PKG_CONFIG --modversion "edelib-gui"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$EDELIB_GUI_LIBS" >&5
-@@ -5759,12 +5739,7 @@ $as_echo "$EDELIB_GUI_NO_IMAGES_CFLAGS" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking
EDELIB_GUI_NO_IMAGES_LIBS" >&5
- $as_echo_n "checking EDELIB_GUI_NO_IMAGES_LIBS... " >&6; }
- ## don't use --libs since that can do evil things like add
-Wl,--export-dynamic
-- if test "$SHELL" = "/bin/ksh"; then
-- ## ksh does not do escaping properly
-- EDELIB_GUI_NO_IMAGES_LIBS="`$PKG_CONFIG --libs-only-L
"edelib-gui-no-images"` `$PKG_CONFIG --libs-only-l "edelib-gui-no-images"`"
-- else
-- EDELIB_GUI_NO_IMAGES_LIBS="`$PKG_CONFIG --libs-only-L
\"edelib-gui-no-images\"` `$PKG_CONFIG --libs-only-l \"edelib-gui-no-images\"`"
-- fi
-+ EDELIB_GUI_NO_IMAGES_LIBS="`$PKG_CONFIG --libs-only-L
'edelib-gui-no-images'` `$PKG_CONFIG --libs-only-l 'edelib-gui-no-images'`"
-
- EDELIB_GUI_NO_IMAGES_VERSION=`$PKG_CONFIG --modversion
"edelib-gui-no-images"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$EDELIB_GUI_NO_IMAGES_LIBS" >&5
-@@ -5873,12 +5848,7 @@ $as_echo "$EDELIB_DBUS_CFLAGS" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking
EDELIB_DBUS_LIBS" >&5
- $as_echo_n "checking EDELIB_DBUS_LIBS... " >&6; }
- ## don't use --libs since that can do evil things like add
-Wl,--export-dynamic
-- if test "$SHELL" = "/bin/ksh"; then
-- ## ksh does not do escaping properly
-- EDELIB_DBUS_LIBS="`$PKG_CONFIG --libs-only-L "edelib-dbus"`
`$PKG_CONFIG --libs-only-l "edelib-dbus"`"
-- else
-- EDELIB_DBUS_LIBS="`$PKG_CONFIG --libs-only-L \"edelib-dbus\"`
`$PKG_CONFIG --libs-only-l \"edelib-dbus\"`"
-- fi
-+ EDELIB_DBUS_LIBS="`$PKG_CONFIG --libs-only-L 'edelib-dbus'`
`$PKG_CONFIG --libs-only-l 'edelib-dbus'`"
-
- EDELIB_DBUS_VERSION=`$PKG_CONFIG --modversion "edelib-dbus"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$EDELIB_DBUS_LIBS" >&5
-@@ -6017,7 +5987,7 @@ $as_echo "yes" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- ;;
-- "1.3."[0123456789])
-+ "1.3."[0123456789]*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- ;;
-@@ -6904,8 +6874,6 @@ else
- LIBICONV="-L$iconv_path/lib -liconv"
- INCICONV="-I$iconv_path/include"
-
--$as_echo "#define ICONV_CONST 1" >>confdefs.h
--
- fi
- fi
-
-@@ -7044,12 +7012,7 @@ $as_echo "$xft_CFLAGS" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking xft_LIBS" >&5
- $as_echo_n "checking xft_LIBS... " >&6; }
- ## don't use --libs since that can do evil things like add
-Wl,--export-dynamic
-- if test "$SHELL" = "/bin/ksh"; then
-- ## ksh does not do escaping properly
-- xft_LIBS="`$PKG_CONFIG --libs-only-L "xft >= 2.0.0"`
`$PKG_CONFIG --libs-only-l "xft >= 2.0.0"`"
-- else
-- xft_LIBS="`$PKG_CONFIG --libs-only-L \"xft >= 2.0.0\"`
`$PKG_CONFIG --libs-only-l \"xft >= 2.0.0\"`"
-- fi
-+ xft_LIBS="`$PKG_CONFIG --libs-only-L 'xft >= 2.0.0'` `$PKG_CONFIG
--libs-only-l 'xft >= 2.0.0'`"
-
- xft_VERSION=`$PKG_CONFIG --modversion "xft >= 2.0.0"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xft_LIBS" >&5
-@@ -7175,12 +7138,7 @@ $as_echo "$xrandr_CFLAGS" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking xrandr_LIBS" >&5
- $as_echo_n "checking xrandr_LIBS... " >&6; }
- ## don't use --libs since that can do evil things like add
-Wl,--export-dynamic
-- if test "$SHELL" = "/bin/ksh"; then
-- ## ksh does not do escaping properly
-- xrandr_LIBS="`$PKG_CONFIG --libs-only-L "xrandr >= 1.2.0"`
`$PKG_CONFIG --libs-only-l "xrandr >= 1.2.0"`"
-- else
-- xrandr_LIBS="`$PKG_CONFIG --libs-only-L \"xrandr >= 1.2.0\"`
`$PKG_CONFIG --libs-only-l \"xrandr >= 1.2.0\"`"
-- fi
-+ xrandr_LIBS="`$PKG_CONFIG --libs-only-L 'xrandr >= 1.2.0'`
`$PKG_CONFIG --libs-only-l 'xrandr >= 1.2.0'`"
-
- xrandr_VERSION=`$PKG_CONFIG --modversion "xrandr >= 1.2.0"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xrandr_LIBS" >&5
-@@ -7782,12 +7740,7 @@ $as_echo "$libpng_CFLAGS" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking libpng_LIBS" >&5
- $as_echo_n "checking libpng_LIBS... " >&6; }
- ## don't use --libs since that can do evil things like add
-Wl,--export-dynamic
-- if test "$SHELL" = "/bin/ksh"; then
-- ## ksh does not do escaping properly
-- libpng_LIBS="`$PKG_CONFIG --libs-only-L "libpng >= 1.0.0"`
`$PKG_CONFIG --libs-only-l "libpng >= 1.0.0"`"
-- else
-- libpng_LIBS="`$PKG_CONFIG --libs-only-L \"libpng >= 1.0.0\"`
`$PKG_CONFIG --libs-only-l \"libpng >= 1.0.0\"`"
-- fi
-+ libpng_LIBS="`$PKG_CONFIG --libs-only-L 'libpng >= 1.0.0'`
`$PKG_CONFIG --libs-only-l 'libpng >= 1.0.0'`"
-
- libpng_VERSION=`$PKG_CONFIG --modversion "libpng >= 1.0.0"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libpng_LIBS" >&5
Index: x11/ede/desktop/patches/patch-data_pekwm_scripts_Jamfile
===================================================================
RCS file: x11/ede/desktop/patches/patch-data_pekwm_scripts_Jamfile
diff -N x11/ede/desktop/patches/patch-data_pekwm_scripts_Jamfile
--- x11/ede/desktop/patches/patch-data_pekwm_scripts_Jamfile 11 Mar 2022
20:15:27 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
---- data/pekwm/scripts/Jamfile.orig Sat Jul 13 17:58:34 2013
-+++ data/pekwm/scripts/Jamfile Sat Jul 13 17:58:38 2013
-@@ -10,4 +10,4 @@
-
- SubDir TOP data pekwm scripts ;
-
--InstallProgram "$(PEKWM_DATA_DIR)/scripts" : pekwm_themeset.sh
pekwm_ws_menu.sh ;
-+# InstallProgram "$(PEKWM_DATA_DIR)/scripts" : pekwm_themeset.sh
pekwm_ws_menu.sh ;
Index: x11/ede/desktop/patches/patch-ede-bug-tools_ede-bug-report_Jamfile
===================================================================
RCS file: x11/ede/desktop/patches/patch-ede-bug-tools_ede-bug-report_Jamfile
diff -N x11/ede/desktop/patches/patch-ede-bug-tools_ede-bug-report_Jamfile
--- x11/ede/desktop/patches/patch-ede-bug-tools_ede-bug-report_Jamfile 11 Mar
2022 20:15:27 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- ede-bug-tools/ede-bug-report/Jamfile.orig Fri May 18 14:51:50 2012
-+++ ede-bug-tools/ede-bug-report/Jamfile Sun Dec 8 03:28:28 2013
-@@ -99,7 +99,7 @@ if $(CURL_CFLAGS) || $(CURL_LIBS) {
- curlmulti.c
- lock_pthread.c ;
-
-- ObjectCcFlags $(CURL_TRANSPORT_SRC) : $(CURL_CFLAGS) ;
-+ ObjectCcFlags $(CURL_TRANSPORT_SRC) : $(XMLRPC_C_FLAGS) $(CURL_CFLAGS) ;
-
- UTIL_SRC =
- casprintf.c
Index: x11/ede/desktop/patches/patch-ede-desktop_Jamfile
===================================================================
RCS file: x11/ede/desktop/patches/patch-ede-desktop_Jamfile
diff -N x11/ede/desktop/patches/patch-ede-desktop_Jamfile
--- x11/ede/desktop/patches/patch-ede-desktop_Jamfile 11 Mar 2022 20:15:27
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
---- ede-desktop/Jamfile.orig Sat Jun 21 23:24:22 2014
-+++ ede-desktop/Jamfile Fri Jul 11 19:07:53 2014
-@@ -31,4 +31,4 @@ SOURCE = ede-desktop.cpp
-
- ObjectC++Flags $(SOURCE) : $(EDELIB_DBUS_INCLUDE) ;
- EdeProgram ede-desktop : $(SOURCE) ;
--LinkAgainst ede-desktop : $(EDELIB_DBUS_LIB) $(XSHAPE_LIBS) ;
-\ No newline at end of file
-+LinkAgainst ede-desktop : $(EDELIB_DBUS_LIB) $(XSHAPE_LIBS) $(PTHREAD_LIBS) ;
Index: x11/ede/desktop/patches/patch-ede-keyboard-conf_ede-keyboard-conf_cpp
===================================================================
RCS file:
/cvs/ports/x11/ede/desktop/patches/patch-ede-keyboard-conf_ede-keyboard-conf_cpp,v
diff -u -p -r1.2 patch-ede-keyboard-conf_ede-keyboard-conf_cpp
--- x11/ede/desktop/patches/patch-ede-keyboard-conf_ede-keyboard-conf_cpp
11 Mar 2022 20:15:27 -0000 1.2
+++ x11/ede/desktop/patches/patch-ede-keyboard-conf_ede-keyboard-conf_cpp
7 Jul 2026 14:57:23 -0000
@@ -1,6 +1,7 @@
---- ede-keyboard-conf/ede-keyboard-conf.cpp.orig Wed Jul 10 13:33:12 2013
-+++ ede-keyboard-conf/ede-keyboard-conf.cpp Wed Jul 10 13:36:12 2013
-@@ -70,6 +70,7 @@ static const char *x11_dirs[] = {
+Index: ede-keyboard-conf/ede-keyboard-conf.cpp
+--- ede-keyboard-conf/ede-keyboard-conf.cpp.orig
++++ ede-keyboard-conf/ede-keyboard-conf.cpp
+@@ -71,6 +71,7 @@ static const char *x11_dirs[] = {
"/usr/local/share/X11/",
"/usr/X11R6/lib/X11/",
"/usr/X11R6/lib64/X11/",
@@ -8,7 +9,7 @@
"/usr/local/X11R6/lib/X11/",
"/usr/local/X11R6/lib64/X11/",
"/usr/lib/X11/",
-@@ -84,6 +85,7 @@ static const char *x11_dirs[] = {
+@@ -85,6 +86,7 @@ static const char *x11_dirs[] = {
static const char *x11_rules[] = {
"xkb/rules/xorg",
"xkb/rules/xfree86",
Index: x11/ede/desktop/patches/patch-ede-notify-daemon_Jamfile
===================================================================
RCS file: x11/ede/desktop/patches/patch-ede-notify-daemon_Jamfile
diff -N x11/ede/desktop/patches/patch-ede-notify-daemon_Jamfile
--- x11/ede/desktop/patches/patch-ede-notify-daemon_Jamfile 11 Mar 2022
20:15:27 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- ede-notify-daemon/Jamfile.orig Fri May 25 18:48:27 2012
-+++ ede-notify-daemon/Jamfile Fri May 25 18:48:40 2012
-@@ -13,7 +13,7 @@ SubDir TOP ede-notify-daemon ;
- SOURCE = ede-notify-daemon.cpp NotifyWindow.cpp ;
-
- EdeProgram ede-notify-daemon : $(SOURCE) ;
--LinkAgainst ede-notify-daemon : $(EDELIB_DBUS_LIB) ;
-+LinkAgainst ede-notify-daemon : $(EDELIB_DBUS_LIB) $(PTHREAD_LIBS) ;
-
- TranslationStrings locale : $(SOURCE) ;
-
Index:
x11/ede/desktop/patches/patch-ede-panel_applets_cpu-monitor_CpuMonitor_cpp
===================================================================
RCS file:
/cvs/ports/x11/ede/desktop/patches/patch-ede-panel_applets_cpu-monitor_CpuMonitor_cpp,v
diff -u -p -r1.4 patch-ede-panel_applets_cpu-monitor_CpuMonitor_cpp
--- x11/ede/desktop/patches/patch-ede-panel_applets_cpu-monitor_CpuMonitor_cpp
11 Mar 2022 20:15:27 -0000 1.4
+++ x11/ede/desktop/patches/patch-ede-panel_applets_cpu-monitor_CpuMonitor_cpp
7 Jul 2026 14:57:23 -0000
@@ -1,24 +1,7 @@
---- ede-panel/applets/cpu-monitor/CpuMonitor.cpp.orig Sat Jun 21 15:24:21 2014
-+++ ede-panel/applets/cpu-monitor/CpuMonitor.cpp Wed Sep 17 01:46:03 2014
-@@ -36,20 +36,24 @@
- # include <string.h> /* strncmp */
- #endif
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
- # include <sys/param.h>
- # include <sys/sysctl.h>
-+#if defined(__OpenBSD__)
-+#include <sys/sched.h>
-+#else
- # if __FreeBSD_version < 500101
- # include <sys/dkstat.h>
- # else
- # include <sys/resource.h>
- # endif
-+#endif
- # include <sys/stat.h>
- #endif
+Index: ede-panel/applets/cpu-monitor/CpuMonitor.cpp
+--- ede-panel/applets/cpu-monitor/CpuMonitor.cpp.orig
++++ ede-panel/applets/cpu-monitor/CpuMonitor.cpp
+@@ -53,7 +53,7 @@
#include "CpuMonitor.h"
@@ -27,7 +10,7 @@
/* The part ripped from top... */
/*
-@@ -481,15 +485,18 @@ void CPUMonitor::get_cpu_info() {
+@@ -485,15 +485,18 @@ void CPUMonitor::get_cpu_info() {
#endif /* have_kstat_h */
Index: x11/ede/desktop/patches/patch-evoke_EvokeService_cpp
===================================================================
RCS file: x11/ede/desktop/patches/patch-evoke_EvokeService_cpp
diff -N x11/ede/desktop/patches/patch-evoke_EvokeService_cpp
--- x11/ede/desktop/patches/patch-evoke_EvokeService_cpp 11 Mar 2022
20:15:27 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-Don't provide shutdown and restart options. They do not work without HAL.
-
---- evoke/EvokeService.cpp.orig Sat Jun 21 23:24:42 2014
-+++ evoke/EvokeService.cpp Fri Jul 11 19:07:10 2014
-@@ -66,8 +66,11 @@ EDELIB_NS_USING(EDBUS_SYSTEM)
- #endif
-
- /* stolen from xfce's xfsm-shutdown-helper */
--#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) ||
defined(__OpenBSD__)
-+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
- # define POWEROFF_CMD "/sbin/shutdown -p now"
-+# define REBOOT_CMD "/sbin/shutdown -r now"
-+#elif defined(__OpenBSD__)
-+# define POWEROFF_CMD "/sbin/shutdown -hp now"
- # define REBOOT_CMD "/sbin/shutdown -r now"
- #elif defined(sun) || defined(__sun)
- # define POWEROFF_CMD "/usr/sbin/shutdown -i 5 -g 0 -y"
Index: x11/ede/desktop/patches/patch-evoke_Jamfile
===================================================================
RCS file: x11/ede/desktop/patches/patch-evoke_Jamfile
diff -N x11/ede/desktop/patches/patch-evoke_Jamfile
--- x11/ede/desktop/patches/patch-evoke_Jamfile 11 Mar 2022 20:15:27 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- evoke/Jamfile.orig Fri May 18 14:51:51 2012
-+++ evoke/Jamfile Fri May 25 18:52:50 2012
-@@ -27,7 +27,7 @@ ObjectC++Flags Splash.cpp : -DEDEWM_HAVE_NET_SPLASH ;
- ObjectC++Flags evoke.cpp : -DUSE_SIGHUP ;
-
- ObjectC++Flags EvokeService.cpp : $(EDELIB_DBUS_INCLUDE) ;
--LinkAgainstAsFirst evoke : $(EDELIB_DBUS_LIB) ;
-+LinkAgainstAsFirst evoke : $(EDELIB_DBUS_LIB) $(PTHREAD_LIBS) ;
-
- EdeProgram evoke : $(SOURCE) ;
-
Index: x11/ede/desktop/patches/patch-m4_pkg_m4
===================================================================
RCS file: x11/ede/desktop/patches/patch-m4_pkg_m4
diff -N x11/ede/desktop/patches/patch-m4_pkg_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/ede/desktop/patches/patch-m4_pkg_m4 7 Jul 2026 14:57:23 -0000
@@ -0,0 +1,20 @@
+Index: m4/pkg.m4
+--- m4/pkg.m4.orig
++++ m4/pkg.m4
+@@ -35,14 +35,9 @@ AC_DEFUN([PKG_CHECK_MODULES], [
+
+ AC_MSG_CHECKING($1_LIBS)
+ ## don't use --libs since that can do evil things like add
-Wl,--export-dynamic
+- if test "$SHELL" = "/bin/ksh"; then
+- ## ksh does not do escaping properly
+- $1_LIBS="`$PKG_CONFIG --libs-only-L "$2"` `$PKG_CONFIG
--libs-only-l "$2"`"
+- else
+- $1_LIBS="`$PKG_CONFIG --libs-only-L \"$2\"` `$PKG_CONFIG
--libs-only-l \"$2\"`"
+- fi
++ $1_LIBS="`$PKG_CONFIG --libs-only-L '$2'` `$PKG_CONFIG
--libs-only-l '$2'`"
+
+- $1_VERSION=`$PKG_CONFIG --modversion "$2"`
++ $1_VERSION=`$PKG_CONFIG --modversion '$2'`
+ AC_MSG_RESULT($$1_LIBS)
+ else
+ $1_CFLAGS=""
Index: x11/ede/desktop/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/ede/desktop/pkg/PLIST,v
diff -u -p -r1.8 PLIST
--- x11/ede/desktop/pkg/PLIST 26 Oct 2025 22:11:42 -0000 1.8
+++ x11/ede/desktop/pkg/PLIST 7 Jul 2026 14:57:23 -0000
@@ -49,7 +49,6 @@ share/desktop-directories/ede-settings.d
share/desktop-directories/ede-system.directory
share/doc/ede-${FULL_V}/
share/doc/ede-${FULL_V}/manual/
-share/doc/ede-${FULL_V}/manual/README.html
share/doc/ede-${FULL_V}/manual/dbus-usage.html
share/doc/ede-${FULL_V}/manual/ede-calc.html
share/doc/ede-${FULL_V}/manual/ede-dialog.html
