From owner-svn-ports-branches@FreeBSD.ORG Tue Nov 25 14:38:06 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E043C3D4; Tue, 25 Nov 2014 14:38:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C140F2B6; Tue, 25 Nov 2014 14:38:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPEc5dv095646; Tue, 25 Nov 2014 14:38:05 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPEc59W095640; Tue, 25 Nov 2014 14:38:05 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201411251438.sAPEc59W095640@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 25 Nov 2014 14:38:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r373410 - in branches/2014Q4/games/el: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 14:38:06 -0000 Author: amdmi3 Date: Tue Nov 25 14:38:04 2014 New Revision: 373410 URL: https://svnweb.freebsd.org/changeset/ports/373410 QAT: https://qat.redports.org/buildarchive/r373410/ Log: MFH: r373391 - Unbreak - Add missing USES=iconv Approved by: portmgr blanket Appeoved by: ports-secteam (rea) Modified: branches/2014Q4/games/el/Makefile branches/2014Q4/games/el/files/patch-Makefile.bsd branches/2014Q4/games/el/files/patch-platform.h Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/games/el/Makefile ============================================================================== --- branches/2014Q4/games/el/Makefile Tue Nov 25 13:39:22 2014 (r373409) +++ branches/2014Q4/games/el/Makefile Tue Nov 25 14:38:04 2014 (r373410) @@ -16,11 +16,11 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/gra libcal3d.so:${PORTSDIR}/graphics/cal3d RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data -USES= gmake openal:al,alut tar:xz +USES= compiler:c++11-lang gmake iconv openal:al,alut tar:xz USE_GNOME= libxml2 USE_SDL= sdl net image USE_GL= yes -LDFLAGS+= -L${LOCALBASE}/lib -lX11 +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lX11 ALL_TARGET= el.bin MAKEFILE= Makefile.bsd Modified: branches/2014Q4/games/el/files/patch-Makefile.bsd ============================================================================== --- branches/2014Q4/games/el/files/patch-Makefile.bsd Tue Nov 25 13:39:22 2014 (r373409) +++ branches/2014Q4/games/el/files/patch-Makefile.bsd Tue Nov 25 14:38:04 2014 (r373410) @@ -22,7 +22,7 @@ +LDFLAGS+=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \ $(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS)) -_LDFLAGS=$(XDIR) -lGL -lpthread -lstdc++ -+_LDFLAGS=$(XDIR) -lGL -pthread -lstdc++ ++_LDFLAGS=$(XDIR) -lGL -pthread # This works on Ubuntu 8.04 (LTS) at least # Install these packages in addition to those required for a standard build @@ -43,7 +43,7 @@ endif ifndef LINK -LINK=gcc -+LINK?=$(CC) ++LINK?=$(CXX) endif all: $(EXE) Modified: branches/2014Q4/games/el/files/patch-platform.h ============================================================================== --- branches/2014Q4/games/el/files/patch-platform.h Tue Nov 25 13:39:22 2014 (r373409) +++ branches/2014Q4/games/el/files/patch-platform.h Tue Nov 25 14:38:04 2014 (r373410) @@ -1,5 +1,5 @@ ---- platform.h.orig -+++ platform.h +--- platform.h.orig 2014-01-06 18:17:50.000000000 +0400 ++++ platform.h 2014-11-21 19:53:36.000000000 +0300 @@ -11,7 +11,7 @@ // http://predef.sourceforge.net/prearch.html , these ought to work on // gcc, Sun Studio and Visual Studio. @@ -9,3 +9,22 @@ #define X86_64 #endif +@@ -85,16 +85,13 @@ + #include "elglext.h" + #define APIENTRY + #define APIENTRYP * +-#elif !defined(BSD) ++#else + #define GL_GLEXT_LEGACY + #include + #include + #undef GL_VERSION_1_2 + #undef GL_VERSION_1_3 +- #include "glext.h" +-#else // BSD +- #include +- #include ++ #include + #endif + + // Inlucde the plaform specific location sound libs