# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1357702284 18000
# Node ID 09a58eb274f4be973f218cba33c4b324f611b2d0
# Parent  01a2b5484d887213a099d4d4cd5131cf898cda2e
Include pstoedit as a dependency of Octave

diff -r 01a2b5484d88 -r 09a58eb274f4 index.html
--- a/index.html	Tue Jan 08 20:53:50 2013 -0500
+++ b/index.html	Tue Jan 08 22:31:24 2013 -0500
@@ -1834,6 +1834,11 @@
         <td id="protobuf-website"><a href="http://code.google.com/p/protobuf"/>protobuf</a></td>
     </tr>
     <tr>
+        <td id="pstoedit-package">pstoedit</td>
+        <td id="pstoedit-version">3.61</td>
+        <td id="pstoedit-website"><a href="http://www.pstoedit.net"</a></td>
+    </tr>
+    <tr>
         <td id="pthreads-package">pthreads</td>
         <td id="pthreads-version">2-9-1</td>
         <td id="pthreads-website"><a href="http://sourceware.org/pthreads-win32/">Pthreads-w32</a></td>
diff -r 01a2b5484d88 -r 09a58eb274f4 src/octave.mk
--- a/src/octave.mk	Tue Jan 08 20:53:50 2013 -0500
+++ b/src/octave.mk	Tue Jan 08 22:31:24 2013 -0500
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)
-$(PKG)_DEPS     := arpack blas curl fftw fltk gcc glpk gnuplot graphicsmagick lapack llvm pcre qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := arpack blas curl fftw fltk gcc glpk gnuplot graphicsmagick lapack llvm pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
diff -r 01a2b5484d88 -r 09a58eb274f4 src/pstoedit-1-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pstoedit-1-fixes.patch	Tue Jan 08 22:31:24 2013 -0500
@@ -0,0 +1,39 @@
+diff -uNr e/othersrc/gsdllinc/wgsver.c f/othersrc/gsdllinc/wgsver.c
+--- e/othersrc/gsdllinc/wgsver.c	2010-12-27 10:09:35.000000000 -0500
++++ f/othersrc/gsdllinc/wgsver.c	2013-01-08 22:23:09.775545031 -0500
+@@ -39,6 +39,10 @@
+ #include <stdlib.h>
+ #include "wgsver.h"
+ 
++#ifndef KEY_WOW64_64KEY
++#define KEY_WOW64_64KEY 0x0100
++#endif
++
+ /* Ghostscript may be known in the Windows Registry by
+  * the following names.
+  */
+diff -uNr e/src/cbstream.cpp f/src/cbstream.cpp
+--- e/src/cbstream.cpp	2012-08-28 09:52:28.000000000 -0400
++++ f/src/cbstream.cpp	2013-01-08 22:15:04.575971765 -0500
+@@ -33,6 +33,8 @@
+ // this code is only needed under WIN32
+ // ...and under OS/2
+ 
++#include <cstdio>
++
+ #include "cppcomp.h"
+ 
+ #include "cbstream.h"
+diff -uNr e/src/Makefile.am f/src/Makefile.am
+--- e/src/Makefile.am	2010-08-22 09:54:28.000000000 -0400
++++ f/src/Makefile.am	2013-01-08 22:28:40.596345408 -0500
+@@ -133,7 +133,8 @@
+ 	genericints.h 				\
+ 	version.h
+ 
+-libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
++libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -lm
++libpstoedit_la_CPPFLAGS = -I$(top_srcdir)/othersrc/gsdllinc
+ libpstoedit_la_LDFLAGS = -no-undefined
+ 
+ pstoedit_SOURCES = cmdmain.cpp
diff -r 01a2b5484d88 -r 09a58eb274f4 src/pstoedit.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pstoedit.mk	Tue Jan 08 22:31:24 2013 -0500
@@ -0,0 +1,26 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := pstoedit
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 426f3746ecb441caa0db401d5880e1ac04a399d5
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://sourceforge.net/projects/pstoedit/files/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package pstoedit.' >&2;
+    echo $(pstoedit_VERSION)
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && autoreconf
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && '$(1)/configure' \
+        --host='$(TARGET)' \
+        --build="`config.guess`" \
+        --prefix='$(PREFIX)/$(TARGET)'
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
+endef