Attachment #72491 for bug #105362

View | Details | Raw Unified | Return to bug 105362
Collapse All | Expand All




#

PORTNAME=	astyle
PORTVERSION=	1.19
PORTREVISION=	1
CATEGORIES=	devel textproc
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}_${PORTVERSION}_linux

MAINTAINER=	andrew.nau.ua@gmail.com
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
CXXFLAGS+=	-fno-rtti -fno-exceptions
LDFLAGS+=	-s
MAKE_ARGS=	CPPFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"

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 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} ${WRKDIR}/astyle/doc/*.html ${DOCSDIR}
	${INSTALL_DATA} ${WRKDIR}/astyle/doc/*.txt ${DOCSDIR}
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/home/lwhsu/ports/devel/astyle/distinfo (-3 / +3 lines)
1	MD5 (astyle_1.15.3.zip) = 4d8adbcd8703aea00fcd2670be090ddd	1	MD5 (astyle_1.19_linux.tar.gz) = 2cd52822f39b9211846c4070999a492d
2	SHA256 (astyle_1.15.3.zip) = 091adc2dbdcc7532c70dfb00e46361271c23726baa9cd0e5e0e3616838693c75	2	SHA256 (astyle_1.19_linux.tar.gz) = 3582e737bae089e2b81b58166e0fee21e30d846eb357b68525c1e6178a5542f6
3	SIZE (astyle_1.15.3.zip) = 60880	3	SIZE (astyle_1.19_linux.tar.gz) = 63610




--- 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:




--- 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=");

Return to bug 105362

Lines 6-38 Link Here

(-)/home/lwhsu/ports/devel/astyle/Makefile (-11 / +21 lines)
6	#	6	#
7		7
8	PORTNAME= astyle	8	PORTNAME= astyle
9	PORTVERSION= 1.15.3	9	PORTVERSION= 1.19
10	PORTREVISION= 1
11	CATEGORIES= devel textproc	10	CATEGORIES= devel textproc
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
14	DISTNAME= ${PORTNAME}_${PORTVERSION}	13	DISTNAME= ${PORTNAME}_${PORTVERSION}_linux
15		14
16	MAINTAINER= andrew.nau.ua@gmail.com	15	MAINTAINER= andrew.nau.ua@gmail.com
17	COMMENT= A reindenter and reformatter of C++, C and Java source code	16	COMMENT= A reindenter and reformatter of C, C++, C\# and Java source code
18		17
19	USE_ZIP= yes
20	EXTRACT_BEFORE_ARGS= -q -aa
21	EXTRACT_AFTER_ARGS= -d ${DISTNAME}
22	CFLAGS+= "-fpermissive"
23	ALL_TARGET= astyle	18	ALL_TARGET= astyle
24	MAKE_ARGS= CPPFLAGS="${CXXFLAGS}"	19	CXXFLAGS+= -fno-rtti -fno-exceptions
		20	LDFLAGS+= -s
		21	MAKE_ARGS= CPPFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
		22
		23	WRKSRC= ${WRKDIR}/astyle/src
		24
		25	pre-patch:
		26	${REINPLACE_CMD} -e \
		27	's,^ifdef,#ifdef,; \
		28	s,^else,#else,; \
		29	s,^endif,#endif,; \
		30	s,^CPPFLAGS,#CPPFLAGS,; \
		31	s,^LDFLAGS,#LDFLAGS,;' \
		32	${WRKSRC}/Makefile
		33	${REINPLACE_CMD} -e 's,g++,$$(CXX),' ${WRKSRC}/Makefile
25		34
26	PLIST_FILES= bin/astyle	35	PLIST_FILES= bin/astyle
27	.if !defined(NOPORTDOCS)	36	.if !defined(NOPORTDOCS)
28	PORTDOCS= astyle.html astyle_release_notes.html license.html	37	PORTDOCS= astyle.html astyleX.html astyle_news.html astyle_release_notes.html install.txt license.html
29	.endif	38	.endif
30		39
31	do-install:	40	do-install:
32	${INSTALL_PROGRAM} ${WRKSRC}/astyle ${PREFIX}/bin	41	${INSTALL_PROGRAM} ${WRKSRC}/astyle ${PREFIX}/bin
33	.if !defined(NOPORTDOCS)	42	.if !defined(NOPORTDOCS)
34	${MKDIR} ${DOCSDIR}	43	${MKDIR} ${DOCSDIR}
35	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}	44	${INSTALL_DATA} ${WRKDIR}/astyle/doc/*.html ${DOCSDIR}
		45	${INSTALL_DATA} ${WRKDIR}/astyle/doc/*.txt ${DOCSDIR}
36	.endif	46	.endif
37		47
38	.include <bsd.port.mk>	48	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)/home/lwhsu/ports/devel/astyle/files/patch-ad (-15 lines)
1	--- Makefile.orig Fri Feb 11 13:02:00 2000
2	+++ Makefile Sat Oct 26 21:35:38 2002
3	@@ -1,10 +1,10 @@
4	OBJS = ASResource.o ASBeautifier.o ASFormatter.o astyle_main.o
5
6	astyle: $(OBJS)
7	- g++ $(CPPFLAGS) -o astyle $(OBJS)
8	+ $(CXX) $(CPPFLAGS) -o astyle $(OBJS)
9
10	.cpp.o:
11	- g++ $(CPPFLAGS) -c $<
12	+ $(CXX) $(CPPFLAGS) -c $<
13	.SUFFIXES: .cpp .c .o
14
15	clean:

Lines 1-20 Link Here

(-)/home/lwhsu/ports/devel/astyle/files/patch-astyle__main.cpp (-20 lines)
1	--- astyle_main.cpp.orig Thu Mar 7 08:22:30 2002
2	+++ astyle_main.cpp Sat May 7 22:31:21 2005
3	@@ -267,7 +267,7 @@
4	{
5	manuallySetJavaStyle(formatter);
6	}
7	- else if ( IS_OPTIONS(arg, "t", "indent=tab=") )
8	+ else if ( IS_PARAM_OPTIONS(arg, "t", "indent=tab=") )
9	{
10	int spaceNum = 4;
11	string spaceNumParam = GET_PARAMS(arg, "t", "indent=tab=");
12	@@ -275,7 +275,7 @@
13	spaceNum = atoi(spaceNumParam.c_str());
14	formatter.setTabIndentation(spaceNum, false);
15	}
16	- else if ( IS_OPTIONS(arg, "T", "force-indent=tab=") )
17	+ else if ( IS_PARAM_OPTIONS(arg, "T", "force-indent=tab=") )
18	{
19	int spaceNum = 4;
20	string spaceNumParam = GET_PARAMS(arg, "T", "force-indent=tab=");