mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00
Code Issues Releases Activity

Use threads. Temporarily add an extra dependency on SimGear to make sure

Browse Source 
we get a version that was compiled with thread support.
This commit is contained in:
Dag-Erling Smørgrav 2003-03-03 20:26:50 +00:00
parent 5d90ba6cc7
commit deef1edf2e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=76814
6 changed files with 96 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
games/fgfs-base/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= FlightGear
PORTVERSION= 0.9.1
PORTREVISION= 2
PORTREVISION= 3
BASEVERSION= 0.9.1a
CATEGORIES= games
MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Source/ \
@ -20,18 +20,21 @@ MAINTAINER= des@FreeBSD.org
BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
${LOCALBASE}/lib/libmk4.a:${PORTSDIR}/databases/metakit \
${X11BASE}/include/simgear/threads/SGThread.hxx:${PORTSDIR}/devel/simgear \
${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
${LOCALBASE}/lib/libmk4.a:${PORTSDIR}/databases/metakit \
${X11BASE}/include/simgear/threads/SGThread.hxx:${PORTSDIR}/devel/simgear \
${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
# Force configure to look in /usr/local/{include,lib}
CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" \
CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" \
CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-threads
MAN1= est-epsilon.1 fgfs.1 fgjs.1 gl-info.1 js_demo.1 pstest.1

28
games/fgfs-base/files/patch-aa
View File

@ -1,5 +1,5 @@
--- configure.orig Thu Dec 5 16:31:39 2002
+++ configure Wed Jan 22 11:11:26 2003
+++ configure Mon Mar 3 13:00:03 2003
@@ -4206,6 +4206,7 @@
if test -r /usr/include/soundcard.h \
-o -r /usr/include/linux/soundcard.h \
@ -8,3 +8,29 @@
-o -r /usr/include/audio.h \
-o "x$ac_cv_header_windows_h" = "xyes" \
-o "$HOSTTYPE" = "macintosh"; then
@@ -5385,13 +5386,13 @@
base_LIBS="$LIBS"
-echo "$as_me:$LINENO: checking for pthread_exit in -lpthread" >&5
-echo $ECHO_N "checking for pthread_exit in -lpthread... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for pthread_exit in -pthread" >&5
+echo $ECHO_N "checking for pthread_exit in -pthread... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
@@ -5439,7 +5440,7 @@
#define HAVE_LIBPTHREAD 1
_ACEOF
- LIBS="-lpthread $LIBS"
+ LIBS="-pthread $LIBS"
fi

7
games/flightgear-data/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= FlightGear
PORTVERSION= 0.9.1
PORTREVISION= 2
PORTREVISION= 3
BASEVERSION= 0.9.1a
CATEGORIES= games
MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Source/ \
@ -20,18 +20,21 @@ MAINTAINER= des@FreeBSD.org
BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
${LOCALBASE}/lib/libmk4.a:${PORTSDIR}/databases/metakit \
${X11BASE}/include/simgear/threads/SGThread.hxx:${PORTSDIR}/devel/simgear \
${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
${LOCALBASE}/lib/libmk4.a:${PORTSDIR}/databases/metakit \
${X11BASE}/include/simgear/threads/SGThread.hxx:${PORTSDIR}/devel/simgear \
${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
# Force configure to look in /usr/local/{include,lib}
CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" \
CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" \
CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-threads
MAN1= est-epsilon.1 fgfs.1 fgjs.1 gl-info.1 js_demo.1 pstest.1

28
games/flightgear-data/files/patch-aa
View File

@ -1,5 +1,5 @@
--- configure.orig Thu Dec 5 16:31:39 2002
+++ configure Wed Jan 22 11:11:26 2003
+++ configure Mon Mar 3 13:00:03 2003
@@ -4206,6 +4206,7 @@
if test -r /usr/include/soundcard.h \
-o -r /usr/include/linux/soundcard.h \
@ -8,3 +8,29 @@
-o -r /usr/include/audio.h \
-o "x$ac_cv_header_windows_h" = "xyes" \
-o "$HOSTTYPE" = "macintosh"; then
@@ -5385,13 +5386,13 @@
base_LIBS="$LIBS"
-echo "$as_me:$LINENO: checking for pthread_exit in -lpthread" >&5
-echo $ECHO_N "checking for pthread_exit in -lpthread... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for pthread_exit in -pthread" >&5
+echo $ECHO_N "checking for pthread_exit in -pthread... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
@@ -5439,7 +5440,7 @@
#define HAVE_LIBPTHREAD 1
_ACEOF
- LIBS="-lpthread $LIBS"
+ LIBS="-pthread $LIBS"
fi

7
games/flightgear/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= FlightGear
PORTVERSION= 0.9.1
PORTREVISION= 2
PORTREVISION= 3
BASEVERSION= 0.9.1a
CATEGORIES= games
MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Source/ \
@ -20,18 +20,21 @@ MAINTAINER= des@FreeBSD.org
BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
${LOCALBASE}/lib/libmk4.a:${PORTSDIR}/databases/metakit \
${X11BASE}/include/simgear/threads/SGThread.hxx:${PORTSDIR}/devel/simgear \
${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
${LOCALBASE}/lib/libmk4.a:${PORTSDIR}/databases/metakit \
${X11BASE}/include/simgear/threads/SGThread.hxx:${PORTSDIR}/devel/simgear \
${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
# Force configure to look in /usr/local/{include,lib}
CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" \
CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" \
CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-threads
MAN1= est-epsilon.1 fgfs.1 fgjs.1 gl-info.1 js_demo.1 pstest.1

28
games/flightgear/files/patch-aa
View File

@ -1,5 +1,5 @@
--- configure.orig Thu Dec 5 16:31:39 2002
+++ configure Wed Jan 22 11:11:26 2003
+++ configure Mon Mar 3 13:00:03 2003
@@ -4206,6 +4206,7 @@
if test -r /usr/include/soundcard.h \
-o -r /usr/include/linux/soundcard.h \
@ -8,3 +8,29 @@
-o -r /usr/include/audio.h \
-o "x$ac_cv_header_windows_h" = "xyes" \
-o "$HOSTTYPE" = "macintosh"; then
@@ -5385,13 +5386,13 @@
base_LIBS="$LIBS"
-echo "$as_me:$LINENO: checking for pthread_exit in -lpthread" >&5
-echo $ECHO_N "checking for pthread_exit in -lpthread... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for pthread_exit in -pthread" >&5
+echo $ECHO_N "checking for pthread_exit in -pthread... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
@@ -5439,7 +5440,7 @@
#define HAVE_LIBPTHREAD 1
_ACEOF
- LIBS="-lpthread $LIBS"
+ LIBS="-pthread $LIBS"
fi