qzdoom: Remove, package never worked

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: qzdoom: Remove, package never worked
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Fri, 25 Jun 2021 14:15:49 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Jun 25 16:15:49 2021 +0200
Changeset:	e982b2e0c594028bb9381c770d128b96921008ff

Modified Files:
	Makefile
Removed Files:
	qzdoom/COMMIT_MSG
	qzdoom/DESCR
	qzdoom/Makefile
	qzdoom/PLIST
	qzdoom/TODO
	qzdoom/distinfo
	qzdoom/files/INSTALL.pkgsrc
	qzdoom/patches/patch-CMakeLists.txt
	qzdoom/patches/patch-src_gameconfigfile.cpp
	qzdoom/patches/patch-src_version.h

Log Message:
qzdoom: Remove, package never worked

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

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

diffstat:
 Makefile                                    |  1 -
 qzdoom/COMMIT_MSG                           |  4 --
 qzdoom/DESCR                                |  2 -
 qzdoom/Makefile                             | 62 -----------------------------
 qzdoom/PLIST                                | 19 ---------
 qzdoom/TODO                                 |  7 ----
 qzdoom/distinfo                             |  9 -----
 qzdoom/files/INSTALL.pkgsrc                 |  6 ---
 qzdoom/patches/patch-CMakeLists.txt         | 51 ------------------------
 qzdoom/patches/patch-src_gameconfigfile.cpp | 35 ----------------
 qzdoom/patches/patch-src_version.h          | 19 ---------
 11 files changed, 215 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 00de766b45..fda4d966b3 100644
--- a/Makefile
+++ b/Makefile
@@ -4870,7 +4870,6 @@ SUBDIR+=	quiterss
 SUBDIR+=	qupzilla
 SUBDIR+=	quvi
 SUBDIR+=	qxmpp
-SUBDIR+=	qzdoom
 SUBDIR+=	r8s
 SUBDIR+=	radare2-git
 SUBDIR+=	radiotray
