[csw-devel] SF.net SVN: gar:[11804] csw/mgar/pkg/gnuplot/trunk

[dmichelsen at users.sourceforge.net]

Revision: 11804
          http://gar.svn.sourceforge.net/gar/?rev=11804&view=rev
Author:   dmichelsen
Date:     2010-12-06 13:03:02 +0000 (Mon, 06 Dec 2010)

Log Message:
-----------
gnuplot: Update to 4.4.2 and some minor patching

Modified Paths:
--------------
    csw/mgar/pkg/gnuplot/trunk/Makefile
    csw/mgar/pkg/gnuplot/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gnuplot/trunk/files/0001-Remove-definition-unclear-why-leaving-it-in-causes-e.patch

Modified: csw/mgar/pkg/gnuplot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnuplot/trunk/Makefile	2010-12-06 03:27:58 UTC (rev 11803)
+++ csw/mgar/pkg/gnuplot/trunk/Makefile	2010-12-06 13:03:02 UTC (rev 11804)
@@ -1,16 +1,56 @@
 GARNAME = gnuplot
-GARVERSION = 4.4.0
+GARVERSION = 4.4.2
 CATEGORIES = utils
 
 DESCRIPTION = The Gnuplot Plotting Utility
 define BLURB
-	The Gnuplot Plotting Utility.
+  The Gnuplot Plotting Utility.
 endef
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
+PATCHFILES = 0001-Remove-definition-unclear-why-leaving-it-in-causes-e.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+VENDOR_URL = http://www.gnuplot.info/
+
+LICENSE = Copyright
+
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWwxwidgetscommon
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibatk
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWpango
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWpng
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWemacscommon
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWfconfig
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWiconv
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWwxwidgetsgtk2
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWreadline
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWgtk2
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWgd
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWxpm
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWncurses
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWlua
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWsunmath
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWftype2
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWglib2
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWzlib
+RUNTIME_DEP_PKGS_CSWgnuplot += CSWjpeg
+
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWgnuplot)
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+# Preset value until this is fixed:
+#   https://sourceforge.net/tracker/?func=detail&aid=3129839&group_id=2055&atid=102055
+CONFIGURE_ARGS += ac_cv_type__Bool=no
+
+#CONFIGURE_ARGS += --with-texdir=
+
+TEST_TARGET = check
+
 include gar/category.mk

Modified: csw/mgar/pkg/gnuplot/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnuplot/trunk/checksums	2010-12-06 03:27:58 UTC (rev 11803)
+++ csw/mgar/pkg/gnuplot/trunk/checksums	2010-12-06 13:03:02 UTC (rev 11804)
@@ -1 +1 @@
-e708665bd512153ad5c35252fe499059  gnuplot-4.4.0.tar.gz
+a4f0dd89f9b9334890464f687ddd9f50  gnuplot-4.4.2.tar.gz

Added: csw/mgar/pkg/gnuplot/trunk/files/0001-Remove-definition-unclear-why-leaving-it-in-causes-e.patch
===================================================================
--- csw/mgar/pkg/gnuplot/trunk/files/0001-Remove-definition-unclear-why-leaving-it-in-causes-e.patch	                        (rev 0)
+++ csw/mgar/pkg/gnuplot/trunk/files/0001-Remove-definition-unclear-why-leaving-it-in-causes-e.patch	2010-12-06 13:03:02 UTC (rev 11804)
@@ -0,0 +1,25 @@
+From 0935ad8425969e358de4ba22b7bdf3f0b967b9c9 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 6 Dec 2010 13:36:41 +0100
+Subject: [PATCH] Remove definition, unclear why leaving it in causes errors
+
+---
+ src/syscfg.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/syscfg.h b/src/syscfg.h
+index 1921f63..83e107e 100644
+--- a/src/syscfg.h
++++ b/src/syscfg.h
+@@ -415,7 +415,7 @@ typedef RETSIGTYPE (*sigfunc)__PROTO((void));
+ #  ifdef __cplusplus
+ typedef bool _Bool;
+ #  else
+-typedef unsigned char _Bool;
++typedef unsigned char _Bool_;
+ #  endif
+ # endif
+ # define bool _Bool
+-- 
+1.7.3
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.