mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-02 11:09:29 +00:00
Code Issues Releases Activity

Fix two patches that I've forgot to update before committing.

Browse Source
This commit is contained in:
Maxim Sobolev 2002-10-18 16:53:52 +00:00
parent 1b11d98cb8
commit 1febd762e2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=68269
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
games/asc/Makefile
View File

@ -29,15 +29,16 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
USE_GMAKE= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \
CPPFLAGS="`${SDL_CONFIG} --cflags`" \
LIBS="`${SDL_CONFIG} --libs` -lgnugetopt -lm"
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@find ${WRKSRC} \( -name "*.cpp" -or -name "*.h" \) | xargs \
${PERL} -pi -e 's|malloc\.h|stdlib.h|g'
${REINPLACE_CMD} -e 's|malloc[.]h|stdlib.h|g'
pre-configure:
@${RM} -f ${WRKSRC}/config.cache

26
games/asc/files/patch-configure
View File

@ -1,9 +1,29 @@
$FreeBSD$
--- configure.orig Tue Oct 1 15:16:15 2002
+++ configure Tue Oct 1 15:16:21 2002
@@ -2992,7 +2992,7 @@
--- configure.orig Fri Oct 18 19:42:20 2002
+++ configure Fri Oct 18 19:52:51 2002
@@ -2219,9 +2219,6 @@
cat > conftest.$ac_ext <<EOF
#line 2221 "configure"
#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int) throw();
-#endif
#include <cstdio>
#include <cstring>
@@ -2466,9 +2463,6 @@
cat > conftest.$ac_ext <<EOF
#line 2468 "configure"
#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int) throw();
-#endif
#include "paragui.h"
#include "pgapplication.h"
@@ -2992,7 +2986,7 @@

8
games/asc/files/patch-source::gamedlg.cpp
View File

@ -1,13 +1,13 @@
$FreeBSD$
--- source/gamedlg.cpp 2002/10/18 12:57:12 1.2
+++ source/gamedlg.cpp 2002/10/18 12:57:38
@@ -3794,7 +3794,7 @@
--- source/gamedlg.cpp.orig Fri Oct 18 19:39:24 2002
+++ source/gamedlg.cpp Fri Oct 18 19:40:48 2002
@@ -3788,7 +3791,7 @@
int step = ( target->service[displayed[mp]].maxAmount - target->service[displayed[mp]].minAmount ) / 100;
if ( step == 0 )
step = 1;
- step = int( pow ( 10, int ( log10 ( (double)step ))));
- step = int( pow ( 10, int ( log10 ( step ))));
+ step = int( pow ( (double)10, int ( log10 ( (double)step ))));
oldpos[mp] = newpos[mp];