From owner-freebsd-ports Sun Jul 18 17:50:57 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 8943214F91 for ; Sun, 18 Jul 1999 17:50:54 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id RAA83849; Sun, 18 Jul 1999 17:50:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from gelemna.ft-wayne.in.us (fw-line-29.fwi.com [209.84.172.34]) by hub.freebsd.org (Postfix) with ESMTP id 766C114E57 for ; Sun, 18 Jul 1999 17:40:49 -0700 (PDT) (envelope-from croyle@gelemna.ft-wayne.in.us) Received: (from croyle@localhost) by gelemna.ft-wayne.in.us (8.9.3/8.9.3) id TAA19057; Sun, 18 Jul 1999 19:40:35 -0500 (EST) (envelope-from croyle) Message-Id: <199907190040.TAA19057@gelemna.ft-wayne.in.us> Date: Sun, 18 Jul 1999 19:40:35 -0500 (EST) From: Don Croyle Reply-To: croyle@gelemna.ft-wayne.in.us To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/12702: Upgrade devel/astyle to 1.10.1 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 12702 >Category: ports >Synopsis: Upgrade devel/astyle to 1.10.1 >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: Sun Jul 18 17:50:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Don Croyle >Release: FreeBSD 3.2-STABLE i386 >Organization: >Environment: >Description: These diffs update the devel/astyle port to use the latest distfile. I've borrowed the ideas Mikhail Teterin used in ports/11086, which should also be closed. I told him he needed to submit a followup with diffs and a note that I'd approved them, but it looks like he never bothered. I'm also changing the primary MASTER_SITE to the site that the old one has been being redirected to all along. >How-To-Repeat: >Fix: Apply this patch. Note that this adds three files: files/Makefile, patches/patch-ab and patches/patch-ac. diff -ruN astyle.old/Makefile astyle/Makefile --- astyle.old/Makefile Fri Apr 2 20:26:17 1999 +++ astyle/Makefile Sun Jul 18 19:06:54 1999 @@ -1,24 +1,29 @@ # New ports collection makefile for: astyle -# Version required: 1.6.0 +# Version required: 1.10.1 # Date created: 31 Jan 1999 # Whom: Don Croyle # # $Id: Makefile,v 1.1.1.1 1999/04/03 01:26:17 steve Exp $ # -DISTNAME= astyle_1.6.0 -PKGNAME= astyle-1.6.0 +DISTNAME= astyle_1.10.1_src +PKGNAME= astyle-1.10.1 CATEGORIES= devel textproc -MASTER_SITES= http://www.bigfoot.com/~davidsont/astyle/stable/src/ \ +MASTER_SITES= http://gene.md.huji.ac.il/~tald/astyle/stable/src/ \ http://www.infonex.com/~dacroyle/freebsd/ EXTRACT_SUFX= .tgz MAINTAINER= croyle@gelemna.ft-wayne.in.us -BUILD_DEPENDS= eg++:${PORTSDIR}/lang/egcs - -WRKSRC= ${WRKDIR}/astyle-src +WRKSRC= ${WRKDIR}/astyle_1.10.1 ALL_TARGET= astyle + +post-extract: + perl -pi -e 's/\r//' ${WRKSRC}/* + +post-patch: + ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.orig + ${CP} -p ${FILESDIR}/Makefile ${WRKSRC}/ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/astyle ${PREFIX}/bin/ diff -ruN astyle.old/files/Makefile astyle/files/Makefile --- astyle.old/files/Makefile Wed Dec 31 19:00:00 1969 +++ astyle/files/Makefile Sun Jul 18 19:17:24 1999 @@ -0,0 +1,8 @@ +SRCS= ASBeautifier.cpp ASFormatter.cpp ASResource.cpp astyle_main.cpp + +PROG=astyle +NOMAN=yes + +CC=${CXX} + +.include diff -ruN astyle.old/files/md5 astyle/files/md5 --- astyle.old/files/md5 Fri Apr 2 20:26:18 1999 +++ astyle/files/md5 Sun Jul 18 18:39:44 1999 @@ -1 +1 @@ -MD5 (astyle_1.6.0.tgz) = e42fee292faf73e0277e40dc01f81a0e +MD5 (astyle_1.10.1_src.tgz) = f682d3ce6ba0611384a5319816826607 diff -ruN astyle.old/patches/patch-aa astyle/patches/patch-aa --- astyle.old/patches/patch-aa Fri Apr 2 20:26:18 1999 +++ astyle/patches/patch-aa Sun Jul 18 18:51:38 1999 @@ -1,19 +1,7 @@ ---- Makefile.orig Sun Jan 3 11:43:25 1999 -+++ Makefile Sun Jan 31 22:34:12 1999 -@@ -1,13 +1,13 @@ - # "Artistic Style" Makefile - --CPPFLAGS = -O2 -W -+CPPFLAGS ?= -O2 -W - OBJS = ASResource.o ASBeautifier.o ASFormatter.o astyle_main.o - - astyle: $(OBJS) -- g++ $(CPPFLAGS) -o astyle $(OBJS) -+ eg++ $(CPPFLAGS) -o astyle $(OBJS) - - .cpp.o: -- g++ $(CPPFLAGS) -c $< -+ eg++ $(CPPFLAGS) -c $< - .SUFFIXES: .cpp .c .o - - clean: +--- 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 -ruN astyle.old/patches/patch-ab astyle/patches/patch-ab --- astyle.old/patches/patch-ab Wed Dec 31 19:00:00 1969 +++ astyle/patches/patch-ab Sun Jul 18 18:52:01 1999 @@ -0,0 +1,12 @@ +--- ASBeautifier.cpp.orig Thu Mar 18 15:47:00 1999 ++++ ASBeautifier.cpp Sun Apr 11 10:23:48 1999 +@@ -34,1 +34,1 @@ +-#include ++#include +--- 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 +-#include ++#include ++#include diff -ruN astyle.old/patches/patch-ac astyle/patches/patch-ac --- astyle.old/patches/patch-ac Wed Dec 31 19:00:00 1969 +++ astyle/patches/patch-ac Sun Jul 18 19:09:32 1999 @@ -0,0 +1,11 @@ +--- ASFormatter.cpp.orig Sun Jul 18 19:07:09 1999 ++++ ASFormatter.cpp Sun Jul 18 19:08:47 1999 +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + + #define INIT_CONTAINER(container, value) {if ( (container) != NULL ) delete (container); (container) = (value); } >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message