graphics/agg26: update to 2.7.0

PR: 285652

5 files changed, 12 insertions, 43 deletions

diff --git a/graphics/agg26/Makefile b/graphics/agg26/Makefile
index 9beca02d1f2a..e8457e61877c 100644
--- a/graphics/agg26/Makefile
+++ b/graphics/agg26/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	agg
-DISTVERSION=	2.6
+DISTVERSION=	2.7.0
 PORTREVISION=	0
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	26${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	High Quality Rendering Engine for C++
-WWW=		https://github.com/ghaerr/agg-2.6
+WWW=		https://github.com/clausecker/agg
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/copying
@@ -18,23 +18,18 @@ USES=		cpe localbase gmake libtool pkgconfig \
 CONFLICTS=      agg-2.*
 CPE_VENDOR=	antigrain
 USE_GITHUB=	yes
-GH_ACCOUNT=	ghaerr
-GH_PROJECT=	${PORTNAME}-${PORTVERSION}
-GH_TAGNAME=	c4f36b44 # 20230821
+GH_ACCOUNT=	clausecker
+GH_TAGNAME=	b064760 # 2024-09-28
 USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
-USE_SDL=	sdl2
+USE_SDL=	sdl
 USE_XORG=	x11
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}/agg-src
 
 INSTALL_TARGET=	install-strip
 
 post-patch:
-	${REINPLACE_CMD} \
-		's|agg_platform_support.cpp|../sdl2/agg_platform_support.cpp|' \
-		 ${WRKSRC}/src/platform/sdl/Makefile.am
 	${REINPLACE_CMD} 's|_LDFLAGS|_LDADD|' ${WRKSRC}/examples/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/graphics/agg26/distinfo b/graphics/agg26/distinfo
index 97fba822d0d6..4c23499ba194 100644
--- a/graphics/agg26/distinfo
+++ b/graphics/agg26/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730123960
-SHA256 (ghaerr-agg-2.6-2.6-c4f36b44_GH0.tar.gz) = 932c2382f1da3bd13d9baa9f464f7cba57c0a032720b3f2f2604064a66bce63f
-SIZE (ghaerr-agg-2.6-2.6-c4f36b44_GH0.tar.gz) = 118943923
+TIMESTAMP = 1746091363
+SHA256 (clausecker-agg-2.7.0-b064760_GH0.tar.gz) = 771e1a68ec5b2924dc8e0c859b6cdd59aa5914c0b62d27f58bb693247897aacb
+SIZE (clausecker-agg-2.7.0-b064760_GH0.tar.gz) = 1580108
diff --git a/graphics/agg26/files/patch-configure.ac b/graphics/agg26/files/patch-configure.ac
deleted file mode 100644
index 26f1ae438df4..000000000000
--- a/graphics/agg26/files/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.ac.orig	2023-08-21 15:51:12 UTC
-+++ configure.ac
-@@ -99,9 +99,9 @@ temp_CXXFLAGS="$CXXFLAGS"
- temp_LIBS="$LIBS"
- temp_CFLAGS="$CFLAGS"
- temp_CXXFLAGS="$CXXFLAGS"
--sdl_enabled=""
--SDL_VERSION=1.2.0
--AM_PATH_SDL($SDL_VERSION,
-+sdl_enabled="yes"
-+SDL_VERSION=2.1.0
-+AM_PATH_SDL2($SDL_VERSION,
-     [sdl_enabled="yes"],
-     AC_MSG_WARN([*** SDL version $SDL_VERSION not found! Omitting sdl layer.])
-     )
diff --git a/graphics/agg26/files/patch-font_freetype__agg_font_freetype.cpp b/graphics/agg26/files/patch-font_freetype__agg_font_freetype.cpp
deleted file mode 100644
index 2bae296c0829..000000000000
--- a/graphics/agg26/files/patch-font_freetype__agg_font_freetype.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- font_freetype/agg_font_freetype.cpp.orig	2023-08-21 15:51:12 UTC
-+++ font_freetype/agg_font_freetype.cpp
-@@ -158,7 +158,7 @@ namespace agg
- 
-         FT_Vector*  point;
-         FT_Vector*  limit;
--        char*       tags;
-+        unsigned char *tags;
- 
-         int   n;         // index of contour in outline
-         int   first;     // index of first point in contour
diff --git a/graphics/agg26/pkg-plist b/graphics/agg26/pkg-plist
index f56bf276fe2c..0989b6fe2d00 100644
--- a/graphics/agg26/pkg-plist
+++ b/graphics/agg26/pkg-plist
@@ -143,18 +143,18 @@ include/agg2/util/agg_color_conv_rgb8.h
 lib/libagg.a
 lib/libagg.so
 lib/libagg.so.2
-lib/libagg.so.2.0.6
+lib/libagg.so.2.0.7
 lib/libaggfontfreetype.a
 lib/libaggfontfreetype.so
 lib/libaggfontfreetype.so.2
-lib/libaggfontfreetype.so.2.0.6
+lib/libaggfontfreetype.so.2.0.7
 lib/libaggplatformX11.a
 lib/libaggplatformX11.so
 lib/libaggplatformX11.so.2
-lib/libaggplatformX11.so.2.0.6
+lib/libaggplatformX11.so.2.0.7
 lib/libaggplatformsdl.a
 lib/libaggplatformsdl.so
 lib/libaggplatformsdl.so.2
-lib/libaggplatformsdl.so.2.0.6
+lib/libaggplatformsdl.so.2.0.7
 libdata/pkgconfig/libagg.pc
 share/aclocal/libagg.m4