7001049 Update gnuplot to version 4.4.4
authorRich Burridge <rich.burridge@oracle.com>
Fri, 27 Jan 2012 10:45:51 -0800
changeset 670 2d9c52030317
parent 669 8046d7c55991
child 671 2bc83fb23c67
7001049 Update gnuplot to version 4.4.4
components/gnuplot/Makefile
components/gnuplot/gnuplot.p5m
components/gnuplot/patches/syscfg.h.patch
--- a/components/gnuplot/Makefile	Thu Jan 26 15:58:31 2012 -0800
+++ b/components/gnuplot/Makefile	Fri Jan 27 10:45:51 2012 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -28,11 +28,11 @@
 LD_Z_IGNORE=
 
 COMPONENT_NAME=		gnuplot
-COMPONENT_VERSION=	4.4.0
+COMPONENT_VERSION=	4.4.4
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=  http://gnuplot.info/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha1:04a2eede7b2af8e64144aa8ffede6535b7a043b5
+COMPONENT_ARCHIVE_HASH= sha1:d4f143eade1f8d8b27be44cbda431d37a71c6a31
 COMPONENT_ARCHIVE_URL=  http://sourceforge.net/projects/$(COMPONENT_NAME)/files/$(COMPONENT_NAME)/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)/download
 
 COMPONENT_BUILD_TARGETS = all info
--- a/components/gnuplot/gnuplot.p5m	Thu Jan 26 15:58:31 2012 -0800
+++ b/components/gnuplot/gnuplot.p5m	Fri Jan 27 10:45:51 2012 -0800
@@ -18,13 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr/demo/gnuplot/(.+[.-].+)$ -> set action.hash demo/%<\1> >
 
 set name=pkg.fmri value=pkg:/image/gnuplot@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="gnuplot - plotting utility"
-set name=pkg.description value="gnuplot - command-driven interactive function plotting program (4.4.0)"
+set name=pkg.description value="gnuplot - command-driven interactive function plotting program"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Graphics and Imaging"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gnuplot/patches/syscfg.h.patch	Thu Jan 26 15:58:31 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gnuplot-4.4.0/src/syscfg.h.orig	Tue Feb  2 21:01:00 2010
-+++ gnuplot-4.4.0/src/syscfg.h	Mon Mar 28 16:38:32 2011
-@@ -425,7 +425,7 @@
- #endif
- 
- /* May or may not fix a problem reported for Sun Studio compilers */
--#if defined(__SUNPRO_CC) && !defined(bool)
-+#if defined(__SUNPRO_CC) && !defined __cplusplus && !defined(bool)
- #define bool unsigned char
- #endif
-