Update to 1.15.3. Changes:

New option: '--force-indent=tab=#'. Added support for C#. Many bugfixes.

4 files changed, 12 insertions, 34 deletions

diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile
index c720e1fe4e5..9f4eafb67c6 100644
--- a/devel/astyle/Makefile
+++ b/devel/astyle/Makefile
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile,v 1.14 2012/10/31 11:16:38 asau Exp $
+# $NetBSD: Makefile,v 1.15 2013/05/25 16:39:39 shattered Exp $
 #
 
-DISTNAME=	astyle_1.13.6.1
-PKGNAME=	astyle-1.13.6.1
-PKGREVISION=	1
+DISTNAME=	astyle_1.15.3
+PKGNAME=	astyle-1.15.3
 CATEGORIES=	textproc devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=astyle/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://astyle.sourceforge.net/
-COMMENT=	Reindenter and reformatter of C++, C and Java source code
+COMMENT=	Reindenter and reformatter of C, C++, C# and Java source code
+LICENSE=	gnu-gpl-v2
 
 HTMLDIR=	${PREFIX}/share/doc/html/astyle
 INSTALLATION_DIRS=	bin ${HTMLDIR}
 
 USE_LANGUAGES=	c++
+WRKSRC=		${WRKDIR}
 
 .include "../../mk/compiler.mk"
 
diff --git a/devel/astyle/distinfo b/devel/astyle/distinfo
index d6e613f5ccc..ab76aa836b8 100644
--- a/devel/astyle/distinfo
+++ b/devel/astyle/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2012/07/03 18:17:25 joerg Exp $
+$NetBSD: distinfo,v 1.11 2013/05/25 16:39:39 shattered Exp $
 
-SHA1 (astyle_1.13.6.1.zip) = 4e0172fe30986d68c61b4a7c1638a1fc42ea0675
-RMD160 (astyle_1.13.6.1.zip) = 74030324515be84e0e7499edc2503d0e549673ba
-Size (astyle_1.13.6.1.zip) = 61422 bytes
+SHA1 (astyle_1.15.3.zip) = 51e115d1f84028899fff1725d4c6298d5e191ea4
+RMD160 (astyle_1.15.3.zip) = ec84150edbe09dcd62ef960f288b688b52553d8b
+Size (astyle_1.15.3.zip) = 60880 bytes
 SHA1 (patch-aa) = 67bb1b1802e74bc264cb951a55075982c566d463
-SHA1 (patch-ab) = c9b21d45f53331411425a734971f003d415b11e7
-SHA1 (patch-ac) = f99b2993bbbd63ae7a56783c75375d97876dee2d
+SHA1 (patch-ac) = 42b568e4bb8f6a9748c1ec73db641739ce14e673
diff --git a/devel/astyle/patches/patch-ab b/devel/astyle/patches/patch-ab
deleted file mode 100644
index 228d695669b..00000000000
--- a/devel/astyle/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/11/05 15:27:41 jmmv Exp $
-
---- compiler_defines.h.orig	2003-11-05 16:09:42.000000000 +0100
-+++ compiler_defines.h
-@@ -31,7 +31,7 @@
- #define USES_NAMESPACE
- 
- 
--#ifdef __GNUC__
-+#if defined(__GNUC__) && defined(ASTYLE_GCC2)
- // for G++ implementation of string.compare:
- #define COMPARE(place, length, str)       compare((str), (place), (length))
- #else
diff --git a/devel/astyle/patches/patch-ac b/devel/astyle/patches/patch-ac
index 89e8ef51b26..6c004e0aa39 100644
--- a/devel/astyle/patches/patch-ac
+++ b/devel/astyle/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2012/07/03 18:17:26 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2013/05/25 16:39:39 shattered Exp $
 
 --- astyle_main.cpp.orig	2001-01-20 17:02:14.000000000 +0000
 +++ astyle_main.cpp
@@ -20,12 +20,3 @@ $NetBSD: patch-ac,v 1.3 2012/07/03 18:17:26 joerg Exp $
  
  template<class ITER>
  bool parseOptions(ASFormatter &formatter,
-@@ -650,7 +652,7 @@ void printHelpAndExit()
-     exit(1);
- }
- 
--main(int argc, char *argv[])
-+int main(int argc, char *argv[])
- {
-     ASFormatter formatter;
-     vector<string> fileNameVector;