# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1354544105 18000
# Node ID 848118c648ae15858376cf254a360e3ebaf50f64
# Parent  152e3e6935682ef43c2f5e240c258fb57f30a1f7
Include gnuplot as a dependency of Octave

diff -r 152e3e693568 -r 848118c648ae index.html
--- a/index.html	Thu Nov 29 12:22:19 2012 -0500
+++ b/index.html	Mon Dec 03 09:15:05 2012 -0500
@@ -1194,6 +1194,11 @@
         <td id="gmp-website"><a href="http://www.gmplib.org/">GMP</a></td>
     </tr>
     <tr>
+        <td id="gnuplot-package">gnuplot</td>
+        <td id="gnuplot-version">4.6.1</td>
+        <td id="gnuplot-website"><a href="http://www.gnuplot.info/">gnuplot</a></td>
+    </tr>
+    <tr>
         <td id="gnutls-package">gnutls</td>
         <td id="gnutls-version">3.1.4</td>
         <td id="gnutls-website"><a href="http://www.gnu.org/software/gnutls/">GnuTLS</a></td>
diff -r 152e3e693568 -r 848118c648ae src/gnuplot-1-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gnuplot-1-fixes.patch	Mon Dec 03 09:15:05 2012 -0500
@@ -0,0 +1,147 @@
+--- a/config/mingw/Makefile	2012-11-30 16:52:35.622821917 -0500
++++ b/config/mingw/Makefile	2012-11-30 16:52:23.071255685 -0500
+@@ -27,7 +27,7 @@
+ 
+ # Use more modern HTML help instead of no longer supported Windows help system
+ # Please update the HHWPATH below if necessary.
+-HTML_HELP=1
++#HTML_HELP=1
+ 
+ # GIF, PNG, JPEG device drivers
+ # Requires gd library. There are two possibilities how to configure these
+@@ -127,29 +127,29 @@
+ # -mpentiumpro means optimize for Pentium II and Pro procesors
+ #CFLAGS +=
+ 
+-ifdef HTML_HELP
+-
+-# To compile the .chm file you need the Microsoft HTML Help 1.4 SDK
+-# It can be obtained here:
+-# http://go.microsoft.com/fwlink/?LinkId=154968
+-# We need to explicitly set the correct path here since we also need
+-# adjust the include and linrary paths.
+-HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/"
+-HHC = $(HHWPATH)hhc
++# ifdef HTML_HELP
+ 
+-else
++# # To compile the .chm file you need the Microsoft HTML Help 1.4 SDK
++# # It can be obtained here:
++# # http://go.microsoft.com/fwlink/?LinkId=154968
++# # We need to explicitly set the correct path here since we also need
++# # adjust the include and linrary paths.
++# HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/"
++# HHC = $(HHWPATH)hhc
++
++# else
++
++# # To compile the .hlp file you need hcw either out of Microsoft SDK or MS Help
++# # Workshop. The latter can be obtained from either of
++# # ftp://ftp.microsoft.com/softlib/mslfiles/hcwsetup.exe
++# # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=34D35502-4DE9-4676-952C-34CC7F64F098
++# # Put the path to hcw here unless it is already in PATH:
++# HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/"
++# HCW = $(HCWPATH)hcw
++# # Switches are for HCW 4.03:
++# HCWFLAG =
+ 
+-# To compile the .hlp file you need hcw either out of Microsoft SDK or MS Help
+-# Workshop. The latter can be obtained from either of
+-# ftp://ftp.microsoft.com/softlib/mslfiles/hcwsetup.exe
+-# http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=34D35502-4DE9-4676-952C-34CC7F64F098
+-# Put the path to hcw here unless it is already in PATH:
+-HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/"
+-HCW = $(HCWPATH)hcw
+-# Switches are for HCW 4.03:
+-HCWFLAG =
+-
+-endif
++# endif
+ 
+ # Choose which windres/rc do you want to use (GNU windres or MS RC):
+ GNU_RC = 1
+@@ -397,7 +397,7 @@
+   RES2COFF = res2coff -i wgnuplot.res -o wgplt_res.$(O)
+ endif
+ 
+-default: $(TARGET) $(MENUFILE) support
++default: $(TARGET) $(MENUFILE) # support
+ 
+ console:
+ 	$(MAKE) TARGET=gnuplot.exe gnuplot.exe
+@@ -433,7 +433,7 @@
+ 	$(W)/winmain.c $(W)/wmenu.c $(W)/wpause.c $(W)/wprinter.c \
+ 	$(W)/wresourc.h $(W)/wtext.c $(W)/wtext.h $(W)/geticon.c \
+ 	$(W)/screenbuf.c $(W)/screenbuf.h $(W)/wgdiplus.cpp $(W)/wgdiplus.h \
+-	$(D)doc2rtf.c $(T)win.trm $(W)/grpicon.ico $(W)/texticon.ico
++	$(D)doc2rtf.c $(T)win.trm $(W)/GRPICON.ico $(W)/TEXTICON.ico
+ 
+ ifdef HTML_HELP
+ WINDOWS +=	$(D)windows/doc2html.c
+@@ -453,7 +453,7 @@
+   LDFLAGS2 += -L$(HHWPATH)lib
+ endif
+ 
+-$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) texticon.ico grpicon.ico
++$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) TEXTICON.ico GRPICON.ico
+ 	$(LDX) $(LDFLAGS) $(LDFLAGS2) -o $@ $(OBJS) $(WINOBJS) wgplt_res.$(O) $(LDLIBS)\
+ 	$(TERMLIBS) $(WX_LIBS) $(PANGOCAIRO_LIBS)
+ 
+@@ -462,7 +462,7 @@
+ 
+ # rules
+ 
+-wgplt_res.$(O) :  $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h texticon.ico grpicon.ico
++wgplt_res.$(O) :  $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h TEXTICON.ico GRPICON.ico
+ 	$(RC) $(RCFLAGS) $< $(RCOUT)
+ 	$(RES2COFF)
+ 
+@@ -521,13 +521,13 @@
+ 	$(CC) -c $(CFLAGS) -o $@ $<
+ 
+ # extract icons from wgnuplot.rc
+-texticon.ico: grpicon.ico
++TEXTICON.ico: GRPICON.ico
+ 
+-grpicon.ico: geticon.exe $(W)/wgnuplot.rc
++GRPICON.ico: geticon $(W)/wgnuplot.rc
+ 	./geticon $(W)/wgnuplot.rc
+ 
+-geticon.exe: $(W)/geticon.c
+-	$(LD) $(LDFLAGS) -o $@ $<
++geticon: $(W)/geticon.c
++	gcc -o $@ $<
+ 
+ ifdef HTML_HELP
+ # convert gnuplot.doc to windows/wgnuplot.html
+@@ -730,7 +730,7 @@
+ 	$(RM) config.h wgnuplot.map wgnuplot.res $(W)/gnuplot.rtf
+ 	$(RM) *.$(O) *.po *.o *.co
+ 	$(RM) doc2*.exe $(W)/wgnuplib.res wgnuplib.map wgnuplot.lib
+-	$(RM) $(M)bf_test.exe *.ico geticon.exe allterm.h allterm.c
++	$(RM) $(M)bf_test.exe *.ico geticon allterm.h allterm.c
+ 	$(RM) *.aux *.log *.dvi *.toc
+ 	$(RM) gnuplot.tex gnuplot-figures.tex pdffigures.tex figure_*.pdf
+ 	$(RM) titlepag.tex toc_entr.sty VERSION
+@@ -829,7 +829,7 @@
+ 
+ installer:
+ 	$(MAKE) DESTDIR=./dist install
+-	cp -p grpicon.ico ./dist/bin/
++	cp -p GRPICON.ico ./dist/bin/
+ 	cp -p $(TOP)/win/*.iss ./dist
+ 	(cd ./dist; $(ISCC) gnuplot.iss)
+ 	mv ./dist/gp*-setup.exe .
+--- a/src/win/wgnuplot.rc	2011-05-13 14:32:22.000000000 -0400
++++ b/src/win/wgnuplot.rc	2012-11-30 16:53:59.407926642 -0500
+@@ -15,8 +15,8 @@
+    * rc -30 -k -dMSRC win\wgnuplot.rc wgnuplot.exe
+    */
+ 
+-GRPICON ICON "grpicon.ico"
+-TEXTICON ICON  "texticon.ico"
++GRPICON ICON "GRPICON.ico"
++TEXTICON ICON  "TEXTICON.ico"
+ 
+ #else
+ /* using Borland BRC.EXE */
diff -r 152e3e693568 -r 848118c648ae src/gnuplot.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gnuplot.mk	Mon Dec 03 09:15:05 2012 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := gnuplot
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 1ea21a628223159b0297ae65fe8293afd5aab3c0
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := gnuplot-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://sourceforge.net/projects/gnuplot/files/gnuplot/4.6.1/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package gnuplot.' >&2;
+    echo $(gnuplot_VERSION)
+endef
+
+define $(PKG)_BUILD
+    make -C '$(1)/config/mingw' CC='$(TARGET)-gcc' CXX='$(TARGET)-g++' RC='$(TARGET)-windres' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe
+    make -C '$(1)/config/mingw' CC='$(TARGET)-gcc' CXX='$(TARGET)-g++' RC='$(TARGET)-windres' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe
+    make -C '$(1)/config/mingw' CC='$(TARGET)-gcc' CXX='$(TARGET)-g++' RC='$(TARGET)-windres' -j '$(JOBS)' wgnuplot.mnu
+
+    $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'
+    $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(PREFIX)/$(TARGET)/bin/'
+    $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(PREFIX)/$(TARGET)/bin/'
+    $(INSTALL) -m644 '$(1)/config/mingw/wgnuplot.mnu' '$(PREFIX)/$(TARGET)/bin/'
+
+endef
diff -r 152e3e693568 -r 848118c648ae src/octave.mk
--- a/src/octave.mk	Thu Nov 29 12:22:19 2012 -0500
+++ b/src/octave.mk	Mon Dec 03 09:15:05 2012 -0500
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://jweaton.org/$($(PKG)_FILE)
-$(PKG)_DEPS     := arpack blas curl fftw fltk gcc glpk graphicsmagick lapack pcre qhull qrupdate readline suitesparse zlib
+$(PKG)_DEPS     := arpack blas curl fftw fltk gcc glpk gnuplot graphicsmagick lapack pcre qhull qrupdate readline suitesparse zlib
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;