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

[dmichelsen at users.sourceforge.net]

Revision: 14645
          http://gar.svn.sourceforge.net/gar/?rev=14645&view=rev
Author:   dmichelsen
Date:     2011-05-25 09:10:41 +0000 (Wed, 25 May 2011)

Log Message:
-----------
gnuplot: Enable X11 for base package as requested in #4773 and remove unneeded dependencies

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

Modified: csw/mgar/pkg/gnuplot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnuplot/trunk/Makefile	2011-05-25 02:27:34 UTC (rev 14644)
+++ csw/mgar/pkg/gnuplot/trunk/Makefile	2011-05-25 09:10:41 UTC (rev 14645)
@@ -31,10 +31,6 @@
 RUNTIME_DEP_PKGS_CSWgnuplot += CSWftype2
 RUNTIME_DEP_PKGS_CSWgnuplot += CSWzlib
 RUNTIME_DEP_PKGS_CSWgnuplot += CSWjpeg
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWpango
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWglib2
 
 PACKAGES += CSWgnuplot-wx
 CATALOGNAME_CSWgnuplot-wx = gnuplot_wx
@@ -72,7 +68,7 @@
 
 CONFIGURE_ARGS_wxwidgets-no += --without-cairo
 CONFIGURE_ARGS_wxwidgets-no += --disable-wxwidgets
-CONFIGURE_ARGS_wxwidgets-no += --without-x
+#CONFIGURE_ARGS_wxwidgets-no += --without-x
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_wxwidgets-$(WXWIDGETS))
 
 # Preset value until this is fixed:
@@ -88,6 +84,7 @@
 
 # These are exactly the differing files between the install-directories
 ALTERNATIVE_FILES += /opt/csw/bin/gnuplot
+ALTERNATIVE_FILES += /opt/csw/libexec/gnuplot/4.4/gnuplot_x11
 ALTERNATIVE_FILES += /opt/csw/share/emacs/site-lisp/gnuplot-gui.elc
 ALTERNATIVE_FILES += /opt/csw/share/emacs/site-lisp/gnuplot.elc
 ALTERNATIVE_FILES += /opt/csw/share/gnuplot/4.4/gnuplot.gih


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