Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Nov 2016 09:24:57 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r427089 - in head/graphics/sharpconstruct: . files
Message-ID:  <201611250924.uAP9Ov97036126@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Nov 25 09:24:57 2016
New Revision: 427089
URL: https://svnweb.freebsd.org/changeset/ports/427089

Log:
  - Add LICENSE
  - Fix build with clang 3.9
  - Regenerate patches
  
  PR:		214645

Added:
  head/graphics/sharpconstruct/files/patch-src_prefix.cc   (contents, props changed)
Modified:
  head/graphics/sharpconstruct/Makefile
  head/graphics/sharpconstruct/files/patch-include-Optimized.h
  head/graphics/sharpconstruct/files/patch-src_MainWindow.cc

Modified: head/graphics/sharpconstruct/Makefile
==============================================================================
--- head/graphics/sharpconstruct/Makefile	Fri Nov 25 09:20:45 2016	(r427088)
+++ head/graphics/sharpconstruct/Makefile	Fri Nov 25 09:24:57 2016	(r427089)
@@ -10,16 +10,19 @@ MASTER_SITES=	SF/sharp3d/SharpConstruct/
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	3D modeller for organic shapes
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:x11-toolkits/gtkglextmm \
 		libglademm-2.4.so:devel/libglademm24
 
-USES=		tar:bzip2 gmake pkgconfig
-USE_GL=		yes
-GNU_CONFIGURE=	yes
-
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	uses SSE instructions
 
+USES=		tar:bzip2 gmake pkgconfig
+GNU_CONFIGURE=	yes
+USE_GL=		yes
+
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 PORTDATA=	*

Modified: head/graphics/sharpconstruct/files/patch-include-Optimized.h
==============================================================================
--- head/graphics/sharpconstruct/files/patch-include-Optimized.h	Fri Nov 25 09:20:45 2016	(r427088)
+++ head/graphics/sharpconstruct/files/patch-include-Optimized.h	Fri Nov 25 09:24:57 2016	(r427089)
@@ -1,6 +1,6 @@
---- include/Optimized.h.orig	Sat Dec 31 06:26:59 2005
-+++ include/Optimized.h	Thu Oct 11 02:07:55 2007
-@@ -193,7 +193,7 @@
+--- include/Optimized.h.orig	2005-12-31 03:26:59 UTC
++++ include/Optimized.h
+@@ -193,7 +193,7 @@ namespace SharpConstruct
  		void Normalize( Point3D& );
  		
  		typedef Point3D Normal3D;

Modified: head/graphics/sharpconstruct/files/patch-src_MainWindow.cc
==============================================================================
--- head/graphics/sharpconstruct/files/patch-src_MainWindow.cc	Fri Nov 25 09:20:45 2016	(r427088)
+++ head/graphics/sharpconstruct/files/patch-src_MainWindow.cc	Fri Nov 25 09:24:57 2016	(r427089)
@@ -1,6 +1,6 @@
---- src/MainWindow.cc.orig	2013-10-02 09:31:18.000000000 +0000
+--- src/MainWindow.cc.orig	2006-01-02 10:18:20 UTC
 +++ src/MainWindow.cc
-@@ -786,7 +786,7 @@ void MainWindow::on_speed_test_clicked_(
+@@ -792,7 +792,7 @@ void MainWindow::on_speed_test_clicked_(
  			output += ToString( times[ i ] ) + " seconds\n";
  			adder += times[ i ];
  		}
@@ -9,7 +9,7 @@
  						   "\nAverage: " + ToString( adder / runs ) +
  						   " seconds" ).run();
  	}
-@@ -810,7 +810,7 @@ void MainWindow::on_speed_test_clicked_(
+@@ -816,7 +816,7 @@ void MainWindow::on_speed_test_clicked_(
  		for( unsigned i = 0; i < runs; ++i )
  			editor_.event( (GdkEvent*)( &click ) );
  		timer.stop();

Added: head/graphics/sharpconstruct/files/patch-src_prefix.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/sharpconstruct/files/patch-src_prefix.cc	Fri Nov 25 09:24:57 2016	(r427089)
@@ -0,0 +1,22 @@
+--- src/prefix.cc.orig	2005-08-22 01:24:14 UTC
++++ src/prefix.cc
+@@ -393,7 +393,8 @@ br_strndup (char *str, size_t size)
+ char *
+ br_extract_dir (const char *path)
+ {
+-	char *end, *result;
++	const char *end;
++	char *result;
+ 
+ 	br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
+ 
+@@ -428,7 +429,8 @@ br_extract_dir (const char *path)
+ char *
+ br_extract_prefix (const char *path)
+ {
+-	char *end, *tmp, *result;
++	const char *end;
++	char *tmp, *result;
+ 
+ 	br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
+ 



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