# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1369499834 14400
# Node ID 1f944d8d6fe5cbdb9195ab1b936089cefd874fad
# Parent  4b450c162e392aa3e0ede98c6a7ff449eb4af56d
Modfications for libuuid dependancies

* index.html: Added uuid package entry.

* src/fltk-2-uuid-mod.patch: New patch file

* src/fltk.m: Added uuid to fltk dependancies.

* src/octave.mk (PKG_BUILD): Removed build of uuid.dll.

* src/uuid.mk: New file.

diff -r 4b450c162e39 -r 1f944d8d6fe5 index.html
--- a/index.html	Sat May 18 18:15:43 2013 -0400
+++ b/index.html	Sat May 25 12:37:14 2013 -0400
@@ -2174,6 +2174,11 @@
         <td id="tre-website"><a href="http://laurikari.net/tre/">TRE</a></td>
     </tr>
     <tr>
+        <td id="uuid-package">uuid</td>
+        <td id="uuid-version">3.17</td>
+        <td id="uuid-website"><a href="http://www.mingw.org/">MingWG Windows API</a></td>
+    </tr>
+    <tr>
         <td id="vigra-package">vigra</td>
         <td id="vigra-version">1.9.0</td>
         <td id="vigra-website"><a href="http://hci.iwr.uni-heidelberg.de/vigra">vigra</a></td>
diff -r 4b450c162e39 -r 1f944d8d6fe5 src/fltk-2-uuid-mod.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/fltk-2-uuid-mod.patch	Sat May 25 12:37:14 2013 -0400
@@ -0,0 +1,12 @@
+diff -ur fltk-1.3.1.orig/fltk-config.in fltk-1.3.1/fltk-config.in
+--- fltk-1.3.1.orig/fltk-config.in	2013-05-24 20:20:53.000000000 -0400
++++ fltk-1.3.1/fltk-config.in	2013-05-24 20:22:12.000000000 -0400
+@@ -341,7 +341,7 @@
+     libdirs=$libs
+ 
+     for i in $LDLIBS ; do
+-	if test $i != -L$libdir ; then
++	if test $i != -L$libdir -a $i != -luuid ; then
+ 	    if test -z "$my_libs" ; then
+ 		my_libs="$i"
+ 	    else
diff -r 4b450c162e39 -r 1f944d8d6fe5 src/fltk.mk
--- a/src/fltk.mk	Sat May 18 18:15:43 2013 -0400
+++ b/src/fltk.mk	Sat May 25 12:37:14 2013 -0400
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR)-source.tar.gz
 $(PKG)_URL      := http://fltk.org/pub/fltk/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc zlib jpeg libpng pthreads
+$(PKG)_DEPS     := gcc zlib jpeg libpng pthreads uuid
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.fltk.org/' | \
diff -r 4b450c162e39 -r 1f944d8d6fe5 src/octave.mk
--- a/src/octave.mk	Sat May 18 18:15:43 2013 -0400
+++ b/src/octave.mk	Sat May 25 12:37:14 2013 -0400
@@ -15,14 +15,6 @@
 endef
 
 define $(PKG)_BUILD
-    if [ $(BUILD_SHARED) = yes ]; then \
-      $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libuuid.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libuuid.dll.a' '$(PREFIX)/$(TARGET)/lib/libuuid.dll.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libuuid.dll' '$(PREFIX)/$(TARGET)/bin/libuuid.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libuuid.dll'; \
-    fi
-
     mkdir '$(1)/.build'
     cd '$(1)' && autoreconf -W none
     cd '$(1)/.build' && '$(1)/configure' \
diff -r 4b450c162e39 -r 1f944d8d6fe5 src/uuid.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/uuid.mk	Sat May 25 12:37:14 2013 -0400
@@ -0,0 +1,22 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := uuid
+$(PKG)_IGNORE   = $(w32api_IGNORE)
+$(PKG)_CHECKSUM = $(w32api_CHECKSUM)
+$(PKG)_SUBDIR   = $(w32api_SUBDIR)
+$(PKG)_FILE     = $(w32api_FILE)
+$(PKG)_URL      = $(w32api_URL)
+$(PKG)_DEPS     = gcc
+
+define $(PKG)_UPDATE
+    echo "$(w32api_VERSION)"
+endef
+
+define $(PKG)_BUILD
+    if [ $(BUILD_SHARED) = yes ]; then \
+      $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/lib/libuuid.a'; \
+      $(INSTALL) -m755 '$(1)/lib/libuuid.dll' '$(PREFIX)/$(TARGET)/bin/libuuid.dll'; \
+    fi
+endef