Ticket #13203: freeimage-3.9.3.diff

File freeimage-3.9.3.diff, 3.8 KB (added by ryandesign (Ryan Carsten Schmidt), 17 years ago)
  • files/patch-Makefile.osx.diff

     
    1 Index: Makefile.osx
    2 ===================================================================
    3 RCS file: /cvsroot/freeimage/FreeImage/Makefile.osx,v
    4 retrieving revision 1.9
    5 diff -d -u -r1.9 Makefile.osx
    6 --- Makefile.osx        11 Dec 2006 14:30:13 -0000      1.9
    7 +++ Makefile.osx        31 Dec 2006 03:22:16 -0000
    8 @@ -5,23 +5,23 @@
    9  include Makefile.srcs
    10  
    11  # General configuration variables:
    12 -CC_PPC = gcc-3.3
    13 +CC_PPC = gcc-4.0
    14  CC_I386 = gcc-4.0
    15 -CPP_PPC = g++-3.3
    16 +CPP_PPC = g++-4.0
    17  CPP_I386 = g++-4.0
    18 -COMPILERFLAGS = -O3
    19 +COMPILERFLAGS = -Os
    20  COMPILERFLAGS_PPC = -arch ppc
    21  COMPILERFLAGS_I386 = -arch i386
    22  COMPILERPPFLAGS = -Wno-ctor-dtor-privacy
    23  INCLUDE +=
    24 -INCLUDE_PPC = -nostdinc -isystem /Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3 -isystem /Developer/SDKs/MacOSX10.3.9.sdk/usr/include -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3/c++ -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3/c++/ppc-darwin
    25 +INCLUDE_PPC = -isysroot /Developer/SDKs/MacOSX10.3.9.sdk
    26  INCLUDE_I386 = -isysroot /Developer/SDKs/MacOSX10.4u.sdk
    27  CFLAGS_PPC = $(COMPILERFLAGS) $(COMPILERFLAGS_PPC) $(INCLUDE) $(INCLUDE_PPC)
    28  CFLAGS_I386 = $(COMPILERFLAGS) $(COMPILERFLAGS_I386) $(INCLUDE) $(INCLUDE_I386)
    29  CPPFLAGS_PPC = $(COMPILERPPFLAGS) $(CFLAGS_PPC)
    30  CPPFLAGS_I386 = $(COMPILERPPFLAGS) $(CFLAGS_I386)
    31 -LIBRARIES_PPC = -L/Developer/SDKs/MacOSX10.3.9.sdk/usr/lib/gcc/darwin/3.3 -lc -lgcc -lstdc++
    32 -LIBRARIES_I386 = -L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.0 -lc -lgcc -lstdc++
    33 +LIBRARIES_PPC = -Wl,-syslibroot /Developer/SDKs/MacOSX10.3.9.sdk
    34 +LIBRARIES_I386 = -Wl,-syslibroot /Developer/SDKs/MacOSX10.4u.sdk
    35  LIBTOOL = libtool
    36  LIPO = lipo
    37  
    38 @@ -65,10 +65,10 @@
    39         $(LIPO) -create $(SHAREDLIB)-ppc $(SHAREDLIB)-i386 -output $(SHAREDLIB)
    40  
    41  $(SHAREDLIB)-ppc: $(MODULES_PPC)
    42 -       $(LIBTOOL) -arch_only ppc -dynamic $(LIBRARIES_PPC) -o $@ $(MODULES_PPC)
    43 +       $(CPP_PPC) -arch ppc -dynamiclib $(LIBRARIES_PPC) -o $@ $(MODULES_PPC)
    44  
    45  $(SHAREDLIB)-i386: $(MODULES_I386)
    46 -       $(CPP_I386) -arch_only i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386)
    47 +       $(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386)
    48  
    49  .c.o-ppc:
    50         $(CC_PPC) $(CFLAGS_PPC) -c $< -o $@
  • Portfile

     
    22# $Id$
    33
    44PortSystem 1.0
     5
    56name                    freeimage
    6 version                 3.9.2
     7version                 3.9.3
    78categories              graphics
    89maintainers             ryand-ruby@zenspider.com
    910description             Library for FreeImage, a dependency-less graphics library
     
    1112                        support most popular graphics image formats. Some \
    1213                        highlights are: extremely simple in use, not limited to \
    1314                        the local PC (unique FreeImageIO) and Plugin driven!
    14 platforms               darwin freebsd
     15platforms               macosx
    1516homepage                http://freeimage.sourceforge.net/
    1617master_sites            sourceforge
    17 
    18 fetch.type              cvs
    19 cvs.root                :pserver:anonymous@freeimage.cvs.sourceforge.net:/cvsroot/freeimage
    20 cvs.module              FreeImage
    21 cvs.date                20070101
    22 version                 ${version}-${cvs.date}
     18distname                FreeImage[strsed ${version} {g/\.//}]
     19use_zip                 yes
    2320worksrcdir              FreeImage
    2421
    25 patchfiles              patch-Makefile.osx.diff
     22checksums               md5 bf3574fa4e6135cf511d5ff4bc871ec3 \
     23                        sha1 07696e54ed246d08cf401a9e39e9256b4e73ec9a \
     24                        rmd160 d7a33a6c9b101d39db16ee18f9177b3f590df6ab
    2625
    2726use_configure           no
    2827
    2928destroot.pre_args       -f Makefile.osx ${destroot.target}
    3029destroot.destdir        PREFIX=${destroot}${prefix}
     30
     31# FreeImage always builds universal, so let's advertise that.
     32default_variants +universal
     33variant universal {}
     34
     35livecheck.regex         <title>Source Distribution (.*) released.*</title>