Update to 0.7.1 and unbreak.

6 files changed, 163 insertions, 40 deletions

diff --git a/devel/ruby-rudl/Makefile b/devel/ruby-rudl/Makefile
index d0a1dd4e0562..53d0e16d31e9 100644
--- a/devel/ruby-rudl/Makefile
+++ b/devel/ruby-rudl/Makefile
@@ -6,34 +6,35 @@
 #
 
 PORTNAME=	rudl
-PORTVERSION=	0.4
-PORTREVISION=	3
+PORTVERSION=	0.7.1
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://froukepc.dhs.org/rudl/download/antiques/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A high level library to use SDL from Ruby
 
-BROKEN=		"Does not build"
-
-USE_SDL=	image mixer ttf sdl
+USE_SDL=	gfx image mixer ttf sdl
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
+NO_WRKSUBDIR=	yes
 CONFIGURE_ARGS=	--with-sdl-config="sdl11-config"
 INSTALL_TARGET=	site-install
 
-DOCS=		INSTALL.txt LICENSE.txt README.txt WARRANTY.txt
+DOCS=		README.txt WARRANTY.txt docs/*
+EXAMPLES=	samples/*
 
-post-patch:
-	${RUBY} -i -pe 'gsub %r:\.\./:, ""' ${WRKSRC}/samples/*.rb
+post-extract:
+	${RUBY} -i -pe 'sub(/\r$$/, "")' ${WRKSRC}/*.[ch]
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/* ${RUBY_MODEXAMPLESDIR}/
+	${CP} -R ${WRKSRC}/samples/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/devel/ruby-rudl/distinfo b/devel/ruby-rudl/distinfo
index 8cd93cb0c1e2..2fd4a6ece01a 100644
--- a/devel/ruby-rudl/distinfo
+++ b/devel/ruby-rudl/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/rudl-0.4.tar.gz) = 52561ba5eb9266bc883df3d5ab04a6bc
-SIZE (ruby/rudl-0.4.tar.gz) = 84507
+MD5 (ruby/rudl-0.7.1-source.tar.gz) = 372c44f2e0ec42ee7ec3f717924b02a2
+SIZE (ruby/rudl-0.7.1-source.tar.gz) = 765882
diff --git a/devel/ruby-rudl/files/patch-bitmask.c b/devel/ruby-rudl/files/patch-bitmask.c
new file mode 100644
index 000000000000..a1a543344641
--- /dev/null
+++ b/devel/ruby-rudl/files/patch-bitmask.c
@@ -0,0 +1,11 @@
+--- bitmask.c.orig	Sat Sep  7 19:51:41 2002
++++ bitmask.c	Mon Apr 19 04:20:51 2004
+@@ -26,7 +26,7 @@
+  *Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  */
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "bitmask.h"
+ 
+ #define MIN(a,b) ((a) < (b) ? (a) : (b))
diff --git a/devel/ruby-rudl/files/patch-extconf.rb b/devel/ruby-rudl/files/patch-extconf.rb
index 9e503ce20268..fb29c73ff798 100644
--- a/devel/ruby-rudl/files/patch-extconf.rb
+++ b/devel/ruby-rudl/files/patch-extconf.rb
@@ -1,14 +1,31 @@
---- extconf.rb.orig	Wed May 16 02:55:22 2001
-+++ extconf.rb	Wed May 16 03:51:59 2001
-@@ -24,9 +24,7 @@
- have_header('SDL_image.h')
- have_header('SDL_mixer.h')
- 
--if have_library('SDL', 'SDL_Quit') and 
--		have_library('SDLmain') and 
--		have_header('SDL.h') then
--
-+if have_func('SDL_Quit') and 
-+    have_header('SDL.h') then
- 	create_makefile('RUDL')
- end
+--- extconf.rb.orig	Sat Sep 27 07:59:45 2003
++++ extconf.rb	Mon Apr 19 04:07:30 2004
+@@ -52,14 +52,14 @@
+ windows=mswin32||cygwin

+ unix=!windows

+ 

+-$CFLAGS+="-funroll-loops " if !mswin32

++$CFLAGS+=" -funroll-loops " if !mswin32

+ 

+-$CFLAGS+="-Wall " if unix||cygwin

+-$CPPFLAGS+="-GX " if mswin32

++$CFLAGS+=" -Wall " if unix||cygwin

++$CPPFLAGS+=" -GX " if mswin32

+ 

+ if unix

