REMOVE: games/prboom

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
10 messages Options
Reply | Threaded
Open this post in threaded view
|

REMOVE: games/prboom

Ryan Freeman
First time trying to remove something, here is a patch to move
games/prboom to the attic.  games/prboom-plus does everything it
did and more with fixes.  netgames can be played with:
- games/chocolate-doom
- games/odamex
- games/gzdoom

anything I've forgotten for removal?

OK?
-ryan

? prboom.diff
Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- Makefile 10 Feb 2021 03:12:27 -0000 1.28
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-# $OpenBSD: Makefile,v 1.28 2021/02/10 03:12:27 jeremy Exp $
-
-COMMENT= enhanced clone of Id Software's Doom game; multiplayer#'
-DISTNAME= prboom-2.5.0
-REVISION= 3
-
-CATEGORIES= games x11
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prboom/}
-
-HOMEPAGE= http://prboom.sourceforge.net/
-
-# GPLv2+
-PERMIT_PACKAGE= Yes
-
-WANTLIB = SDL c m pthread GL GLU SDL_mixer>=3 SDL_net>=1 png>=4
-
-RUN_DEPENDS = audio/timidity
-
-LIB_DEPENDS = devel/sdl-mixer \
- devel/sdl-net \
- graphics/png
-
-CONFIGURE_STYLE=autoconf
-AUTOCONF_VERSION=2.61
-CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--disable-cpu-opt \
- --with-waddir=${TRUEPREFIX}/share/doom
-MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools
-
-FAKE_FLAGS += gamesdir=${PREFIX}/bin \
- docdir=${PREFIX}/share/doc/prboom
-
-.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: distinfo
diff -N distinfo
--- distinfo 31 Mar 2013 21:09:32 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-SHA256 (prboom-2.5.0.tar.gz) = ImwcRw+MyYMydTZAT0BaHQJs8KUYjGlKEkPMhjABS64=
-SIZE (prboom-2.5.0.tar.gz) = 1049505
Index: patches/patch-autotools_ac_c_compile_flags_m4
===================================================================
RCS file: patches/patch-autotools_ac_c_compile_flags_m4
diff -N patches/patch-autotools_ac_c_compile_flags_m4
--- patches/patch-autotools_ac_c_compile_flags_m4 28 Sep 2017 23:12:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-autotools_ac_c_compile_flags_m4,v 1.1 2017/09/28 23:12:48 naddy Exp $
-
-Index: autotools/ac_c_compile_flags.m4
---- autotools/ac_c_compile_flags.m4.orig
-+++ autotools/ac_c_compile_flags.m4
-@@ -5,7 +5,6 @@ do
-  AC_MSG_CHECKING(whether compiler supports $ac_flag)
-  CFLAGS="$NEW_CFLAGS $ac_flag"
-  AC_TRY_COMPILE(,[
--  void f() {};
-  ],[
-   NEW_CFLAGS="$CFLAGS"
-   AC_MSG_RESULT(yes)
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 28 Sep 2017 23:12:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2017/09/28 23:12:48 naddy Exp $
-
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -26,9 +26,9 @@ fi
- AC_ARG_WITH(waddir,AC_HELP_STRING([--with-waddir],[Path to install prboom.wad and look for other WAD files]),
- DOOMWADDIR="$withval",
- if test "x$prefix" != xNONE; then
--  DOOMWADDIR="$prefix/share/games/doom"
-+  DOOMWADDIR="$prefix/share/prboom"
- else
--  DOOMWADDIR="$ac_default_prefix/share/games/doom"
-+  DOOMWADDIR="$ac_default_prefix/share/prboom"
- fi
- )
- AC_DEFINE_UNQUOTED(DOOMWADDIR,"$DOOMWADDIR",[Define to be the path where Doom WADs are stored])
Index: patches/patch-src_SDL_i_sshot_c
===================================================================
RCS file: patches/patch-src_SDL_i_sshot_c
diff -N patches/patch-src_SDL_i_sshot_c
--- patches/patch-src_SDL_i_sshot_c 31 Mar 2013 21:09:33 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_SDL_i_sshot_c,v 1.1 2013/03/31 21:09:33 bentley Exp $
-
-Fix build with png-1.5.
-
---- src/SDL/i_sshot.c.orig Wed Mar 27 00:17:06 2013
-+++ src/SDL/i_sshot.c Wed Mar 27 00:18:10 2013
-@@ -231,7 +231,7 @@ int I_ScreenShot (const char *fname)
-   if (fp)
-   {
-     png_struct *png_ptr = png_create_write_struct(
--        PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
-+        PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
-
-     if (png_ptr)
-     {
-@@ -279,7 +279,7 @@ int I_ScreenShot (const char *fname)
-             break;
-         }
-       }
--      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
-+      png_destroy_write_struct(&png_ptr,  NULL);
-     }
-     fclose(fp);
-   }
Index: patches/patch-src_gl_intern_h
===================================================================
RCS file: patches/patch-src_gl_intern_h
diff -N patches/patch-src_gl_intern_h
--- patches/patch-src_gl_intern_h 10 Feb 2021 03:12:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_gl_intern_h,v 1.1 2021/02/10 03:12:27 jeremy Exp $
-
-Index: src/gl_intern.h
---- src/gl_intern.h.orig
-+++ src/gl_intern.h
-@@ -83,6 +83,6 @@ int gld_GetTexDimension(int value);
- void gld_SetTexturePalette(GLenum target);
- void gld_Precache(void);
-
--PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;
-+extern PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;
-
- #endif // _GL_INTERN_H
Index: patches/patch-src_gl_main_c
===================================================================
RCS file: patches/patch-src_gl_main_c
diff -N patches/patch-src_gl_main_c
--- patches/patch-src_gl_main_c 10 Feb 2021 03:12:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gl_main_c,v 1.1 2021/02/10 03:12:27 jeremy Exp $
-
-Index: src/gl_main.c
---- src/gl_main.c.orig
-+++ src/gl_main.c
-@@ -83,6 +83,8 @@ int gl_paletted_texture = 0;
- int gl_shared_texture_palette = 0;
- int gl_sprite_offset; // item out of floor offset Mead 8/13/03
-
-+PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;
-+
- GLuint gld_DisplayList=0;
- int fog_density=200;
- static float extra_red=0.0f;
Index: patches/patch-src_m_fixed_h
===================================================================
RCS file: patches/patch-src_m_fixed_h
diff -N patches/patch-src_m_fixed_h
--- patches/patch-src_m_fixed_h 11 Aug 2017 14:21:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_m_fixed_h,v 1.1 2017/08/11 14:21:22 sthen Exp $
-
-Index: src/m_fixed.h
---- src/m_fixed.h.orig
-+++ src/m_fixed.h
-@@ -113,7 +113,7 @@ static CONSTFUNC fixed_t FixedMul(fixed_t a, fixed_t b
-       : "=a" (result)           /* eax is always the result */
-       : "0" (a),                /* eax is also first operand */
-         "rm" (b)                /* second operand can be reg or mem */
--      : "%edx", "%cc"           /* edx and condition codes clobbered */
-+      : "%edx", "cc"           /* edx and condition codes clobbered */
-       );
-
-   return result;
-@@ -186,7 +186,7 @@ static CONSTFUNC fixed_t FixedDiv(fixed_t a, fixed_t b
-  : "0" (a<<16),
-    "d" (a>>16),
-    "rm" (b)
--  : "%cc"
-+  : "cc"
-  );
-       return result;
-     }
Index: pkg/DESCR
===================================================================
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- pkg/DESCR 22 Sep 2018 21:51:16 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-PrBoom is a modified version of ID Software's classic game Doom.  It
-runs on several platforms (including Win32 and Unixes) and features
-many additions to the original game.  It also supports multiplayer
-games.
Index: pkg/PLIST
===================================================================
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- pkg/PLIST 22 Sep 2018 21:51:16 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.5 2018/09/22 21:51:16 solene Exp $
-@bin bin/prboom
-@bin bin/prboom-game-server
-@man man/man5/boom.cfg.5
-@man man/man6/prboom-game-server.6
-@man man/man6/prboom.6
-share/doc/pkg-readmes/${PKGSTEM}
-share/doc/prboom/
-@comment share/doc/prboom/AUTHORS
-@comment share/doc/prboom/COPYING
-share/doc/prboom/MBF.txt
-share/doc/prboom/MBFFAQ.txt
-@comment share/doc/prboom/NEWS
-share/doc/prboom/README
-share/doc/prboom/README.compat
-share/doc/prboom/README.demos
-share/doc/prboom/boom.txt
-share/doom/
-share/doom/prboom.wad
Index: pkg/README
===================================================================
RCS file: pkg/README
diff -N pkg/README
--- pkg/README 22 Sep 2018 21:51:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-You will need an IWAD for PrBoom to be fully functional.  An IWAD is
-the main data file containing the graphics and levels for Doom.  If
-you have a copy of one of the original Doom games, simply copy your
-Doom, Doom 2, Ultimate Doom, or Final Doom IWAD (doom.wad, doom2.wad,
-tnt.wad, and plutonia.wad respectively) to ${PREFIX}/share/prboom/.
-If you do not possess any of those, you can use the shareware IWAD
-which is available at:
-
-ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/doom/doom-1.8.wad.gz
-SHA256 (doom-1.8.wad.gz) = WM9qVjtjGkdWFjCvpidthTwnB5NC95aewwBpZdqFV6E=
-
-Install it to ${PREFIX}/share/prboom as "doom.wad".

