6 files changed, 118 insertions, 91 deletions

diff --git a/devel/ruby-rudl/Makefile b/devel/ruby-rudl/Makefile
index 55c804666844..c7b55af7d9ec 100644
--- a/devel/ruby-rudl/Makefile
+++ b/devel/ruby-rudl/Makefile
@@ -6,41 +6,61 @@
 #
 
 PORTNAME=	rudl
-PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTVERSION=	0.8
 CATEGORIES=	devel ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
+DISTFILES=	${DISTNAME}-source${EXTRACT_SUFX}
 DIST_SUBDIR=	ruby
-DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	erik@smluc.org
 COMMENT=	A high level library to use SDL from Ruby
 
-BROKEN=		"Checksum mismatch"
-
 USE_SDL=	gfx image mixer ttf sdl
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
-NO_WRKSUBDIR=	yes
+#NO_WRKSUBDIR=	yes
 CONFIGURE_ARGS=	--with-sdl-config="sdl11-config"
 INSTALL_TARGET=	site-install
 
-DOCS=		README.txt WARRANTY.txt docs/*
+DOCS=	RUDL/audio.html \
+	RUDL/cdrom.html \
+	RUDL/displaysurface.html \
+	RUDL/fonts.html \
+	RUDL/index.html \
+	RUDL/input.html \
+	RUDL/misc.html \
+	RUDL/rudl.html \
+	RUDL/sfont.gif \
+	RUDL/surface.html \
+	RUDL/timer.html \
+	dokumentat.css \
+	howto_install.html \
+	howto_use.html \
+	index.html \
+	rudl.css
+
 EXAMPLES=	samples/*
 
 post-extract:
-	${RUBY} -i -pe 'sub(/\r$$/, "")' ${WRKSRC}/*.[ch]
+	@${RUBY} -i -pe 'sub(/\r$$/, "")' \
+		${WRKSRC}/*.[ch] \
+		${WRKSRC}/extconf.rb
+
+post-patch:
+	@${RUBY} -i -pe 'sub(/malloc.h/, "stdlib.h")' \
+		${WRKSRC}/bitmask.c
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/samples/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
+	${MKDIR} ${RUBY_MODDOCDIR}/RUDL
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${RUBY_MODDOCDIR}/${f}
 .endfor
 .endif
 
diff --git a/devel/ruby-rudl/distinfo b/devel/ruby-rudl/distinfo
index 2fd4a6ece01a..1cce83ba3434 100644
--- a/devel/ruby-rudl/distinfo
+++ b/devel/ruby-rudl/distinfo
@@ -1,2 +1,3 @@
-MD5 (ruby/rudl-0.7.1-source.tar.gz) = 372c44f2e0ec42ee7ec3f717924b02a2
-SIZE (ruby/rudl-0.7.1-source.tar.gz) = 765882
+MD5 (ruby/rudl-0.8-source.tar.gz) = aba322c3fa45b2043e186f7551cac64b
+SHA256 (ruby/rudl-0.8-source.tar.gz) = b01a7cc4095db36b2e6572bc779d8a090ebc7e590c4786d5f322077548910f2a
+SIZE (ruby/rudl-0.8-source.tar.gz) = 926107
diff --git a/devel/ruby-rudl/files/patch-bitmask.c b/devel/ruby-rudl/files/patch-bitmask.c
deleted file mode 100644
index a1a543344641..000000000000
--- a/devel/ruby-rudl/files/patch-bitmask.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 fb29c73ff798..4dc7c1ecd1dc 100644
--- a/devel/ruby-rudl/files/patch-extconf.rb
+++ b/devel/ruby-rudl/files/patch-extconf.rb
@@ -1,31 +1,11 @@
---- 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

+--- extconf.rb.orig	Wed Dec  7 11:12:50 2005
++++ extconf.rb	Wed Dec  7 11:14:10 2005
+@@ -105,7 +105,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
deleted file mode 100644
index af806834d9a9..000000000000
--- a/devel/ruby-rudl/files/patch-rudl_video_surface.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 599edec16983..d71151844b22 100644
--- a/devel/ruby-rudl/pkg-plist
+++ b/devel/ruby-rudl/pkg-plist
@@ -1,10 +1,43 @@
-%%RUBY_SITEARCHLIBDIR%%/RUDL.so
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/RUDL/audio.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/RUDL/cdrom.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/RUDL/displaysurface.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/RUDL/fonts.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/RUDL/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/RUDL/input.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/RUDL/misc.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/RUDL/rudl.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/RUDL/sfont.gif
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/RUDL/surface.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/RUDL/timer.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/dokumentat.css
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/howto_install.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/howto_use.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rudl.css
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/barrage.prefs.yaml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/barrage.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/gameoverstate.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/gamestate.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/graphics.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/menustate.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/particle.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/playfield.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/rsc/adlibn.ttf
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/rsc/arrow_small.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/rsc/polarbear.ttf
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/rsc/tank.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/tank.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/utils/alg3d.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/utils/state_engine.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/barrage/utils/timer_control.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic.rbw
 %%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%%/crossfader.rbw
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/draw.rbw
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/edit_field_test.rbw
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/events.rb
@@ -15,8 +48,36 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/liquid.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/24p_copperplate_blue.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/adlibn.ttf
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/ball.bmp
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/bob.gif
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/bounce.bmp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_01.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_02.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_03.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_04.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_05.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_06.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_07.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_08.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_09.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_10.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_11.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_12.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_13.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_14.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_17.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_18.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_19.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_20.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_21.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_22.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_23.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_24.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_25.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_26.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_27.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_28.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/c64_font_29.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/crapola.bmp
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/crapola_boom.wav
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/crapola_crash.wav
@@ -28,18 +89,22 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/goose.ttf
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/hond.bmp
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/icon.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/lake.jpg
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/liquid.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/media/mslug2-1.png
 %%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%%/media/sky.jpg
 %%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%%/polyscope.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pong.rbw
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rotozoom.rbw
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/Data06/NeHe.bmp
@@ -58,6 +123,9 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson08.rbw
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson09.rbw
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubynehe/lesson12.rbw
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/scale2x.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/scale4x.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sdl_ball.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sfont.rbw
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/stars.rbw
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/string_loading.rbw
@@ -66,6 +134,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/urlaubtris/urlaubtris.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/urlaubtris/utils.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/zoom.rbw
+%%RUBY_SITEARCHLIBDIR%%/RUDL.so
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/urlaubtris
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rubynehe/Data12
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rubynehe/Data09
@@ -74,30 +143,9 @@
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rubynehe/Data06
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/rubynehe
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/media
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/barrage/utils
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/barrage/rsc
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/barrage
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%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%%/RUDL
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%