Update to 0.12.1

* Fix MASTER_SITES to standard way.
* Strip end of line CR for patching.

Changlog:
unknown

5 files changed, 60 insertions, 45 deletions

diff --git a/games/xye/Makefile b/games/xye/Makefile
index c0bbeaa5052..9734425a693 100644
--- a/games/xye/Makefile
+++ b/games/xye/Makefile
@@ -1,20 +1,23 @@
-# $NetBSD: Makefile,v 1.12 2013/06/04 22:16:12 tron Exp $
+# $NetBSD: Makefile,v 1.13 2013/06/09 06:30:14 ryoon Exp $
 #
 
-DISTNAME=	xye-0.9.1
-PKGREVISION=	7
+DISTNAME=	xye-0.12.1
 CATEGORIES=	games
-MASTER_SITE_SOURCEFORGE_NEW= http://downloads.sourceforge.net/project/
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_NEW:=xye/xye/0.9.1/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xye/0.12.1/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://xye.sourceforge.net/
 COMMENT=	Kye clone
 
-WRKSRC=		${WRKDIR}/xye-0.9.1
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc
-USE_LANGUAGES=	c c++
+GNU_CONFIGURE=		yes
+#CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc
+USE_LANGUAGES=		c c++
+
+SUBST_CLASSES+=		crlf
+SUBST_MESSAGE.crlf=	stripping EOL CR
+SUBST_STAGE.crlf=	post-extract
+SUBST_FILES.crlf=	*/*
+SUBST_FILTER_CMD.crlf=	${TR} -d '\r'
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
diff --git a/games/xye/PLIST b/games/xye/PLIST
index 16fc82148f5..baeaacdf781 100644
--- a/games/xye/PLIST
+++ b/games/xye/PLIST
@@ -1,16 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2009/09/15 11:43:02 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/06/09 06:30:14 ryoon Exp $
 bin/xye
-share/doc/xye/AUTHORS
-share/doc/xye/COPYING
-share/doc/xye/GAMEINTRO.txt
-share/doc/xye/INSTALL
-share/doc/xye/NEWS
-share/doc/xye/README
-share/doc/xye/xye.svg
+share/xye/AUTHORS
+share/xye/ChangeLog
+share/xye/NEWS
+share/xye/ReadMe.html
 share/xye/levels/5levels.xye
 share/xye/levels/Mic4.xye
+share/xye/levels/Phipps.xye
+share/xye/levels/SuperJustin.xye
 share/xye/levels/cracked.xye
-share/xye/levels/kye.xye
 share/xye/levels/levels.xye
 share/xye/levels/logo.xye
 share/xye/levels/microban.xsb
@@ -21,10 +19,24 @@ share/xye/levels/tutorials.xye
 share/xye/levels/xyester.xye
 share/xye/res/DejaVuSans-Bold.ttf
 share/xye/res/DejaVuSans.ttf
-share/xye/res/classic.xml
+share/xye/res/clean40.png
+share/xye/res/clean40.xml
+share/xye/res/clean40_luminosity.png
 share/xye/res/default.xml
+share/xye/res/default_icon.png
+share/xye/res/detailed.png
+share/xye/res/detailed.xml
+share/xye/res/detailed20.png
+share/xye/res/detailed20.xml
+share/xye/res/detailed30.png
+share/xye/res/detailed30.xml
+share/xye/res/detailed_COPYING
+share/xye/res/detailed_L.png
+share/xye/res/detailed_L20.png
+share/xye/res/detailed_L30.png
+share/xye/res/detailed_icon.png
 share/xye/res/fon.bmp
 share/xye/res/fon_bold.bmp
-share/xye/res/kye.png
 share/xye/res/xye.png
 share/xye/res/xye_luminosity.png
+share/xye/xye.svg
diff --git a/games/xye/distinfo b/games/xye/distinfo
index 4ca1ff0f646..47cbcc9381f 100644
--- a/games/xye/distinfo
+++ b/games/xye/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2013/04/29 21:31:11 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/06/09 06:30:14 ryoon Exp $
 
-SHA1 (xye-0.9.1.tar.gz) = f10386fb8553b3377ec3592652c96fcb7827b857
-RMD160 (xye-0.9.1.tar.gz) = 5bc45c2595a9179c7bf77582d6d254f60e652dc0
-Size (xye-0.9.1.tar.gz) = 1217636 bytes
-SHA1 (patch-aa) = 5992b8785b3db457785809a8e4dc684117461f28
-SHA1 (patch-src_gen.cpp) = 8cf75045e7931fe4ea12309311cbc73ba371861b
+SHA1 (xye-0.12.1.tar.gz) = 82bea042934ade4ff43984ac210dab39b87f0939
+RMD160 (xye-0.12.1.tar.gz) = 852f7ff50b98688011d43be1c984a08367e35e82
+Size (xye-0.12.1.tar.gz) = 2850776 bytes
+SHA1 (patch-aa) = 141a40923c4de3ea7df7975f1b4bd2303fde2ea5
+SHA1 (patch-src_gen.cpp) = 52065cbf92adeb27204b9ee4041b1b7862b7825f
diff --git a/games/xye/patches/patch-aa b/games/xye/patches/patch-aa
index 625c3709eb4..4d4081c61f7 100644
--- a/games/xye/patches/patch-aa
+++ b/games/xye/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2009/09/15 11:43:02 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2013/06/09 06:30:14 ryoon Exp $
 
---- src/options.cpp.orig	2009-07-27 03:02:29.000000000 +0200
+--- src/options.cpp.orig	2013-06-09 06:21:13.000000000 +0000
 +++ src/options.cpp
-@@ -21,6 +21,7 @@ Permission is granted to anyone to use t
- #include "options.h"

- #include "gen.h"

- 

+@@ -24,6 +24,7 @@ Permission is granted to anyone to use t
+ #include<map>
+ #include<algorithm>
+ #include<string>
 +#include <unistd.h>
- 

- #include<iostream>

- #include<fstream>

+ 
+ using std::string;
+ 
diff --git a/games/xye/patches/patch-src_gen.cpp b/games/xye/patches/patch-src_gen.cpp
index e5b9675321f..fa2f3b8188d 100644
--- a/games/xye/patches/patch-src_gen.cpp
+++ b/games/xye/patches/patch-src_gen.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_gen.cpp,v 1.1 2013/04/29 21:31:11 joerg Exp $
+$NetBSD: patch-src_gen.cpp,v 1.2 2013/06/09 06:30:14 ryoon Exp $
 
---- src/gen.cpp.orig	2013-04-29 18:55:25.000000000 +0000
+--- src/gen.cpp.orig	2013-06-09 06:21:13.000000000 +0000
 +++ src/gen.cpp
-@@ -19,6 +19,7 @@ Permission is granted to anyone to use t
- #include "gen.h"

- #include "vxsdl.h"

- #include<cstdio>

-+#include<ctime>

- 

- const float F_RAND_MAX = (float)(RAND_MAX);

- 

+@@ -21,6 +21,7 @@ Permission is granted to anyone to use t
+ #include<cstdio>
+ #include<iostream>
+ #include<fstream>
++#include<ctime>
+ 
+ const float F_RAND_MAX = (float)(RAND_MAX);
+