svn commit: r321962 - in head/graphics/pencil: . files

[Ganael LAPLANCHE]

Author: martymac
Date: Fri Jun 28 13:50:25 2013
New Revision: 321962
URL: http://svnweb.freebsd.org/changeset/ports/321962

Log:
  - Switch to new Makefile header format
  - Fix build with clang

Added:
  head/graphics/pencil/files/patch-src-graphics-vector-beziercurve.cpp   (contents, props changed)
Modified:
  head/graphics/pencil/Makefile
  head/graphics/pencil/files/patch-pencil.pro   (contents, props changed)

Modified: head/graphics/pencil/Makefile
==============================================================================
--- head/graphics/pencil/Makefile	Fri Jun 28 13:10:29 2013	(r321961)
+++ head/graphics/pencil/Makefile	Fri Jun 28 13:50:25 2013	(r321962)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	pencil
-# Date created:		2008-04-16
-# Whom:			Ganael Laplanche <ganael.laplanche at martymac.org>
-#
+# Created by: Ganael Laplanche <ganael.laplanche at martymac.org>
 # $FreeBSD$
-#
 
 PORTNAME=	pencil
 PORTVERSION=	0.4.4b
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}-planner/Pencil/${PORTVERSION}eta
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFFIX}

Modified: head/graphics/pencil/files/patch-pencil.pro
==============================================================================
--- head/graphics/pencil/files/patch-pencil.pro	Fri Jun 28 13:10:29 2013	(r321961)
+++ head/graphics/pencil/files/patch-pencil.pro	Fri Jun 28 13:50:25 2013	(r321962)
@@ -1,6 +1,6 @@
---- pencil.pro.orig	2008-04-16 14:23:57.000000000 +0000
-+++ pencil.pro	2008-04-16 14:19:45.000000000 +0000
-@@ -86,5 +86,9 @@
+--- pencil.pro.orig	2008-01-20 10:04:02.000000000 +0100
++++ pencil.pro	2013-06-26 15:47:47.000000000 +0200
+@@ -86,5 +86,13 @@
  	SOURCES += src/external/linux/linux.cpp
  	LIBS += -Lliblinux -lming -lpng
  }
@@ -8,5 +8,9 @@
 +	SOURCES += src/external/freebsd/freebsd.cpp
 +	LIBS += -lming -lpng
 +}
++freebsd-clang {
++	SOURCES += src/external/freebsd/freebsd.cpp
++	LIBS += -lming -lpng
++}
  RESOURCES += pencil.qrc
  QT += xml opengl

Added: head/graphics/pencil/files/patch-src-graphics-vector-beziercurve.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/pencil/files/patch-src-graphics-vector-beziercurve.cpp	Fri Jun 28 13:50:25 2013	(r321962)
@@ -0,0 +1,15 @@
+--- src/graphics/vector/beziercurve.cpp.orig	2013-06-26 10:46:07.000000000 +0200
++++ src/graphics/vector/beziercurve.cpp	2013-06-26 10:40:02.000000000 +0200
+@@ -700,9 +700,9 @@
+ 	R1.setTopLeft(P1); R1.setBottomRight(Q1);
+ 	R2.setTopLeft(P2); R2.setBottomRight(Q2);
+ 	
+-	//QPointF intersectionPoint = QPointF(50.0, 50.0); // bogus point
+-	//QPointF* intersection = &intersectionPoint;
+-	QPointF* cubicIntersection = &QPointF(50.0, 50.0); // bogus point
++	QPointF tmpIntersectionPoint = QPointF(50.0, 50.0); // bogus point
++	QPointF* cubicIntersection = &tmpIntersectionPoint;
++	//QPointF* cubicIntersection = &QPointF(50.0, 50.0); // bogus point
+ 	if( R1.intersects(R2) || L2.intersect(L1, cubicIntersection) == QLineF::BoundedIntersection ) {
+ 	//if(L2.intersect(L1, intersection) == QLineF::BoundedIntersection) {
+ 		//qDebug() << "                   FOUND rectangle intersection ";