+-	$CFLAGS += `#{sdl_config} --cflags`.chomp

+-	$LDFLAGS += `#{sdl_config} --libs`.chomp

++	$CFLAGS += " " + `#{sdl_config} --cflags`.chomp

++	$LDFLAGS += " " + `#{sdl_config} --libs`.chomp

+ end

+ 

+ puts '* Checking for optional files'

+@@ -99,7 +99,7 @@
+ 

+ puts '* Checking for required files'

+ puts ' - SDL from http://www.libsdl.org/download-1.2.html'

+-if have_library('SDL', 'SDL_Quit') and have_header('SDL.h')

++if have_func('SDL_Quit') and have_header('SDL.h')

+ 	create_makefile('RUDL')

+ 	puts '* Done! You may now run make.'

+ else

diff --git a/devel/ruby-rudl/files/patch-rudl_video_surface.c b/devel/ruby-rudl/files/patch-rudl_video_surface.c
new file mode 100644
index 000000000000..af806834d9a9
--- /dev/null
+++ b/devel/ruby-rudl/files/patch-rudl_video_surface.c
@@ -0,0 +1,11 @@
+--- rudl_video_surface.c.orig	Sun Oct 19 20:26:13 2003
++++ rudl_video_surface.c	Mon Apr 19 04:14:08 2004
+@@ -58,7 +58,7 @@
+ 	return surface;
+ }
+ 
+-__inline__ void setMasksFromBPP(Uint32 bpp, boolean alphaWanted, Uint32* Rmask, Uint32* Gmask, Uint32* Bmask, Uint32* Amask)
++__inline__ void setMasksFromBPP(Uint32 bpp, int alphaWanted, Uint32* Rmask, Uint32* Gmask, Uint32* Bmask, Uint32* Amask)
+ {
+ 	*Amask = 0;
+ 	if(alphaWanted && (bpp==32||bpp==16)){
diff --git a/devel/ruby-rudl/pkg-plist b/devel/ruby-rudl/pkg-plist
index 5954ece252bf..599edec16983 100644
--- a/devel/ruby-rudl/pkg-plist
+++ b/devel/ruby-rudl/pkg-plist
@@ -1,20 +1,103 @@
 %%RUBY_SITEARCHLIBDIR%%/RUDL.so
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bounce.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bounceme.bmp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/crap.xm
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/crapola.bmp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/crapola.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bobs.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bounce.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cd.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/collision.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/collision_2.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/crapola.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/draw.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/edit_field_test.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/events.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/flxplay.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/framerate_test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/info.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/joystick.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/mousecursor.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/music.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pixelaccess.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pong.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pong_bip.wav
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pong_blerpblerp.wav
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pong_bop.wav
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/liquid.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/24p_copperplate_blue.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/adlibn.ttf
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/bob.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/bounce.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/crapola.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/crapola_boom.wav
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/crapola_crash.wav
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/crapola_fire.mod
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/crapola_ha_ha_thump.mod
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/crapola_new_ship.wav
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/crapola_ship_boom.wav
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/crapola_shoot.wav
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/goose.ttf
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/hond.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/icon.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/liquid.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/player1.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/polarbear.ttf
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/pong_bip.wav
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/pong_blerpblerp.wav
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/pong_bop.wav
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/mousecursor.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/moveit.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/movesp.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/opengl.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pixelaccess.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/play_music.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pong.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rotozoom.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/Data06/NeHe.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/Data07/crate.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/Data08/glass.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/Data09/Star.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/Data12/cube.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/README.txt
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson01.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson02.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson03.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson04.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson05.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson06.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson07.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson08.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson09.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson12.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sfont.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/stars.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/string_loading.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ttf.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/urlaubtris/interface.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/urlaubtris/urlaubtris.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/urlaubtris/utils.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/zoom.rbw
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/urlaubtris
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rubynehe/Data12
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rubynehe/Data09
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rubynehe/Data08
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rubynehe/Data07
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rubynehe/Data06
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rubynehe
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/media
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/INSTALL.txt
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/LICENSE.txt
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.txt
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/WARRANTY.txt
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/howto_install.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/howto_use.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/makedocs.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl.css
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_audio.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_cdrom.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_events.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_joystick.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_keyboard.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_mouse.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_movie.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_sfont.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_timer.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_ttf.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_video.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_video_bitmask.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_video_display_surface.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_video_rect.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_video_sdl_gfx.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl_video_surface.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/sfont.gif
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%