cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 1.14.121

Browse Source 
PR:		ports/138682
Submitted by:	Aragon Gouveia <aragon@phat.za.net> (maintainer)
This commit is contained in:
Pav Lucistnik 2009-09-10 22:07:40 +00:00
parent 0e5582eaee
commit 1fa61ac605
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=241186
4 changed files with 131 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
games/d2x-xl/Makefile
View File

@ -6,9 +6,10 @@
#
PORTNAME= d2x-xl
PORTVERSION= 1.14.108
PORTVERSION= 1.14.121
CATEGORIES= games
MASTER_SITES= SF/d2x-xl/Linux:source \
MASTER_SITES= SF/d2x-xl/Linux/Archive:source \
SF/d2x-xl/Linux:source \
SF/d2x-xl/Data:data \
http://www.descent2.de/downloads/:source,data
DISTFILES= ${PORTNAME}-src-${PORTVERSION}.rar:source \
@ -26,10 +27,9 @@ CONFIGURE_ARGS= --disable-debug --enable-release=yes \
--with-sharepath=${PREFIX}/share/d2x-xl
USE_SDL= sdl mixer image
USE_GMAKE= yes
USE_AUTOTOOLS= aclocal:110 \
autoheader:262 \
automake:110 \
autoconf:262
USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262
USE_MOTIF= yes
MAKE_JOBS_SAFE= yes
AUTOMAKE_ARGS= --add-missing --copy
USE_DOS2UNIX= missing depcomp

6
games/d2x-xl/distinfo
View File

@ -1,6 +1,6 @@
MD5 (d2x-xl-src-1.14.108.rar) = 7a3738164824b538305ddfe66510339a
SHA256 (d2x-xl-src-1.14.108.rar) = 60740a73f92c6352c7710967ea9e64e8617ef5c2508655808f6ed0aea0fe453d
SIZE (d2x-xl-src-1.14.108.rar) = 1651184
MD5 (d2x-xl-src-1.14.121.rar) = 83d3d1dc31f043b112f36c72c5050575
SHA256 (d2x-xl-src-1.14.121.rar) = 410cce88b54ceeac3a62260e1d5bc420e7f4b758943014a23cad3012bdb8126b
SIZE (d2x-xl-src-1.14.121.rar) = 1751369
MD5 (d2x-xl-data-1.14.95.rar) = 20a2d3663171b0514b66f6c1ad41cf82
SHA256 (d2x-xl-data-1.14.95.rar) = bf1d877aba1987c0d529e8dbfbc55a1c5e374556f89ecb860bfd6942f9430625
SIZE (d2x-xl-data-1.14.95.rar) = 9034850

46
games/d2x-xl/files/patch-main-gamefolders.cpp Normal file
View File

@ -0,0 +1,46 @@
--- main/gamefolders.cpp.orig 2009-09-08 15:00:31.000000000 +0200
+++ main/gamefolders.cpp 2009-09-10 02:55:54.000000000 +0200
@@ -112,7 +112,7 @@
// ----------------------------------------------------------------------------
#ifdef _WIN32
-# define STD_GAMEDIR ""
+# define STD_GAMEDIR "./"
# define D2X_APPNAME "d2x-xl.exe"
#elif defined(__macosx__)
# define STD_GAMEDIR "/Applications/Games/D2X-XL"
@@ -228,8 +228,6 @@
# endif //__unix__
if (!*gameFolders.szGameDir && GetAppFolder ("", gameFolders.szGameDir, STD_GAMEDIR, ""))
*gameFolders.szGameDir = '\0';
-if (!*gameFolders.szGameDir && GetAppFolder ("", gameFolders.szGameDir, SHAREPATH, ""))
- *gameFolders.szGameDir = '\0';
# ifdef __macosx__
GetOSXAppFolder (szDataRootDir, gameFolders.szGameDir);
# else
@@ -732,19 +730,16 @@
if ((i = FindArg ("-userdir")) && pszArgList [i + 1] && *pszArgList [i + 1]) {
strcpy (szRootFolder, pszArgList [i + 1]);
i = int (strlen (szRootFolder));
-#if defined(__unix__)
- if (szRootFolder [i - 1] != '/')
- strcat (szRootFolder, "/");
-#else
- if ((szRootFolder [i - 1] != '\\') && (szRootFolder [i - 1] != '/') && (szRootFolder [i - 1] != ':'))
- strcat (szRootFolder, "/");
-#endif
}
else
+ strcpy (szRootFolder, STD_GAMEDIR);
+
#if defined(__unix__)
- strcpy (szRootFolder, "/usr/local/games/d2x-xl/");
+if (szRootFolder [i - 1] != '/')
+ strcat (szRootFolder, "/");
#else
- strcpy (szRootFolder, "./");
+if ((szRootFolder [i - 1] != '\\') && (szRootFolder [i - 1] != '/') && (szRootFolder [i - 1] != ':'))
+ strcat (szRootFolder, "/");
#endif
#if defined(__unix__)

