- Fix build with clang

- Add LICENSE
- Add desktop entry file
- Support staging

PR:		pors/184815
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

7 files changed, 57 insertions, 9 deletions

diff --git a/graphics/graphopt/Makefile b/graphics/graphopt/Makefile
index f6468ca746fc..c6a7ec9b7258 100644
--- a/graphics/graphopt/Makefile
+++ b/graphics/graphopt/Makefile
@@ -3,16 +3,19 @@
 
 PORTNAME=	graphopt
 PORTVERSION=	0.4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Graph Layout Optimizer
+COMMENT=	Graph layout optimizer
+
+LICENSE=	GPLv2 # (or later)
 
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
-NO_STAGE=	yes
+DESKTOP_ENTRIES="GraphOpt" "" "" "${PORTNAME}" "Graphics;GTK;" ""
+
 .include <bsd.port.mk>
diff --git a/graphics/graphopt/files/patch-src:classes:psExporter.cc b/graphics/graphopt/files/patch-src:classes:psExporter.cc
index 3db6b86bae59..2d649f2d5790 100644
--- a/graphics/graphopt/files/patch-src:classes:psExporter.cc
+++ b/graphics/graphopt/files/patch-src:classes:psExporter.cc
@@ -1,10 +1,13 @@
 --- src/classes/psExporter.cc.orig	Mon Aug  9 09:31:11 2004
 +++ src/classes/psExporter.cc	Mon Aug  9 09:31:38 2004
-@@ -23,13 +23,13 @@ void psExporter::do_export() {
-    fclose(outfile);
- }
+@@ -1,4 +1,5 @@
+ #include "psExporter.h"
++#include <cstdlib>
  
  
+ psExporter::psExporter(char *what_file, nodes *what_nodes) {
+@@ -26,7 +27,7 @@
+ 
  void psExporter::write_headers(FILE *outfile) {
     char *line = new char[200];
 -   sprintf(line, "\%!PS-Adobe-1.0\n%%%%BoundingBox: 0 0 %d %d\n%%%%DocumentFonts: Helvetica\n%%%%Pages: 1\n",
@@ -12,6 +15,3 @@
             translatexcoord((double) biggest_x) + 2 * margin,
             translateycoord((double) biggest_y) + 2 * margin);
     fwrite(line, strlen(line), 1, outfile);
-    delete line;
- }
- 
diff --git a/graphics/graphopt/files/patch-src__classes__dotImporter.cc b/graphics/graphopt/files/patch-src__classes__dotImporter.cc
new file mode 100644
index 000000000000..807beedb09cd
--- /dev/null
+++ b/graphics/graphopt/files/patch-src__classes__dotImporter.cc
@@ -0,0 +1,10 @@
+--- src/classes/dotImporter.cc.orig
++++ src/classes/dotImporter.cc
+@@ -1,5 +1,6 @@
+ #include "dotImporter.h"
+-#include <string.h>
++#include <cstdlib>
++#include <cstring>
+ #include <gtk/gtk.h>
+ #include "../interface.h"
+ 
diff --git a/graphics/graphopt/files/patch-src__classes__nodes.cc b/graphics/graphopt/files/patch-src__classes__nodes.cc
new file mode 100644
index 000000000000..46542717f358
--- /dev/null
+++ b/graphics/graphopt/files/patch-src__classes__nodes.cc
@@ -0,0 +1,9 @@
+--- src/classes/nodes.cc.orig	2013-12-10 00:22:15.000000000 +0900
++++ src/classes/nodes.cc	2013-12-10 00:22:39.000000000 +0900
+@@ -1,4 +1,5 @@
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
+ #include "nodes.h"
+ 
+ 
diff --git a/graphics/graphopt/files/patch-src__classes__optFileReader.cc b/graphics/graphopt/files/patch-src__classes__optFileReader.cc
new file mode 100644
index 000000000000..1529cb2e2656
--- /dev/null
+++ b/graphics/graphopt/files/patch-src__classes__optFileReader.cc
@@ -0,0 +1,10 @@
+--- src/classes/optFileReader.cc.orig
++++ src/classes/optFileReader.cc
+@@ -1,5 +1,6 @@
+ #include "optFileReader.h"
+-#include <string.h>
++#include <cstdlib>
++#include <cstring>
+ #include <gtk/gtk.h>
+ #include "../interface.h"
+ 
diff --git a/graphics/graphopt/files/patch-src__classes__optFileWriter.cc b/graphics/graphopt/files/patch-src__classes__optFileWriter.cc
new file mode 100644
index 000000000000..fccf43906145
--- /dev/null
+++ b/graphics/graphopt/files/patch-src__classes__optFileWriter.cc
@@ -0,0 +1,8 @@
+--- src/classes/optFileWriter.cc.orig
++++ src/classes/optFileWriter.cc
+@@ -1,4 +1,5 @@
+ #include "optFileWriter.h"
++#include <cstdlib>
+ 
+ 
+ optFileWriter::optFileWriter(char *what_file, nodes *what_nodes) {
diff --git a/graphics/graphopt/files/patch-src__classes__visioExporter.cc b/graphics/graphopt/files/patch-src__classes__visioExporter.cc
new file mode 100644
index 000000000000..e093590a0fde
--- /dev/null
+++ b/graphics/graphopt/files/patch-src__classes__visioExporter.cc
@@ -0,0 +1,8 @@
+--- src/classes/visioExporter.cc.orig
++++ src/classes/visioExporter.cc
+@@ -1,4 +1,5 @@
+ #include "visioExporter.h"
++#include <cstdlib>
+ 
+ 
+ visioExporter::visioExporter(char *what_file, nodes *what_nodes) {