Upgrade to TORCS-1.2.3.

Remark: it is currently broken on FreeBSD-4.11.

games/torcs/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		torcs
-PORTVERSION=		1.2.2
-PORTREVISION=		1
+PORTVERSION=		1.2.3
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,15 +15,15 @@ EXTRACT_SUFX=		.tgz
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}			\
 			${EXTRADIST}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}			\
-			${DISTNAME}-robots-base${EXTRACT_SUFX}		\
-			${DISTNAME}-robots-astigot${EXTRACT_SUFX}
+			${DISTNAME}-robots-base${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Open Racing Car Simulator
 
-BUILD_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
+BUILD_DEPENDS=	${LOCALBASE}/lib/libpub.a:${PORTSDIR}/devel/publib	\
+		${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -32,16 +31,16 @@ USE_REINPLACE=	yes
 USE_GETOPT_LONG=yes
 REINPLACE_ARGS=	-i ""
 CONFIGURE_ARGS=	--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 ALL_TARGET=	default
 
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -lpub
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 TARBALL=	${PORTNAME:U}-${PORTVERSION}
 DATANAME=	${TARBALL}-data
 EXTRADIST=	${DATANAME}${EXTRACT_SUFX}				\
 		${DISTNAME}-robots-base${EXTRACT_SUFX}			\
-		${DISTNAME}-robots-astigot${EXTRACT_SUFX}		\
 		${DATANAME}-tracks-dirt${EXTRACT_SUFX}			\
 		${DATANAME}-tracks-oval${EXTRACT_SUFX}			\
 		${DATANAME}-tracks-road${EXTRACT_SUFX}			\
@@ -65,14 +64,6 @@ PLIST_SUB+=	BERNIW=""
 PLIST_SUB+=	BERNIW="@comment "
 .endif
 
-.if !defined(WITHOUT_BILLY)
-DISTFILES+=	${DISTNAME}-robots-billy${EXTRACT_SUFX}
-EXTRACT_ONLY+=	${DISTNAME}-robots-billy${EXTRACT_SUFX}
-PLIST_SUB+=	BILLY=""
-.else
-PLIST_SUB+=	BILLY="@comment "
-.endif
-
 .if !defined(WITHOUT_BT)
 DISTFILES+=	${DISTNAME}-robots-bt${EXTRACT_SUFX}
 EXTRACT_ONLY+=	${DISTNAME}-robots-bt${EXTRACT_SUFX}
@@ -81,34 +72,38 @@ PLIST_SUB+=	BT=""
 PLIST_SUB+=	BT="@comment "
 .endif
 
-.if !defined(WITHOUT_K1999)
-DISTFILES+=	${DISTNAME}-robots-K1999${EXTRACT_SUFX}
-EXTRACT_ONLY+=	${DISTNAME}-robots-K1999${EXTRACT_SUFX}
-PLIST_SUB+=	K1999=""
+.if !defined(WITHOUT_OLETHROS)
+DISTFILES+=	${DISTNAME}-robots-olethros${EXTRACT_SUFX}
+EXTRACT_ONLY+=	${DISTNAME}-robots-olethros${EXTRACT_SUFX}
+PLIST_SUB+=	OLETHROS=""
 .else
-PLIST_SUB+=	K1999="@comment "
+PLIST_SUB+=	OLETHROS="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+BROKEN=	"Does not compile on FreeBSD-4."
+.endif
+
 .if ${OSVERSION} < 500041
-CPPFLAGS+=	-I${X11BASE}/include -fPIC
+CPPFLAGS+=	-I${X11BASE}/include
 .else
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -DHAVE_DECL_GETOPT -fPIC" \
-		LDFLAGS="-L${LOCALBASE}/lib" CXXFLAGS="-fPIC" CFLAGS="-fPIC"
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -DHAVE_DECL_GETOPT" \
+		LDFLAGS="${LDFLAGS}"
 .endif
 
 .if !defined(WITHOUT_FREEGLUT)
 LIB_DEPENDS+=	glut.11:${PORTSDIR}/x11-toolkits/freeglut
 .else
-USE_MESA=	yes
+USE_GL=		yes
 .endif
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "	You might define these options:"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "	- WITHOUT_BERNIW, WITHOUT_BILLY, WITHOUT_BT and WITHOUT_K1999:"
+	@${ECHO_MSG} "	- WITHOUT_BERNIW, WITHOUT_BT and WITHOUT_OLETHROS:"
 	@${ECHO_MSG} "	  do not install optional robots."
 	@${ECHO_MSG} ""
 

games/torcs/distinfo

@@ -1,36 +1,32 @@
-MD5 (TORCS-1.2.2-src.tgz) = cf03f0623eab7f9f7d6b13ac20660515
-SIZE (TORCS-1.2.2-src.tgz) = 4203160
-MD5 (TORCS-1.2.2-data.tgz) = 241552524488396fc5cca4ff8c943709
-SIZE (TORCS-1.2.2-data.tgz) = 7972702
-MD5 (TORCS-1.2.2-src-robots-base.tgz) = 425b9737f951f95e4255f81b60449f94
-SIZE (TORCS-1.2.2-src-robots-base.tgz) = 1863563
-MD5 (TORCS-1.2.2-src-robots-astigot.tgz) = 653c522a007d01c9e8d8fc069651517b
-SIZE (TORCS-1.2.2-src-robots-astigot.tgz) = 209190
-MD5 (TORCS-1.2.2-data-tracks-dirt.tgz) = 630e7e53ffcd84a46175a7627438ba2b
-SIZE (TORCS-1.2.2-data-tracks-dirt.tgz) = 1968319
-MD5 (TORCS-1.2.2-data-tracks-oval.tgz) = 846a977e0a147de2560b23e740ebdecb
-SIZE (TORCS-1.2.2-data-tracks-oval.tgz) = 9748114
-MD5 (TORCS-1.2.2-data-tracks-road.tgz) = 78dabde8e38aa618fcfa570a5835732e
-SIZE (TORCS-1.2.2-data-tracks-road.tgz) = 18030186
-MD5 (TORCS-1.2.2-data-cars-extra.tgz) = 96ff8279e7d77a40564122fa1a7a78b6
-SIZE (TORCS-1.2.2-data-cars-extra.tgz) = 3717858
-MD5 (TORCS-1.2.2-data-cars-kcendra-gt.tgz) = 858c0e05e589c88264472a27c94f2a29
-SIZE (TORCS-1.2.2-data-cars-kcendra-gt.tgz) = 3706990
-MD5 (TORCS-1.2.2-data-cars-kcendra-roadsters.tgz) = 7d490c510914a0cdab5939cca66f37cb
-SIZE (TORCS-1.2.2-data-cars-kcendra-roadsters.tgz) = 361633
-MD5 (TORCS-1.2.2-data-cars-kcendra-sport.tgz) = 3e574373fe582269f927b94b3d01ccfa
-SIZE (TORCS-1.2.2-data-cars-kcendra-sport.tgz) = 3405021
-MD5 (TORCS-1.2.2-data-cars-nascar.tgz) = 4b20ced6ffc65357ffddb31fbc561682
-SIZE (TORCS-1.2.2-data-cars-nascar.tgz) = 57047
-MD5 (TORCS-1.2.2-data-cars-Patwo-Design.tgz) = df5706fd877d98cebf0d9977005304d4
-SIZE (TORCS-1.2.2-data-cars-Patwo-Design.tgz) = 1767862
-MD5 (TORCS-1.2.2-data-cars-VM.tgz) = 4394bdbe9722cc8b962fea29dec9531d
-SIZE (TORCS-1.2.2-data-cars-VM.tgz) = 1125266
-MD5 (TORCS-1.2.2-src-robots-berniw.tgz) = 7e49902b503edb9245c95ffb682bc5c1
-SIZE (TORCS-1.2.2-src-robots-berniw.tgz) = 1318080
-MD5 (TORCS-1.2.2-src-robots-billy.tgz) = 43af2098b788aa96556c8939048ac1b3
-SIZE (TORCS-1.2.2-src-robots-billy.tgz) = 364533
-MD5 (TORCS-1.2.2-src-robots-bt.tgz) = e81c9f15a8089b138113621e9e7013d1
-SIZE (TORCS-1.2.2-src-robots-bt.tgz) = 205755
-MD5 (TORCS-1.2.2-src-robots-K1999.tgz) = b092acfca04bd4708f9722fe0732ba75
-SIZE (TORCS-1.2.2-src-robots-K1999.tgz) = 34868
+MD5 (TORCS-1.2.3-src.tgz) = 0f1dc6a3f08e1ae9f80e118c350bb4b4
+SIZE (TORCS-1.2.3-src.tgz) = 2651809
+MD5 (TORCS-1.2.3-data.tgz) = aad3396e3524dc24436225fe119a1fcf
+SIZE (TORCS-1.2.3-data.tgz) = 13759252
+MD5 (TORCS-1.2.3-src-robots-base.tgz) = 43d670da19adb2e4c632390611d2dc31
+SIZE (TORCS-1.2.3-src-robots-base.tgz) = 1433731
+MD5 (TORCS-1.2.3-data-tracks-dirt.tgz) = ff3e6b722311b637afec8087968c0958
+SIZE (TORCS-1.2.3-data-tracks-dirt.tgz) = 1810542
+MD5 (TORCS-1.2.3-data-tracks-oval.tgz) = f245ac621677371dec762703d681d000
+SIZE (TORCS-1.2.3-data-tracks-oval.tgz) = 9751181
+MD5 (TORCS-1.2.3-data-tracks-road.tgz) = 3a9409d67e2e57a260cd62fd7a60c19b
+SIZE (TORCS-1.2.3-data-tracks-road.tgz) = 31800172
+MD5 (TORCS-1.2.3-data-cars-extra.tgz) = 143bd1dd82c22170604b7d504e1d8811
+SIZE (TORCS-1.2.3-data-cars-extra.tgz) = 7064252
+MD5 (TORCS-1.2.3-data-cars-kcendra-gt.tgz) = f4ea43e00e5bca9db8ff3a8e25a669e9
+SIZE (TORCS-1.2.3-data-cars-kcendra-gt.tgz) = 5637908
+MD5 (TORCS-1.2.3-data-cars-kcendra-roadsters.tgz) = a260b13b2be08417cb5a0fca6a663bd2
+SIZE (TORCS-1.2.3-data-cars-kcendra-roadsters.tgz) = 814778
+MD5 (TORCS-1.2.3-data-cars-kcendra-sport.tgz) = 6315a8961a4f020b303cf9e820b342ca
+SIZE (TORCS-1.2.3-data-cars-kcendra-sport.tgz) = 5388673
+MD5 (TORCS-1.2.3-data-cars-nascar.tgz) = 4ff4e4caabcdfe23d9cba7f50db6b87a
+SIZE (TORCS-1.2.3-data-cars-nascar.tgz) = 376530
+MD5 (TORCS-1.2.3-data-cars-Patwo-Design.tgz) = b3d09f66ef85f8dfe46ae7766cd6119e
+SIZE (TORCS-1.2.3-data-cars-Patwo-Design.tgz) = 1496949
+MD5 (TORCS-1.2.3-data-cars-VM.tgz) = 8606ae6d589f6310ab715ac412d6463f
+SIZE (TORCS-1.2.3-data-cars-VM.tgz) = 1397739
+MD5 (TORCS-1.2.3-src-robots-berniw.tgz) = ba4f75b0707a592cb18ea971da8c1382
+SIZE (TORCS-1.2.3-src-robots-berniw.tgz) = 1319399
+MD5 (TORCS-1.2.3-src-robots-bt.tgz) = 605d82faeb3d547ccb9acbbac9281ff9
+SIZE (TORCS-1.2.3-src-robots-bt.tgz) = 209893
+MD5 (TORCS-1.2.3-src-robots-olethros.tgz) = 2cd15c851a6f07410a4363114a5b2880
+SIZE (TORCS-1.2.3-src-robots-olethros.tgz) = 620317

games/torcs/files/patch-configure

@@ -1,45 +1,19 @@
---- configure.orig	Tue Jun  1 22:10:38 2004
-+++ configure	Tue Jun  1 22:13:20 2004
-@@ -2023,13 +2023,11 @@
+--- configure.orig	Fri Feb  4 23:30:08 2005
++++ configure	Mon Feb 14 23:05:09 2005
+@@ -4930,13 +4930,13 @@
  fi
  
  #CFLAGS="-ansi -Wall -Wstrict-prototypes -W"
--ADDCFLAGS="-Wall -Wstrict-prototypes"
-+ADDCFLAGS="$CFLAGS -Wall -Wstrict-prototypes"
+-ADDCFLAGS="-Wall -fPIC"
++ADDCFLAGS="$CFLAGS -Wall -fPIC"
  # Check whether --enable-debug or --disable-debug was given.
  if test "${enable_debug+set}" = set; then
    enableval="$enable_debug"
    ADDCFLAGS="$ADDCFLAGS -g -DDEBUG -DDEBUG_OUT"
 -else
--  ADDCFLAGS="$ADDCFLAGS -O3"
- fi
+-  ADDCFLAGS="$ADDCFLAGS -O2"
++#else
++#  ADDCFLAGS="$ADDCFLAGS -O2"
+ fi;
  
- 
-@@ -3357,9 +3355,6 @@
-   cat > conftest.$ac_ext <<EOF
- #line 3359 "configure"
- #include "confdefs.h"
--#ifdef __cplusplus
--extern "C" void exit(int) throw ();
--#endif
- 
- #include <unistd.h>
- #include <plib/ul.h>
-@@ -3369,7 +3364,7 @@
- int main() {
-     int major, minor, micro;
- 
--    if ( PLIB_VERSION != MIN_PLIB_VERSION ) {
-+    if ( PLIB_VERSION < MIN_PLIB_VERSION ) {
- 	 return -1;
-     }
- 
-@@ -3385,7 +3380,7 @@
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -fr conftest*
--  echo "$ac_t""PLIB 1.6.0 was not detected. TORCS can run only with PLIB 1.6.0, so verify that the PLIB 1.6.0 is really the version installed on your system." 1>&6
-+  echo "$ac_t""PLIB 1.6.0 was not detected. TORCS can run only with PLIB > 1.6.0, so verify that the PLIB 1.6.0 is really the version installed on your system." 1>&6
- fi
- rm -fr conftest*
- fi
+ # Check whether --enable-xrandr or --disable-xrandr was given.

games/torcs/files/patch-src::libs::raceengineclient::raceinit.cpp

@@ -0,0 +1,11 @@
+--- src/libs/raceengineclient/raceinit.cpp.orig	Mon Feb 14 23:33:57 2005
++++ src/libs/raceengineclient/raceinit.cpp	Mon Feb 14 23:38:17 2005
+@@ -34,6 +34,8 @@
+ #include <racescreens.h>
+ #include <robottools.h>
+ 
++#include <publib.h>
++
+ #include "raceengine.h"
+ #include "racemain.h"
+ #include "racestate.h"

games/torcs/files/patch-src::libs::tgfclient::screen.cpp

@@ -0,0 +1,11 @@
+--- src/libs/tgfclient/screen.cpp.orig	Mon Feb 14 23:09:32 2005
++++ src/libs/tgfclient/screen.cpp	Mon Feb 14 23:22:49 2005
+@@ -36,6 +36,8 @@
+ #include <process.h>
+ #endif /* WIN32 */
+ 
++#include <publib.h>
++
+ #include <tgfclient.h>
+ #include "gui.h"
+ #include "fg_gm.h"