Changeset 114158 for trunk/dports/aqua


Ignore:
Timestamp:
Nov 30, 2013, 3:59:00 PM (6 years ago)
Author:
michaelld@…
Message:

fltk-devel: update to 1.3.x-r10020.

Location:
trunk/dports/aqua/fltk-devel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/fltk-devel/Portfile

    r111498 r114158  
    66name            fltk-devel
    77conflicts       fltk
    8 version         1.3.x-r9965
     8version         1.3.x-r10020
    99categories      aqua devel
    1010license         LGPL
     
    3131use_bzip2       yes
    3232
    33 checksums       rmd160  ac32fbec144147aff32d43f14840dfcb2eef950d \
    34                 sha256  6ddd756316d6071640d75fb31b47a3420c0c4a0d041b3c44e76cb34f84096890
     33checksums       rmd160  0fec8d95997ebfd0e77677e16f1bc1b19db11864 \
     34                sha256  8f9ed6b125c71a87f44847b06b4e8e7b829d337c9f445bee443c1ebcc6345d31
    3535
    3636depends_lib     port:jpeg \
     
    5050    # Disable silent rules
    5151    reinplace "/^\\.SILENT:$/d" ${worksrcpath}/makeinclude.in
     52
     53    # tell fltk's make script to create config.sub, which is required
     54    # before configure will execute properly.  This command actually
     55    # runs configure through once, to create the file; we then call
     56    # configure manually with the correct argument, which overwrites
     57    # this (and other) files to be what we want.
     58
     59    system "cd ${worksrcpath} && make config.sub"
    5260}
    5361
    54 variant universal {}
     62pre-configure {
     63    configure.args-append \
     64        --with-archflags="[get_canonical_archflags]"
     65}
    5566
    5667configure.args  --enable-shared \
    5768                --disable-localjpeg \
    5869                --disable-localzlib \
    59                 --disable-localpng \
    60                 --with-archflags="[get_canonical_archflags]"
     70                --disable-localpng
     71
     72configure.universal_args-delete --disable-dependency-tracking
    6173
    6274post-configure {
  • trunk/dports/aqua/fltk-devel/files/patch-fluid-Makefile.diff

    r97584 r114158  
    1 --- fluid/Makefile.orig 2012-09-09 10:28:39.000000000 -0500
    2 +++ fluid/Makefile      2012-09-09 10:30:39.000000000 -0500
    3 @@ -54,7 +54,7 @@
     1--- fluid/Makefile.orig 2013-11-29 14:01:44.000000000 -0500
     2+++ fluid/Makefile      2013-11-29 14:02:38.000000000 -0500
     3@@ -48,13 +48,13 @@
     4 fluid$(EXEEXT):                $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
     5                        $(IMGLIBNAME)
     6        echo Linking $@...
     7-       $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
     8+       $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) $(LDFLAGS)
     9        $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
     10 
    411 fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
    512                        ../src/$(IMGDSONAME)
    613        echo Linking $@...
    7 -       $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
    8 +       $(CXX) $(ARCHFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
     14-       $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
     15+       $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
    916 
    1017 clean:
  • trunk/dports/aqua/fltk-devel/files/patch-src-Makefile.diff

    r107541 r114158  
    1 --- src/Makefile.orig   2013-04-16 10:02:42.000000000 -0400
    2 +++ src/Makefile        2013-07-02 14:19:06.000000000 -0400
     1--- src/Makefile.orig   2013-11-29 14:05:10.000000000 -0500
     2+++ src/Makefile        2013-11-29 14:05:50.000000000 -0500
    33@@ -355,7 +355,7 @@
    44                -install_name $(libdir)/$@ \
Note: See TracChangeset for help on using the changeset viewer.