Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Feb 2014 09:26:34 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342673 - in head/games/atr3d: . files
Message-ID:  <201402050926.s159QYV9053962@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Wed Feb  5 09:26:34 2014
New Revision: 342673
URL: http://svnweb.freebsd.org/changeset/ports/342673
QAT: https://qat.redports.org/buildarchive/r342673/

Log:
  - STAGE-clean
  - Fix segfault

Added:
  head/games/atr3d/files/patch-main.cpp   (contents, props changed)
Modified:
  head/games/atr3d/Makefile

Modified: head/games/atr3d/Makefile
==============================================================================
--- head/games/atr3d/Makefile	Wed Feb  5 09:17:08 2014	(r342672)
+++ head/games/atr3d/Makefile	Wed Feb  5 09:26:34 2014	(r342673)
@@ -27,10 +27,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 USE_AUTOTOOLS=	automake autoconf
 
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENAL}
@@ -53,9 +52,4 @@ post-patch:
 pre-configure:
 	cd ${WRKSRC}; ${SH} autogen.sh
 
-post-configure:
-	@${REINPLACE_CMD} -e \
-		's|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/Makefile
-
 .include <bsd.port.mk>

Added: head/games/atr3d/files/patch-main.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/atr3d/files/patch-main.cpp	Wed Feb  5 09:26:34 2014	(r342673)
@@ -0,0 +1,13 @@
+--- main.cpp.orig	2014-02-05 10:21:41.000000000 +0100
++++ main.cpp	2014-02-05 10:22:16.000000000 +0100
+@@ -58,6 +58,10 @@
+ 
+   initsound(&argc, argv);
+ 
++  /* initialize glut here, so we have 
++   * access to argv and argc */
++  glutInit (&argc, argv);
++
+   DoInitializations();
+ 
+   playsound(NewLifeSound);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402050926.s159QYV9053962>