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

[lblume at users.sourceforge.net]

Revision: 21352
          http://gar.svn.sourceforge.net/gar/?rev=21352&view=rev
Author:   lblume
Date:     2013-06-17 09:18:17 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
gnuplot/trunk: bump to 4.6.3; change wxwidget dependencies; clean up useless dependencies thanks to -z ignore 

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

Modified: csw/mgar/pkg/gnuplot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnuplot/trunk/Makefile	2013-06-17 09:15:33 UTC (rev 21351)
+++ csw/mgar/pkg/gnuplot/trunk/Makefile	2013-06-17 09:18:17 UTC (rev 21352)
@@ -1,5 +1,5 @@
 NAME = gnuplot
-VERSION = 4.6.1
+VERSION = 4.6.3
 
 DESCRIPTION = The Gnuplot Plotting Utility
 
@@ -15,19 +15,11 @@
 PACKAGES += CSWgnuplot
 CATALOGNAME_CSWgnuplot = gnuplot
 SPKG_DESC_CSWgnuplot = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibreadline6
 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibgd2
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibxpm4
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibncurses5
 RUNTIME_DEP_PKGS_CSWgnuplot += CSWliblua5-2
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibz1
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibjpeg7
 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpdf6
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpng15-15
 
 # There is just an emacs style in it, do not depend on it
 CHECKPKG_OVERRIDES_CSWgnuplot += missing-dependency|CSWemacscommon
@@ -36,34 +28,18 @@
 CATALOGNAME_CSWgnuplot-wx = gnuplot_wx
 SPKG_DESC_CSWgnuplot-wx = $(DESCRIPTION) (with WX-Widgets and Pango)
 RUNTIME_DEP_PKGS_CSWgnuplot-wx = CSWgnuplot
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetscommon
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibatk1-0-0
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWpango
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibcairo2
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetsgtk2
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibreadline6
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgd2
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibxpm4
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibncursesw5
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWliblua5-2
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWsunmath
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibz1
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibjpeg7
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgdk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgtk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibpdf6
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgets
+RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetsgtk2
 
 # This is pulled in from Wx, take out if that has been redone
 CHECKPKG_OVERRIDES_CSWgnuplot-wx += bad-rpath-entry|/opt/csw/lib/|opt/csw/libexec/gnuplot/4.6/gnuplot_x11-wx
@@ -73,7 +49,7 @@
 
 REINPLACE_USRLOCAL += share/gnuplotrc
 
-EXTRA_LINKER_FLAGS += -norunpath
+EXTRA_LINKER_FLAGS += -norunpath -z ignore
 
 # Gnuplot automatically pulls in libCstd which is needed by libwx_gtk2u_core-2.8.so.0.6.0 because
 # the library is wrong self-contained (ldd -r on that throws unresolved symbol errors).
@@ -133,11 +109,6 @@
 CHECKPKG_OVERRIDES_CSWgnuplot += surplus-dependency|CSWalternatives
 CHECKPKG_OVERRIDES_CSWgnuplot-wx += surplus-dependency|CSWalternatives
 
-# These are just examples
-CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/share/gnuplot/4.6/gnuplot.gih-nowx
-CHECKPKG_OVERRIDES_CSWgnuplot-wx += file-with-bad-content|/usr/local|root/opt/csw/share/gnuplot/4.6/gnuplot.gih-wx
-CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnuplot.info
-
 # Is this GDFONTPATH related? That would be bad... CHECK!!!
 #CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/bin/gnuplot-nowx
 #CHECKPKG_OVERRIDES_CSWgnuplot-wx += file-with-bad-content|/usr/local|root/opt/csw/bin/gnuplot-wx

Modified: csw/mgar/pkg/gnuplot/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnuplot/trunk/checksums	2013-06-17 09:15:33 UTC (rev 21351)
+++ csw/mgar/pkg/gnuplot/trunk/checksums	2013-06-17 09:18:17 UTC (rev 21352)
@@ -1 +1 @@
-4c9a06461f402482c30cf94e267eb877  gnuplot-4.6.1.tar.gz
+db7a73d2dddec0149dcec35e30561aa3  gnuplot-4.6.3.tar.gz

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