Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Jun 2014 22:02:46 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r358753 - in head/games/netherearth: . files
Message-ID:  <201406212202.s5LM2kPV025477@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rakuco
Date: Sat Jun 21 22:02:46 2014
New Revision: 358753
URL: http://svnweb.freebsd.org/changeset/ports/358753
QAT: https://qat.redports.org/buildarchive/r358753/

Log:
  - Support staging.
  - Apply local patch to avoid a complaint from the compiler:
    "Function <glutStrokeWidth> called without first calling 'glutInit'."
  
  PR:		190833
  Submitted by:	olevole@olevole.ru (maintainer)

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

Modified: head/games/netherearth/Makefile
==============================================================================
--- head/games/netherearth/Makefile	Sat Jun 21 21:58:45 2014	(r358752)
+++ head/games/netherearth/Makefile	Sat Jun 21 22:02:46 2014	(r358753)
@@ -3,7 +3,7 @@
 
 PORTNAME=	netherearth
 PORTVERSION=	0.51
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://move.kirishi.ru/soft/netherearth/
 
@@ -15,14 +15,13 @@ GNU_CONFIGURE=	yes
 USE_GL=		glut
 USE_SDL=	sdl mixer
 
-NO_STAGE=	yes
 pre-install:
-	if [ ! -d ${PREFIX}/share/netherearth ] ; then \
-		${MKDIR} ${PREFIX}/share/netherearth ;\
+	if [ ! -d ${STAGEDIR}${PREFIX}/share/netherearth ] ; then \
+		${MKDIR} ${STAGEDIR}${PREFIX}/share/netherearth ;\
 	fi
-	${CP} -R ${WRKSRC}/maps ${PREFIX}/share/netherearth/
-	${CP} -R ${WRKSRC}/models ${PREFIX}/share/netherearth/
-	${CP} -R ${WRKSRC}/sound ${PREFIX}/share/netherearth/
-	${CP} -R ${WRKSRC}/textures ${PREFIX}/share/netherearth/
+	${CP} -R ${WRKSRC}/maps ${STAGEDIR}${PREFIX}/share/netherearth/
+	${CP} -R ${WRKSRC}/models ${STAGEDIR}${PREFIX}/share/netherearth/
+	${CP} -R ${WRKSRC}/sound ${STAGEDIR}${PREFIX}/share/netherearth/
+	${CP} -R ${WRKSRC}/textures ${STAGEDIR}${PREFIX}/share/netherearth/
 
 .include <bsd.port.mk>

Added: head/games/netherearth/files/patch-main.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/netherearth/files/patch-main.cpp	Sat Jun 21 22:02:46 2014	(r358753)
@@ -0,0 +1,21 @@
+--- main.cpp.orig	2014-06-09 19:39:33.355708525 +0400
++++ main.cpp	2014-06-09 19:40:20.729705674 +0400
+@@ -20,6 +20,9 @@
+ #include "piece3dobject.h"
+ #include "nether.h"
+ 
++#include "GL/gl.h"
++#include "GL/glut.h"
++
+ /*                                              GLOBAL VARIABLES INITIALIZATION:                                                        */ 
+ 
+ int SCREEN_X=640;
+@@ -158,6 +161,8 @@
+ 	screen_sfc = initialization((fullscreen ? SDL_FULLSCREEN : 0));
+ 	if (screen_sfc==0) return 0;
+ 
++	glutInit(&argc, argv);
++
+ 	time=init_time=SDL_GetTicks();
+ 
+ 	while (!quit) {



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