Update onscripter to 20121019.

pkgsrc changes:
 - add PKG_OPTION onscripter-pda that enables PDA_AUTOSIZE option
   to fit window size to screen on small PDA devices like W-ZERO3 and Zaurus

upstream changes since 20120926:

20121029:
 - fix compiler error on iOS target build environment

20121019: serious bug fix
 - fix memory leak per rendering a glyph, slipped in since 20050819

20121016:
 - reimplement yesnobox insn to allow yes/no choice in dialog
 - implement okcancelbox insn
 - enlarge buttons in yesnobox and okcancelbox dialogs
 - allow mapping right click to no/cancle in yesnobox and okcancelbox insns

4 files changed, 35 insertions, 12 deletions

diff --git a/games/onscripter/Makefile b/games/onscripter/Makefile
index 695a53d4506..01f87783515 100644
--- a/games/onscripter/Makefile
+++ b/games/onscripter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2012/10/07 20:20:24 tsutsui Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/30 16:09:53 tsutsui Exp $
 #
 
-DISTNAME=		onscripter-20120926
+DISTNAME=		onscripter-20121029
 CATEGORIES=		games
 MASTER_SITES=		http://onscripter.sourceforge.jp/
 
@@ -20,6 +20,8 @@ BUILD_TARGET=	ALL
 
 USE_TOOLS+=	pkg-config
 
+.include "options.mk"
+
 SUBST_CLASSES+=		fix
 SUBST_STAGE.fix=	pre-configure
 SUBST_FILES.fix=	${MAKE_FILE}
@@ -27,6 +29,7 @@ SUBST_SED.fix=		-e 's!@RM@!${RM}!g'
 SUBST_SED.fix+=		-e 's!@CXX@!${CXX:Q}!g'
 SUBST_SED.fix+=		-e 's!@LD@!${LD:Q}!g'
 SUBST_SED.fix+=		-e 's!@CXXFLAGS@!${CXXFLAGS:Q}!g'
+SUBST_SED.fix+=		-e 's!@PDA_DEFS@!${PDA_DEFS:Q}!g'
 
 do-install:
 .for f in nsaconv nsadec onscripter sarconv sardec
diff --git a/games/onscripter/distinfo b/games/onscripter/distinfo
index 30b8e302528..fc76b942c99 100644
--- a/games/onscripter/distinfo
+++ b/games/onscripter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2012/10/07 20:20:24 tsutsui Exp $
+$NetBSD: distinfo,v 1.14 2012/10/30 16:09:53 tsutsui Exp $
 
-SHA1 (onscripter-20120926.tar.gz) = 738a732f4ac61a2a3cb1016027e6214b20ea6554
-RMD160 (onscripter-20120926.tar.gz) = 8b28237a1411ff37fcc4b4547e699c2e805a159b
-Size (onscripter-20120926.tar.gz) = 228793 bytes
-SHA1 (patch-Makefile.Linux) = d16a09d0296386e480c17b36bdaea2e62606edb3
+SHA1 (onscripter-20121029.tar.gz) = 392da94b27a1f3bcc44cea62aefda9401784d063
+RMD160 (onscripter-20121029.tar.gz) = 532e3be659fa4268f50e2f07694353f0d01dc975
+Size (onscripter-20121029.tar.gz) = 230200 bytes
+SHA1 (patch-Makefile.Linux) = 6aa721529ed7f733a73fb4f6f7a525160d492909
diff --git a/games/onscripter/options.mk b/games/onscripter/options.mk
new file mode 100644
index 00000000000..0c1700e825a
--- /dev/null
+++ b/games/onscripter/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2012/10/30 16:09:53 tsutsui Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.onscripter
+PKG_SUPPORTED_OPTIONS=	onscripter-pda
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Monscripter-pda)
+# Enable PDA_AUTOSIZE option to fit window size to screen on small PDA devices
+PDA_DEFS=	-DPDA_AUTOSIZE
+.else
+PDA_DEFS=
+.endif
diff --git a/games/onscripter/patches/patch-Makefile.Linux b/games/onscripter/patches/patch-Makefile.Linux
index 9a0b89fea8e..5ca2f51f191 100644
--- a/games/onscripter/patches/patch-Makefile.Linux
+++ b/games/onscripter/patches/patch-Makefile.Linux
@@ -1,10 +1,11 @@
-$NetBSD: patch-Makefile.Linux,v 1.5 2012/05/27 17:40:38 tsutsui Exp $
+$NetBSD: patch-Makefile.Linux,v 1.6 2012/10/30 16:09:54 tsutsui Exp $
 
 - use appropriate pkg-config metainfo for INCS and LIBS definitions
 - disable avifile (that is not in pkgsrc) support
 - replace tools definitions with pkgsrc ones
+- make optional PDA options configurable
 
---- Makefile.Linux.orig	2012-05-27 05:49:49.000000000 +0000
+--- Makefile.Linux.orig	2012-10-19 17:34:31.000000000 +0000
 +++ Makefile.Linux
 @@ -18,8 +18,8 @@ EXT_OBJS = 
  
@@ -33,7 +34,7 @@ $NetBSD: patch-Makefile.Linux,v 1.5 2012/05/27 17:40:38 tsutsui Exp $
  
  # optional: Integer OggVorbis
  #DEFS += -DUSE_OGG_VORBIS -DINTEGER_OGG_VORBIS
-@@ -42,16 +44,16 @@ LIBS += -logg -lvorbis -lvorbisfile
+@@ -42,31 +44,33 @@ LIBS += -logg -lvorbis -lvorbisfile
  DEFS += -DUSE_CDROM
  
  # optional: avifile
@@ -57,7 +58,12 @@ $NetBSD: patch-Makefile.Linux,v 1.5 2012/05/27 17:40:38 tsutsui Exp $
  EXT_OBJS += LUAHandler$(OBJSUFFIX)
  
  # optional: force screen width for PDA
-@@ -62,11 +64,11 @@ EXT_OBJS += LUAHandler$(OBJSUFFIX)
+ #DEFS += -DPDA_WIDTH=640
++#DEFS += -DPDA_AUTOSIZE
++DEFS += @PDA_DEFS@
+ 
+ # optional: enable English mode
+ #DEFS += -DENABLE_1BYTE_CHAR -DFORCE_1BYTE_CHAR
  
  
  # for GNU g++
@@ -72,7 +78,7 @@ $NetBSD: patch-Makefile.Linux,v 1.5 2012/05/27 17:40:38 tsutsui Exp $
  
  # for GCC on PowerPC specfied
  #CC = powerpc-unknown-linux-gnu-g++
-@@ -80,6 +82,6 @@ CFLAGS = -O3 -Wall -fomit-frame-pointer 
+@@ -80,6 +84,6 @@ CFLAGS = -O3 -Wall -fomit-frame-pointer 
  
  #CFLAGS = -O3 -tpp6 -xK -c $(INCS) $(DEFS)