[97414] trunk/dports/aqua/fltk

[ryandesign at macports.org]

Revision: 97414
          https://trac.macports.org/changeset/97414
Author:   ryandesign at macports.org
Date:     2012-09-05 01:54:15 -0700 (Wed, 05 Sep 2012)
Log Message:
-----------
fltk: update to 1.3.0 (#29664, #35971)

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

Added Paths:
-----------
    trunk/dports/aqua/fltk/files/
    trunk/dports/aqua/fltk/files/patch-src-filename_list.cxx.diff

Modified: trunk/dports/aqua/fltk/Portfile
===================================================================
--- trunk/dports/aqua/fltk/Portfile	2012-09-05 08:03:16 UTC (rev 97413)
+++ trunk/dports/aqua/fltk/Portfile	2012-09-05 08:54:15 UTC (rev 97414)
@@ -5,8 +5,7 @@
 
 name            fltk
 conflicts       fltk-devel
-version         1.1.10
-revision        5
+version         1.3.0
 categories      aqua devel
 license         LGPL
 platforms       macosx
@@ -30,11 +29,9 @@
 master_sites    http://ftp.easysw.com/pub/fltk/${version}/
 worksrcdir      ${name}-${version}
 distname        ${worksrcdir}-source
-use_bzip2       yes
 
-checksums       md5     a1765594bc427ff892e36089fe1fa672 \
-                sha1    0d2b34fede91fa78eeaefb893dd70282f73908a8 \
-                rmd160  f8fc4371811efcc0d6fc73edd0525d8ff87a4faa
+checksums       rmd160  dea1eb42ae1b81efa22a54198956211367e2945a \
+                sha256  990676808294cea4cca3de833ad5a5de08073c11b665356d4ecf35d22535b21c
 
 depends_lib     port:jpeg \
                 port:libpng \
@@ -42,12 +39,7 @@
 
 use_parallel_build  yes
 
-# Force 32-bit (#21054)
-supported_archs i386 ppc
-universal_variant no
-if {[vercmp $macosx_deployment_target 10.7] >= 0} {
-    macosx_deployment_target 10.6
-}
+patchfiles      patch-src-filename_list.cxx.diff
 
 post-patch {
     reinplace "s|/Applications|${applications_dir}/${name}|g" \
@@ -55,16 +47,14 @@
         ${worksrcpath}/test/Makefile
 }
 
-configure.cflags
-configure.cppflags
-configure.cxxflags
-configure.ldflags
-configure.env         DSOFLAGS=\"${configure.ld_archflags}\"
-configure.args  --enable-threads \
-                --enable-shared \
-                --mandir=${prefix}/share/man \
-                --with-archflags=\"${configure.cc_archflags}\"
+variant universal {}
 
+configure.args  --enable-shared \
+                --disable-localjpeg \
+                --disable-localzlib \
+                --disable-localpng \
+                --with-archflags="[get_canonical_archflags]"
+
 post-configure {
     reinplace -E {s|-arch [a-z0-9_]+||g} ${worksrcpath}/fltk-config
 }

Added: trunk/dports/aqua/fltk/files/patch-src-filename_list.cxx.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-src-filename_list.cxx.diff	                        (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-src-filename_list.cxx.diff	2012-09-05 08:54:15 UTC (rev 97414)
@@ -0,0 +1,16 @@
+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
+@@ -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/20120905/c66730b0/attachment.html>