Update to 1.15.3. Changes in this release:

- numerous bug fixes
- license changed from Artistic License to GPL
- support for C#

No longer requires gmake.

Submitted by:	Andrey Smagin <andrey@smagin.com>

Respect CXX/CXXFLAGS.
This commit is contained in:
naddy 2002-07-29 21:34:41 +00:00
parent 0b423dec77
commit 64f88786a5
3 changed files with 33 additions and 24 deletions

View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.6 2002/07/10 20:48:12 avsm Exp $
# $OpenBSD: Makefile,v 1.7 2002/07/29 21:34:41 naddy Exp $
COMMENT= "indenter and formatter of C/C++/Java source files"
DISTNAME= astyle_1.14.1
PKGNAME= astyle-1.14.1
CATEGORIES= devel
NEED_VERSION= 1.515
DISTNAME= astyle_1.15.3
PKGNAME= ${DISTNAME:S/_/-/}
CATEGORIES= devel
HOMEPAGE= http://astyle.sourceforge.net/
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -16,14 +16,9 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=astyle/}
EXTRACT_SUFX= .zip
USE_GMAKE= Yes
ALL_TARGET= astyle
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/astyle ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/astyle
.for i in astyle astyle_release_notes license
${INSTALL_DATA} ${WRKSRC}/$i.html ${PREFIX}/share/doc/astyle
.endfor
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
WRKDIST= ${WRKDIR}
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (astyle_1.14.1.zip) = d11f8c1b09098f1b1bfa740c5ed66283
RMD160 (astyle_1.14.1.zip) = 080e4f676d3644e3c911701436417e55d5be793f
SHA1 (astyle_1.14.1.zip) = a983c1e449d8e48ebde5463c776064a15c04ddab
MD5 (astyle_1.15.3.zip) = 4d8adbcd8703aea00fcd2670be090ddd
RMD160 (astyle_1.15.3.zip) = ec84150edbe09dcd62ef960f288b688b52553d8b
SHA1 (astyle_1.15.3.zip) = 51e115d1f84028899fff1725d4c6298d5e191ea4

View File

@ -1,19 +1,33 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2001/03/24 02:25:06 avsm Exp $
--- Makefile.orig Fri Feb 11 12:02:10 2000
+++ Makefile Sat Mar 24 02:08:48 2001
@@ -1,13 +1,12 @@
$OpenBSD: patch-Makefile,v 1.2 2002/07/29 21:34:42 naddy Exp $
--- Makefile.orig Fri Feb 11 13:02:00 2000
+++ Makefile Mon Jul 29 23:13:15 2002
@@ -1,14 +1,24 @@
# "Artistic Style" Makefile
-CPPFLAGS = -Wall -Wno-sign-compare -O2
+CXXFLAGS += -Wall -Wno-sign-compare
OBJS = ASResource.o ASBeautifier.o ASFormatter.o astyle_main.o
+CXX ?= g++
astyle: $(OBJS)
-astyle: $(OBJS)
- g++ $(CPPFLAGS) -o astyle $(OBJS)
+ ${CXX} $(CFLAGS) -o astyle $(OBJS)
+all: astyle
+astyle: ${OBJS}
+ ${CXX} ${CXXFLAGS} -o $@ ${OBJS}
+
+.SUFFIXES: .cpp .o
.cpp.o:
- g++ $(CPPFLAGS) -c $<
+ ${CXX} $(CFLAGS) -c $<
.SUFFIXES: .cpp .c .o
-.SUFFIXES: .cpp .c .o
+ ${CXX} ${CXXFLAGS} -c -o $@ $<
clean:
rm *.o
+
+install: astyle
+ ${BSD_INSTALL_PROGRAM} astyle ${PREFIX}/bin
+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/astyle
+ ${BSD_INSTALL_DATA} astyle.html ${PREFIX}/share/doc/astyle
+ ${BSD_INSTALL_DATA} astyle_release_notes.html ${PREFIX}/share/doc/astyle
+ ${BSD_INSTALL_DATA} license.html ${PREFIX}/share/doc/astyle