7 files changed, 14 insertions, 64 deletions

diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile
index ebb61650b66e..3f18d13b5f60 100644
--- a/devel/astyle/Makefile
+++ b/devel/astyle/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	astyle
-PORTVERSION=	1.11.6
+PORTVERSION=	1.14.0
 CATEGORIES=	devel textproc
-MASTER_SITES=	ftp://astyle.sourceforge.net/pub/astyle/stable/src/\
-		http://www.gelemna.org/ports/
-DISTNAME=	${PORTNAME}_${PORTVERSION}_src
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}_${PORTVERSION}
+USE_ZIP=	yes
+EXTRACT_BEFORE_ARGS=	-q -aa
 
 MAINTAINER=	croyle@gelemna.org
 
-WRKSRC=		${WRKDIR}/astyle_1.11.6
-
 ALL_TARGET=	astyle
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/astyle ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/astyle ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/astyle
-	${INSTALL_DATA} ${WRKSRC}/astyle.html ${PREFIX}/share/doc/astyle
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/astyle/distinfo b/devel/astyle/distinfo
index 36f2f11f55a7..aee000f7a54e 100644
--- a/devel/astyle/distinfo
+++ b/devel/astyle/distinfo
@@ -1 +1 @@
-MD5 (astyle_1.11.6_src.tgz) = dced6286ff5c5a7f774090d0bc4e7c76
+MD5 (astyle_1.14.0.zip) = 3964fb8f199439bb260ef91a42976d51
diff --git a/devel/astyle/files/patch-aa b/devel/astyle/files/patch-aa
deleted file mode 100644
index a860747604f8..000000000000
--- a/devel/astyle/files/patch-aa
+++ /dev/null
@@ -1,7 +0,0 @@
---- compiler_defines.h.orig	Thu Mar 18 15:39:49 1999
-+++ compiler_defines.h	Sun Apr 11 10:04:35 1999
-@@ -29,3 +29,3 @@
-  * comment out the line below if your compiler does NOT understand NAMESPACES
-- */
- #define USES_NAMESPACE
-+ */
diff --git a/devel/astyle/files/patch-ab b/devel/astyle/files/patch-ab
deleted file mode 100644
index 2c70578c7062..000000000000
--- a/devel/astyle/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- ASBeautifier.cpp.orig	Thu Mar 18 15:47:00 1999
-+++ ASBeautifier.cpp	Sun Apr 11 10:23:48 1999
-@@ -34,1 +34,1 @@
--#include <iostream>
-+#include <iostream.h>
---- astyle_main.cpp.orig	Thu Mar 18 15:41:30 1999
-+++ astyle_main.cpp	Sun Apr 11 10:25:00 1999
-@@ -26,2 +26,2 @@
--#include <iostream>
--#include <fstream>
-+#include <iostream.h>
-+#include <fstream.h>
diff --git a/devel/astyle/files/patch-ac b/devel/astyle/files/patch-ac
deleted file mode 100644
index 1328967ade11..000000000000
--- a/devel/astyle/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- ASFormatter.cpp.orig	Sun Jul 18 19:07:09 1999
-+++ ASFormatter.cpp	Sun Jul 18 19:08:47 1999
-@@ -33,7 +33,7 @@
- #include <cctype>
- #include <vector>
- #include <algorithm>
--#include <iostream>
-+#include <iostream.h>
- 
- 
- #define INIT_CONTAINER(container, value)     {if ( (container) != NULL ) delete (container); (container) = (value); }
diff --git a/devel/astyle/files/patch-ad b/devel/astyle/files/patch-ad
deleted file mode 100644
index 44e863dfe9f2..000000000000
--- a/devel/astyle/files/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig	Sat Sep 25 08:29:04 1999
-+++ Makefile	Fri Feb  4 19:58:09 2000
-@@ -1,13 +1,15 @@
- # "Artistic Style" Makefile
- 
--CPPFLAGS = -O2 -W
-+CXX?=	g++
-+CPPFLAGS = ${CXXFLAGS} 
-+CPPFLAGS ?= -O2
- OBJS = ASResource.o ASBeautifier.o ASFormatter.o astyle_main.o
- 
- astyle: $(OBJS)
--	g++ $(CPPFLAGS) -o astyle  $(OBJS)
-+	$(CXX) $(CPPFLAGS) -o astyle  $(OBJS)
- 
- .cpp.o:
--	g++ $(CPPFLAGS) -c $<
-+	$(CXX) $(CPPFLAGS) -c $<
- .SUFFIXES: .cpp .c .o
- 
- clean:
diff --git a/devel/astyle/pkg-plist b/devel/astyle/pkg-plist
index 7d1585652e7d..9ba47ad20fc9 100644
--- a/devel/astyle/pkg-plist
+++ b/devel/astyle/pkg-plist
@@ -1,3 +1,5 @@
 bin/astyle
-share/doc/astyle/astyle.html
-@dirrm share/doc/astyle
+%%PORTDOCS%%share/doc/astyle/astyle.html
+%%PORTDOCS%%share/doc/astyle/astyle_release_notes.html
+%%PORTDOCS%%share/doc/astyle/license.html
+%%PORTDOCS%%@dirrm share/doc/astyle