From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 30 22:50:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 218131065676 for ; Thu, 30 Oct 2008 22:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EBA938FC0C for ; Thu, 30 Oct 2008 22:50:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id m9UMo0Cl019439 for ; Thu, 30 Oct 2008 22:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id m9UMo0Nj019438; Thu, 30 Oct 2008 22:50:00 GMT (envelope-from gnats) Resent-Date: Thu, 30 Oct 2008 22:50:00 GMT Resent-Message-Id: <200810302250.m9UMo0Nj019438@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Bernhard Schmidt Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F9DF1065675 for ; Thu, 30 Oct 2008 22:46:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id F12E58FC2A for ; Thu, 30 Oct 2008 22:46:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id m9UMkUao071015 for ; Thu, 30 Oct 2008 22:46:30 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id m9UMkU5D071014; Thu, 30 Oct 2008 22:46:30 GMT (envelope-from nobody) Message-Id: <200810302246.m9UMkU5D071014@www.freebsd.org> Date: Thu, 30 Oct 2008 22:46:30 GMT From: Bernhard Schmidt To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/128491: games/el[-data] unusable because of outdated version X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Oct 2008 22:50:01 -0000 >Number: 128491 >Category: ports >Synopsis: games/el[-data] unusable because of outdated version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Oct 30 22:50:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Bernhard Schmidt >Release: FreeBSD 7.1-BETA2 i386 >Organization: >Environment: FreeBSD julie.lab.sad1.techwires.net 7.1-BETA2 FreeBSD 7.1-BETA2 #0: Mon Oct 13 04:23:28 UTC 2008 root@logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: The version of games/el and games/el-data is unusable with the current Eternal-Lands server version 1.7.0. Right after the client connects to the server it is booted with the message: This version is no longer supported, please update! >How-To-Repeat: Install games/el and start el. >Fix: Update to 1.7.0 NOTE: el-170.tar.bz2 is an archive of 'cvs -z3 -d:pserver:anonymous@cvs.elc.berlios.de:/cvsroot/elc co -r elc_1_7_0 elc' Patch attached with submission follows: diff -urN games/el.orig/Makefile games/el/Makefile --- games/el.orig/Makefile 2008-03-22 09:55:32.000000000 +0100 +++ games/el/Makefile 2008-10-30 22:00:01.000000000 +0100 @@ -6,10 +6,10 @@ # PORTNAME= el -PORTVERSION= 140 -PORTREVISION= 2 +PORTVERSION= 170 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ +MASTER_SITES= http://el.techwires.net/elc/ \ + ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} DIST_SUBDIR= ${PORTNAME} @@ -31,7 +31,7 @@ USE_GL= yes ALL_TARGET= el.x86 -MAKEFILE= Makefile.bsdg +MAKEFILE= Makefile.linux PLIST= ${WRKDIR}/pkg-plist .include @@ -44,10 +44,6 @@ BROKEN= Does not compile on sparc64 .endif -post-extract: - @cd ${WRKSRC} && \ - ${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e 's|malloc.h|stdlib.h|g' "{}" \; - pre-install: @${ECHO} "#!/bin/sh" > ${WRKDIR}/el @${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/el diff -urN games/el.orig/distinfo games/el/distinfo --- games/el.orig/distinfo 2007-08-20 09:18:28.000000000 +0200 +++ games/el/distinfo 2008-10-30 20:58:58.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (el/el-140.tar.bz2) = 664e3f527bfe4b0692ad351707e51b94 -SHA256 (el/el-140.tar.bz2) = 325f95ced420088874f70b3a6f9dd864e14cc67018d484abd3232244917da6ec -SIZE (el/el-140.tar.bz2) = 1474451 +MD5 (el/el-170.tar.bz2) = f4afd8b1267175163a4cbe64a63a13ab +SHA256 (el/el-170.tar.bz2) = e9cec42d28a8c525883743a515acee6961e5378962514a603f97bc81d2765b31 +SIZE (el/elc-170.tar.bz2) = 1876840 diff -urN games/el.orig/files/patch-Makefile.bsdg games/el/files/patch-Makefile.bsdg --- games/el.orig/files/patch-Makefile.bsdg 2008-04-19 19:48:58.000000000 +0200 +++ games/el/files/patch-Makefile.bsdg 1970-01-01 01:00:00.000000000 +0100 @@ -1,63 +0,0 @@ ---- Makefile.bsdg Sun Aug 19 19:21:10 2007 -+++ Makefile.bsdg Sun Aug 19 19:21:36 2007 -@@ -1,7 +1,7 @@ - .PHONY: clean release docs - - # tune these for your setup & compile options --OPTIONS=-DLINUX -DELC -DPNG_SCREENSHOT -DUSE_FRAMEBUFFER -DNEW_FRUSTUM -DBUG_FIX_3D_OBJECTS_MIN_MAX -DNEW_TEX -DOPTIONS_I18N -DATI_9200_FIX -DNEW_ACTOR_ANIMATION -DAUTO_UPDATE -DCOUNTERS -+OPTIONS=-DFREEBSD -DELC -DPNG_SCREENSHOT -DUSE_FRAMEBUFFER -DNEW_FRUSTUM -DBUG_FIX_3D_OBJECTS_MIN_MAX -DNEW_TEX -DOPTIONS_I18N -DATI_9200_FIX -DNEW_ACTOR_ANIMATION -DCOUNTERS - - #-DX86_64 - #-DTIMER_CHECK -@@ -25,20 +25,19 @@ - #-DAFK_FIX # fixes afk messages to count only PM's, and store and count local messages if the option is selected - #-DFONTS_FIX # dynamically loads all fonts with the filename in the format font*.bmp, and makes them accessable in the options - --PLATFORM=-march=i686 --XDIR=-L/usr/X11R6/lib -+XDIR=-L$(LOCALBASE)/lib - CWARN= - #-Wdeclaration-after-statement -Wall -Werror - CPPWARN= - #-Wall -Werror - - # basic compiling and linking - rarely changed --CFLAGS=$(PLATFORM) $(CWARN) -g -ggdb -pipe $(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/ --_CFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags) --CXXFLAGS=$(PLATFORM) $(CPPWARN) -O -ggdb -pipe -I/usr/local/include $(OPTIONS) --_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) -+CFLAGS+=$(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/ -+_CFLAGS=$(CFLAGS) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -+CXXFLAGS+=-I$(LOCALBASE)/include $(OPTIONS) -+_CXXFLAGS=$(CXXFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) - --LDFLAGS=$(shell sdl11-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng -+LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lalut -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng - _LDFLAGS=$(XDIR) -lGL -lpthread -lz - STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libopenal.a libs/libvorbisfile.a libs/libvorbis.a libs/libogg.a libs/libxml2.a libs/libcal3d.a - -@@ -54,7 +53,7 @@ - ignore.o init.o interface.o items.o \ - keys.o knowledge.o lights.o list.o loading_win.o loginwin.o \ - main.o manufacture.o map_io.o mapwin.o \ -- md2loader.o md5.o misc.o multiplayer.o \ -+ md5.o misc.o multiplayer.o \ - new_actors.o new_character.o notepad.o \ - openingwin.o \ - particles.o paste.o pathfinder.o pm_log.o \ -@@ -78,11 +77,11 @@ - - OBJS=$(COBJS) $(CXXOBJS) - --EXE=el.x86.bsd.bin -+EXE=el.x86 - --CC=gcc --CXX=g++ --LINK=gcc -+CC?=gcc -+CXX?=g++ -+LINK?=gcc - - # the compile targets - $(EXE): $(OBJS) diff -urN games/el.orig/files/patch-Makefile.linux games/el/files/patch-Makefile.linux --- games/el.orig/files/patch-Makefile.linux 1970-01-01 01:00:00.000000000 +0100 +++ games/el/files/patch-Makefile.linux 2008-10-30 21:14:22.000000000 +0100 @@ -0,0 +1,20 @@ +--- Makefile.linux.orig 2008-06-13 07:34:12.000000000 +0200 ++++ Makefile.linux 2008-10-30 21:13:43.000000000 +0100 +@@ -3,7 +3,7 @@ + -include make.conf + + # basic compiling and linking - rarely changed +-OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) ++OPTIONS = -DBSD -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) + CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) + _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) +@@ -75,7 +75,7 @@ + DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P)) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)) + #(shell echo $OBJ |sed s/\.o/\.P/)) + +-EXE=el.x86.linux.bin ++EXE=el.x86 + + ifndef CC + CC=gcc diff -urN games/el.orig/files/patch-make.defaults games/el/files/patch-make.defaults --- games/el.orig/files/patch-make.defaults 1970-01-01 01:00:00.000000000 +0100 +++ games/el/files/patch-make.defaults 2008-10-30 21:12:29.000000000 +0100 @@ -0,0 +1,11 @@ +--- make.defaults.orig 2008-10-30 21:10:31.000000000 +0100 ++++ make.defaults 2008-10-30 21:10:56.000000000 +0100 +@@ -54,7 +54,7 @@ + #FEATURES += ZLIBW # Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor + + PLATFORM=-march=i686 +-XDIR=-L/usr/X11R6/lib ++XDIR=-L$(LOCALBASE)/lib + CWARN=-Wall -Wdeclaration-after-statement + # -Wno-pointer-sign -Wno-sign-compare -Werror + CXXWARN=-Wall diff -urN games/el.orig/files/patch-text_aliases.c games/el/files/patch-text_aliases.c --- games/el.orig/files/patch-text_aliases.c 1970-01-01 01:00:00.000000000 +0100 +++ games/el/files/patch-text_aliases.c 2008-10-30 21:22:05.000000000 +0100 @@ -0,0 +1,11 @@ +--- text_aliases.c.orig 2008-10-30 21:20:59.000000000 +0100 ++++ text_aliases.c 2008-10-30 21:21:32.000000000 +0100 +@@ -2,6 +2,8 @@ + #include + #ifdef OSX + #include ++ #elif BSD ++ #include + #else + #include + #endif diff -urN games/el-data.orig/Makefile games/el-data/Makefile --- games/el-data.orig/Makefile 2007-08-20 09:18:29.000000000 +0200 +++ games/el-data/Makefile 2008-10-30 20:42:02.000000000 +0100 @@ -6,9 +6,9 @@ # PORTNAME= data -PORTVERSION= 140 +PORTVERSION= 170 CATEGORIES= games -MASTER_SITES= http://el.beplacid.net/downloads/ +MASTER_SITES= http://www.eternal-lands.com/ PKGNAMEPREFIX= el- DISTFILES= ${EL_DATA} DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//} @@ -23,7 +23,7 @@ DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX:S/-//} PLIST= ${WRKDIR}/pkg-plist WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX:S/-//}_install -EL_DATA= ${PKGNAMEPREFIX:S/-/_/}linux_install_${PORTVERSION}.zip +EL_DATA= ${PKGNAMEPREFIX:S/-/_/}linux_${PORTVERSION}_install.zip do-extract: @${MKDIR} ${WRKDIR} diff -urN games/el-data.orig/distinfo games/el-data/distinfo --- games/el-data.orig/distinfo 2007-08-20 09:18:29.000000000 +0200 +++ games/el-data/distinfo 2008-10-30 20:41:36.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (el/el_linux_install_140.zip) = 3e45142635cd0f4fcb769199d30eeff0 -SHA256 (el/el_linux_install_140.zip) = 713700920e461483910f9775e8202138ec8912770e533cf160d54e44f5057da7 -SIZE (el/el_linux_install_140.zip) = 40068971 +MD5 (el/el_linux_170_install.zip) = d3d32e1920efb172e7de58efe0db9788 +SHA256 (el/el_linux_170_install.zip) = 32f0d76064bee90ab66b0d26cc2c4da7ee43c99d107a5b059435d7f2669a3efc +SIZE (el/el_linux_170_install.zip) = 54118197 >Release-Note: >Audit-Trail: >Unformatted: