From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:57:49 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7B66CBB4; Wed, 8 Jan 2014 11:57:49 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5B81D10E7; Wed, 8 Jan 2014 11:57:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08Bvnkl051615; Wed, 8 Jan 2014 11:57:49 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BvmtM051607; Wed, 8 Jan 2014 11:57:48 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201401081157.s08BvmtM051607@svn.freebsd.org> From: Rene Ladan Date: Wed, 8 Jan 2014 11:57:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339108 - in branches/2014Q1/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.17 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: Wed, 08 Jan 2014 11:57:49 -0000 Author: rene Date: Wed Jan 8 11:57:47 2014 New Revision: 339108 URL: http://svnweb.freebsd.org/changeset/ports/339108 Log: MFH: r338898 - Update to 193 to be able to connect to the servers again - Repack distribution file, reroll/simplify patches. The original host is gone, and there is no obvious replacement for the distribution file, so roll our own from the referenced git repository: git://git.berlios.de/elc branch master, commit 86780d5dd43b3c9b66fa014944cf1811fa78d161 - Stagify - Strip library versions [1] Submitted by: portlint [1] Approved by: acm (implicit) Approved by: portmgr (bapt) Modified: branches/2014Q1/games/el/Makefile branches/2014Q1/games/el/distinfo branches/2014Q1/games/el/files/patch-Makefile.bsd branches/2014Q1/games/el/files/patch-make.defaults branches/2014Q1/games/el/files/patch-platform.h Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/el/Makefile ============================================================================== --- branches/2014Q1/games/el/Makefile Wed Jan 8 11:56:13 2014 (r339107) +++ branches/2014Q1/games/el/Makefile Wed Jan 8 11:57:47 2014 (r339108) @@ -2,23 +2,20 @@ # $FreeBSD$ PORTNAME= el -PORTVERSION= 192 -PORTREVISION= 3 +PORTVERSION= 193 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ - ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} -DIST_SUBDIR= ${PORTNAME} +MASTER_SITES= LOCAL/rene \ + ftp://rene-ladan.nl/pub/distfiles/ MAINTAINER= acm@FreeBSD.org COMMENT= Eternal Lands is a free 3D MMORPG LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ - libvorbis.so.4:${PORTSDIR}/audio/libvorbis \ - libcal3d.so.12:${PORTSDIR}/graphics/cal3d + libvorbis.so:${PORTSDIR}/audio/libvorbis \ + libcal3d.so:${PORTSDIR}/graphics/cal3d RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data -PROJECTHOST= bsdistfiles -USE_BZIP2= yes +USE_XZ= yes USE_GMAKE= yes USE_OPENAL= al alut USE_GNOME= libxml2 @@ -30,7 +27,6 @@ ALL_TARGET= el.bin MAKEFILE= Makefile.bsd PLIST= ${WRKDIR}/pkg-plist -NO_STAGE= yes .include .if ${ARCH} == "sparc64" @@ -47,8 +43,8 @@ pre-install: @${ECHO} "@dirrmtry %%DATADIR%%" >> ${PLIST} do-install: - @${MKDIR} ${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/el ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/el.bin ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKDIR}/el ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/el.bin ${STAGEDIR}${DATADIR} .include Modified: branches/2014Q1/games/el/distinfo ============================================================================== --- branches/2014Q1/games/el/distinfo Wed Jan 8 11:56:13 2014 (r339107) +++ branches/2014Q1/games/el/distinfo Wed Jan 8 11:57:47 2014 (r339108) @@ -1,2 +1,2 @@ -SHA256 (el/el-192.tar.bz2) = 0a88f38642d1a05c7b533101201b80632af398cb0bdc616d2d33115e0689cb13 -SIZE (el/el-192.tar.bz2) = 2181980 +SHA256 (el-193.tar.xz) = d8b815a1c1169102ed3fbd440b66afc90fa78589f8e49c4ebd1c31addc0021d0 +SIZE (el-193.tar.xz) = 1941152 Modified: branches/2014Q1/games/el/files/patch-Makefile.bsd ============================================================================== --- branches/2014Q1/games/el/files/patch-Makefile.bsd Wed Jan 8 11:56:13 2014 (r339107) +++ branches/2014Q1/games/el/files/patch-Makefile.bsd Wed Jan 8 11:57:47 2014 (r339108) @@ -1,5 +1,5 @@ ---- Makefile.bsd.orig 2011-10-20 11:30:54.000000000 -0500 -+++ Makefile.bsd 2011-10-20 11:40:50.000000000 -0500 +--- Makefile.bsd.orig 2014-01-06 15:25:15.000000000 +0100 ++++ Makefile.bsd 2014-01-06 15:49:31.000000000 +0100 @@ -2,17 +2,19 @@ -include make.conf @@ -12,21 +12,21 @@ -_CFLAGS=$(PLATFORM) -O2 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+CFLAGS+=$(CWARN) $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+_CFLAGS=-fomit-frame-pointer -ffast-math -pipe $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+CXXFLAGS+=$(CXXWARN) $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+_CXXFLAGS=-fomit-frame-pointer -ffast-math $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++CFLAGS+=$(PLATFORM) $(CWARN) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++_CFLAGS=-fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++CXXFLAGS+=$(CXXWARN) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++_CXXFLAGS=-fomit-frame-pointer -ffast-math $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) PNG_SCREENSHOT_LIBS = -lpng -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 \ -+LDFLAGS+=`$(SDL_CONFIG) --libs` $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \ ++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++ # This works on Ubuntu 8.04 (LTS) at least # Install these packages in addition to those required for a standard build -@@ -87,16 +89,16 @@ +@@ -86,16 +88,16 @@ DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P) #(shell echo $OBJ |sed s/\.o/\.P/)) Modified: branches/2014Q1/games/el/files/patch-make.defaults ============================================================================== --- branches/2014Q1/games/el/files/patch-make.defaults Wed Jan 8 11:56:13 2014 (r339107) +++ branches/2014Q1/games/el/files/patch-make.defaults Wed Jan 8 11:57:47 2014 (r339108) @@ -1,15 +1,15 @@ ---- make.defaults.orig 2011-10-20 11:41:47.000000000 -0500 -+++ make.defaults 2011-10-20 11:42:04.000000000 -0500 -@@ -65,8 +65,6 @@ +--- make.defaults.orig ++++ make.defaults +@@ -69,8 +69,6 @@ FEATURES += MIDDLE_MOUSE_PASTE # Paste using the middle mouse button from the pr --PLATFORM=-march=i686 +-PLATFORM=-march=native -XDIR=-L/usr/X11R6/lib CWARN=-Wall -Wdeclaration-after-statement # -Wno-pointer-sign -Wno-sign-compare -Werror CXXWARN=-Wall -@@ -82,7 +80,3 @@ +@@ -86,7 +84,3 @@ CXXWARN=-Wall #EXTRA_INCLUDES=-IC:\\Programme\\Dev-Cpp\\Include #EXTRA_LIBS=-lz #EXTRA_STATICLIBS=libs/zlib.a Modified: branches/2014Q1/games/el/files/patch-platform.h ============================================================================== --- branches/2014Q1/games/el/files/patch-platform.h Wed Jan 8 11:56:13 2014 (r339107) +++ branches/2014Q1/games/el/files/patch-platform.h Wed Jan 8 11:57:47 2014 (r339108) @@ -1,5 +1,5 @@ ---- platform.h 2009-01-20 09:51:39.000000000 -0500 -+++ platform.h 2009-01-20 09:51:58.000000000 -0500 +--- platform.h.orig ++++ platform.h @@ -11,7 +11,7 @@ // http://predef.sourceforge.net/prearch.html , these ought to work on // gcc, Sun Studio and Visual Studio.