Ticket #27428: Portfile-samba.diff

File Portfile-samba.diff, 11.8 KB (added by jgosmann (Jan Gosmann), 13 years ago)

Patch to update portfile to version 3.6

  • Portfile

    old new  
    55
    66name                    samba3
    77conflicts               talloc
    8 version                 3.2.15
    9 revision        2
     8version                 3.6.0
     9revision        0
    1010categories              net
    1111platforms               darwin
    1212maintainers             mww openmaintainer
    … …  
    2121                                ftp://us4.samba.org/pub/samba/stable/ \
    2222                                ftp://ru.samba.org/pub/samba/stable/
    2323distname                samba-${version}
    24 checksums           md5     5a3bcc4927c9643b9f42970d0815b18f \
    25                     sha1    52240aa9f2f5584f1978d788024fa2d6cb208e56 \
    26                     rmd160  0046aeaf5b91c34bbc9a387c714caf41ca84d1ae
     24checksums           md5     e297e0ea7923c7de8d7c1d8fd0ec0a05 \
     25                    sha1    c87e2481d755f3a7f22bae44ef2f22ca64b9d173
    2726depends_lib             port:libiconv port:openssl port:popt port:cyrus-sasl2
    2827
    2928# Parallel bug filed upstream: https://bugzilla.samba.org/show_bug.cgi?id=6278
    3029use_parallel_build no
    3130
    32 worksrcdir              ${worksrcdir}/source
     31worksrcdir              ${worksrcdir}/source3
    3332
    34 configure.cflags-append "-fno-common"
     33configure.cflags-append "-Derror_message=strerror -fno-common"
    3534configure.cppflags-append "-DHAVE_STRUCT_TIMESPEC"
     35configure.ldflags-append        "-lintl"
    3636configure.args  --with-mandir=${prefix}/share/man \
    3737                                --with-libdir=${prefix}/lib/${name} \
    3838                                --with-privatedir=${prefix}/var/db/smb \
    … …  
    6767        system "touch ${destroot}${prefix}/var/db/smb/secrets.tdb.sample"
    6868
    6969        set changeline "\
    70                 -change bin/libnetapi.dylib.0 ${prefix}/lib/samba3/libnetapi.dylib \
    71                 -change bin/libsmbclient.dylib.0 ${prefix}/lib/samba3/libsmbclient.dylib \
    72                 -change bin/libsmbsharemodes.dylib.0 ${prefix}/lib/samba3/libsmbsharemodes.dylib \
    73                 -change bin/libtalloc.dylib.1 ${prefix}/lib/samba3/libtalloc.dylib \
    74                 -change bin/libtdb.dylib.1 ${prefix}/lib/samba3/libtdb.dylib \
    75                 -change bin/audit.dylib ${prefix}/lib/samba3/vfs/audit.dylib \
    76                 -change bin/cap.dylib ${prefix}/lib/samba3/vfs/cap.dylib \
    77                 -change bin/default_quota.dylib ${prefix}/lib/samba3/vfs/default_quota.dylib \
    78                 -change bin/expand_msdfs.dylib ${prefix}/lib/samba3/vfs/expand_msdfs.dylib \
    79                 -change bin/extd_audit.dylib ${prefix}/lib/samba3/vfs/extd_audit.dylib \
    80                 -change bin/fake_perms.dylib ${prefix}/lib/samba3/vfs/fake_perms.dylib \
    81                 -change bin/full_audit.dylib ${prefix}/lib/samba3/vfs/full_audit.dylib \
    82                 -change bin/netatalk.dylib ${prefix}/lib/samba3/vfs/netatalk.dylib \
    83                 -change bin/readahead.dylib ${prefix}/lib/samba3/vfs/readahead.dylib \
    84                 -change bin/readonly.dylib ${prefix}/lib/samba3/vfs/readonly.dylib \
    85                 -change bin/recycle.dylib ${prefix}/lib/samba3/vfs/recycle.dylib \
    86                 -change bin/shadow_copy.dylib ${prefix}/lib/samba3/vfs/shadow_copy.dylib \
    87                 -change bin/shadow_copy2.dylib ${prefix}/lib/samba3/vfs/shadow_copy2.dylib \
    88                 -change bin/streams_xattr.dylib ${prefix}/lib/samba3/vfs/streams_xattr.dylib \
    89                 -change bin/xattr_tdb.dylib ${prefix}/lib/samba3/vfs/xattr_tdb.dylib"
    90 
    91         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libnetapi.dylib ${destroot}${prefix}/lib/samba3/libnetapi.dylib"
    92         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libsmbclient.dylib ${destroot}${prefix}/lib/samba3/libsmbclient.dylib"
    93         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libsmbsharemodes.dylib ${destroot}${prefix}/lib/samba3/libsmbsharemodes.dylib"
    94         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libtalloc.dylib ${destroot}${prefix}/lib/samba3/libtalloc.dylib"
    95         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libtdb.dylib ${destroot}${prefix}/lib/samba3/libtdb.dylib"
    96         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/audit.dylib ${destroot}${prefix}/lib/samba3/vfs/audit.dylib"
    97         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/cap.dylib ${destroot}${prefix}/lib/samba3/vfs/cap.dylib"
    98         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/default_quota.dylib ${destroot}${prefix}/lib/samba3/vfs/default_quota.dylib"
    99         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/expand_msdfs.dylib ${destroot}${prefix}/lib/samba3/vfs/expand_msdfs.dylib"
    100         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/extd_audit.dylib ${destroot}${prefix}/lib/samba3/vfs/extd_audit.dylib"
    101         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/fake_perms.dylib ${destroot}${prefix}/lib/samba3/vfs/fake_perms.dylib"
    102         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/full_audit.dylib ${destroot}${prefix}/lib/samba3/vfs/full_audit.dylib"
    103         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/netatalk.dylib ${destroot}${prefix}/lib/samba3/vfs/netatalk.dylib"
    104         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/readahead.dylib ${destroot}${prefix}/lib/samba3/vfs/readahead.dylib"
    105         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/readonly.dylib ${destroot}${prefix}/lib/samba3/vfs/readonly.dylib"
    106         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/recycle.dylib ${destroot}${prefix}/lib/samba3/vfs/recycle.dylib"
    107         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/shadow_copy.dylib ${destroot}${prefix}/lib/samba3/vfs/shadow_copy.dylib"
    108         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/shadow_copy2.dylib ${destroot}${prefix}/lib/samba3/vfs/shadow_copy2.dylib"
    109         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/streams_xattr.dylib ${destroot}${prefix}/lib/samba3/vfs/streams_xattr.dylib"
    110         system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/xattr_tdb.dylib ${destroot}${prefix}/lib/samba3/vfs/xattr_tdb.dylib"
     70                -change bin/libnetapi.dylib.0 ${prefix}/lib/libnetapi.dylib \
     71                -change bin/libsmbclient.dylib.0 ${prefix}/lib/libsmbclient.dylib \
     72                -change bin/libsmbsharemodes.dylib.0 ${prefix}/lib/libsmbsharemodes.dylib \
     73                -change bin/libtalloc.dylib.2 ${prefix}/lib/libtalloc.dylib \
     74                -change bin/libtdb.dylib.1 ${prefix}/lib/libtdb.dylib \
     75                -change bin/audit.dylib ${prefix}/lib/vfs/audit.dylib \
     76                -change bin/cap.dylib ${prefix}/lib/vfs/cap.dylib \
     77                -change bin/default_quota.dylib ${prefix}/lib/vfs/default_quota.dylib \
     78                -change bin/expand_msdfs.dylib ${prefix}/lib/vfs/expand_msdfs.dylib \
     79                -change bin/extd_audit.dylib ${prefix}/lib/vfs/extd_audit.dylib \
     80                -change bin/fake_perms.dylib ${prefix}/lib/vfs/fake_perms.dylib \
     81                -change bin/full_audit.dylib ${prefix}/lib/vfs/full_audit.dylib \
     82                -change bin/netatalk.dylib ${prefix}/lib/vfs/netatalk.dylib \
     83                -change bin/readahead.dylib ${prefix}/lib/vfs/readahead.dylib \
     84                -change bin/readonly.dylib ${prefix}/lib/vfs/readonly.dylib \
     85                -change bin/recycle.dylib ${prefix}/lib/vfs/recycle.dylib \
     86                -change bin/shadow_copy.dylib ${prefix}/lib/vfs/shadow_copy.dylib \
     87                -change bin/shadow_copy2.dylib ${prefix}/lib/vfs/shadow_copy2.dylib \
     88                -change bin/streams_xattr.dylib ${prefix}/lib/vfs/streams_xattr.dylib \
     89                -change bin/xattr_tdb.dylib ${prefix}/lib/vfs/xattr_tdb.dylib"
     90
     91        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libnetapi.dylib ${destroot}${prefix}/lib/libnetapi.dylib"
     92        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libsmbclient.dylib ${destroot}${prefix}/lib/libsmbclient.dylib"
     93        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libsmbsharemodes.dylib ${destroot}${prefix}/lib/libsmbsharemodes.dylib"
     94        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libtalloc.dylib ${destroot}${prefix}/lib/libtalloc.dylib"
     95        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libtdb.dylib ${destroot}${prefix}/lib/libtdb.dylib"
     96        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/audit.dylib ${destroot}${prefix}/lib/vfs/audit.dylib"
     97        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/cap.dylib ${destroot}${prefix}/lib/vfs/cap.dylib"
     98        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/default_quota.dylib ${destroot}${prefix}/lib/vfs/default_quota.dylib"
     99        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/expand_msdfs.dylib ${destroot}${prefix}/lib/vfs/expand_msdfs.dylib"
     100        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/extd_audit.dylib ${destroot}${prefix}/lib/vfs/extd_audit.dylib"
     101        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/fake_perms.dylib ${destroot}${prefix}/lib/vfs/fake_perms.dylib"
     102        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/full_audit.dylib ${destroot}${prefix}/lib/vfs/full_audit.dylib"
     103        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/netatalk.dylib ${destroot}${prefix}/lib/vfs/netatalk.dylib"
     104        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/readahead.dylib ${destroot}${prefix}/lib/vfs/readahead.dylib"
     105        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/readonly.dylib ${destroot}${prefix}/lib/vfs/readonly.dylib"
     106        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/recycle.dylib ${destroot}${prefix}/lib/vfs/recycle.dylib"
     107        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/shadow_copy.dylib ${destroot}${prefix}/lib/vfs/shadow_copy.dylib"
     108        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/shadow_copy2.dylib ${destroot}${prefix}/lib/vfs/shadow_copy2.dylib"
     109        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/streams_xattr.dylib ${destroot}${prefix}/lib/vfs/streams_xattr.dylib"
     110        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/xattr_tdb.dylib ${destroot}${prefix}/lib/vfs/xattr_tdb.dylib"
    111111        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/eventlogadm"
    112         system "install_name_tool ${changeline} ${destroot}${prefix}/bin/ldbadd"
    113         system "install_name_tool ${changeline} ${destroot}${prefix}/bin/ldbdel"
    114         system "install_name_tool ${changeline} ${destroot}${prefix}/bin/ldbedit"
    115         system "install_name_tool ${changeline} ${destroot}${prefix}/bin/ldbmodify"
    116         system "install_name_tool ${changeline} ${destroot}${prefix}/bin/ldbsearch"
    117112        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/net"
    118113        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/nmblookup"
    119114        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/ntlm_auth"
    120115        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/pdbedit"
    121116        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/profiles"
    122117        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/rpcclient"
     118        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/sharesec"
    123119        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbcacls"
    124120        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbclient"
    125121        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbcontrol"
    … …  
    128124        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbpasswd"
    129125        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbspool"
    130126        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbstatus"
     127        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbta-util"
    131128        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbtree"
    132129        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/tdbbackup"
    133130        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/tdbdump"
     131        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/tdbrestore"
    134132        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/tdbtool"
    135133        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/testparm"
    136134        system "install_name_tool ${changeline} ${destroot}${prefix}/sbin/nmbd"
    … …  
    140138
    141139livecheck.type  regex
    142140livecheck.url   http://us5.samba.org/samba/ftp/?M=D
    143 livecheck.regex samba-(3\\.2\[0-9a-z.\]+)\\.tar\\.gz
     141livecheck.regex samba-(3\\.6\[0-9a-z.\]+)\\.tar\\.gz
    144142