[102647] trunk/dports/aqua/fltk

[and.damore at macports.org]

Revision: 102647
          https://trac.macports.org/changeset/102647
Author:   and.damore at macports.org
Date:     2013-02-05 09:57:21 -0800 (Tue, 05 Feb 2013)
Log Message:
-----------
port fltk: update to 1.3.2

Modified Paths:
--------------
    trunk/dports/aqua/fltk/Portfile

Removed Paths:
-------------
    trunk/dports/aqua/fltk/files/patch-FL-mac.H.diff
    trunk/dports/aqua/fltk/files/patch-src-filename_list.cxx.diff

Modified: trunk/dports/aqua/fltk/Portfile
===================================================================
--- trunk/dports/aqua/fltk/Portfile	2013-02-05 17:42:25 UTC (rev 102646)
+++ trunk/dports/aqua/fltk/Portfile	2013-02-05 17:57:21 UTC (rev 102647)
@@ -5,7 +5,7 @@
 
 name            fltk
 conflicts       fltk-devel
-version         1.3.0
+version         1.3.2
 categories      aqua devel
 license         LGPL
 platforms       macosx
@@ -30,8 +30,8 @@
 worksrcdir      ${name}-${version}
 distname        ${worksrcdir}-source
 
-checksums       rmd160  dea1eb42ae1b81efa22a54198956211367e2945a \
-                sha256  990676808294cea4cca3de833ad5a5de08073c11b665356d4ecf35d22535b21c
+checksums           rmd160  5d697cb582cb80a1eca50c35696731eea5591768 \
+                    sha256  176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4
 
 depends_lib     port:jpeg \
                 port:libpng \
@@ -39,10 +39,8 @@
 
 use_parallel_build  yes
 
-patchfiles      patch-FL-mac.H.diff \
-                patch-fluid-Makefile.diff \
-                patch-src-Makefile.diff \
-                patch-src-filename_list.cxx.diff
+patchfiles      patch-fluid-Makefile.diff \
+                patch-src-Makefile.diff
 
 post-patch {
     reinplace "s|/Applications|${applications_dir}/${name}|g" \

Deleted: trunk/dports/aqua/fltk/files/patch-FL-mac.H.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-FL-mac.H.diff	2013-02-05 17:42:25 UTC (rev 102646)
+++ trunk/dports/aqua/fltk/files/patch-FL-mac.H.diff	2013-02-05 17:57:21 UTC (rev 102647)
@@ -1,15 +0,0 @@
---- FL/mac.H.orig	2011-05-12 06:50:43.000000000 -0500
-+++ FL/mac.H	2012-09-05 18:57:31.000000000 -0500
-@@ -52,6 +52,12 @@
- #ifndef MAC_OS_X_VERSION_10_6
- #define MAC_OS_X_VERSION_10_6 1060
- #endif
-+#ifndef MAC_OS_X_VERSION_10_7
-+#define MAC_OS_X_VERSION_10_7 1070
-+#endif
-+#ifndef MAC_OS_X_VERSION_10_8
-+#define MAC_OS_X_VERSION_10_8 1080
-+#endif
- 
- #if !(defined(FL_LIBRARY) || defined(FL_INTERNALS)) // this part is used when compiling an application program
- 

Deleted: trunk/dports/aqua/fltk/files/patch-src-filename_list.cxx.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-src-filename_list.cxx.diff	2013-02-05 17:42:25 UTC (rev 102646)
+++ trunk/dports/aqua/fltk/files/patch-src-filename_list.cxx.diff	2013-02-05 17:57:21 UTC (rev 102647)
@@ -1,27 +0,0 @@
-http://www.fltk.org/str.php?L2864
---- src/filename_list.cxx.orig	2011-01-05 10:50:10.000000000 -0600
-+++ src/filename_list.cxx	2012-08-14 04:23:22.000000000 -0500
-@@ -31,7 +22,9 @@
- #include <FL/fl_utf8.h>
- #include "flstring.h"
- #include <stdlib.h>
--
-+#ifdef __APPLE__
-+#include <FL/x.H>
-+#endif
- 
- extern "C" {
- #ifndef HAVE_SCANDIR
-@@ -115,6 +108,12 @@
-   int n = scandir(dirloc, list, 0, (int(*)(void*, void*))sort);
- #elif defined(__sgi)
-   int n = scandir(dirloc, list, 0, sort);
-+#elif defined(__APPLE__)
-+# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-+  int n = scandir(dirloc, list, 0, (int(*)(const struct dirent**,const struct dirent**))sort);
-+# else
-+  int n = scandir(dirloc, list, 0, (int(*)(const void*,const void*))sort);
-+# endif
- #else
-   // The vast majority of UNIX systems want the sort function to have this
-   // prototype, most likely so that it can be passed to qsort without any
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130205/553cd70f/attachment.html>