git: 460b8b74cf94 - main - games/scorched3d: Cleanup EXPIRED ports
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 31 Dec 2022 01:03:11 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=460b8b74cf949dce5320ee3795e1ccef831686f2
commit 460b8b74cf949dce5320ee3795e1ccef831686f2
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-12-31 01:01:26 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-12-31 01:03:00 +0000
games/scorched3d: Cleanup EXPIRED ports
Approved by: portmgr
---
MOVED | 1 +
games/Makefile | 1 -
games/scorched3d/Makefile | 79 -------------
games/scorched3d/distinfo | 2 -
games/scorched3d/files/patch-acinclude.m4 | 21 ----
games/scorched3d/files/patch-configure-al.m4 | 125 ---------------------
.../patch-src_client_GLEXT_GLFont2dFreeType.h | 17 ---
.../files/patch-src_client_client_LoadPNG.cpp | 63 -----------
.../files/patch-src_client_client_SecureID.cpp | 50 ---------
.../patch-src_common_image_ImagePngFactory.cpp | 11 --
.../files/patch-src_common_porting_windows.h | 18 ---
.../patch-src_common_weapons_AccessoryStore.cpp | 15 ---
.../patch-src_launcher_wxdialogs_TrueTypeFont.h | 17 ---
games/scorched3d/pkg-descr | 9 --
14 files changed, 1 insertion(+), 428 deletions(-)
diff --git a/MOVED b/MOVED
index 08e9fdf389ef..33cf1be42ff0 100644
--- a/MOVED
+++ b/MOVED
@@ -17714,3 +17714,4 @@ devel/rubygem-aws-sdk-s31114|devel/rubygem-aws-sdk-s3|2022-12-30|Remove obsolete
devel/rubygem-google-protobuf319|devel/rubygem-google-protobuf|2022-12-30|Remove obsoleted port. Use devel/rubygem-google-protobuf instead
databases/pgpool-II-37|databases/pgpool-II-43|2022-12-30|Has expired: Upstream EOL reaches on 2022-11 use pgpool-II-43
shells/ksh2020||2022-12-30|Has expired: Upstream ksh2020 branch archived, development continues under new ksh93 project
+games/scorched3d/||2022-12-31|Has expired: Abandoned project and use deprecated wxgtk28
diff --git a/games/Makefile b/games/Makefile
index 6e8fbe67314a..c310d309ac3e 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -878,7 +878,6 @@
SUBDIR += sauerbraten
SUBDIR += scare
SUBDIR += scid
- SUBDIR += scorched3d
SUBDIR += scourge
SUBDIR += scourge-data
SUBDIR += scramble
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
deleted file mode 100644
index 27f11e5abca7..000000000000
--- a/games/scorched3d/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-PORTNAME= scorched3d
-PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION}
-PORTREVISION= 13
-CATEGORIES= games
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${SCORCH_VERSION}
-DISTNAME= Scorched3D-${SCORCH_VERSION}-src
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= 3D version of the classic DOS game Scorched Earth
-WWW= http://www.scorched3d.co.uk/
-
-DEPRECATED= Abandoned project and use deprecated wxgtk28
-EXPIRATION_DATE= 2022-12-31
-
-LICENSE= GPLv2
-
-LIB_DEPENDS= libvorbis.so:audio/libvorbis \
- libpng.so:graphics/png \
- libfftw3.so:math/fftw3 \
- libfftw3f.so:math/fftw3-float \
- libexpat.so:textproc/expat2
-
-OPTIONS_DEFINE= MYSQL
-
-WRKSRC= ${WRKDIR}/scorched
-
-USES= autoreconf compiler:c++11-lang dos2unix gl gmake iconv jpeg \
- openal:al,alut perl5 pkgconfig sdl
-USE_GL= glew glu
-USE_SDL= mixer net sdl
-USE_WX= 2.8
-WX_CONF_ARGS= absolute
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --datadir=${DATADIR}
-
-DOS2UNIX_GLOB= *.h *.cpp
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-LDFLAGS_i386= -Wl,-znotext
-
-SCORCH_VERSION= 43.3d
-SCORCH_REVISION= # none
-
-MYSQL_USES= mysql
-MYSQL_CONFIGURE_ON= --with-mysql
-
-PLIST_FILES= bin/scorched3d \
- bin/scorched3dc \
- bin/scorched3ds
-PORTDATA= *
-
-BINARY_ALIAS= freetype-config=true
-
-post-extract:
- @${RM} ${WRKSRC}/src/client/GLEXT/[a-z]*
-
-post-patch:
- @${REINPLACE_CMD} -e \
- '/^CPPFLAGS=/s|^|#|g ; \
- /^LDFLAGS=/s|^|#|g ; \
- /if test/s|==|=|' ${WRKSRC}/configure.ac
- @${REINPLACE_CMD} -e \
- '/GL_LIBS/s|"-lGL -lGLU"|"-lGL -lGLU -lGLEW"| ; \
- /if test/s|==|=|' ${WRKSRC}/*.m4
- @${REINPLACE_CMD} -e \
- 's|std::exit|exit|' ${WRKSRC}/src/common/common/main.h
- @${REINPLACE_CMD} -e \
- 's|"glew.h"|<GL/glew.h>|' ${WRKSRC}/src/client/GLEXT/GLState.h
- @${REINPLACE_CMD} -e \
- '/GLEXT\\glew.c/d ; \
- /GLEXT\\glew.h/d ; \
- /GLEXT\\glxew.h/d ; \
- /GLEXT\\wglew.h/d' ${WRKSRC}/src/client/scorchedc/scorchedc.vcxproj
-
-pre-configure:
- @cd ${WRKSRC}/scripts && ${PERL} createAMMakefile.pl
-
-.include <bsd.port.mk>
diff --git a/games/scorched3d/distinfo b/games/scorched3d/distinfo
deleted file mode 100644
index 114cbe2f81d8..000000000000
--- a/games/scorched3d/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (Scorched3D-43.3d-src.tar.gz) = a5e7bdc3810517ab142cfcb43951ca55d03c81252d00bc323f0f204deb62ef1c
-SIZE (Scorched3D-43.3d-src.tar.gz) = 93245939
diff --git a/games/scorched3d/files/patch-acinclude.m4 b/games/scorched3d/files/patch-acinclude.m4
deleted file mode 100644
index 7f5a4e3a20f1..000000000000
--- a/games/scorched3d/files/patch-acinclude.m4
+++ /dev/null
@@ -1,21 +0,0 @@
---- acinclude.m4.orig 2021-08-06 14:48:14 UTC
-+++ acinclude.m4
-@@ -437,13 +437,13 @@ AC_DEFUN([AC_CHECK_FT2],
- if test "$FT2_CONFIG" = "no" ; then
- no_ft=yes
- else
-- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
-- FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
-- ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
-+ FT2_CFLAGS=`pkg-config freetype2 --cflags`
-+ FT2_LIBS=`pkg-config freetype2 --libs`
-+ ft_config_major_version=`pkg-config freetype2 --modversion | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-- ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
-+ ft_config_minor_version=`pkg-config freetype2 --modversion | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-- ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
-+ ft_config_micro_version=`pkg-config freetype2 --modversion | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- ft_min_major_version=`echo $min_ft_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
diff --git a/games/scorched3d/files/patch-configure-al.m4 b/games/scorched3d/files/patch-configure-al.m4
deleted file mode 100644
index 76adaf5a2820..000000000000
--- a/games/scorched3d/files/patch-configure-al.m4
+++ /dev/null
@@ -1,125 +0,0 @@
---- configure-al.m4.orig 2011-12-31 14:51:36 UTC
-+++ configure-al.m4
-@@ -1,118 +1,8 @@
- dnl Checking for OpenAL
--AC_ARG_WITH([openal-static],
-- AC_HELP_STRING([--with-openal-static],
-- [enable static linking for openal (default no)]),
-- [use_static_openal=${withval}],,)
--AC_ARG_ENABLE(openaltest,
-- [ --disable-openaltest Do not try to compile and run a test OpenAL program],
-- , enable_openaltest=yes)
--AC_MSG_CHECKING(for OpenAL support)
--AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
--if test x$OPENAL_CONFIG = xno; then
-- echo "The openal-config script installed by OpenAL could not be found"
-- echo "Make sure openal-config is in your path, or set the OPENAL_CONFIG"
-- echo "environment variable to the full path to openal-config."
-- echo "Trying pkg-config instead."
--
-- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-- if test x$PKG_CONFIG = xno; then
-- echo "The pkg-config script could not be found"
-- echo "Make sure pkg-config is in your path, or set the PKG_CONFIG"
-- echo "environment variable to the full path to pkg-config."
--
-- AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/])
-- else
-- OPENAL_CONFIG="$PKG_CONFIG openal";
-- fi
--fi
--
--if test x"$use_static_openal" = x"yes"; then
-- AL_LIBS="/usr/local/lib/libopenal.a"
--else
-- AL_LIBS="`$OPENAL_CONFIG --libs`"
--fi
--
--AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
--
--AC_MSG_RESULT(yes)
--
--AC_MSG_CHECKING(for Freealut support)
--AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
--if test x$FREEALUT_CONFIG = xno; then
-- echo "*** Warning: The freealut-config script installed by OpenAL could not be found."
-- echo "*** The alut library is required, however some older OpenAL distribitions may include it."
-- echo "*** If Scorched3D fails to link check alut is in the link line."
-- echo "*** Alternatively, make sure freealut-config is in your path, or set the FREEALUT_CONFIG"
-- echo "*** environment variable to the full path to openal-config."
--else
--
-- AL_LIBS="$AL_LIBS `$FREEALUT_CONFIG --libs`"
-- AL_CFLAGS="$AL_CFLAGS `$FREEALUT_CONFIG --cflags`"
--
-- AC_MSG_RESULT(yes)
--fi
--
--AC_MSG_CHECKING(for OpenAL compilation)
--if test "x$enable_openaltest" = "xyes" ; then
--
-- ac_save_CFLAGS="$CFLAGS"
-- ac_save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $AL_CFLAGS"
-- LIBS="$AL_LIBS $LIBS"
--
-- AC_TRY_COMPILE([
--#ifdef __APPLE__
-- #include <OpenAL/al.h>
-- #include <OpenAL/alc.h>
--#else
-- #include <AL/al.h>
-- #include <AL/alut.h>
-- #include <AL/alc.h>
--#endif
--
-- ],[
-- ],[
-- have_openal=yes
-- ],[
-- echo "*** Failed to compile using the OpenAL library."
-- echo "*** CFLAGS = $AL_CFLAGS";
-- AC_MSG_ERROR([*** Check the OpenAL library is correctly installed.])
-- ])
--
-- AC_TRY_LINK([
--#ifdef __APPLE__
-- #include <OpenAL/al.h>
-- #include <OpenAL/alc.h>
--#else
-- #include <AL/al.h>
-- #include <AL/alut.h>
-- #include <AL/alc.h>
--#endif
--
-- int main(int argc, char *argv[])
-- {
-- alutInit(argc, argv);
-- return 0;
-- }
--#undef main
--#define main K_and_R_C_main
--
-- ],[
-- ],[
-- have_openal=yes
-- ],[
-- echo "*** Compiled but failed to link using the OpenAL library."
-- echo "*** LIBS = $AL_LIBS";
-- echo "*** Check the OpenAL library is on the LD_LIBRARY_PATH";
-- AC_MSG_ERROR([*** Check the OpenAL library is correctly installed.])
-- ])
--
-- CFLAGS="$ac_save_CFLAGS"
-- LIBS="$ac_save_LIBS"
--
-- AC_MSG_RESULT(yes)
--fi
--
-+PKG_CHECK_MODULES([OPENAL], [openal])
-+PKG_CHECK_MODULES([FREEALUT], [freealut])
-+AL_CFLAGS="$OPENAL_CFLAGS $FREEALUT_CFLAGS"
-+AL_LIBS="$OPENAL_LIBS $FREEALUT_LIBS"
- AC_SUBST(AL_CFLAGS)
- AC_SUBST(AL_LIBS)
-
diff --git a/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h b/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h
deleted file mode 100644
index b8fe14351be9..000000000000
--- a/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/client/GLEXT/GLFont2dFreeType.h.orig 2016-06-20 14:16:37 UTC
-+++ src/client/GLEXT/GLFont2dFreeType.h
-@@ -23,10 +23,10 @@
-
- #include <GLEXT/GLFont2dStorage.h>
- #include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
--#include <freetype/fttrigon.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
-+#include FT_TRIGONOMETRY_H
- #include <string>
-
- class GLFont2dFreeType
diff --git a/games/scorched3d/files/patch-src_client_client_LoadPNG.cpp b/games/scorched3d/files/patch-src_client_client_LoadPNG.cpp
deleted file mode 100644
index 138a50aead91..000000000000
--- a/games/scorched3d/files/patch-src_client_client_LoadPNG.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/client/client/LoadPNG.cpp.orig 2016-06-20 14:16:37 UTC
-+++ src/client/client/LoadPNG.cpp
-@@ -28,6 +28,8 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
- int row, i;
- volatile int ckey = -1;
- png_color_16 *transv;
-+ png_colorp png_palette;
-+ int num_palette;
-
- if ( !src ) {
- /* The error message has been set in SDL_RWFromFile */
-@@ -58,7 +60,7 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
- * the normal method of doing things with libpng). REQUIRED unless you
- * set up your own error handlers in png_create_read_struct() earlier.
- */
-- if ( setjmp(png_ptr->jmpbuf) ) {
-+ if ( setjmp(png_jmpbuf(png_ptr)) ) {
- error = "Error reading the PNG file.";
- goto done;
- }
-@@ -127,9 +129,9 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
- Rmask = 0x000000FF;
- Gmask = 0x0000FF00;
- Bmask = 0x00FF0000;
-- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- } else {
-- int s = (info_ptr->channels == 4) ? 0 : 8;
-+ int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- Rmask = 0xFF000000 >> s;
- Gmask = 0x00FF0000 >> s;
- Bmask = 0x0000FF00 >> s;
-@@ -137,7 +139,7 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
- }
- }
- surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
-- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
-+ bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
- if ( surface == NULL ) {
- error = "Out of memory";
- goto done;
-@@ -185,12 +187,15 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
- palette->colors[i].g = i;
- palette->colors[i].b = i;
- }
-- } else if (info_ptr->num_palette > 0 ) {
-- palette->ncolors = info_ptr->num_palette;
-- for( i=0; i<info_ptr->num_palette; ++i ) {
-- palette->colors[i].b = info_ptr->palette[i].blue;
-- palette->colors[i].g = info_ptr->palette[i].green;
-- palette->colors[i].r = info_ptr->palette[i].red;
-+ } else {
-+ png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
-+ if (num_palette > 0 ) {
-+ palette->ncolors = num_palette;
-+ for( i=0; i<num_palette; ++i ) {
-+ palette->colors[i].b = png_palette[i].blue;
-+ palette->colors[i].g = png_palette[i].green;
-+ palette->colors[i].r = png_palette[i].red;
-+ }
- }
- }
- }
diff --git a/games/scorched3d/files/patch-src_client_client_SecureID.cpp b/games/scorched3d/files/patch-src_client_client_SecureID.cpp
deleted file mode 100644
index b1549c629724..000000000000
--- a/games/scorched3d/files/patch-src_client_client_SecureID.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/client/client/SecureID.cpp.orig 2016-06-20 14:16:37 UTC
-+++ src/client/client/SecureID.cpp
-@@ -71,6 +71,47 @@ std::string SecureID::GetPrivateKey(void
- return result;
- }
-
-+#elif defined(__FreeBSD__)
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <net/if_dl.h>
-+#include <ifaddrs.h>
-+
-+std::string SecureID::GetPrivateKey(void)
-+{
-+ std::string Key;
-+ struct ifaddrs* ifaphead;
-+
-+ if (getifaddrs(&ifaphead) != 0)
-+ {
-+ return "";
-+ }
-+
-+ for (struct ifaddrs* ifap = ifaphead; ifap; ifap = ifap->ifa_next)
-+ {
-+ if (ifap->ifa_addr->sa_family == AF_LINK)
-+ {
-+ if (strncmp(ifap->ifa_name, "lo", 2) != 0)
-+ {
-+ struct sockaddr_dl* sdl =
-+ (struct sockaddr_dl *)ifap->ifa_addr;
-+ unsigned char* if_mac = (unsigned char*)LLADDR(sdl);
-+ char buf[18];
-+ snprintf(buf, 18,
-+ "%02x:%02x:%02x:%02x:%02x:%02x",
-+ if_mac[0], if_mac[1], if_mac[2],
-+ if_mac[3], if_mac[4], if_mac[5]);
-+ Key = buf;
-+ break;
-+ }
-+ }
-+ }
-+
-+ freeifaddrs(ifaphead);
-+ return Key;
-+}
-+
- #else
-
- #include <sys/ioctl.h>
diff --git a/games/scorched3d/files/patch-src_common_image_ImagePngFactory.cpp b/games/scorched3d/files/patch-src_common_image_ImagePngFactory.cpp
deleted file mode 100644
index 1afd54ffe0da..000000000000
--- a/games/scorched3d/files/patch-src_common_image_ImagePngFactory.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/image/ImagePngFactory.cpp.orig 2016-06-20 14:16:37 UTC
-+++ src/common/image/ImagePngFactory.cpp
-@@ -62,7 +62,7 @@ struct user_read_struct
-
- static void user_png_error(png_structp png_ptr, png_const_charp msg)
- {
-- longjmp(png_ptr->jmpbuf,1);
-+ longjmp(png_jmpbuf(png_ptr),1);
- }
-
- static void user_png_warning(png_structp png_ptr, png_const_charp msg)
diff --git a/games/scorched3d/files/patch-src_common_porting_windows.h b/games/scorched3d/files/patch-src_common_porting_windows.h
deleted file mode 100644
index 35521a22ba48..000000000000
--- a/games/scorched3d/files/patch-src_common_porting_windows.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/common/porting/windows.h.orig 2016-06-20 14:16:37 UTC
-+++ src/common/porting/windows.h
-@@ -9,6 +9,7 @@
- #include <ctype.h>
- #include <common/Defines.h>
-
-+#if defined(_WIN32)
- typedef char * LPSTR;
- typedef const char * LPCTSTR;
- typedef unsigned int DWORD;
-@@ -27,6 +28,7 @@ typedef int LPARAM;
- typedef int LRESULT;
- typedef void * HDC;
- typedef void * HGLRC;
-+#endif
-
- #define _strnicmp(a,b,c) strncasecmp(a,b,c)
- #define stricmp(a,b) strcasecmp(a,b)
diff --git a/games/scorched3d/files/patch-src_common_weapons_AccessoryStore.cpp b/games/scorched3d/files/patch-src_common_weapons_AccessoryStore.cpp
deleted file mode 100644
index ed855ce1525b..000000000000
--- a/games/scorched3d/files/patch-src_common_weapons_AccessoryStore.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-../../common/weapons/AccessoryStore.cpp:158:64: error: cannot initialize return object of type 'AccessoryPart *' with an rvalue of type 'bool'
- if (!currentNode->getNamedParameter("type", typeNode)) return false;
- ^~~~~
-
---- src/common/weapons/AccessoryStore.cpp.orig 2018-07-30 09:52:29 UTC
-+++ src/common/weapons/AccessoryStore.cpp
-@@ -155,7 +155,7 @@ AccessoryPart *AccessoryStore::createAccessoryPart(
- Accessory *parent, XMLNode *currentNode)
- {
- XMLNode *typeNode = 0;
-- if (!currentNode->getNamedParameter("type", typeNode)) return false;
-+ if (!currentNode->getNamedParameter("type", typeNode)) return 0;
-
- AccessoryPart *accessoryPart =
- AccessoryMetaRegistration::getNewAccessory(typeNode->getContent(), this);
diff --git a/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h b/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h
deleted file mode 100644
index 1c6f5fad2761..000000000000
--- a/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/launcher/wxdialogs/TrueTypeFont.h.orig 2016-06-20 14:16:37 UTC
-+++ src/launcher/wxdialogs/TrueTypeFont.h
-@@ -25,10 +25,10 @@
- #include <wx/image.h>
- #include <ft2build.h>
- #include <string>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
--#include <freetype/fttrigon.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
-+#include FT_TRIGONOMETRY_H
-
- class TrueTypeFont
- {
diff --git a/games/scorched3d/pkg-descr b/games/scorched3d/pkg-descr
deleted file mode 100644
index 9f9c9d63d954..000000000000
--- a/games/scorched3d/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Scorched3d is a cross-platform multiplayer modernisation of the classic
-DOS game Scorched Earth "The Mother Of All Games".
-
-Scorched3d incorporates lively, fully destructible 3D landscapes that
-include animated jets, naval vessels, water and even birds, with
-detailed tanks and projectiles and stunning visual effects.
-
-You should have 3D hardware accelleration enabled to enjoy a playable
-FPS rate.