From owner-svn-ports-head@FreeBSD.ORG Fri Nov 30 13:32:18 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 52C34ED6; Fri, 30 Nov 2012 13:32:18 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 389DA8FC17; Fri, 30 Nov 2012 13:32:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAUDWIf4091894; Fri, 30 Nov 2012 13:32:18 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAUDWINJ091891; Fri, 30 Nov 2012 13:32:18 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201211301332.qAUDWINJ091891@svn.freebsd.org> From: Alexey Dokuchaev Date: Fri, 30 Nov 2012 13:32:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308009 - in head/math/aamath: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Nov 2012 13:32:18 -0000 Author: danfe Date: Fri Nov 30 13:32:17 2012 New Revision: 308009 URL: http://svnweb.freebsd.org/changeset/ports/308009 Log: - Fix the build with Clang - Cleanup Makefile Submitted by: Ilya Arkhipov Feature safe: yes Added: head/math/aamath/files/patch-clang (contents, props changed) Modified: head/math/aamath/Makefile Modified: head/math/aamath/Makefile ============================================================================== --- head/math/aamath/Makefile Fri Nov 30 13:05:44 2012 (r308008) +++ head/math/aamath/Makefile Fri Nov 30 13:32:17 2012 (r308009) @@ -1,15 +1,11 @@ -# New ports collection makefile for: aamath -# Date created: 2005-06-23 -# Whom: Vsevolod Stakhov -# +# Created by: Vsevolod Stakhov # $FreeBSD$ -# PORTNAME= aamath PORTVERSION= 0.3 PORTREVISION= 1 CATEGORIES= math textproc -MASTER_SITES= http://fuse.superglue.se/aamath/ +MASTER_SITES= http://fuse.superglue.se/${PORTNAME}/ MAINTAINER= ports@FreeBSD.org COMMENT= Renders ASCII art from mathematical expressions @@ -17,11 +13,11 @@ COMMENT= Renders ASCII art from mathemat WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_JOBS_SAFE= yes -PLIST_FILES+= bin/${PORTNAME} -MAN1= aamath.1 +PLIST_FILES= bin/${PORTNAME} +MAN1= ${PORTNAME}.1 do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/aamath ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1 .include Added: head/math/aamath/files/patch-clang ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/aamath/files/patch-clang Fri Nov 30 13:32:17 2012 (r308009) @@ -0,0 +1,69 @@ +--- expr.cc.orig 2005-03-08 02:00:02.000000000 +0000 ++++ expr.cc 2012-11-30 13:52:13.000000000 +0000 +@@ -430,8 +430,6 @@ + { + CanvasPtr canvas_down = down->render(); + +- Size size_down = canvas_down->size(); +- + CanvasPtr canvas; + + (*canvas)[0][0] = '-'; +@@ -1175,10 +1173,8 @@ + int rise = get_rise(); + + CanvasPtr canvas_from = from->render(); +- Size size_from = canvas_from->size(); + + CanvasPtr canvas_to = to->render(); +- Size size_to = canvas_to->size(); + + CanvasPtr canvas; + +@@ -1192,7 +1188,7 @@ + + class SumSymbol : public OpSymbol { + public: +- void render(Canvas& c, int r, int c) const; ++ void render(Canvas& c, int r, int i) const; + }; + + void +@@ -1208,7 +1204,7 @@ + + class ProductSymbol : public OpSymbol { + public: +- void render(Canvas& c, int r, int c) const; ++ void render(Canvas& c, int r, int i) const; + }; + + void +@@ -1612,7 +1608,7 @@ + int cols = num_cols(); + int rows = num_rows(); + +- CanvasPtr ec[cols * rows]; ++ std::vectorec(cols * rows); + Size sz[cols * rows]; + + int row_height[rows]; +--- expr.h.orig 2005-03-08 01:56:12.000000000 +0000 ++++ expr.h 2012-11-30 13:28:57.000000000 +0000 +@@ -451,7 +451,7 @@ + + virtual CanvasPtr render_head() const; + +- void render_symbol(Canvas& c, int r, int c, int h) const; ++ void render_symbol(Canvas& c, int r, int i, int h) const; + + virtual CanvasPtr render() const; + }; +@@ -467,7 +467,7 @@ + + class OpSymbol { + public: +- virtual void render(Canvas& c, int r, int c) const = 0; ++ virtual void render(Canvas& c, int r, int i) const = 0; + }; + + class SumOrProduct : public OpOnFunction {