diff --git a/qzdoom/COMMIT_MSG b/qzdoom/COMMIT_MSG
deleted file mode 100644
index 5e478685b3..0000000000
--- a/qzdoom/COMMIT_MSG
+++ /dev/null
@@ -1,4 +0,0 @@
-qzdoom: Import version 4.4.2
-
-QZDoom is a continuation of dpJudas's truecolor software rendering, merged
-with and forked from GZDoom.
diff --git a/qzdoom/DESCR b/qzdoom/DESCR
deleted file mode 100644
index d2d5126e6f..0000000000
--- a/qzdoom/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-QZDoom is a continuation of dpJudas's truecolor software rendering, merged
-with and forked from GZDoom.
diff --git a/qzdoom/Makefile b/qzdoom/Makefile
deleted file mode 100644
index 274e590fc0..0000000000
--- a/qzdoom/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	qzdoom-4.4.2
-CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GITHUB:=madame-rachelle/}
-GITHUB_TAG=	${DISTNAME:S/qzdoom-/g/}
-
-MAINTAINER=	micha%NetBSD.org@localhost
-HOMEPAGE=	https://qzdoom.drdteam.org/
-COMMENT=	Continuation of dpJudas's truecolor software renderer for ZDoom
-LICENSE=	gnu-gpl-v3
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	pkg-config
-USE_CMAKE=	yes
-#CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Debug
-CMAKE_ARGS+=	-DNO_OPENAL=OFF
-CMAKE_ARGS+=	-DDYN_OPENAL=OFF
-CMAKE_ARGS+=	-DNO_OPENMP=ON
-
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-/-g/}
-
-# DOOMWADDIR is intentionally shared with other Doom packages
-DOOMWADDIR=		share/doom
-INSTALLATION_DIRS+=	share/doc/qzdoom
-
-# Add DOOMWADDIR to search path
-SUBST_CLASSES+=		waddir
-SUBST_STAGE.waddir=	pre-configure
-SUBST_MESSAGE.waddir=	Preparing gameconfigfile.cpp file ...
-SUBST_FILES.waddir=	src/gameconfigfile.cpp
-SUBST_SED.waddir=	-e 's,PKGSRC_PREFIX,${PREFIX},'
-SUBST_SED.waddir+=	-e 's,PKGSRC_DOOMWADDIR,${DOOMWADDIR},'
-
-pre-configure:
-	${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
-
-# Keep the gzdoom namespace clean (for a potential future package of gzdoom)
-# - Rename binary to qzdoom
-# - Rename documentation directory to qzdoom
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/INSTALL.pkgsrc \
-		${DESTDIR}${PREFIX}/share/doc/qzdoom/INSTALL.pkgsrc
-	${MV} ${DESTDIR}${PREFIX}/bin/gzdoom ${DESTDIR}${PREFIX}/bin/qzdoom
-	${MV} ${DESTDIR}${PREFIX}/share/doc/gzdoom/* \
-		${DESTDIR}${PREFIX}/share/doc/qzdoom
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../audio/openal-soft/buildlink3.mk"
-.include "../../devel/SDL2/buildlink3.mk"
-.include "../../devel/libexecinfo/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-#.include "../../parallel/openmp/buildlink3.mk"
-.include "../../wip/ZMusic/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/qzdoom/PLIST b/qzdoom/PLIST
deleted file mode 100644
index 2666e9890a..0000000000
--- a/qzdoom/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD$
-bin/qzdoom
-share/doc/qzdoom/INSTALL.pkgsrc
-share/doc/qzdoom/console.css
-share/doc/qzdoom/console.html
-share/doc/qzdoom/licenses/README.TXT
-share/doc/qzdoom/licenses/bsd.txt
-share/doc/qzdoom/licenses/bzip2.txt
-share/doc/qzdoom/licenses/dumb.txt
-share/doc/qzdoom/licenses/fxaa.txt
-share/doc/qzdoom/licenses/gdtoa.txt
-share/doc/qzdoom/licenses/gpl.txt
-share/doc/qzdoom/licenses/lgpl.txt
-share/doc/qzdoom/rh-log.txt
-share/doc/qzdoom/skins.txt
-share/doom/qzdoom/brightmaps.pk3
-share/doom/qzdoom/game_support.pk3
-share/doom/qzdoom/gzdoom.pk3
-share/doom/qzdoom/lights.pk3
diff --git a/qzdoom/TODO b/qzdoom/TODO
deleted file mode 100644
index 01daaa27a7..0000000000
--- a/qzdoom/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-[X] Package ZMusic dependency
-[ ] The patch for fts_set() is ugly
-[X] Add pkgsrc locations to search paths
-[X] Do not use GZDoom namespace
-[X] Add fluidsynth dependency (loaded at runtime)
-
-Crash with segmentation fault.
diff --git a/qzdoom/distinfo b/qzdoom/distinfo
deleted file mode 100644
index 228120b98a..0000000000
--- a/qzdoom/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-SHA1 (qzdoom-4.4.2.tar.gz) = 167618be5c2f2fb59fc14139492194a2341e431b
-RMD160 (qzdoom-4.4.2.tar.gz) = 15e4d3982b12732bdd1ba81810803b2ad4327dfa
-SHA512 (qzdoom-4.4.2.tar.gz) = 552b612a84db4dbb181406f633a2d8102f0b23e75fed1ac240ba05ae2953a5bca7c460ffeb52b6d1408171fad74b26260ec4d64745300b6186bbb546bac20fc4
-Size (qzdoom-4.4.2.tar.gz) = 12613887 bytes
-SHA1 (patch-CMakeLists.txt) = 21e52cd278aab5a5c3278696e2c8803f5fa8574d
-SHA1 (patch-src_gameconfigfile.cpp) = 5c88ddafbc2f19dd9d9de56e6537b67e96a16c35
-SHA1 (patch-src_version.h) = b6082d7c84651ffe84c1fe69ef9056f46831b85d
diff --git a/qzdoom/files/INSTALL.pkgsrc b/qzdoom/files/INSTALL.pkgsrc
deleted file mode 100644
index 48a4d3b0df..0000000000
--- a/qzdoom/files/INSTALL.pkgsrc
+++ /dev/null
@@ -1,6 +0,0 @@
-The location of the qzdoom WAD directory has been set to:
-
-   DOOMWADDIR
-
-This is the pkgsrc standard Doom WAD directory location (shared with other
-Doom packages).
diff --git a/qzdoom/patches/patch-CMakeLists.txt b/qzdoom/patches/patch-CMakeLists.txt
deleted file mode 100644
index a02e1fd46b..0000000000
--- a/qzdoom/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD$
-
-Install game data to ${PREFIX}/share/doom/qzdoom
-
-fts_set() is not detected because NetBSD has renamed the symbol.
-Remove the check and assume it is available.
-
---- CMakeLists.txt.orig	2020-06-16 17:19:13.000000000 +0000
-+++ CMakeLists.txt
-@@ -93,7 +93,7 @@ function( add_pk3 PK3_NAME PK3_DIR )
- 	if( WIN32 )
- 		set( INSTALL_PK3_PATH . CACHE STRING "Directory where zdoom.pk3 will be placed during install." )
- 	else()
--		set( INSTALL_PK3_PATH share/games/doom CACHE STRING "Directory where zdoom.pk3 will be placed during install." )
-+		set( INSTALL_PK3_PATH share/doom/qzdoom CACHE STRING "Directory where zdoom.pk3 will be placed during install." )
- 	endif()
- 	install(FILES "${PROJECT_BINARY_DIR}/${PK3_NAME}"
- 			DESTINATION ${INSTALL_PK3_PATH}
-@@ -247,19 +247,19 @@ else()
- 		set( ALL_C_FLAGS "-ffp-contract=off -DHAVE_SOFTPOLY" )
- 	endif()
- 
--	if ( UNIX )
--		include(CheckSymbolExists)
--		check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
--		if ( NOT HAVE_FTS )
--			include ( FindPkgConfig )
--			pkg_check_modules( MUSL_FTS musl-fts )
--			if ( MUSL_FTS_FOUND )
--				set ( ALL_C_FLAGS "${ALL_C_FLAGS} ${MUSL_FTS_LDFLAGS}" )
--			else ( MUSL_FTS_FOUND )
--				message (ERROR "fts_* functions not found in the system" )
--			endif ( MUSL_FTS_FOUND )
--		endif ( NOT HAVE_FTS )
--	endif ( UNIX )
-+#	if ( UNIX )
-+#		include(CheckSymbolExists)
-+#		check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
-+#		if ( NOT HAVE_FTS )
-+#			include ( FindPkgConfig )
-+#			pkg_check_modules( MUSL_FTS musl-fts )
-+#			if ( MUSL_FTS_FOUND )
-+#				set ( ALL_C_FLAGS "${ALL_C_FLAGS} ${MUSL_FTS_LDFLAGS}" )
-+#			else ( MUSL_FTS_FOUND )
-+#				message (ERROR "fts_* functions not found in the system" )
-+#			endif ( MUSL_FTS_FOUND )
-+#		endif ( NOT HAVE_FTS )
-+#	endif ( UNIX )
- 
- 	set( REL_C_FLAGS "" )
- 	set( DEB_C_FLAGS "" )
diff --git a/qzdoom/patches/patch-src_gameconfigfile.cpp b/qzdoom/patches/patch-src_gameconfigfile.cpp
deleted file mode 100644
index d033800087..0000000000
--- a/qzdoom/patches/patch-src_gameconfigfile.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-Add pkgsrc paths to WAD/game/soundfont file search paths.
-
---- src/gameconfigfile.cpp.orig	2020-06-16 17:19:13.000000000 +0000
-+++ src/gameconfigfile.cpp
-@@ -96,6 +96,9 @@ FGameConfigFile::FGameConfigFile ()
- 		SetSection ("IWADSearch.Directories", true);
- 		SetValueForKey ("Path", ".", true);
- 		SetValueForKey ("Path", "$DOOMWADDIR", true);
-+		// For pkgsrc
-+		SetValueForKey ("Path", "PKGSRC_PREFIX/PKGSRC_DOOMWADDIR/qzdoom", true);
-+		SetValueForKey ("Path", "PKGSRC_PREFIX/PKGSRC_DOOMWADDIR", true);
- #ifdef __APPLE__
- 		SetValueForKey ("Path", user_docs, true);
- 		SetValueForKey ("Path", user_app_support, true);
-@@ -120,6 +123,9 @@ FGameConfigFile::FGameConfigFile ()
- 	if (!SetSection ("FileSearch.Directories"))
- 	{
- 		SetSection ("FileSearch.Directories", true);
-+		// For pkgsrc
-+		SetValueForKey ("Path", "PKGSRC_PREFIX/PKGSRC_DOOMWADDIR/qzdoom", true);
-+		SetValueForKey ("Path", "PKGSRC_PREFIX/PKGSRC_DOOMWADDIR", true);
- #ifdef __APPLE__
- 		SetValueForKey ("Path", user_docs, true);
- 		SetValueForKey ("Path", user_app_support, true);
-@@ -142,6 +148,8 @@ FGameConfigFile::FGameConfigFile ()
- 	if (!SetSection("SoundfontSearch.Directories"))
- 	{
- 		SetSection("SoundfontSearch.Directories", true);
-+		// For pkgsrc
-+		SetValueForKey("Path", "PKGSRC_PREFIX/PKGSRC_DOOMWADDIR/soundfonts", true);
- #ifdef __APPLE__
- 		SetValueForKey("Path", user_docs + "/soundfonts", true);
- 		SetValueForKey("Path", user_docs + "/fm_banks", true);
diff --git a/qzdoom/patches/patch-src_version.h b/qzdoom/patches/patch-src_version.h
deleted file mode 100644
index 242e81e95f..0000000000
--- a/qzdoom/patches/patch-src_version.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Set QZDoom for game name.
-
---- src/version.h.orig	2020-06-16 17:19:13.000000000 +0000
-+++ src/version.h
-@@ -98,9 +98,9 @@ const char *GetVersionString();
- #define VR3D_ENABLED
- 
- // More stuff that needs to be different for derivatives.
--#define GAMENAME "GZDoom"
--#define WGAMENAME L"GZDoom"
--#define GAMENAMELOWERCASE "gzdoom"
-+#define GAMENAME "QZDoom"
-+#define WGAMENAME L"QZDoom"
-+#define GAMENAMELOWERCASE "qzdoom"
- #define FORUM_URL "http://forum.zdoom.org/";
- #define BUGS_FORUM_URL	"http://forum.zdoom.org/viewforum.php?f=2";
-
Prev by Date: dmake: Install default rules to "share/lib/dmake/make.rules"
Next by Date: 389-ds-base: remove
Previous by Thread: dmake: Install default rules to "share/lib/dmake/make.rules"
Next by Thread: 389-ds-base: remove
Indexes:
Home | Main Index | Thread Index | Old Index