Date: Sat, 22 Oct 2011 21:05:45 GMT From: green dog <fiziologus@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/161910: [UPDATE] games/darkplaces Message-ID: <201110222105.p9ML5jRZ056448@red.freebsd.org> Resent-Message-ID: <201110222110.p9MLA8m4071482@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161910 >Category: ports >Synopsis: [UPDATE] games/darkplaces >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 22 21:10:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: green dog >Release: FreeBSD-8.2 >Organization: >Environment: FreeBSD localhost.my.domain 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: update to 20110628 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN darkplaces/Makefile darkplaces.new/Makefile --- darkplaces/Makefile 2010-06-07 00:43:45.000000000 +0400 +++ darkplaces.new/Makefile 2011-10-23 00:45:19.000000000 +0400 @@ -6,8 +6,7 @@ # PORTNAME= darkplaces -PORTVERSION= 20071120 -PORTREVISION= 5 +PORTVERSION= 20110628 CATEGORIES= games MASTER_SITES= http://offload1.icculus.org:9090/twilight/darkplaces/files/ DISTNAME= ${PORTNAME}engine${PORTVERSION} diff -ruN darkplaces/distinfo darkplaces.new/distinfo --- darkplaces/distinfo 2011-07-03 18:23:43.000000000 +0400 +++ darkplaces.new/distinfo 2011-10-22 23:44:17.000000000 +0400 @@ -1,2 +1,2 @@ -SHA256 (darkplacesengine20071120.zip) = a5a06e5dd692375f8ca936841832e306838916f694dd1d8d0972ce63a97235ef -SIZE (darkplacesengine20071120.zip) = 10272585 +SHA256 (darkplacesengine20110628.zip) = d2464c681e3fdcc66cb090e79c44c0c173a43b6f181a12e500b0b1fd7d73ffce +SIZE (darkplacesengine20110628.zip) = 23377408 diff -ruN darkplaces/files/patch-cd_bsd.c darkplaces.new/files/patch-cd_bsd.c --- darkplaces/files/patch-cd_bsd.c 1970-01-01 03:00:00.000000000 +0300 +++ darkplaces.new/files/patch-cd_bsd.c 2011-10-23 01:02:47.000000000 +0400 @@ -0,0 +1,11 @@ +--- cd_bsd.c.orig 2011-10-23 01:01:02.000000000 +0400 ++++ cd_bsd.c 2011-10-23 01:02:00.000000000 +0400 +@@ -39,7 +39,7 @@ + #ifndef __FreeBSD__ + # define DEFAULT_CD_DEVICE _PATH_DEV "cd0" + #else +-# define DEFAULT_CD_DEVICE "/dev/acd0c" ++# define DEFAULT_CD_DEVICE "/dev/acd0" + #endif + + static int cdfile = -1; diff -ruN darkplaces/files/patch-glquake.h darkplaces.new/files/patch-glquake.h --- darkplaces/files/patch-glquake.h 1970-01-01 03:00:00.000000000 +0300 +++ darkplaces.new/files/patch-glquake.h 2011-10-22 23:41:31.000000000 +0400 @@ -0,0 +1,14 @@ +--- glquake.h.orig 2011-10-22 00:02:41.000000000 +0400 ++++ glquake.h 2011-10-21 23:16:37.000000000 +0400 +@@ -758,9 +758,11 @@ + + // GL 2.0 shader objects + #ifndef GL_PROGRAM_OBJECT ++#ifndef __glext_h_ + // 1-byte character string + typedef char GLchar; + #endif ++#endif + extern void (GLAPIENTRY *qglDeleteShader)(GLuint obj); + extern void (GLAPIENTRY *qglDeleteProgram)(GLuint obj); + //extern GLuint (GLAPIENTRY *qglGetHandle)(GLenum pname); diff -ruN darkplaces/files/patch-makefile darkplaces.new/files/patch-makefile --- darkplaces/files/patch-makefile 1970-01-01 03:00:00.000000000 +0300 +++ darkplaces.new/files/patch-makefile 2011-10-22 23:41:31.000000000 +0400 @@ -0,0 +1,13 @@ +--- makefile.orig 2011-10-22 23:23:36.000000000 +0400 ++++ makefile 2011-10-22 23:36:14.000000000 +0400 +@@ -171,8 +171,8 @@ + EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ) + + # libjpeg dependency (set these to "" if you want to use dynamic loading instead) +- CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG +- LIB_JPEG=-ljpeg ++ CFLAGS_LIBJPEG="" ++ LIB_JPEG="" + endif + + # Win32 configuration diff -ruN darkplaces/files/patch-makefile.inc darkplaces.new/files/patch-makefile.inc --- darkplaces/files/patch-makefile.inc 2007-12-12 08:05:23.000000000 +0300 +++ darkplaces.new/files/patch-makefile.inc 2011-10-23 00:51:13.000000000 +0400 @@ -1,54 +1,69 @@ ---- makefile.inc.orig Sat Nov 10 06:34:18 2007 -+++ makefile.inc Thu Nov 29 16:39:58 2007 -@@ -1,5 +1,5 @@ - # Choose the compiler you want to use --CC=gcc -+CC?=gcc - - # athlon optimizations - #CPUOPTIMIZATIONS=-march=athlon -@@ -172,7 +172,7 @@ - OBJ_GLX= builddate.c sys_linux.o vid_glx.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON) - - LDFLAGS_UNIXCOMMON=-lm --LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND) -+LDFLAGS_UNIXCL=-L$(LOCALBASE)/lib -lX11 -lXpm -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND) - LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -lvorbis -lvorbisfile -lcurl - LDFLAGS_UNIXSV_PRELOAD=-lz -lcurl - LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -lvorbis -lvorbisfile -lcurl -@@ -376,28 +376,28 @@ +--- makefile.inc.orig 2011-06-01 14:47:42.000000000 +0400 ++++ makefile.inc 2011-10-23 00:50:35.000000000 +0400 +@@ -201,8 +201,8 @@ + #OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS) + #OPTIM_RELEASE=-O2 -fno-strict-aliasing -fno-math-errno -fno-trapping-math -ffinite-math-only -fno-signaling-nans -fcx-limited-range -funroll-loops $(CPUOPTIMIZATIONS) + #OPTIM_RELEASE=-O2 -fno-strict-aliasing -funroll-loops $(CPUOPTIMIZATIONS) +-#OPTIM_RELEASE=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS) +-OPTIM_RELEASE=-O3 -fno-strict-aliasing $(CPUOPTIMIZATIONS) ++OPTIM_RELEASE=$(CPUOPTIMIZATIONS) ++#OPTIM_RELEASE=-O3 -fno-strict-aliasing $(CPUOPTIMIZATIONS) + # NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag + + DO_CC=$(CC) $(CFLAGS) -c $< -o $@ +@@ -219,7 +219,7 @@ + OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON) + + LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) +-LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86dga -lXxf86vm -pthread $(LIB_SOUND) ++LDFLAGS_UNIXCL=-L$(LOCALBASE)/lib -lX11 -lXpm -lXext -lXxf86dga -lXxf86vm -pthread $(LIB_SOUND) + LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl -lmodplug + LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl + LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl -lmodplug +@@ -453,8 +453,8 @@ @echo "========== $(EXE) (debug) ==========" $(MAKE) $(EXE) \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\ -- LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)" +- LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)" LEVEL=2 + CFLAGS+="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\ -+ LDFLAGS+="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)" ++ LDFLAGS+="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)" LEVEL=2 bin-profile : - @echo + $(CHECKLEVEL1) +@@ -462,8 +462,8 @@ @echo "========== $(EXE) (profile) ==========" $(MAKE) $(EXE) \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\ -- LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)" +- LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)" LEVEL=2 + CFLAGS+="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\ -+ LDFLAGS+="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)" ++ LDFLAGS+="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)" LEVEL=2 bin-release : - @echo + $(CHECKLEVEL1) +@@ -471,8 +471,8 @@ @echo "========== $(EXE) (release) ==========" $(MAKE) $(EXE) \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\ -- LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" +- LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" LEVEL=2 + CFLAGS+="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\ -+ LDFLAGS+="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" ++ LDFLAGS+="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" LEVEL=2 $(STRIP) $(EXE) + bin-release-profile : +@@ -496,11 +496,11 @@ + vid_glx.o: vid_glx.c + $(CHECKLEVEL2) +- $(DO_CC) -I/usr/X11R6/include ++ $(DO_CC) -I$(LOCALBASE)/include + + keysym2ucs.o: keysym2ucs.c + $(CHECKLEVEL2) - $(DO_CC) -I/usr/X11R6/include + $(DO_CC) -I$(LOCALBASE)/include vid_sdl.o: vid_sdl.c - $(DO_CC) $(CFLAGS_SDL) + $(CHECKLEVEL2) >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110222105.p9ML5jRZ056448>