Update to 20110416.

Changelog:
* Add --wide option, 16:9 wode screen support.
* Fix SDL related bug.
* Improve Android support.
* Use PDA screen size selection mechanism.

4 files changed, 19 insertions, 39 deletions

diff --git a/games/onscripter/Makefile b/games/onscripter/Makefile
index 5c602e76853..657eac4d261 100644
--- a/games/onscripter/Makefile
+++ b/games/onscripter/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2011/04/22 13:43:38 obache Exp $
+# $NetBSD: Makefile,v 1.5 2011/04/29 17:02:27 ryoon Exp $
 #
 
-DISTNAME=		onscripter-20110320
-PKGREVISION=		1
+DISTNAME=		onscripter-20110416
 CATEGORIES=		games
 MASTER_SITES=		http://onscripter.sourceforge.jp/
 
diff --git a/games/onscripter/distinfo b/games/onscripter/distinfo
index c02e7e21593..9fd285886c9 100644
--- a/games/onscripter/distinfo
+++ b/games/onscripter/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2011/04/10 08:11:56 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2011/04/29 17:02:27 ryoon Exp $
 
-SHA1 (onscripter-20110320.tar.gz) = 90eba76fc04640420c6b2b2e339ee83b2a2d54cb
-RMD160 (onscripter-20110320.tar.gz) = 090cedbf55d98fd523a23ad854083e2ef574a7da
-Size (onscripter-20110320.tar.gz) = 222685 bytes
-SHA1 (patch-Makefile.Linux) = 1858f37ee018e763ebba965972c2333a9ce33c17
-SHA1 (patch-Makefile.onscripter) = e70df448c97fec2b6df9902bfe616050e07c6b1d
+SHA1 (onscripter-20110416.tar.gz) = 2d7b622fb8f1bd6527565baf60d90270a09bf4de
+RMD160 (onscripter-20110416.tar.gz) = f57f6b303ff5a0ddada479f3331c67d991a9f413
+Size (onscripter-20110416.tar.gz) = 224128 bytes
+SHA1 (patch-Makefile.Linux) = 5345657c71b2fb2020e472a9af9bc4d11cfc2fbe
+SHA1 (patch-Makefile.onscripter) = 51e5cac78802322f4ff015b904d030b23b95410c
diff --git a/games/onscripter/patches/patch-Makefile.Linux b/games/onscripter/patches/patch-Makefile.Linux
index d21d12a538f..b7961483f6f 100644
--- a/games/onscripter/patches/patch-Makefile.Linux
+++ b/games/onscripter/patches/patch-Makefile.Linux
@@ -1,45 +1,26 @@
-$NetBSD: patch-Makefile.Linux,v 1.1.1.1 2011/03/02 12:05:19 ryoon Exp $
+$NetBSD: patch-Makefile.Linux,v 1.2 2011/04/29 17:02:27 ryoon Exp $
 
---- Makefile.Linux.orig	2011-02-26 02:18:50.000000000 +0000
+--- Makefile.Linux.orig	2011-04-18 01:51:34.000000000 +0000
 +++ Makefile.Linux
-@@ -3,23 +3,27 @@
- # Makefile.Linux - Makefile rules for linux
- #
- 
--# without OggVorbis and AVI
--#INCS = `sdl-config --cflags` `smpeg-config --cflags`
--#LIBS = `sdl-config --libs` `smpeg-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm
-+# without OggVorbis, AVI and Lua
-+#INCS = `sdl-config --cflags` `smpeg-config --cflags` `pkg-config --cflags SDL_ttf` `pkg-config --cflags SDL_image` `pkg-config --cflags SDL_mixer`
-+#LIBS = `sdl-config --libs` `smpeg-config --libs` `pkg-config --libs SDL_ttf` `pkg-config --libs SDL_image` `pkg-config --libs SDL_mixer` -lbz2 -ljpeg -lm
+@@ -8,11 +8,15 @@
+ #LIBS = `sdl-config --libs` `smpeg-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm
  #DEFS = -DLINUX
  
 -INCS = `sdl-config --cflags` `smpeg-config --cflags` `avifile-config --cflags` -I/usr/include/lua5.1
--# with OggVorbis and AVI
++#INCS = `sdl-config --cflags` `smpeg-config --cflags` `avifile-config --cflags` -I/usr/include/lua5.1
+ # with OggVorbis and AVI
 -LIBS = `sdl-config --libs` `smpeg-config --libs` `avifile-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm -logg -lvorbis -lvorbisfile -llua5.1
--#DEFS = -DLINUX -DUSE_AVIFILE -DUSE_OGG_VORBIS
++#LIBS = `sdl-config --libs` `smpeg-config --libs` `avifile-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm -logg -lvorbis -lvorbisfile -llua5.1
+ #DEFS = -DLINUX -DUSE_AVIFILE -DUSE_OGG_VORBIS
 -DEFS = -DLINUX -DUSE_AVIFILE -DUSE_OGG_VORBIS -DUSE_LUA -DUSE_FONTCONFIG
