Attachment 37249 Details for Bug 59382 – file.diff

[patch] file.diff

file.diff (text/plain), 12.68 KB, created by Sebastian Yepes on 2003-11-17 20:50:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Yepes

Created: 2003-11-17 20:50:22 UTC

Size: 12.68 KB

patch

obsolete

>diff -ur esdl.old/Makefile esdl/Makefile
>--- esdl.old/Makefile	Mon Nov 17 18:15:00 2003
>+++ esdl/Makefile	Mon Nov 17 18:15:15 2003
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	esdl
>-PORTVERSION=	0.93.0526
>-PORTREVISION=	1
>+PORTVERSION=	0.93.0909
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>diff -ur esdl.old/distinfo esdl/distinfo
>--- esdl.old/distinfo	Mon Nov 17 18:15:00 2003
>+++ esdl/distinfo	Mon Nov 17 18:16:26 2003
>@@ -1 +1 @@
>-MD5 (erlang/esdl-0.93.0526.src.tar.gz) = ac54d03d0bd7f53ebf84c371cbaabcb2
>+MD5 (erlang/esdl-0.93.0909.src.tar.gz) = f086856666b00211be451269747f14c3
>diff -ur esdl.old/files/patch-c__src_Makefile esdl/files/patch-c__src_Makefile
>--- esdl.old/files/patch-c__src_Makefile	Mon Nov 17 18:15:00 2003
>+++ esdl/files/patch-c__src_Makefile	Mon Nov 17 18:43:39 2003
>@@ -1,42 +1,45 @@
>-
>-$FreeBSD: ports/devel/esdl/files/patch-c__src_Makefile,v 1.4 2003/07/18 09:50:21 olgeni Exp $
>-
>---- c_src/Makefile.orig	Mon May 26 16:13:17 2003
>-+++ c_src/Makefile	Fri Jul 18 11:42:01 2003
>-@@ -5,7 +5,7 @@
>- #     $Id: Makefile,v 1.8 2003/05/26 08:00:46 dgud Exp $
>- #
>+--- c_src/Makefile.ori	Tue Sep  9 10:28:24 2003
>++++ c_src/Makefile	Mon Nov 17 18:34:14 2003
>+@@ -11,7 +11,7 @@
>+ include ../win32_conf/mingw_vars.mk
>+ else
>  
>--OGLDIR  = /usr
>-+OGLDIR  = ${X11BASE}
>+-  OGLDIR  = /usr
>++  OGLDIR  = ${X11BASE}
>  
>  # Uncomment these if your opengl header is located in another directory than
>  # the usual $(OGLDIR)/include/GL/gl.h
>-@@ -15,13 +15,13 @@
>- GL_LIBS		= -L$(OGLDIR)/lib -lGL -lGLU 
>- GL_INCS		= -I$(OGLDIR)/include/$(GL_INCLUDE_DIR)
>- 
>--SDL_LIBS	= $(shell sdl-config --libs)
>-+SDL_LIBS	= $(shell $(SDL_CONFIG) --libs)
>- LIBS		= $(GL_LIBS) $(SDL_LIBS) -lm 
>- 
>--SDLINCS		= $(shell sdl-config --cflags)
>-+SDLINCS		= $(shell $(SDL_CONFIG) --cflags)
>- 
>--CFLAGS	= -g -O2 -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \
>--            $(USE_GL_INCLUDE_DIR) -DSHM -DPTHREADS $(GL_INCS) $(SDLINCS) $(ERLINC)
>-+CFLAGS	+= -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \
>-+            $(USE_GL_INCLUDE_DIR) -DSHM -DPTHREADS $(GL_INCS) $(SDLINCS)
>+@@ -21,14 +21,13 @@
>+   GL_LIBS		= -L$(OGLDIR)/lib -lGL -lGLU 
>+   GL_INCS		= -I$(OGLDIR)/include/$(GL_INCLUDE_DIR)
>+ 
>+-  SDL_LIBS		= $(shell sdl-config --libs)
>+-  SDL_INCS		= $(shell sdl-config --cflags)
>++  SDL_LIBS		= $(shell $(SDL_CONFIG) --libs)
>++  SDL_INCS		= $(shell $(SDL_CONFIG) --cflags)
>+ 
>+   LIBS			= $(GL_LIBS) $(SDL_LIBS) -lm 
>+ 
>+-  CFLAGS		= -g -O2 -funroll-loops -Wall -ffast-math -fpic \
>+-			-fomit-frame-pointer $(USE_GL_INCLUDE_DIR) -DSHM \
>+-			-DPTHREADS $(GL_INCS) $(SDL_INCS) $(ERL_INCS)
>++  CFLAGS		+= -O2 -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \
>++			$(USE_GL_INCLUDE_DIR) -DSHM -DPTHREADS $(GL_INCS) $(SDL_INCS) $(ERL_INCS)
>+ 
>+   CLINKFLAGS 		=  -fpic -shared  
>+ 
>+@@ -38,13 +37,13 @@
>+   ERL_DIR := $(shell echo 'io:format("~s~n",[code:root_dir()]),halt().' | erl | sed 's,^[0-9]*> *,,g' | tail +2)
>+   ERL_INCS = -I$(ERL_DIR)/usr/include
>+ 
>+-  CC = gcc
>++  CC ?= gcc
>+ 
>+ endif
>  
>  TARGETDIR = ../priv
>  
>-@@ -29,8 +29,8 @@
>- ERL_DIR := $(shell echo 'io:format("~s~n",[code:root_dir()]),halt().' | erl | sed 's,^[0-9]*> *,,g' | tail +2)
>- ERLINC = -I$(ERL_DIR)/usr/include
>- 
>--CC = gcc
>--GCC_O	= $(CC) -c $(CFLAGS) $(INCS) $<
>-+CC ?= gcc
>+-GCC_O	= $(CC) -c $(CFLAGS) $<
> +GCC_O	= $(CC) -c $(CFLAGS) $(INCS) $(ERLINC) $<
>  
>  # Files
>diff -ur esdl.old/files/patch-c__src_esdl__events.c esdl/files/patch-c__src_esdl__events.c
>--- esdl.old/files/patch-c__src_esdl__events.c	Mon Nov 17 18:15:00 2003
>+++ esdl/files/patch-c__src_esdl__events.c	Mon Nov 17 18:28:43 2003
>@@ -1,9 +1,6 @@
>-
>-$FreeBSD: ports/devel/esdl/files/patch-c__src_esdl__events.c,v 1.1 2003/01/02 19:57:54 olgeni Exp $
>-
>---- c_src/esdl_events.c.orig	Mon Dec  9 23:13:11 2002
>-+++ c_src/esdl_events.c	Mon Dec  9 23:13:35 2002
>-@@ -14,7 +14,11 @@
>+--- c_src/esdl_events.c.ori	Tue Sep  9 10:28:24 2003
>++++ c_src/esdl_events.c	Mon Nov 17 18:23:24 2003
>+@@ -15,7 +15,11 @@
>  #ifdef WIN32
>  #include <SDL_events.h>
>  #else
>@@ -14,4 +11,4 @@
> +#endif
>  #endif
>  
>- /* Foward decls */
>+ #define MAX_EVENT_SIZE 13
>diff -ur esdl.old/files/patch-c__src_esdl__video.c esdl/files/patch-c__src_esdl__video.c
>--- esdl.old/files/patch-c__src_esdl__video.c	Mon Nov 17 18:15:00 2003
>+++ esdl/files/patch-c__src_esdl__video.c	Mon Nov 17 18:28:14 2003
>@@ -1,9 +1,6 @@
>-
>-$FreeBSD: ports/devel/esdl/files/patch-c__src_esdl__video.c,v 1.1 2003/01/02 19:57:54 olgeni Exp $
>-
>---- c_src/esdl_video.c.orig	Mon Dec  9 23:12:18 2002
>-+++ c_src/esdl_video.c	Mon Dec  9 23:13:01 2002
>-@@ -18,7 +18,11 @@
>+--- c_src/esdl_video.c.ori	Tue Sep  9 10:28:24 2003
>++++ c_src/esdl_video.c	Mon Nov 17 18:24:48 2003
>+@@ -16,7 +16,11 @@
>  #ifdef WIN32
>  #include <SDL_syswm.h>
>  #else
>@@ -14,4 +11,4 @@
> +#endif
>  #endif
>  
>- int es_setVideoMode(sdl_data *sd, int len, char * buff) 
>+ void es_setVideoMode(sdl_data *sd, int len, char* bp) 
>diff -ur esdl.old/pkg-plist esdl/pkg-plist
>--- esdl.old/pkg-plist	Mon Nov 17 18:15:00 2003
>+++ esdl/pkg-plist	Mon Nov 17 21:21:01 2003
>@@ -1,81 +1,87 @@
>-lib/erlang/lib/esdl-%%VERSION%%/Readme
>-lib/erlang/lib/esdl-%%VERSION%%/Readme.MacOSX-Cocoa
>+lib/erlang/lib/esdl-%%VERSION%%/src/esdl.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_video.erl
>+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_util.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_util.erl
>+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_mouse.erl
>+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_keyboard.erl
>+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_joystick.erl
>+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_events.erl
>+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_audio.erl
>+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_active.erl
>+lib/erlang/lib/esdl-%%VERSION%%/src/sdl.erl
>+lib/erlang/lib/esdl-%%VERSION%%/src/glu_funcs.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/src/glu.erl
>+lib/erlang/lib/esdl-%%VERSION%%/src/glext_funcs.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/src/gl_funcs.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/src/gl.erl
>+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_video_funcs.hrl
> lib/erlang/lib/esdl-%%VERSION%%/c_src/CPS.h
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/SDLMain.h
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl.h
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_audio.c
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_audio.h
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_conv.h
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_driver.c
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_events.c
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_events.h
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gen.c
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl.c
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl.h
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext.c
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext.h
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu.c
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu.h
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_spec.c
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_util.c
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_util.h
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_video.c
>-lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_video.h
> lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_wrapper.c
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_video.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_video.c
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_util.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_util.c
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_spec.c
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_sdl_fp.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu_fp.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu.c
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext_fp.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext.c
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl_fp.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl.c
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gen.c
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_events.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_events.c
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_driver.c
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_conv.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_audio.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_audio.c
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl.h
>+lib/erlang/lib/esdl-%%VERSION%%/c_src/SDLMain.h
> lib/erlang/lib/esdl-%%VERSION%%/c_src/hexdump.c
>+lib/erlang/lib/esdl-%%VERSION%%/include/gl.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_mouse.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_keyboard.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_joystick.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_events.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_audio.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_active.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/include/sdl.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/include/glu.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_video.hrl
> lib/erlang/lib/esdl-%%VERSION%%/doc/gl.html
>-lib/erlang/lib/esdl-%%VERSION%%/doc/glu.html
>-lib/erlang/lib/esdl-%%VERSION%%/doc/index.html
>-lib/erlang/lib/esdl-%%VERSION%%/doc/sdl.html
>-lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_active.html
>-lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_audio.html
>-lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_events.html
>-lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_joystick.html
>-lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_keyboard.html
>-lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_mouse.html
> lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_util.html
>+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_mouse.html
>+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_keyboard.html
>+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_joystick.html
>+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_events.html
>+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_audio.html
>+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_active.html
>+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl.html
>+lib/erlang/lib/esdl-%%VERSION%%/doc/index.html
>+lib/erlang/lib/esdl-%%VERSION%%/doc/glu.html
> lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_video.html
> lib/erlang/lib/esdl-%%VERSION%%/ebin/gl.beam
>-lib/erlang/lib/esdl-%%VERSION%%/ebin/glu.beam
>-lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl.beam
>-lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_active.beam
>-lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_audio.beam
>-lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_events.beam
>-lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_joystick.beam
>-lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_keyboard.beam
>-lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_mouse.beam
> lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_util.beam
>+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_mouse.beam
>+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_keyboard.beam
>+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_joystick.beam
>+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_events.beam
>+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_audio.beam
>+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_active.beam
>+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl.beam
>+lib/erlang/lib/esdl-%%VERSION%%/ebin/glu.beam
> lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_video.beam
>-lib/erlang/lib/esdl-%%VERSION%%/include/gl.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/include/glu.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/include/old_gl.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/include/sdl.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/include/sdl_active.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/include/sdl_audio.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/include/sdl_events.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/include/sdl_joystick.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/include/sdl_keyboard.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/include/sdl_mouse.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/include/sdl_video.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/license.terms
>+lib/erlang/lib/esdl-%%VERSION%%/ebin
> lib/erlang/lib/esdl-%%VERSION%%/priv/sdl_driver.so
>-lib/erlang/lib/esdl-%%VERSION%%/src/esdl.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/src/gl.erl
>-lib/erlang/lib/esdl-%%VERSION%%/src/gl_funcs.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/src/glext_funcs.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/src/glu.erl
>-lib/erlang/lib/esdl-%%VERSION%%/src/glu_funcs.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/src/sdl.erl
>-lib/erlang/lib/esdl-%%VERSION%%/src/sdl_active.erl
>-lib/erlang/lib/esdl-%%VERSION%%/src/sdl_audio.erl
>-lib/erlang/lib/esdl-%%VERSION%%/src/sdl_events.erl
>-lib/erlang/lib/esdl-%%VERSION%%/src/sdl_joystick.erl
>-lib/erlang/lib/esdl-%%VERSION%%/src/sdl_keyboard.erl
>-lib/erlang/lib/esdl-%%VERSION%%/src/sdl_mouse.erl
>-lib/erlang/lib/esdl-%%VERSION%%/src/sdl_util.erl
>-lib/erlang/lib/esdl-%%VERSION%%/src/sdl_util.hrl
>-lib/erlang/lib/esdl-%%VERSION%%/src/sdl_video.erl
>-lib/erlang/lib/esdl-%%VERSION%%/src/sdl_video_funcs.hrl
>+lib/erlang/lib/esdl-%%VERSION%%/priv
>+lib/erlang/lib/esdl-%%VERSION%%/Readme.win32
>+lib/erlang/lib/esdl-%%VERSION%%/Readme.MacOSX-Cocoa
>+lib/erlang/lib/esdl-%%VERSION%%/Readme
>+lib/erlang/lib/esdl-%%VERSION%%/license.terms
> lib/erlang/lib/esdl-%%VERSION%%/vsn
> @dirrm lib/erlang/lib/esdl-%%VERSION%%/src
> @dirrm lib/erlang/lib/esdl-%%VERSION%%/priv

Actions: View | Diff

Attachments on bug 59382: 37249