Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Jan 2002 22:03:27 -0800 (PST)
From:      Paul Marquis <pmarquis@pobox.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/33601: Update port: devel/astyle - upgrade to version 1.14.0
Message-ID:  <200201060603.g0663Rm35644@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         33601
>Category:       ports
>Synopsis:       Update port: devel/astyle - upgrade to version 1.14.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 05 22:10:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Paul Marquis
>Release:        4-STABLE
>Organization:
>Environment:
FreeBSD sboy.pmarquis.com 4.5-PRERELEASE FreeBSD 4.5-PRERELEASE #0: Sun Dec 23 09:20:55 EST 2001     root@:/usr/obj/home/src/sys/SBOY  i386

>Description:


>How-To-Repeat:

>Fix:
diff -Naur astyle.orig/Makefile astyle/Makefile
--- astyle.orig/Makefile	Mon Feb  5 09:34:37 2001
+++ astyle/Makefile	Sun Jan  6 00:46:04 2002
@@ -2,28 +2,27 @@
 # Date created:		31 Jan 1999
 # Whom:			Don Croyle <croyle@gelemna.org>
 #
-# $FreeBSD: ports/devel/astyle/Makefile,v 1.11 2001/02/05 14:34:37 olgeni Exp $
+# $FreeBSD$
 #
 
 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 -Naur astyle.orig/distinfo astyle/distinfo
--- astyle.orig/distinfo	Mon Feb 14 18:07:00 2000
+++ astyle/distinfo	Sat Jan  5 21:05:12 2002
@@ -1 +1 @@
-MD5 (astyle_1.11.6_src.tgz) = dced6286ff5c5a7f774090d0bc4e7c76
+MD5 (astyle_1.14.0.zip) = 3964fb8f199439bb260ef91a42976d51
diff -Naur astyle.orig/files/patch-aa astyle/files/patch-aa
--- astyle.orig/files/patch-aa	Thu Jul 22 00:20:46 1999
+++ astyle/files/patch-aa	Wed Dec 31 19:00:00 1969
@@ -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 -Naur astyle.orig/files/patch-ab astyle/files/patch-ab
--- astyle.orig/files/patch-ab	Thu Jul 22 10:34:45 1999
+++ astyle/files/patch-ab	Wed Dec 31 19:00:00 1969
@@ -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 -Naur astyle.orig/files/patch-ac astyle/files/patch-ac
--- astyle.orig/files/patch-ac	Thu Jul 22 10:34:45 1999
+++ astyle/files/patch-ac	Wed Dec 31 19:00:00 1969
@@ -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 -Naur astyle.orig/files/patch-ad astyle/files/patch-ad
--- astyle.orig/files/patch-ad	Fri Feb  4 22:59:13 2000
+++ astyle/files/patch-ad	Wed Dec 31 19:00:00 1969
@@ -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 -Naur astyle.orig/pkg-plist astyle/pkg-plist
--- astyle.orig/pkg-plist	Sat Jul 31 20:43:46 1999
+++ astyle/pkg-plist	Sun Jan  6 00:50:08 2002
@@ -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

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201060603.g0663Rm35644>