1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00

- Update to 1.19

- Respect CPPFLAGS, LDFLAGS
- Fix 4.X build [1]

PR:		ports/105362
Submitted by:	Li-Wen Hsu <lwhsu@lwhsu.org>
                [1] miwi
Approved by:	maintainer
This commit is contained in:
Martin Wilke 2006-11-13 07:49:54 +00:00
parent 247ff4e341
commit c33559351c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=177161
4 changed files with 25 additions and 49 deletions

View File

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

View File

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

View File

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

View File

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