76
games/d2x-xl/files/patch-noupdates Normal file
View File

@ -0,0 +1,76 @@
--- Makefile.am.orig 2009-09-10 02:36:08.000000000 +0200
+++ Makefile.am 2009-09-10 02:36:29.000000000 +0200
@@ -59,12 +59,12 @@
if MINGW32
if USE_NETWORK
-d2x_sdl_LDADD = ${d2x_LDADD} -lwinmm -lwsock32 -lcurl -lXm -lXt -lX11
+d2x_sdl_LDADD = ${d2x_LDADD} -lwinmm -lwsock32 -lXm -lXt -lX11
else
-d2x_sdl_LDADD = ${d2x_LDADD} -lwinmm -lcurl -lXm -lXt -lX11
+d2x_sdl_LDADD = ${d2x_LDADD} -lwinmm -lXm -lXt -lX11
endif
else
-d2x_sdl_LDADD = ${d2x_LDADD} -lm -lcurl -lXm -lXt -lX11
+d2x_sdl_LDADD = ${d2x_LDADD} -lm -lXm -lXt -lX11
endif
d2x_xl_LDADD = ${d2x_sdl_LDADD} ${OGL_LIBS}
--- main/gamefolders.cpp.orig 2009-09-10 02:36:46.000000000 +0200
+++ main/gamefolders.cpp 2009-09-10 02:38:18.000000000 +0200
@@ -871,7 +871,7 @@
// ----------------------------------------------------------------------------
-#if defined(__unix__)
+#if 0
# define FILEEXT "rar"
# define FILETYPE "src"
@@ -928,7 +928,7 @@
#endif
-#if defined(_WIN32) || defined(__unix__)
+#if 0
int CheckForUpdate (void)
{
--- menus/mainmenu.cpp.orig 2009-09-10 02:39:20.000000000 +0200
+++ menus/mainmenu.cpp 2009-09-10 02:40:21.000000000 +0200
@@ -87,7 +87,7 @@
int nOrder;
int nHelp;
int nChoice;
-#if defined(_WIN32) || defined(__unix__)
+#if 0
int nUpdate;
#endif
} mainOpts;
@@ -101,7 +101,7 @@
//returns the number of demo files on the disk
int NDCountDemos (void);
-#if defined(_WIN32) || defined(__unix__)
+#if 0
int CheckForUpdate (void);
#endif
@@ -180,7 +180,7 @@
if (!gameStates.app.bNostalgia)
mainOpts.nSongs = m.AddMenu (TXT_PLAY_SONGS, KEY_S, HTX_MAIN_SONGS);
mainOpts.nCredits = m.AddMenu (TXT_CREDITS, KEY_C, HTX_MAIN_CREDITS);
-#if defined(_WIN32) || defined(__unix__)
+#if 0
mainOpts.nUpdate = m.AddMenu (TXT_CHECK_FOR_UPDATE, KEY_U, HTX_CHECK_FOR_UPDATE);
#endif
mainOpts.nQuit = m.AddMenu (TXT_QUIT, KEY_Q, HTX_MAIN_QUIT);
@@ -369,7 +369,7 @@
}
else if (nChoice == mainOpts.nOrder)
ShowOrderForm ();
-#if defined(_WIN32) || defined(__unix__)
+#if 0
else if (nChoice == mainOpts.nUpdate)
CheckForUpdate ();
#endif