7 files changed, 36 insertions, 53 deletions
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index b1fa65b4d5f6..3026cde4cfe9 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -1,12 +1,10 @@
 PORTNAME=	idesk
-PORTVERSION=	0.7.5
-PORTREVISION=	15
+PORTVERSION=	0.7.9
 CATEGORIES=	x11
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Place launch icons and background directly on your desktop
-WWW=		https://idesk.sourceforge.net
+WWW=		https://github.com/neagix/idesk
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -14,7 +12,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
 		libXft.so:x11-fonts/libXft
 
-USES=		gmake pkgconfig tar:bzip2 xorg
+USE_GITHUB=	yes
+GH_ACCOUNT=	neagix
+GH_TAGNAME=	15f0b51dc7c7adbdf191481423793d7726fa8fab
+
+USES=		autoreconf gmake localbase:ldflags pkgconfig \
+		tar:bzip2 xorg
 USE_XORG=	ice sm x11
 
 GNU_CONFIGURE=	yes
@@ -37,6 +40,9 @@ SHAPE_CONFIGURE_ENABLE=	shape
 SN_LIB_DEPENDS=		libstartup-notification-1.so:x11/startup-notification
 SN_CONFIGURE_ON=	--enable-libsn
 
+post-patch:
+	${REINPLACE_CMD} -e 's|0.7.8|${PORTVERSION}|g' ${WRKSRC}/configure.ac
+
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/src/idesk ${STAGEDIR}${PREFIX}/bin
 		${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/x11/idesk/distinfo b/x11/idesk/distinfo
index eb1bdf278bdf..0607a9eeaf70 100644
--- a/x11/idesk/distinfo
+++ b/x11/idesk/distinfo
@@ -1,2 +1,3 @@
-SHA256 (idesk-0.7.5.tar.bz2) = d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3
-SIZE (idesk-0.7.5.tar.bz2) = 185858
+TIMESTAMP = 1745876492
+SHA256 (neagix-idesk-0.7.9-15f0b51dc7c7adbdf191481423793d7726fa8fab_GH0.tar.gz) = a3e41968c358e115fece2a1df8e5efb4bf86e4e49b1dce3bd9a99f8920974d5e
+SIZE (neagix-idesk-0.7.9-15f0b51dc7c7adbdf191481423793d7726fa8fab_GH0.tar.gz) = 139044
diff --git a/x11/idesk/files/patch-configure b/x11/idesk/files/patch-configure
deleted file mode 100644
index ec9459eb870d..000000000000
--- a/x11/idesk/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
-work around removed imlib2-config
-
-Index: configure
---- configure.orig	2005-11-10 23:31:38 UTC
-+++ configure
-@@ -7030,13 +7030,8 @@ echo $ECHO_N "checking for imlib2... $ECHO_C" >&6
-   echo "$as_me:$LINENO: checking for imlib2" >&5
- echo $ECHO_N "checking for imlib2... $ECHO_C" >&6
-   no_imlib2=""
--  if test "$IMLIB2_CONFIG" = "no" ; then
--     no_imlib2=yes
--  else
--     IMLIB2_CFLAGS="`$IMLIB2_CONFIG $imlib2_config_args --cflags`"
--     IMLIB2_LIBS="`$IMLIB2_CONFIG $imlib2_config_args --libs`"
--
--  fi
-+     IMLIB2_CFLAGS="`pkg-config --cflags imlib2`"
-+     IMLIB2_LIBS="`pkg-config --libs imlib2`"
-   if test "x$no_imlib2" = x ; then
-      echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-@@ -7067,8 +7062,8 @@ echo "$as_me: error: Cannot find imlib2: Is imlib2-con
- 
- 
- 
--IMLIB_LIBS=`imlib2-config --libs`
--IMLIB_CFLAGS=`imlib2-config --cflags`
-+IMLIB_LIBS=`pkg-config --libs imlib2`
-+IMLIB_CFLAGS=`pkg-config --cflags imlib2`
- 
- 
- 
diff --git a/x11/idesk/files/patch-src_Database.cpp b/x11/idesk/files/patch-src_Database.cpp
new file mode 100644
index 000000000000..bfef5be3d60c
--- /dev/null
+++ b/x11/idesk/files/patch-src_Database.cpp
@@ -0,0 +1,18 @@
+--- src/Database.cpp.orig	2025-04-06 14:11:58 UTC
++++ src/Database.cpp
+@@ -33,13 +33,13 @@ static inline std::string &ltrim(std::string &s) {
+
+ // trim from start
+ static inline std::string &ltrim(std::string &s) {
+-        s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
++        s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](const unsigned char ch) {return !std::isspace(ch); }));
+         return s;
+ }
+
+ // trim from end
+ static inline std::string &rtrim(std::string &s) {
+-        s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
++        s.erase(std::find_if(s.rbegin(), s.rend(), [](const unsigned char ch) {return !std::isspace(ch); }).base(), s.end());
+         return s;
+ }
+
diff --git a/x11/idesk/files/patch-src_DesktopConfig.cpp b/x11/idesk/files/patch-src_DesktopConfig.cpp
deleted file mode 100644
index c87db678e7e3..000000000000
--- a/x11/idesk/files/patch-src_DesktopConfig.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DesktopConfig.cpp.orig	2005-11-10 23:07:58 UTC
-+++ src/DesktopConfig.cpp
-@@ -24,6 +24,7 @@
- 
- #include "DesktopConfig.h"
- #include "Util.h"
-+#include "sys/stat.h"
- 
- //the initilizer list just sets the program defaults for non-necessary options
- DesktopConfig::DesktopConfig(Database db, string ideskrcFile) :
diff --git a/x11/idesk/files/patch-src_Timer.cpp b/x11/idesk/files/patch-src_Timer.cpp
index f7b8f5bde910..899d0742ec8a 100644
--- a/x11/idesk/files/patch-src_Timer.cpp
+++ b/x11/idesk/files/patch-src_Timer.cpp
@@ -1,5 +1,5 @@
---- src/Timer.cpp.orig	2005-08-15 05:26:39 UTC
-+++ src/Timer.cpp
+--- src/Timer.cpp	2025-04-28 14:46:12.228799000 -0700
++++ src/Timer.cpp	2025-04-28 14:46:20.177517000 -0700
 @@ -26,6 +26,7 @@
  #include "Database.h"
  #include <X11/Xlib.h>
diff --git a/x11/idesk/files/patch-src_XImlib2Background.cpp b/x11/idesk/files/patch-src_XImlib2Background.cpp
index d7dd9162b9af..c99bce26fc98 100644
--- a/x11/idesk/files/patch-src_XImlib2Background.cpp
+++ b/x11/idesk/files/patch-src_XImlib2Background.cpp
@@ -1,5 +1,5 @@
---- src/XImlib2Background.cpp.orig	2005-11-10 23:08:55 UTC
-+++ src/XImlib2Background.cpp
+--- src/XImlib2Background.cpp	2025-04-28 14:47:32.419474000 -0700
++++ src/XImlib2Background.cpp	2025-04-28 14:48:10.152608000 -0700
 @@ -26,6 +26,7 @@
  #include "Database.h"
  #include "XImlib2Background.h"