From owner-svn-ports-head@FreeBSD.ORG  Fri May 24 14:17:39 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 384AF861;
 Fri, 24 May 2013 14:17:39 +0000 (UTC)
 (envelope-from bapt@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 0F77910B;
 Fri, 24 May 2013 14:17:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4OEHcvk045363;
 Fri, 24 May 2013 14:17:38 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4OEHcXt045358;
 Fri, 24 May 2013 14:17:38 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201305241417.r4OEHcXt045358@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 24 May 2013 14:17:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r318974 - in head/accessibility/dasher: . 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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 May 2013 14:17:39 -0000

Author: bapt
Date: Fri May 24 14:17:38 2013
New Revision: 318974
URL: http://svnweb.freebsd.org/changeset/ports/318974

Log:
  Fix build with clang: this unbreak gnome2 with clang
  
  While here:
  - Trim headers
  - Remove test for unsupported FreeBSD versions

Added:
  head/accessibility/dasher/files/
  head/accessibility/dasher/files/patch-clang   (contents, props changed)
Modified:
  head/accessibility/dasher/Makefile

Modified: head/accessibility/dasher/Makefile
==============================================================================
--- head/accessibility/dasher/Makefile	Fri May 24 14:16:47 2013	(r318973)
+++ head/accessibility/dasher/Makefile	Fri May 24 14:17:38 2013	(r318974)
@@ -1,10 +1,6 @@
-# Ports collection Makefile for:	dasher
-# Date created:				5 July 2003
-# Whom:					lewiz <purple@lewiz.net>
-#
+# Created by: lewiz <purple@lewiz.net>
 # $FreeBSD$
 #   $MCom: ports/accessibility/dasher/Makefile,v 1.66 2009/03/18 04:59:21 marcus Exp $
-#
 
 PORTNAME=	dasher
 PORTVERSION=	4.10.1
@@ -48,9 +44,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-O2||g'
-.if ${OSVERSION} >= 700042
 	@${REINPLACE_CMD} -e 's|__gnu_cxx::lldiv|lldiv|' \
 	    	${WRKSRC}/Src/DasherCore/DasherViewSquare.cpp
-.endif
 
 .include <bsd.port.post.mk>

Added: head/accessibility/dasher/files/patch-clang
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/accessibility/dasher/files/patch-clang	Fri May 24 14:17:38 2013	(r318974)
@@ -0,0 +1,37 @@
+--- ./Src/DasherCore/DasherViewSquare.h.orig	2013-05-24 17:03:27.185956866 +0200
++++ ./Src/DasherCore/DasherViewSquare.h	2013-05-24 17:03:36.904410678 +0200
+@@ -20,11 +20,6 @@
+   class CDasherNode;
+ }
+ 
+-class Dasher::CDasherViewSquare;
+-class Dasher::CDasherModel;
+-class Dasher::CDelayedDraw;
+-class Dasher::CDasherNode;
+-
+ /// \ingroup View
+ /// @{
+ 
+--- ./Src/DasherCore/SettingsStore.h.orig	2013-05-24 16:53:08.087996232 +0200
++++ ./Src/DasherCore/SettingsStore.h	2013-05-24 16:53:40.137994206 +0200
+@@ -18,9 +18,6 @@
+   class CParameterNotificationEvent;
+ }
+ 
+-class Dasher::CEventHandler;
+-class Dasher::CParameterNotificationEvent;
+-
+ // Types that are parameters can be
+ enum ParameterType
+ {
+--- ./Src/DasherCore/View/DelayedDraw.h.orig	2013-05-24 17:00:06.589967502 +0200
++++ ./Src/DasherCore/View/DelayedDraw.h	2013-05-24 16:57:01.492979337 +0200
+@@ -15,8 +15,6 @@
+   class CDasherScreen;
+ }
+ 
+-class Dasher::CDasherScreen;
+-
+ namespace Dasher {
+   /// \ingroup View
+   /// @{