Ticket #32636: Portfile.diff

File Portfile.diff, 13.3 KB (added by ranauei@…, 12 years ago)

Also minimized explicit dependencies, adjusted livecheck, and removed the lines precedently commented out

  • Portfile

    old new  
    55
    66name                    samba3
    77conflicts               talloc
    8 version                 3.2.15
    9 revision        2
     8version                 3.6.1
    109categories              net
    1110platforms               darwin
    1211maintainers             mww openmaintainer
    1312license                 GPL-3
    1413description             SMB/CIFS implementation
    1514long_description        Samba is an software suite that provides seamless file and \
    16                                         print services to SMB/CIFS clients
     15                        print services to SMB/CIFS clients
    1716
    1817homepage                http://www.samba.org/
    19 master_sites    http://us1.samba.org/samba/ftp/stable/ \
    20                                 ftp://ftp.bit.nl/mirror/samba/stable/ \
    21                                 ftp://de.samba.org/samba.org/stable/ \
    22                                 ftp://us4.samba.org/pub/samba/stable/ \
    23                                 ftp://ru.samba.org/pub/samba/stable/
     18master_sites            http://mirror.kent.ac.uk/sites/ftp.samba.org/ \
     19                        http://us1.samba.org/samba/ftp/stable/ \
     20                        ftp://ftp.bit.nl/mirror/samba/stable/ \
     21                        ftp://de.samba.org/samba.org/stable/ \
     22                        ftp://us4.samba.org/pub/samba/stable/ \
     23                        ftp://ru.samba.org/pub/samba/stable/
    2424distname                samba-${version}
    25 checksums           md5     5a3bcc4927c9643b9f42970d0815b18f \
    26                     sha1    52240aa9f2f5584f1978d788024fa2d6cb208e56 \
    27                     rmd160  0046aeaf5b91c34bbc9a387c714caf41ca84d1ae
    28 depends_lib             port:libiconv port:openssl port:popt port:cyrus-sasl2
    29 
    30 # Parallel bug filed upstream: https://bugzilla.samba.org/show_bug.cgi?id=6278
    31 use_parallel_build no
    32 
    33 worksrcdir              ${worksrcdir}/source
    34 
    35 configure.cflags-append "-fno-common"
    36 configure.cppflags-append "-DHAVE_STRUCT_TIMESPEC"
    37 configure.args  --with-mandir=${prefix}/share/man \
    38                                 --with-libdir=${prefix}/lib/${name} \
    39                                 --with-privatedir=${prefix}/var/db/smb \
    40                                 --with-configdir=${prefix}/etc/samba3/ \
    41                                 --with-swatdir=${prefix}/share/${name}/swat \
    42                                 --with-readline=${prefix} \
    43                                 --with-krb5=/usr \
    44                                 --without-included-popt \
    45                                 --without-readline \
    46                                 --enable-cups
    47 
    48 post-patch {
    49         reinplace "s|-bundle|-dynamiclib|g" ${worksrcpath}/configure
    50 
    51 ### BAND-AID: libs in subdirectories of ${prefix}/lib/samba3 will
    52 ###   still have unresolved symbols since the makefile doesn't contain
    53 ###   any information about install location at link time...
    54         reinplace "s|@\$\(SHLD\) \$\(LDSHFLAGS\)|@\$\(SHLD\) \$\(LDSHFLAGS\) -install_name @libdir@/`basename \$@`|g" \
    55                 ${worksrcpath}/Makefile.in
    56 }
     25worksrcdir              ${worksrcdir}/source3
     26
     27checksums               sha256 c5b0f2ab02fe2c641b1ce52a141c28f1b3fbc093ada8a62eeca70c25e15bd564 \
     28                        rmd160 6ed44e66b22cef00168831fa7ed13571fd5e45ed
     29
     30depends_lib             port:openssl \
     31                        port:popt \
     32                        port:cyrus-sasl2
     33
     34configure.ldflags-append -lintl
     35configure.args  --libdir=${prefix}/lib/${name} \
     36                --with-privatedir=${prefix}/var/db/smb \
     37                --with-configdir=${prefix}/etc/${name} \
     38                --with-swatdir=${prefix}/share/${name}/swat \
     39                --with-readline=${prefix} \
     40                --without-included-popt \
     41                --enable-cups
    5742
    5843platform darwin 9 {
    5944        patchfiles-append       patch-source_smbd_utmp_c.diff
    6045}
    6146
    6247post-destroot {
    63         xinstall -m 755 -d ${destroot}${prefix}/etc/samba3/ \
     48        xinstall -m 755 -d ${destroot}${prefix}/etc/${name}/ \
    6449                ${destroot}${prefix}/var/db/smb/
    6550        xinstall -m 644 ${worksrcpath}/../examples/smb.conf.default \
    66                 ${destroot}${prefix}/etc/samba3/smb.conf.sample
    67         system "touch ${destroot}${prefix}/etc/samba3/lmhosts.sample"
     51                ${destroot}${prefix}/etc/${name}/smb.conf.sample
     52        system "touch ${destroot}${prefix}/etc/${name}/lmhosts.sample"
    6853        system "touch ${destroot}${prefix}/var/db/smb/secrets.tdb.sample"
    6954
    7055        set changeline "\
    7156                -change bin/libnetapi.dylib.0 ${prefix}/lib/samba3/libnetapi.dylib \
    7257                -change bin/libsmbclient.dylib.0 ${prefix}/lib/samba3/libsmbclient.dylib \
    7358                -change bin/libsmbsharemodes.dylib.0 ${prefix}/lib/samba3/libsmbsharemodes.dylib \
    74                 -change bin/libtalloc.dylib.1 ${prefix}/lib/samba3/libtalloc.dylib \
     59                -change bin/libtalloc.dylib.2 ${prefix}/lib/samba3/libtalloc.dylib \
    7560                -change bin/libtdb.dylib.1 ${prefix}/lib/samba3/libtdb.dylib \
     61                -change bin/script.dylib ${prefix}/lib/samba3/auth/script.dylib \
     62                -change bin/CP437.dylib ${prefix}/lib/samba3/charset/CP437.dylib \
     63                -change bin/CP850.dylib ${prefix}/lib/samba3/charset/CP850.dylib \
     64                -change bin/macosxfs.dylib ${prefix}/lib/samba3/charset/macosxfs.dylib \
     65                -change bin/autorid.dylib ${prefix}/lib/samba3/idmap/autorid.dylib \
     66                -change bin/pam_smbpass.dylib ${prefix}/lib/samba3/security/pam_smbpass.dylib \
     67                -change bin/acl_tdb.dylib ${prefix}/lib/samba3/vfs/acl_tdb.dylib \
     68                -change bin/acl_xattr.dylib ${prefix}/lib/samba3/vfs/acl_xattr.dylib \
    7669                -change bin/audit.dylib ${prefix}/lib/samba3/vfs/audit.dylib \
    7770                -change bin/cap.dylib ${prefix}/lib/samba3/vfs/cap.dylib \
     71                -change bin/catia.dylib ${prefix}/lib/samba3/vfs/catia.dylib \
     72                -change bin/crossrename.dylib ${prefix}/lib/samba3/vfs/crossrename.dylib \
    7873                -change bin/default_quota.dylib ${prefix}/lib/samba3/vfs/default_quota.dylib \
    7974                -change bin/expand_msdfs.dylib ${prefix}/lib/samba3/vfs/expand_msdfs.dylib \
    8075                -change bin/extd_audit.dylib ${prefix}/lib/samba3/vfs/extd_audit.dylib \
    8176                -change bin/fake_perms.dylib ${prefix}/lib/samba3/vfs/fake_perms.dylib \
    8277                -change bin/full_audit.dylib ${prefix}/lib/samba3/vfs/full_audit.dylib \
     78                -change bin/linux_xfs_sgid.dylib ${prefix}/lib/samba3/vfs/linux_xfs_sgid.dylib \
    8379                -change bin/netatalk.dylib ${prefix}/lib/samba3/vfs/netatalk.dylib \
     80                -change bin/preopen.dylib ${prefix}/lib/samba3/vfs/preopen.dylib \
    8481                -change bin/readahead.dylib ${prefix}/lib/samba3/vfs/readahead.dylib \
    8582                -change bin/readonly.dylib ${prefix}/lib/samba3/vfs/readonly.dylib \
    8683                -change bin/recycle.dylib ${prefix}/lib/samba3/vfs/recycle.dylib \
     84                -change bin/scannedonly.dylib ${prefix}/lib/samba3/vfs/scannedonly.dylib \
    8785                -change bin/shadow_copy.dylib ${prefix}/lib/samba3/vfs/shadow_copy.dylib \
    8886                -change bin/shadow_copy2.dylib ${prefix}/lib/samba3/vfs/shadow_copy2.dylib \
     87                -change bin/smb_traffic_analyzer.dylib ${prefix}/lib/samba3/vfs/smb_traffic_analyzer.dylib \
     88                -change bin/streams_depot.dylib ${prefix}/lib/samba3/vfs/streams_depot.dylib \
    8989                -change bin/streams_xattr.dylib ${prefix}/lib/samba3/vfs/streams_xattr.dylib \
     90                -change bin/time_audit.dylib ${prefix}/lib/samba3/vfs/time_audit.dylib \
    9091                -change bin/xattr_tdb.dylib ${prefix}/lib/samba3/vfs/xattr_tdb.dylib"
    9192
    9293        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libnetapi.dylib ${destroot}${prefix}/lib/samba3/libnetapi.dylib"
    … …  
    9495        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libsmbsharemodes.dylib ${destroot}${prefix}/lib/samba3/libsmbsharemodes.dylib"
    9596        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libtalloc.dylib ${destroot}${prefix}/lib/samba3/libtalloc.dylib"
    9697        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/libtdb.dylib ${destroot}${prefix}/lib/samba3/libtdb.dylib"
     98        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/auth/script.dylib ${destroot}${prefix}/lib/samba3/auth/script.dylib"
     99        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/charset/CP437.dylib ${destroot}${prefix}/lib/samba3/charset/CP437.dylib"
     100        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/charset/CP850.dylib ${destroot}${prefix}/lib/samba3/charset/CP850.dylib"
     101        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/charset/macosxfs.dylib ${destroot}${prefix}/lib/samba3/charset/macosxfs.dylib"
     102        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/idmap/autorid.dylib ${destroot}${prefix}/lib/samba3/idmap/autorid.dylib"
     103        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/security/pam_smbpass.dylib ${destroot}${prefix}/lib/samba3/security/pam_smbpass.dylib"
     104        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/acl_tdb.dylib ${destroot}${prefix}/lib/samba3/vfs/acl_tdb.dylib"
     105        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/acl_xattr.dylib ${destroot}${prefix}/lib/samba3/vfs/acl_xattr.dylib"
    97106        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/audit.dylib ${destroot}${prefix}/lib/samba3/vfs/audit.dylib"
    98107        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/cap.dylib ${destroot}${prefix}/lib/samba3/vfs/cap.dylib"
     108        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/catia.dylib ${destroot}${prefix}/lib/samba3/vfs/catia.dylib"
     109        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/crossrename.dylib ${destroot}${prefix}/lib/samba3/vfs/crossrename.dylib"
    99110        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/default_quota.dylib ${destroot}${prefix}/lib/samba3/vfs/default_quota.dylib"
    100111        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/expand_msdfs.dylib ${destroot}${prefix}/lib/samba3/vfs/expand_msdfs.dylib"
    101112        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/extd_audit.dylib ${destroot}${prefix}/lib/samba3/vfs/extd_audit.dylib"
    102113        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/fake_perms.dylib ${destroot}${prefix}/lib/samba3/vfs/fake_perms.dylib"
    103114        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/full_audit.dylib ${destroot}${prefix}/lib/samba3/vfs/full_audit.dylib"
     115        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/linux_xfs_sgid.dylib ${destroot}${prefix}/lib/samba3/vfs/linux_xfs_sgid.dylib"
    104116        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/netatalk.dylib ${destroot}${prefix}/lib/samba3/vfs/netatalk.dylib"
     117        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/preopen.dylib ${destroot}${prefix}/lib/samba3/vfs/preopen.dylib"
    105118        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/readahead.dylib ${destroot}${prefix}/lib/samba3/vfs/readahead.dylib"
    106119        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/readonly.dylib ${destroot}${prefix}/lib/samba3/vfs/readonly.dylib"
    107120        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/recycle.dylib ${destroot}${prefix}/lib/samba3/vfs/recycle.dylib"
     121        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/scannedonly.dylib ${destroot}${prefix}/lib/samba3/vfs/scannedonly.dylib"
    108122        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/shadow_copy.dylib ${destroot}${prefix}/lib/samba3/vfs/shadow_copy.dylib"
    109123        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/shadow_copy2.dylib ${destroot}${prefix}/lib/samba3/vfs/shadow_copy2.dylib"
     124        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/smb_traffic_analyzer.dylib ${destroot}${prefix}/lib/samba3/vfs/smb_traffic_analyzer.dylib"
     125        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/streams_depot.dylib ${destroot}${prefix}/lib/samba3/vfs/streams_depot.dylib"
    110126        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/streams_xattr.dylib ${destroot}${prefix}/lib/samba3/vfs/streams_xattr.dylib"
     127        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/time_audit.dylib ${destroot}${prefix}/lib/samba3/vfs/time_audit.dylib"
    111128        system "install_name_tool ${changeline} -id ${prefix}/lib/samba3/vfs/xattr_tdb.dylib ${destroot}${prefix}/lib/samba3/vfs/xattr_tdb.dylib"
    112129        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/eventlogadm"
    113         system "install_name_tool ${changeline} ${destroot}${prefix}/bin/ldbadd"
    114         system "install_name_tool ${changeline} ${destroot}${prefix}/bin/ldbdel"
    115         system "install_name_tool ${changeline} ${destroot}${prefix}/bin/ldbedit"
    116         system "install_name_tool ${changeline} ${destroot}${prefix}/bin/ldbmodify"
    117         system "install_name_tool ${changeline} ${destroot}${prefix}/bin/ldbsearch"
    118130        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/net"
    119131        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/nmblookup"
    120132        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/ntlm_auth"
    121133        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/pdbedit"
    122134        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/profiles"
    123135        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/rpcclient"
     136        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/sharesec"
    124137        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbcacls"
    125138        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbclient"
    126139        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbcontrol"
    … …  
    129142        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbpasswd"
    130143        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbspool"
    131144        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbstatus"
     145        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbta-util"
    132146        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/smbtree"
    133147        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/tdbbackup"
    134148        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/tdbdump"
     149        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/tdbrestore"
    135150        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/tdbtool"
    136151        system "install_name_tool ${changeline} ${destroot}${prefix}/bin/testparm"
    137152        system "install_name_tool ${changeline} ${destroot}${prefix}/sbin/nmbd"
    … …  
    141156
    142157livecheck.type  regex
    143158livecheck.url   http://us5.samba.org/samba/ftp/?M=D
    144 livecheck.regex samba-(3\\.2\[0-9a-z.\]+)\\.tar\\.gz
    145 
     159livecheck.regex samba-(3\\.6\[0-9a-z.\]+)\\.tar\\.gz