4 files changed, 25 insertions, 49 deletions

diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile
index d374e21429a5..79687f4ccb86 100644
--- a/devel/astyle/Makefile
+++ b/devel/astyle/Makefile
@@ -6,33 +6,44 @@
 #
 
 PORTNAME=	astyle
-PORTVERSION=	1.15.3
-PORTREVISION=	1
+PORTVERSION=	1.19
 CATEGORIES=	devel textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+DISTNAME=	${PORTNAME}_${PORTVERSION}_linux
 
 MAINTAINER=	andrew.nau.ua@gmail.com
-COMMENT=	A reindenter and reformatter of C++, C and Java source code
+COMMENT=	A reindenter and reformatter of C, C++, C\# and Java source code
 
-USE_ZIP=	yes
-EXTRACT_BEFORE_ARGS=	-q -aa
-EXTRACT_AFTER_ARGS=	-d ${DISTNAME}
-CFLAGS+=	"-fpermissive"
 ALL_TARGET=	astyle
-MAKE_ARGS=	CPPFLAGS="${CXXFLAGS}"
+CXXFLAGS+=	-fno-rtti -fno-exceptions
+LDFLAGS+=	-s
+MAKE_ARGS=	CPPFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+USE_GCC=	3.3+
+
+WRKSRC=		${WRKDIR}/astyle/src
+
+pre-patch:
+	${REINPLACE_CMD} -e \
+		's,^ifdef,#ifdef,; \
+		s,^else,#else,; \
+		s,^endif,#endif,; \
+		s,^CPPFLAGS,#CPPFLAGS,; \
+		s,^LDFLAGS,#LDFLAGS,;' \
+		${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's,g++,$$(CXX),' ${WRKSRC}/Makefile
 
 PLIST_FILES=	bin/astyle
 .if !defined(NOPORTDOCS)
-PORTDOCS=	astyle.html astyle_release_notes.html license.html
+PORTDOCS=	astyle.html astyleX.html astyle_news.html astyle_release_notes.html install.txt license.html
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/astyle ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/astyle/doc/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/astyle/doc/*.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/astyle/distinfo b/devel/astyle/distinfo
index 37aee0b5c834..493d600ead39 100644
--- a/devel/astyle/distinfo
+++ b/devel/astyle/distinfo
@@ -1,3 +1,3 @@
-MD5 (astyle_1.15.3.zip) = 4d8adbcd8703aea00fcd2670be090ddd
-SHA256 (astyle_1.15.3.zip) = 091adc2dbdcc7532c70dfb00e46361271c23726baa9cd0e5e0e3616838693c75
-SIZE (astyle_1.15.3.zip) = 60880
+MD5 (astyle_1.19_linux.tar.gz) = 2cd52822f39b9211846c4070999a492d
+SHA256 (astyle_1.19_linux.tar.gz) = 3582e737bae089e2b81b58166e0fee21e30d846eb357b68525c1e6178a5542f6
+SIZE (astyle_1.19_linux.tar.gz) = 63610
diff --git a/devel/astyle/files/patch-ad b/devel/astyle/files/patch-ad
deleted file mode 100644
index b73ad2379c1a..000000000000
--- a/devel/astyle/files/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	Fri Feb 11 13:02:00 2000
-+++ Makefile	Sat Oct 26 21:35:38 2002
-@@ -1,10 +1,10 @@
- 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/files/patch-astyle__main.cpp b/devel/astyle/files/patch-astyle__main.cpp
deleted file mode 100644
index 6d399204ecfb..000000000000
--- a/devel/astyle/files/patch-astyle__main.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- astyle_main.cpp.orig	Thu Mar  7 08:22:30 2002
-+++ astyle_main.cpp	Sat May  7 22:31:21 2005
-@@ -267,7 +267,7 @@
-     {
-         manuallySetJavaStyle(formatter);
-     }
--    else if ( IS_OPTIONS(arg, "t", "indent=tab=") )
-+    else if ( IS_PARAM_OPTIONS(arg, "t", "indent=tab=") )
-     {
-         int spaceNum = 4;
-         string spaceNumParam = GET_PARAMS(arg, "t", "indent=tab=");
-@@ -275,7 +275,7 @@
-             spaceNum = atoi(spaceNumParam.c_str());
-         formatter.setTabIndentation(spaceNum, false);
-     }
--    else if ( IS_OPTIONS(arg, "T", "force-indent=tab=") )
-+    else if ( IS_PARAM_OPTIONS(arg, "T", "force-indent=tab=") )
-     {
-         int spaceNum = 4;
-         string spaceNumParam = GET_PARAMS(arg, "T", "force-indent=tab=");