New Ticket     Tickets     Wiki     Browse Source     Timeline     Roadmap     Ticket Reports     Search

Ticket #13366: libiconv-universal.diff

File libiconv-universal.diff, 2.2 KB (added by nox@…, 6 years ago)
  • files/patch-src-Makefile.in-darwin.diff

     
     1--- src/Makefile.in.orig        2007-11-21 22:52:22.000000000 +0100 
     2+++ src/Makefile.in     2007-11-21 22:58:15.000000000 +0100 
     3@@ -104,6 +104,7 @@ 
     4        if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi 
     5        case "@host_os@" in \ 
     6          hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \ 
     7+         darwin*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \ 
     8          *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \ 
     9        esac 
     10        $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv 
  • Portfile

     
    44 
    55name                libiconv 
    66version             1.12 
     7revision            1 
    78categories          textproc 
    89maintainers         ryandesign 
    910platforms           darwin freebsd linux 
     
    3637depends_build \ 
    3738        bin:gperf:gperf 
    3839 
    39 pre-fetch { 
    40     if {[variant_isset universal]} { 
    41         if {![catch {registry_active libiconv}]} { 
    42             return -code error "libiconv needs to be deactivated/uninstalled \ 
    43             before +universal variant can be installed" 
    44         } 
     40patchfiles \ 
     41        patch-src-Makefile.in-darwin.diff 
     42 
     43pre-patch { 
     44    if {![variant_isset disable_utf8mac]} { 
     45        patchfiles-append   utf8mac.diff 
    4546    } 
    4647} 
    4748 
    48 post-patch { 
    49         if {![variant_isset disable_utf8mac]} { 
    50                 system "cd ${worksrcpath} && patch -p1 < ${filespath}/utf8mac.diff" 
    51         } 
    52 } 
    53  
     49configure.cppflags 
     50configure.ldflags 
    5451configure.args \ 
    5552        --enable-static \ 
    5653        --mandir=${prefix}/share/man \