eureka-devel: Remove, games/eureka now uses FLTK 1.4

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: eureka-devel: Remove, games/eureka now uses FLTK 1.4
From: Michael Baeuerle (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Fri, 31 Jan 2025 15:59:00 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Jan 31 16:58:18 2025 +0100
Changeset:	9dcd4a3ddc5e15474eb65bfe3ca329db6ad9f3dc

Modified Files:
	Makefile
Removed Files:
	eureka-devel/DESCR
	eureka-devel/Makefile
	eureka-devel/PLIST
	eureka-devel/README
	eureka-devel/TODO
	eureka-devel/distinfo
	eureka-devel/options.mk
	eureka-devel/patches/patch-CMakeLists.txt
	eureka-devel/patches/patch-src_CMakeLists.txt
	eureka-devel/patches/patch-src_m__files.cc
	eureka-devel/patches/patch-src_m__strings.h
	eureka-devel/patches/patch-src_main.cc

Log Message:
eureka-devel: Remove, games/eureka now uses FLTK 1.4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9dcd4a3ddc5e15474eb65bfe3ca329db6ad9f3dc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                      |  1 -
 eureka-devel/DESCR                            |  7 ----
 eureka-devel/Makefile                         | 51 ---------------------------
 eureka-devel/PLIST                            | 41 ---------------------
 eureka-devel/README                           |  2 --
 eureka-devel/TODO                             |  1 -
 eureka-devel/distinfo                         | 10 ------
 eureka-devel/options.mk                       | 27 --------------
 eureka-devel/patches/patch-CMakeLists.txt     | 23 ------------
 eureka-devel/patches/patch-src_CMakeLists.txt | 27 --------------
 eureka-devel/patches/patch-src_m__files.cc    | 14 --------
 eureka-devel/patches/patch-src_m__strings.h   | 17 ---------
 eureka-devel/patches/patch-src_main.cc        | 33 -----------------
 13 files changed, 254 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index e678097c95..1caf650d03 100644
--- a/Makefile
+++ b/Makefile
@@ -877,7 +877,6 @@ SUBDIR+=	etoile
 SUBDIR+=	etoile-core
 SUBDIR+=	etoile-services
 SUBDIR+=	etos
-SUBDIR+=	eureka-devel
 SUBDIR+=	eureka1
 SUBDIR+=	eventd
 SUBDIR+=	ever-note-mode
diff --git a/eureka-devel/DESCR b/eureka-devel/DESCR
deleted file mode 100644
index e947a583d7..0000000000
--- a/eureka-devel/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Eureka is a map editor for the classic DOOM games, and a few related games
-such as Heretic and Hexen. It supports Windows and Unix (including macOS).
-
-There is a 2D mode to create the layout and a 3D mode to check e.g. texture
-alignment.
-
-This package uses FLTK 1.4 (not released yet).
diff --git a/eureka-devel/Makefile b/eureka-devel/Makefile
deleted file mode 100644
index 6ec0101921..0000000000
--- a/eureka-devel/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	eureka-2.0.2
-CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GITHUB:=ioan-chera/}
-GITHUB_PROJECT=	eureka-editor
-GITHUB_TAG=	${DISTNAME}
-
-MAINTAINER=	micha%NetBSD.org@localhost
-HOMEPAGE=	https://eureka-editor.sourceforge.net/
-COMMENT=	Doom/Heretic/Hexen map editor
-LICENSE=	gnu-gpl-v2
-
-USE_LANGUAGES=		c c++
-USE_CC_FEATURES+=	c11
-USE_CXX_FEATURES+=	c++17
-
-CMAKE_CONFIGURE_ARGS+=		-DENABLE_UNIT_TESTS=off
-
-# DOOMWADDIR is intentionally shared with other Doom packages
-DOOMWADDIR=		share/doom
-INSTALLATION_DIRS=	bin
-
-# Modify internal search path to check ${PREFIX}/share hierarchy first
-SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	do-configure
-SUBST_MESSAGE.prefix=	Preparing main.cc ...
-SUBST_FILES.prefix=	src/main.cc
-SUBST_SED.prefix=	-e 's,PKGSRC_PREFIX,${PREFIX},'
-
-# Modify internal search path for DOOMWADDIR (if environment variable not set)
-SUBST_CLASSES+=		dwd
-SUBST_STAGE.dwd=	do-configure
-SUBST_MESSAGE.dwd=	Preparing m_files.cc ...
-SUBST_FILES.dwd=	src/m_files.cc
-SUBST_SED.dwd=		-e 's,PKGSRC_DOOMWADDIR,${PREFIX}/${DOOMWADDIR},'
-
-.include "options.mk"
-
-BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-
-.include "../../devel/cmake/build.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/eureka-devel/PLIST b/eureka-devel/PLIST
deleted file mode 100644
index d60c21b542..0000000000
--- a/eureka-devel/PLIST
+++ /dev/null
@@ -1,41 +0,0 @@
-@comment $NetBSD$
-bin/eureka
-share/applications/eureka.desktop
-share/eureka/about_logo.png
-share/eureka/bindings.cfg
-share/eureka/common/doom_colors.ugh
-share/eureka/common/doom_groups.ugh
-share/eureka/common/doom_lines.ugh
-share/eureka/common/doom_sectors.ugh
-share/eureka/common/doom_tex.ugh
-share/eureka/common/doom_things.ugh
-share/eureka/common/gen_types.ugh
-share/eureka/common/hexen_groups.ugh
-share/eureka/common/hexen_lines.ugh
-share/eureka/common/hexen_sectors.ugh
-share/eureka/common/plutonia_tex.ugh
-share/eureka/common/tnt_tex.ugh
-share/eureka/defaults.cfg
-share/eureka/games/doom.ugh
-share/eureka/games/doom2.ugh
-share/eureka/games/freedm.ugh
-share/eureka/games/freedoom1.ugh
-share/eureka/games/freedoom2.ugh
-share/eureka/games/hacx.ugh
-share/eureka/games/harm1.ugh
-share/eureka/games/heretic.ugh
-share/eureka/games/hexen.ugh
-share/eureka/games/plutonia.ugh
-share/eureka/games/strife1.ugh
-share/eureka/games/tnt.ugh
-share/eureka/operations.cfg
-share/eureka/ports/boom.ugh
-share/eureka/ports/edge.ugh
-share/eureka/ports/eternity.ugh
-share/eureka/ports/legacy.ugh
-share/eureka/ports/mbf.ugh
-share/eureka/ports/odamex.ugh
-share/eureka/ports/vanilla.ugh
-share/eureka/ports/xdoom.ugh
-share/eureka/ports/zdoom.ugh
-share/icons/hicolor/32x32/apps/eureka.xpm
diff --git a/eureka-devel/README b/eureka-devel/README
deleted file mode 100644
index d9a4c33526..0000000000
--- a/eureka-devel/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Development snapshot.
-Not intended for import.
diff --git a/eureka-devel/TODO b/eureka-devel/TODO
deleted file mode 100644
index 8797f92f4a..0000000000
--- a/eureka-devel/TODO
+++ /dev/null
@@ -1 +0,0 @@
-[ ] Switch back to FLTK version from pkgsrc current
diff --git a/eureka-devel/distinfo b/eureka-devel/distinfo
deleted file mode 100644
index 519c999667..0000000000
--- a/eureka-devel/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD$
-
-BLAKE2s (eureka-2.0.2.tar.gz) = b29ad046135dc58ef7d874448373832e9f8d738b1ef2ac5dc1e8327cfaa79033
-SHA512 (eureka-2.0.2.tar.gz) = dc45d5a94bca0bc6c892ea90473d6c66e67326cf49797493b41ce5524a38196a31639db3579d1b4138b8dfd1570057a237817c668e47007a72a5b1f2f8991257
-Size (eureka-2.0.2.tar.gz) = 2388549 bytes
-SHA1 (patch-CMakeLists.txt) = 0eda67e8a101d9299bc933f2f403b4e8b940a689
-SHA1 (patch-src_CMakeLists.txt) = ba927270b9d63035b84134c683c74f89d5362124
-SHA1 (patch-src_m__files.cc) = a547b17d578ada79e20d006f786b1a594ef34700
-SHA1 (patch-src_m__strings.h) = e8b793e0a8943f3371792e07ac552e8e22e2c248
-SHA1 (patch-src_main.cc) = fe5d1f35637010de7e56e7384a29045f64e9667a
diff --git a/eureka-devel/options.mk b/eureka-devel/options.mk
deleted file mode 100644
index f0df3f1d64..0000000000
--- a/eureka-devel/options.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD$
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.eureka
-PKG_SUPPORTED_OPTIONS=	opengl xdg-utils
-PKG_SUGGESTED_OPTIONS=	opengl xdg-utils
-
-.include "../../mk/bsd.options.mk"
-
-.include "../../x11/fltk/buildlink3.mk"
-
-# Add missing include path for FLTK (eureka does not use fltk-config)
-.if empty(PKG_OPTIONS.fltk:Mcairo)
-CXXFLAGS=	-I"${PREFIX}/include/cairo"
-.endif
-
-# opengl: Use OpenGL for rendering
-# If FLTK is compiled without opengl option, it is always disabled here too.
-# If FLTK is compiled with opengl option, disabling it here allows to force
-# usage of the software renderer (recommended without hardware acceleration).
-.if empty(PKG_OPTIONS.fltk:Mopengl) || empty(PKG_OPTIONS:Mopengl)
-CMAKE_CONFIGURE_ARGS+=	-DENABLE_OPENGL=off
-.endif
-# xdg-utils: Create dependency for xdg-utils (Portland project)
-# Can be used by FLTK for fl_open_uri() on X11.
-.if !empty(PKG_OPTIONS:Mxdg-utils)
-DEPENDS+=		xdg-utils>=1.1:../../misc/xdg-utils
-.endif
diff --git a/eureka-devel/patches/patch-CMakeLists.txt b/eureka-devel/patches/patch-CMakeLists.txt
deleted file mode 100644
index 6cab09ff49..0000000000
--- a/eureka-devel/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-Let pkgsrc handle icon and desktop files.
-
---- CMakeLists.txt.orig	2024-07-07 19:06:38.000000000 +0000
-+++ CMakeLists.txt
-@@ -170,10 +170,12 @@ if(UNIX AND NOT APPLE)  # Linux
-             DESTINATION "${eureka_install_dir}"
-     )
-     # The full-install sequence is here
--    install(CODE "execute_process(
--        COMMAND xdg-desktop-menu install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/misc/eureka.desktop
--        COMMAND xdg-icon-resource install --novendor --size 32 ${CMAKE_CURRENT_SOURCE_DIR}/misc/eureka.xpm
--    )")
-+    #install(CODE "execute_process(
-+    #    COMMAND xdg-desktop-menu install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/misc/eureka.desktop
-+    #    COMMAND xdg-icon-resource install --novendor --size 32 ${CMAKE_CURRENT_SOURCE_DIR}/misc/eureka.xpm
-+    #)")
-+    install(FILES misc/eureka.xpm DESTINATION share/icons/hicolor/32x32/apps)
-+    install(FILES misc/eureka.desktop DESTINATION share/applications)
- 
-     # uninstall target
-     if(NOT TARGET uninstall)
diff --git a/eureka-devel/patches/patch-src_CMakeLists.txt b/eureka-devel/patches/patch-src_CMakeLists.txt
deleted file mode 100644
index bdbdbd4788..0000000000
--- a/eureka-devel/patches/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-Disable downloads for Apple platforms.
-Remove" -Werror".
-Add "-Wno-cast-function-type".
-Remove duplicated flags (GCC fails because they are inserted with quotes).
-
---- src/CMakeLists.txt.orig	2024-07-09 18:15:50.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -237,7 +237,7 @@ else()
-     target_compile_definitions(eurekasrc PUBLIC NO_OPENGL)
- endif()
- 
--if(APPLE OR WIN32)
-+if(WIN32)
-     message(STATUS "Using local FLTK for portability.")
- 
- 	set(LOCAL_FLTK_VERSION "1.3.8")
-@@ -359,7 +359,7 @@ if(MSVC)
- endif()
- 
- if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
--    target_compile_options(eurekasrc PUBLIC "${CMAKE_CXX_FLAGS}" -Wall -Wextra -Werror
-+    target_compile_options(eurekasrc PUBLIC -Wall -Wextra -Wno-cast-function-type
-                            -Wno-unused-parameter -Wno-missing-field-initializers -Wunused-variable)
- endif()
- if ( MSVC )
diff --git a/eureka-devel/patches/patch-src_m__files.cc b/eureka-devel/patches/patch-src_m__files.cc
deleted file mode 100644
index c3b41c1e6c..0000000000
--- a/eureka-devel/patches/patch-src_m__files.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Add placeholder for pkgsrc DOOMWADDIR to beginning of search list.
-
---- src/m_files.cc.orig	2018-06-23 11:29:07.000000000 +0000
-+++ src/m_files.cc
-@@ -506,6 +506,7 @@ static const char * SearchForIWAD(const 
- 		"c:/doom2",
- 		"c:/doom95",
- #else
-+		"PKGSRC_DOOMWADDIR",
- 		"/usr/share/games/doom",
- 		"/usr/share/doom",
- 		"/usr/local/share/games/doom",
diff --git a/eureka-devel/patches/patch-src_m__strings.h b/eureka-devel/patches/patch-src_m__strings.h
deleted file mode 100644
index 3cd10f63d5..0000000000
--- a/eureka-devel/patches/patch-src_m__strings.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Fix headers.
-
---- src/m_strings.h.orig	2024-07-04 06:00:57.000000000 +0000
-+++ src/m_strings.h
-@@ -23,7 +23,9 @@
- 
- #include "PrintfMacros.h"
- 
--#include <string.h>
-+#include <cstdarg>
-+#include <cstdio>
-+#include <cstring>
- 
- #include <ostream>
- #include <string>
diff --git a/eureka-devel/patches/patch-src_main.cc b/eureka-devel/patches/patch-src_main.cc
deleted file mode 100644
index 480281117b..0000000000
--- a/eureka-devel/patches/patch-src_main.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-Include missing header.
-Add placeholder for pkgsrc PREFIX to beginning of search list.
-Remove date to make builds reproducible (based on Debian patch).
-
---- src/main.cc.orig	2024-07-04 06:00:57.000000000 +0000
-+++ src/main.cc
-@@ -30,6 +30,7 @@
- 
- #include <time.h>
- #include <memory>
-+#include <signal.h>
- #include <stdexcept>
- 
- #include "im_color.h"
-@@ -324,6 +325,7 @@ static void Determine_InstallPath(const 
- #else
- 		static const fs::path prefixes[] =
- 		{
-+			"PKGSRC_PREFIX",
- 			"/usr/local",
- 			"/usr",
- 			"/opt",
-@@ -1058,7 +1060,7 @@ static void ShowHelp()
- 
- static void ShowVersion()
- {
--	printf("Eureka version " EUREKA_VERSION " (" __DATE__ ")\n");
-+	printf("Eureka version " EUREKA_VERSION " (Reproducible build)\n");
- 
- 	fflush(stdout);
- }
Prev by Date: pinentry-fltk: Remove, used to update security/pinentry-fltk
Next by Date: eureka1: Switch to FLTK 1.4
Previous by Thread: pinentry-fltk: Remove, used to update security/pinentry-fltk
Next by Thread: eureka1: Switch to FLTK 1.4
Indexes:
Home | Main Index | Thread Index | Old Index