mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-04 01:24:52 +00:00
Update to version 0.3.4.
This commit is contained in:
Alexey Dokuchaev
parent
6aa8cb1880
commit
0c07718c1d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=164580
@ -6,13 +6,14 @@
|
||||
#
|
||||
|
||||
PORTNAME= quetoo
|
||||
PORTVERSION= 0.3.3
|
||||
PORTVERSION= 0.3.4
|
||||
CATEGORIES= games
|
||||
MASTER_SITES= http://jdolan.dyndns.org/jaydolan/files/
|
||||
|
||||
MAINTAINER= danfe@FreeBSD.org
|
||||
COMMENT= Fast, stable, compatible, and secure Quake II client
|
||||
|
||||
USE_AUTOTOOLS= autoconf:259
|
||||
USE_BZIP2= yes
|
||||
USE_SDL= sdl
|
||||
USE_GL= yes
|
||||
@ -21,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
|
||||
${PTHREAD_CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib \
|
||||
-L${X11BASE}/lib ${PTHREAD_LIBS}" \
|
||||
OPENGL_CFLAGS="-I${X11BASE}/include" \
|
||||
OPENGL_LIBS="-L${X11BASE}/lib"
|
||||
OPENGL_LIBS="-L${X11BASE}/lib" \
|
||||
|
||||
LIBDIR= ${PREFIX}/lib/${PORTNAME}
|
||||
PLIST_SUB+= LIBDIR="${LIBDIR:S/${PREFIX}\///}"
|
||||
@ -46,6 +47,8 @@ USE_MYSQL= yes
|
||||
CONFIGURE_ARGS+= --with-mysql
|
||||
CONFIGURE_ENV+= MYSQL_LIBS="-L${LOCALBASE}/lib/mysql -lmysqlclient" \
|
||||
MYSQL_CFLAGS="-I${LOCALBASE}/include"
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-mysql
|
||||
.endif
|
||||
|
||||
.if !defined(WITH_OPTIMIZED_CFLAGS)
|
||||
@ -53,14 +56,9 @@ CONFIGURE_ARGS+= --disable-opt --disable-sse
|
||||
.endif
|
||||
|
||||
post-extract: .SILENT
|
||||
${REINPLACE_CMD} -E 's,^(eval PKGDATADIR=).*$$,\1"${Q2DIR}",; \
|
||||
s,-ldl,,; s, -lGL,,' ${WRKSRC}/configure
|
||||
.if !defined(WITH_MYSQL)
|
||||
${REINPLACE_CMD} '22266,22268d' ${WRKSRC}/configure
|
||||
.else
|
||||
${REINPLACE_CMD} 's,src$$,& @MYSQL_CFLAGS@,' \
|
||||
${WRKSRC}/src/qmass/Makefile.in
|
||||
.endif
|
||||
${REINPLACE_CMD} -E 's,^(eval PKGDATADIR=).*$$,\1"${Q2DIR}",' \
|
||||
${WRKSRC}/configure
|
||||
${REINPLACE_CMD} -E 's,-ldl,,' ${WRKSRC}/src/Makefile.in
|
||||
${REINPLACE_CMD} 's,alsa,sdl,' ${WRKSRC}/src/snd_dma.c
|
||||
|
||||
do-install:
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (quetoo-0.3.3.tar.bz2) = ab946032e611acd66a24db19356fff66
|
||||
SHA256 (quetoo-0.3.3.tar.bz2) = 02001861ba42507c0d5b45ed39702a5a04e73a7c00d693b4bc47317136dfb675
|
||||
SIZE (quetoo-0.3.3.tar.bz2) = 891379
|
||||
MD5 (quetoo-0.3.4.tar.bz2) = 12809b9aae8c4b7389c5478e910338fd
|
||||
SHA256 (quetoo-0.3.4.tar.bz2) = 1271f4a11fa9e954e87e07601c1e786e82c6d1ec2d794a02f7b5ec12da36476d
|
||||
SIZE (quetoo-0.3.4.tar.bz2) = 885752
|
||||
|
||||
47
games/quetoo/files/patch-configure.in
Normal file
47
games/quetoo/files/patch-configure.in
Normal file
@ -0,0 +1,47 @@
|
||||
--- configure.in.orig Sat Jun 3 00:56:38 2006
|
||||
+++ configure.in Sat Jun 3 01:01:40 2006
|
||||
@@ -129,14 +129,19 @@
|
||||
)
|
||||
)
|
||||
|
||||
-if test "x$with_sdl" != xno; then
|
||||
- AC_CHECK_HEADER(SDL/SDL.h,
|
||||
+if test "x${with_sdl}" != xno; then
|
||||
+ SDL_CFLAGS=`${SDL_CONFIG} --cflags`
|
||||
+ save_CPPFLAGS="$CPPFLAGS"
|
||||
+ CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
|
||||
+
|
||||
+ AC_CHECK_HEADER(SDL.h,
|
||||
HAVE_SDL=yes
|
||||
- SDL_CFLAGS=`sdl-config --cflags`
|
||||
- SDL_LIBS=`sdl-config --libs`
|
||||
+ SDL_LIBS=`${SDL_CONFIG} --libs`
|
||||
SND_REFS="$SND_REFS snd_sdl.la",
|
||||
HAVE_SDL=no
|
||||
)
|
||||
+
|
||||
+ CPPFLAGS="$save_CPPFLAGS"
|
||||
fi
|
||||
AC_SUBST(HAVE_SDL)
|
||||
AC_SUBST(SDL_CFLAGS)
|
||||
@@ -207,14 +212,18 @@
|
||||
)
|
||||
|
||||
if test "x${with_mysql}" != xno ; then
|
||||
+ MYSQL_CFLAGS=`mysql_config --cflags`
|
||||
+ save_CPPFLAGS="$CPPFLAGS"
|
||||
+ CPPFLAGS="$CPPFLAGS $MYSQL_CFLAGS"
|
||||
|
||||
- AC_CHECK_HEADER(mysql/mysql.h,
|
||||
+ AC_CHECK_HEADER(mysql.h,
|
||||
HAVE_MYSQL=yes
|
||||
AC_DEFINE(HAVE_MYSQL, 1, [Define this if you have MySQL])
|
||||
- MYSQL_CFLAGS=`mysql_config --cflags`
|
||||
MYSQL_LIBS=`mysql_config --libs`,
|
||||
HAVE_MYSQL=no
|
||||
)
|
||||
+
|
||||
+ CPPFLAGS="$save_CPPFLAGS"
|
||||
fi
|
||||
AC_SUBST(MYSQL_CFLAGS)
|
||||
AC_SUBST(MYSQL_LIBS)
|
||||
@ -1,44 +0,0 @@
|
||||
--- src/q_sh.c.orig Sun Apr 2 01:27:58 2006
|
||||
+++ src/q_sh.c Tue Apr 4 00:35:10 2006
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <unistd.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/time.h>
|
||||
+#include <machine/param.h>
|
||||
|
||||
#include "qcommon.h"
|
||||
|
||||
@@ -42,7 +43,7 @@
|
||||
curhunksize = 0;
|
||||
|
||||
membase = mmap(0, maxhunksize,
|
||||
- PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0
|
||||
+ PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0
|
||||
);
|
||||
|
||||
if(membase == NULL || membase ==(byte *) - 1)
|
||||
@@ -66,9 +67,22 @@
|
||||
}
|
||||
|
||||
int Hunk_End(void){
|
||||
- byte *n;
|
||||
+ byte *n = membase;
|
||||
|
||||
- n = mremap(membase, maxhunksize, curhunksize + sizeof(int), 0);
|
||||
+ size_t old_size = maxhunksize;
|
||||
+ size_t new_size = curhunksize + sizeof(int);
|
||||
+ void * unmap_base;
|
||||
+ size_t unmap_len;
|
||||
+
|
||||
+ new_size = round_page(new_size);
|
||||
+ old_size = round_page(old_size);
|
||||
+ if (new_size > old_size)
|
||||
+ n = (byte *)-1; /* error */
|
||||
+ else if (new_size < old_size) {
|
||||
+ unmap_base = (caddr_t)(membase + new_size);
|
||||
+ unmap_len = old_size - new_size;
|
||||
+ n = munmap(unmap_base, unmap_len) + membase;
|
||||
+ }
|
||||
|
||||
if(n != membase)
|
||||
Sys_Error("Hunk_End: Could not remap virtual block(%d)", errno);
|
||||
Loading…
Reference in New Issue
Block a user