Reply | Threaded
Open this post in threaded view
|

Re: REMOVE: games/prboom

Christian Weisgerber
Ryan Freeman:

> First time trying to remove something, here is a patch to move
> games/prboom to the attic.  games/prboom-plus does everything it
> did and more with fixes.
>
> anything I've forgotten for removal?

Port removals need an entry in devel/quirks.

--
Christian "naddy" Weisgerber                          [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: REMOVE: games/prboom

Klemens Nanni-2
In reply to this post by Ryan Freeman
On Wed, Feb 10, 2021 at 05:46:28PM -0800, Ryan Freeman wrote:
> anything I've forgotten for removal?
quirks as per naddy and you need to unhook the port from the category
Makfile (/usr/ports/games/Makefile).

Reply | Threaded
Open this post in threaded view
|

Re: REMOVE: games/prboom

Ryan Freeman
In reply to this post by Ryan Freeman
On Wed, Feb 10, 2021 at 05:46:28PM -0800, Ryan Freeman wrote:

> First time trying to remove something, here is a patch to move
> games/prboom to the attic.  games/prboom-plus does everything it
> did and more with fixes.  netgames can be played with:
> - games/chocolate-doom
> - games/odamex
> - games/gzdoom
>
> anything I've forgotten for removal?
>
> OK?
> -ryan

Thanks naddy, kn, edd for the hints on Quirks and the main category unhook.
This more like it?


Index: games/Makefile
===================================================================
RCS file: /cvs/ports/games/Makefile,v
retrieving revision 1.434
diff -u -p -r1.434 Makefile
--- games/Makefile 8 Feb 2021 20:33:31 -0000 1.434
+++ games/Makefile 11 Feb 2021 22:50:06 -0000
@@ -234,7 +234,6 @@
      SUBDIR += pokerth
      SUBDIR += polymorphable
      SUBDIR += postal
-     SUBDIR += prboom
      SUBDIR += prboom-plus
      SUBDIR += pushover
      SUBDIR += puzzles
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1173
diff -u -p -r1.1173 Quirks.pm
--- devel/quirks/files/Quirks.pm 10 Feb 2021 12:49:31 -0000 1.1173
+++ devel/quirks/files/Quirks.pm 11 Feb 2021 22:50:06 -0000
@@ -539,6 +539,7 @@ my $stem_extensions = {
  'py-sphinx-intl' => 'py3-sphinx-intl',
  'stegcracker' => 'stegseek',
  'py-ldap3' => 'py3-ldap3',
+ 'prboom' => 'prboom-plus',
 };
 
 my $obsolete_reason = {
@@ -2077,6 +2078,7 @@ my $obsolete_reason = {
  'icinga-web' => 38,
  'icinga-cgi' => 38,
  'icinga-idoutils' => 38,
+ 'prboom' => 3,
 };
 
 # reasons for obsolete packages
Index: games/prboom/Makefile
===================================================================
RCS file: games/prboom/Makefile
diff -N games/prboom/Makefile
--- games/prboom/Makefile 10 Feb 2021 03:12:27 -0000 1.28
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-# $OpenBSD: Makefile,v 1.28 2021/02/10 03:12:27 jeremy Exp $
-
-COMMENT= enhanced clone of Id Software's Doom game; multiplayer#'
-DISTNAME= prboom-2.5.0
-REVISION= 3
-
-CATEGORIES= games x11
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prboom/}
-
-HOMEPAGE= http://prboom.sourceforge.net/
-
-# GPLv2+
-PERMIT_PACKAGE= Yes
-
-WANTLIB = SDL c m pthread GL GLU SDL_mixer>=3 SDL_net>=1 png>=4
-
-RUN_DEPENDS = audio/timidity
-
-LIB_DEPENDS = devel/sdl-mixer \
- devel/sdl-net \
- graphics/png
-
-CONFIGURE_STYLE=autoconf
-AUTOCONF_VERSION=2.61
-CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--disable-cpu-opt \
- --with-waddir=${TRUEPREFIX}/share/doom
-MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools
-
-FAKE_FLAGS += gamesdir=${PREFIX}/bin \
- docdir=${PREFIX}/share/doc/prboom
-
-.include <bsd.port.mk>
Index: games/prboom/distinfo
===================================================================
RCS file: games/prboom/distinfo
diff -N games/prboom/distinfo
--- games/prboom/distinfo 31 Mar 2013 21:09:32 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-SHA256 (prboom-2.5.0.tar.gz) = ImwcRw+MyYMydTZAT0BaHQJs8KUYjGlKEkPMhjABS64=
-SIZE (prboom-2.5.0.tar.gz) = 1049505
Index: games/prboom/patches/patch-autotools_ac_c_compile_flags_m4
===================================================================
RCS file: games/prboom/patches/patch-autotools_ac_c_compile_flags_m4
diff -N games/prboom/patches/patch-autotools_ac_c_compile_flags_m4
--- games/prboom/patches/patch-autotools_ac_c_compile_flags_m4 28 Sep 2017 23:12:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-autotools_ac_c_compile_flags_m4,v 1.1 2017/09/28 23:12:48 naddy Exp $
-
-Index: autotools/ac_c_compile_flags.m4
---- autotools/ac_c_compile_flags.m4.orig
-+++ autotools/ac_c_compile_flags.m4
-@@ -5,7 +5,6 @@ do
-  AC_MSG_CHECKING(whether compiler supports $ac_flag)
-  CFLAGS="$NEW_CFLAGS $ac_flag"
-  AC_TRY_COMPILE(,[
--  void f() {};
-  ],[
-   NEW_CFLAGS="$CFLAGS"
-   AC_MSG_RESULT(yes)
Index: games/prboom/patches/patch-configure_ac
===================================================================
RCS file: games/prboom/patches/patch-configure_ac
diff -N games/prboom/patches/patch-configure_ac
--- games/prboom/patches/patch-configure_ac 28 Sep 2017 23:12:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2017/09/28 23:12:48 naddy Exp $
-
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -26,9 +26,9 @@ fi
- AC_ARG_WITH(waddir,AC_HELP_STRING([--with-waddir],[Path to install prboom.wad and look for other WAD files]),
- DOOMWADDIR="$withval",
- if test "x$prefix" != xNONE; then
--  DOOMWADDIR="$prefix/share/games/doom"
-+  DOOMWADDIR="$prefix/share/prboom"
- else
--  DOOMWADDIR="$ac_default_prefix/share/games/doom"
-+  DOOMWADDIR="$ac_default_prefix/share/prboom"
- fi
- )
- AC_DEFINE_UNQUOTED(DOOMWADDIR,"$DOOMWADDIR",[Define to be the path where Doom WADs are stored])
Index: games/prboom/patches/patch-src_SDL_i_sshot_c
===================================================================
RCS file: games/prboom/patches/patch-src_SDL_i_sshot_c
diff -N games/prboom/patches/patch-src_SDL_i_sshot_c
--- games/prboom/patches/patch-src_SDL_i_sshot_c 31 Mar 2013 21:09:33 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_SDL_i_sshot_c,v 1.1 2013/03/31 21:09:33 bentley Exp $
-
-Fix build with png-1.5.
-
---- src/SDL/i_sshot.c.orig Wed Mar 27 00:17:06 2013
-+++ src/SDL/i_sshot.c Wed Mar 27 00:18:10 2013
-@@ -231,7 +231,7 @@ int I_ScreenShot (const char *fname)
-   if (fp)
-   {
-     png_struct *png_ptr = png_create_write_struct(
--        PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
-+        PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
-
-     if (png_ptr)
-     {
-@@ -279,7 +279,7 @@ int I_ScreenShot (const char *fname)
-             break;
-         }
-       }
--      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
-+      png_destroy_write_struct(&png_ptr,  NULL);
-     }
-     fclose(fp);
-   }
Index: games/prboom/patches/patch-src_gl_intern_h
===================================================================
RCS file: games/prboom/patches/patch-src_gl_intern_h
diff -N games/prboom/patches/patch-src_gl_intern_h
--- games/prboom/patches/patch-src_gl_intern_h 10 Feb 2021 03:12:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_gl_intern_h,v 1.1 2021/02/10 03:12:27 jeremy Exp $
-
-Index: src/gl_intern.h
---- src/gl_intern.h.orig
-+++ src/gl_intern.h
-@@ -83,6 +83,6 @@ int gld_GetTexDimension(int value);
- void gld_SetTexturePalette(GLenum target);
- void gld_Precache(void);
-
--PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;
-+extern PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;
-
- #endif // _GL_INTERN_H
Index: games/prboom/patches/patch-src_gl_main_c
===================================================================
RCS file: games/prboom/patches/patch-src_gl_main_c
diff -N games/prboom/patches/patch-src_gl_main_c
--- games/prboom/patches/patch-src_gl_main_c 10 Feb 2021 03:12:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gl_main_c,v 1.1 2021/02/10 03:12:27 jeremy Exp $
-
-Index: src/gl_main.c
---- src/gl_main.c.orig
-+++ src/gl_main.c
-@@ -83,6 +83,8 @@ int gl_paletted_texture = 0;
- int gl_shared_texture_palette = 0;
- int gl_sprite_offset; // item out of floor offset Mead 8/13/03
-
-+PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;
-+
- GLuint gld_DisplayList=0;
- int fog_density=200;
- static float extra_red=0.0f;
Index: games/prboom/patches/patch-src_m_fixed_h
===================================================================
RCS file: games/prboom/patches/patch-src_m_fixed_h
diff -N games/prboom/patches/patch-src_m_fixed_h
--- games/prboom/patches/patch-src_m_fixed_h 11 Aug 2017 14:21:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_m_fixed_h,v 1.1 2017/08/11 14:21:22 sthen Exp $
-
-Index: src/m_fixed.h
---- src/m_fixed.h.orig
-+++ src/m_fixed.h
-@@ -113,7 +113,7 @@ static CONSTFUNC fixed_t FixedMul(fixed_t a, fixed_t b
-       : "=a" (result)           /* eax is always the result */
-       : "0" (a),                /* eax is also first operand */
-         "rm" (b)                /* second operand can be reg or mem */
--      : "%edx", "%cc"           /* edx and condition codes clobbered */
-+      : "%edx", "cc"           /* edx and condition codes clobbered */
-       );
-
-   return result;
-@@ -186,7 +186,7 @@ static CONSTFUNC fixed_t FixedDiv(fixed_t a, fixed_t b
-  : "0" (a<<16),
-    "d" (a>>16),
-    "rm" (b)
--  : "%cc"
-+  : "cc"
-  );
-       return result;
-     }
Index: games/prboom/pkg/DESCR
===================================================================
RCS file: games/prboom/pkg/DESCR
diff -N games/prboom/pkg/DESCR
--- games/prboom/pkg/DESCR 22 Sep 2018 21:51:16 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-PrBoom is a modified version of ID Software's classic game Doom.  It
-runs on several platforms (including Win32 and Unixes) and features
-many additions to the original game.  It also supports multiplayer
-games.
Index: games/prboom/pkg/PLIST
===================================================================
RCS file: games/prboom/pkg/PLIST
diff -N games/prboom/pkg/PLIST
--- games/prboom/pkg/PLIST 22 Sep 2018 21:51:16 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.5 2018/09/22 21:51:16 solene Exp $
-@bin bin/prboom
-@bin bin/prboom-game-server
-@man man/man5/boom.cfg.5
-@man man/man6/prboom-game-server.6
-@man man/man6/prboom.6
-share/doc/pkg-readmes/${PKGSTEM}
-share/doc/prboom/
-@comment share/doc/prboom/AUTHORS
-@comment share/doc/prboom/COPYING
-share/doc/prboom/MBF.txt
-share/doc/prboom/MBFFAQ.txt
-@comment share/doc/prboom/NEWS
-share/doc/prboom/README
-share/doc/prboom/README.compat
-share/doc/prboom/README.demos
-share/doc/prboom/boom.txt
-share/doom/
-share/doom/prboom.wad
Index: games/prboom/pkg/README
===================================================================
RCS file: games/prboom/pkg/README
diff -N games/prboom/pkg/README
--- games/prboom/pkg/README 22 Sep 2018 21:51:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-You will need an IWAD for PrBoom to be fully functional.  An IWAD is
-the main data file containing the graphics and levels for Doom.  If
-you have a copy of one of the original Doom games, simply copy your
-Doom, Doom 2, Ultimate Doom, or Final Doom IWAD (doom.wad, doom2.wad,
-tnt.wad, and plutonia.wad respectively) to ${PREFIX}/share/prboom/.
-If you do not possess any of those, you can use the shareware IWAD
-which is available at:
-
-ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/doom/doom-1.8.wad.gz
-SHA256 (doom-1.8.wad.gz) = WM9qVjtjGkdWFjCvpidthTwnB5NC95aewwBpZdqFV6E=
-
-Install it to ${PREFIX}/share/prboom as "doom.wad".

Reply | Threaded
Open this post in threaded view
|

Re: REMOVE: games/prboom

Ryan Freeman
On Thu, Feb 11, 2021 at 02:53:04PM -0800, Ryan Freeman wrote:

> On Wed, Feb 10, 2021 at 05:46:28PM -0800, Ryan Freeman wrote:
> > First time trying to remove something, here is a patch to move
> > games/prboom to the attic.  games/prboom-plus does everything it
> > did and more with fixes.  netgames can be played with:
> > - games/chocolate-doom
> > - games/odamex
> > - games/gzdoom
> >
> > anything I've forgotten for removal?
> >
> > OK?
> > -ryan
>
> Thanks naddy, kn, edd for the hints on Quirks and the main category unhook.
> This more like it?

Here is the quirks diff separately

Index: files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1173
diff -u -p -r1.1173 Quirks.pm
--- files/Quirks.pm 10 Feb 2021 12:49:31 -0000 1.1173
+++ files/Quirks.pm 12 Feb 2021 17:25:55 -0000
@@ -539,6 +539,7 @@ my $stem_extensions = {
  'py-sphinx-intl' => 'py3-sphinx-intl',
  'stegcracker' => 'stegseek',
  'py-ldap3' => 'py3-ldap3',
+ 'prboom' => 'prboom-plus',
 };
 
 my $obsolete_reason = {
@@ -2077,6 +2078,7 @@ my $obsolete_reason = {
  'icinga-web' => 38,
  'icinga-cgi' => 38,
  'icinga-idoutils' => 38,
+ 'prboom' => 3,
 };
 
 # reasons for obsolete packages

Reply | Threaded
Open this post in threaded view
|

Re: REMOVE: games/prboom

Ryan Freeman
In reply to this post by Ryan Freeman
On Thu, Feb 11, 2021 at 02:53:04PM -0800, Ryan Freeman wrote:

> On Wed, Feb 10, 2021 at 05:46:28PM -0800, Ryan Freeman wrote:
> > First time trying to remove something, here is a patch to move
> > games/prboom to the attic.  games/prboom-plus does everything it
> > did and more with fixes.  netgames can be played with:
> > - games/chocolate-doom
> > - games/odamex
> > - games/gzdoom
> >
> > anything I've forgotten for removal?
> >
> > OK?
> > -ryan
>
> Thanks naddy, kn, edd for the hints on Quirks and the main category unhook.
> This more like it?

and here is the unhook diff separately

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/Makefile,v
retrieving revision 1.434
diff -u -p -r1.434 Makefile
--- Makefile 8 Feb 2021 20:33:31 -0000 1.434
+++ Makefile 12 Feb 2021 17:26:23 -0000
@@ -234,7 +234,6 @@
      SUBDIR += pokerth
      SUBDIR += polymorphable
      SUBDIR += postal
-     SUBDIR += prboom
      SUBDIR += prboom-plus
      SUBDIR += pushover
      SUBDIR += puzzles

Reply | Threaded
Open this post in threaded view
|

Re: REMOVE: games/prboom

Christian Weisgerber
In reply to this post by Ryan Freeman
Ryan Freeman:

> > anything I've forgotten for removal?
>
> Thanks naddy, kn, edd for the hints on Quirks and the main category unhook.
> This more like it?

devel/quirks needs a version bump when an entry is added.
Also...

> --- devel/quirks/files/Quirks.pm 10 Feb 2021 12:49:31 -0000 1.1173
> +++ devel/quirks/files/Quirks.pm 11 Feb 2021 22:50:06 -0000
> @@ -539,6 +539,7 @@ my $stem_extensions = {
>   'py-sphinx-intl' => 'py3-sphinx-intl',
>   'stegcracker' => 'stegseek',
>   'py-ldap3' => 'py3-ldap3',
> + 'prboom' => 'prboom-plus',
>  };
>  
>  my $obsolete_reason = {
> @@ -2077,6 +2078,7 @@ my $obsolete_reason = {
>   'icinga-web' => 38,
>   'icinga-cgi' => 38,
>   'icinga-idoutils' => 38,
> + 'prboom' => 3,
>  };
>  
>  # reasons for obsolete packages

... I think when a port is replaced ($stem_extenions), it doesn't
get another entry in $obsolete_reason.

--
Christian "naddy" Weisgerber                          [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: REMOVE: games/prboom

Klemens Nanni-2
On Sat, Feb 13, 2021 at 10:25:55PM +0100, Christian Weisgerber wrote:
> Ryan Freeman:
>
> > > anything I've forgotten for removal?
> >
> > Thanks naddy, kn, edd for the hints on Quirks and the main category unhook.
> > This more like it?
>
> devel/quirks needs a version bump when an entry is added.
As any other package does whenever its content changes.

> Also...
>
> > --- devel/quirks/files/Quirks.pm 10 Feb 2021 12:49:31 -0000 1.1173
> > +++ devel/quirks/files/Quirks.pm 11 Feb 2021 22:50:06 -0000
> > @@ -539,6 +539,7 @@ my $stem_extensions = {
> >   'py-sphinx-intl' => 'py3-sphinx-intl',
> >   'stegcracker' => 'stegseek',
> >   'py-ldap3' => 'py3-ldap3',
> > + 'prboom' => 'prboom-plus',
> >  };
> >  
> >  my $obsolete_reason = {
> > @@ -2077,6 +2078,7 @@ my $obsolete_reason = {
> >   'icinga-web' => 38,
> >   'icinga-cgi' => 38,
> >   'icinga-idoutils' => 38,
> > + 'prboom' => 3,
> >  };
> >  
> >  # reasons for obsolete packages
>
> ... I think when a port is replaced ($stem_extenions), it doesn't
> get another entry in $obsolete_reason.
Correct, OK kn for the first hunk, the second hunk must not be there.

Reply | Threaded
Open this post in threaded view
|

Re: REMOVE: games/prboom

Stuart Henderson
On 2021/02/13 23:15, Klemens Nanni wrote:

> On Sat, Feb 13, 2021 at 10:25:55PM +0100, Christian Weisgerber wrote:
> > Ryan Freeman:
> >
> > > > anything I've forgotten for removal?
> > >
> > > Thanks naddy, kn, edd for the hints on Quirks and the main category unhook.
> > > This more like it?
> >
> > devel/quirks needs a version bump when an entry is added.
> As any other package does whenever its content changes.

quirks is special as it has @option always-update, so it _could_ be skipped,
but we haven't being doing that.

> > Also...
> >
> > > --- devel/quirks/files/Quirks.pm 10 Feb 2021 12:49:31 -0000 1.1173
> > > +++ devel/quirks/files/Quirks.pm 11 Feb 2021 22:50:06 -0000
> > > @@ -539,6 +539,7 @@ my $stem_extensions = {
> > >   'py-sphinx-intl' => 'py3-sphinx-intl',
> > >   'stegcracker' => 'stegseek',
> > >   'py-ldap3' => 'py3-ldap3',
> > > + 'prboom' => 'prboom-plus',
> > >  };
> > >  
> > >  my $obsolete_reason = {
> > > @@ -2077,6 +2078,7 @@ my $obsolete_reason = {
> > >   'icinga-web' => 38,
> > >   'icinga-cgi' => 38,
> > >   'icinga-idoutils' => 38,
> > > + 'prboom' => 3,
> > >  };
> > >  
> > >  # reasons for obsolete packages
> >
> > ... I think when a port is replaced ($stem_extenions), it doesn't
> > get another entry in $obsolete_reason.
> Correct, OK kn for the first hunk, the second hunk must not be there.
>

+1

Reply | Threaded
Open this post in threaded view
|

Re: REMOVE: games/prboom

Ryan Freeman
On Sat, Feb 13, 2021 at 10:24:08PM +0000, Stuart Henderson wrote:

> On 2021/02/13 23:15, Klemens Nanni wrote:
> > On Sat, Feb 13, 2021 at 10:25:55PM +0100, Christian Weisgerber wrote:
> > > Ryan Freeman:
> > >
> > > > > anything I've forgotten for removal?
> > > >
> > > > Thanks naddy, kn, edd for the hints on Quirks and the main category unhook.
> > > > This more like it?
> > >
> > > devel/quirks needs a version bump when an entry is added.
> > As any other package does whenever its content changes.
>
> quirks is special as it has @option always-update, so it _could_ be skipped,
> but we haven't being doing that.
>
> > > Also...
> > >
> > > > --- devel/quirks/files/Quirks.pm 10 Feb 2021 12:49:31 -0000 1.1173
> > > > +++ devel/quirks/files/Quirks.pm 11 Feb 2021 22:50:06 -0000
> > > > @@ -539,6 +539,7 @@ my $stem_extensions = {
> > > >   'py-sphinx-intl' => 'py3-sphinx-intl',
> > > >   'stegcracker' => 'stegseek',
> > > >   'py-ldap3' => 'py3-ldap3',
> > > > + 'prboom' => 'prboom-plus',
> > > >  };
> > > >  
> > > >  my $obsolete_reason = {
> > > > @@ -2077,6 +2078,7 @@ my $obsolete_reason = {
> > > >   'icinga-web' => 38,
> > > >   'icinga-cgi' => 38,
> > > >   'icinga-idoutils' => 38,
> > > > + 'prboom' => 3,
> > > >  };
> > > >  
> > > >  # reasons for obsolete packages
> > >
> > > ... I think when a port is replaced ($stem_extenions), it doesn't
> > > get another entry in $obsolete_reason.
> > Correct, OK kn for the first hunk, the second hunk must not be there.
> >
>
> +1
>

Thanks for the hints everyone,  I've updated my tree, reapplied this quirk only for
stem_extensions and bumped version


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1165
diff -u -p -r1.1165 Makefile
--- Makefile 14 Feb 2021 18:06:22 -0000 1.1165
+++ Makefile 14 Feb 2021 20:26:33 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME = quirks-3.553
+PKGNAME = quirks-3.554
 PKG_ARCH = *
 MAINTAINER = Marc Espie <[hidden email]>
 
Index: files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1181
diff -u -p -r1.1181 Quirks.pm
--- files/Quirks.pm 14 Feb 2021 18:06:22 -0000 1.1181
+++ files/Quirks.pm 14 Feb 2021 20:26:33 -0000
@@ -549,6 +549,7 @@ my $stem_extensions = {
  'py-ripe.atlas.cousteau' => 'py3-ripe.atlas.cousteau',
  'py-ripe.atlas.sagan' => 'py3-ripe.atlas.sagan',
  'py-qtawesome' => 'py3-qtawesome',
+ 'prboom' => 'prboom-plus',
 };
 
 my $obsolete_reason = {