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

[dmichelsen at users.sourceforge.net]

Revision: 19917
          http://gar.svn.sourceforge.net/gar/?rev=19917&view=rev
Author:   dmichelsen
Date:     2012-12-18 15:43:54 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
gnuplot/trunk: Add override and additional deps

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

Modified: csw/mgar/pkg/gnuplot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnuplot/trunk/Makefile	2012-12-18 15:40:04 UTC (rev 19916)
+++ csw/mgar/pkg/gnuplot/trunk/Makefile	2012-12-18 15:43:54 UTC (rev 19917)
@@ -26,7 +26,12 @@
 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
+
 PACKAGES += CSWgnuplot-wx
 CATALOGNAME_CSWgnuplot-wx = gnuplot_wx
 SPKG_DESC_CSWgnuplot-wx = $(DESCRIPTION) (with WX-Widgets and Pango)
@@ -50,7 +55,6 @@
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibz1
 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgthread2-0-0
 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
@@ -58,7 +62,13 @@
 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
 
+# 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
+
+# TBD: Add all build deps
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWgnuplot-wx)
 
 REINPLACE_USRLOCAL += share/gnuplotrc

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