-+# with OggVorbis, AVI and Lua + fontconfig
-+#INCS = `sdl-config --cflags` `smpeg-config --cflags` `avifile-config --cflags` `pkg-config --cflags SDL_ttf` `pkg-config --cflags SDL_image` `pkg-config --cflags SDL_mixer` `pkg-config --cflags ogg` `pkg-config --cflags vorbis` `pkg-config --cflags vorbisfile` `pkg-config --cflags lua` `pkg-config --cflags fontconfig`
-+#LIBS = `sdl-config --libs` `smpeg-config --libs` `avifile-config --libs` `pkg-config --libs SDL_ttf` `pkg-config --libs SDL_image` `pkg-config --libs SDL_mixer` -lbz2 -ljpeg -lm `pkg-config --libs ogg` `pkg-config --libs vorbis` `pkg-config --libs vorbisfile` `pkg-config --libs lua` `pkg-config --libs fontconfig`
 +#DEFS = -DLINUX -DUSE_AVIFILE -DUSE_OGG_VORBIS -DUSE_LUA -DUSE_FONTCONFIG
-+
 +# with OggVorbis and Lua + fontconfig
 +INCS = `sdl-config --cflags` `smpeg-config --cflags` `pkg-config --cflags SDL_ttf` `pkg-config --cflags SDL_image` `pkg-config --cflags SDL_mixer` `pkg-config --cflags ogg` `pkg-config --cflags vorbis` `pkg-config --cflags vorbisfile` `pkg-config --cflags lua` `pkg-config --cflags fontconfig`
 +LIBS = `sdl-config --libs` `smpeg-config --libs` `pkg-config --libs SDL_ttf` `pkg-config --libs SDL_image` `pkg-config --libs SDL_mixer` -lbz2 -ljpeg -lm `pkg-config --libs ogg` `pkg-config --libs vorbis` `pkg-config --libs vorbisfile` `pkg-config --libs lua` `pkg-config --libs fontconfig`
 +DEFS = -DLINUX -DUSE_OGG_VORBIS -DUSE_LUA -DUSE_FONTCONFIG
  
  # with Integer OggVorbis and AVI in PDA size
--#LIBS = `sdl-config --libs` `smpeg-config --libs` `avifile-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm -lvorbisidec
-+#LIBS = `sdl-config --libs` `smpeg-config --libs` `avifile-config --libs` `pkg-config --libs SDL_ttf` `pkg-config --libs SDL_image` `pkg-config --libs SDL_mixer` -lbz2 -ljpeg -lm -lvorbisidec
- #DEFS = -DLINUX -DUSE_AVIFILE -DUSE_OGG_VORBIS -DINTEGER_OGG_VORBIS -DPDA -DPDA_WIDTH=640
- 
- # with OggVorbis and AVI and English mode
--#LIBS = `sdl-config --libs` `smpeg-config --libs` `avifile-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm -logg -lvorbis -lvorbisfile
-+#LIBS = `sdl-config --libs` `smpeg-config --libs` `avifile-config --libs` `avifile-config --libs` `pkg-config --libs SDL_ttf` `pkg-config --libs SDL_image` `pkg-config --libs SDL_mixer` -lbz2 -ljpeg -lm -logg -lvorbis -lvorbisfile
- #DEFS = -DLINUX -DUSE_AVIFILE -DUSE_OGG_VORBIS -DENABLE_1BYTE_CHAR -DFORCE_1BYTE_CHAR
- 
- EXESUFFIX =
+ #LIBS = `sdl-config --libs` `smpeg-config --libs` `avifile-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm -lvorbisidec
 @@ -29,11 +33,11 @@ OBJSUFFIX = .o
  .SUFFIXES: $(OBJSUFFIX) .cpp .h
  
diff --git a/games/onscripter/patches/patch-Makefile.onscripter b/games/onscripter/patches/patch-Makefile.onscripter
index ab9dfc40e24..984b8b75ce4 100644
--- a/games/onscripter/patches/patch-Makefile.onscripter
+++ b/games/onscripter/patches/patch-Makefile.onscripter
@@ -1,6 +1,6 @@
-$NetBSD: patch-Makefile.onscripter,v 1.1.1.1 2011/03/02 12:05:19 ryoon Exp $
+$NetBSD: patch-Makefile.onscripter,v 1.2 2011/04/29 17:02:27 ryoon Exp $
 
---- Makefile.onscripter.orig	2011-02-26 02:18:50.000000000 +0000
+--- Makefile.onscripter.orig	2011-04-18 01:51:34.000000000 +0000
 +++ Makefile.onscripter
 @@ -68,22 +68,22 @@ ONSCRIPTER_HEADER = ONScripterLabel.h $(
  ALL: $(TARGET)