Ticket #38834: Portfile.diff

(a) ../Portfile.old vs. (b) /tmp/Portfile

@@ -3 +3 @@
 PortSystem 1.0
 
 name                    samba4
-version                 4.0.0tp5
-revision                1
+version                 4.0.5
+revision                0
+maintainers             mww
 categories              net
 platforms               darwin
-maintainers             mww
 license                 GPL-3
-description             SMB/CIFS server and client, ALPHA release
+description             SMB/CIFS server and client, beta-grade, stable release
 long_description        Samba is an software suite that provides seamless file \
                         and print services to SMB/CIFS clients. \
-                        This is an ALPHA release!
+                        This is a BETA-grade, stable release!
+notes                   "This is a BETA-grade, stable release!"
 
 homepage                http://www.samba.org/
-master_sites            http://download.samba.org/samba/ftp/samba4/ \
-                        ftp://de.samba.org/samba.org/samba4/
+master_sites            https://ftp.samba.org/pub/samba/stable/ \
+                        ftp://de.samba.org/pub/samba/stable/
 distname                samba-${version}
-checksums           md5     dbc2e04455d67b01d2020808065b96df \
-                    sha1    8897cc7a824a594b3543245cdbbceaea32e9e08d \
-                    rmd160  1870f67aa851751e381a3b03dadfa1d0afa28a12
+checksums               md5     58ec2fec08872b72f8fd526f2da20a9e \
+                        sha1    6e6faeb5741bb96816936c0acc3f5522d630b0ee \
+                        rmd160  294c96a14f978a0fda42f0fb6fdd5710547faacf
+
+conflicts               samba3 talloc tdb
+
+depends_build           port:docbook-xsl \
+                        port:perl5 \
+                        port:pkgconfig \
+                        port:python27 \
+                        port:libxslt
+
+depends_lib             port:db47 \
+                        port:gnutls \
+                        port:libiconv \
+                        port:openldap \
+                        port:popt \
+                        port:readline \
+                        port:sqlite3 \
+                        port:zlib
+
+# The wafadmin patches came by running 'buildtools/update-waf.sh'.
+patch.pre_args          -p1 -b -z .orig
+patchfiles              patch-buildtools-wafadmin-Tools-python.py.diff \
+                        patch-buildtools-wafadmin-Utils.py.diff \
+                        patch-buildtools-wafsamba-wafsamba.py.diff \
+                        patch-buildtools-wafsamba-wscript.diff \
+                        patch-lib-ldb-tests-test-ldap.sh.diff \
+                        patch-lib-testtools-testtools-tests-test_compat.py.diff \
+                        patch-source4-scripting-bin-samba_backup.diff
 
-depends_lib             port:gnutls port:readline port:libiconv port:popt port:sqlite3 port:zlib port:gettext
+post-patch {
+        reinplace "s|JOBS=1|JOBS=${build.jobs}|" ${worksrcpath}/configure
+}
 
-worksrcdir              samba-${version}/source
+pre-configure {
+        if {![catch {set vers [lindex [registry_active samba4] 0]}]} {
+                ui_error "Linking conflicts may occur.  Please deactivate samba4 while building samba4."
+                return -code error "conflict"
+        }
+        if {![variant_isset mitkrb5] && ![catch {set vers [lindex [registry_active kerberos5] 0]}]} {
+                ui_error "Linking conflicts may occur.  Please deactivate kerberos5 while building samba4."
+                return -code error "conflict"
+        }
+}
 
-configure.args          --with-fhs \
-                        --mandir=${prefix}/share/man \
-                        --with-libiconv=${prefix} --with-readline=${prefix} --with-sqlite3
+# waf
+configure.args          --enable-fhs \
+                        --with-libiconv=${prefix} \
+                        --destdir=${destroot}
 
-destroot.target-append  installman
 post-destroot {
-        # add a postfix of '4' to all executables to avoid file conflicts
-        foreach dir {bin sbin} {
-                foreach bin [glob -directory "${destroot}${prefix}/${dir}" -type f *] {
-                        file rename "${bin}" "${bin}4"
+        set change [list]
+        set dlist [list]
+        set bogus ${destroot}${prefix}/lib/libnss_wins
+        if {[file isfile ${bogus}.so.2]} {
+                file rename ${bogus}.so.2 ${bogus}.2.dylib
+                file delete ${bogus}.so
+                ln -s [file tail ${bogus}.2.dylib] ${bogus}.dylib
+        }
+        fs-traverse f ${destroot}${prefix}/lib {
+                switch -exact -- "[file type $f][file extension $f]" {
+                file.dylib -
+                file.so {
+                        set o [exec otool -D $f | sed "1d;s/.inst.dylib/.dylib/"]
+                        set n [string range $f [string length ${destroot}] end]
+                        lappend change "-change '$o' '$n'"
+                        lappend dlist $f
+                        system "install_name_tool -id '$n' '$f'"
+                        }
                 }
         }
-        # ..and also to the manpages
-        foreach dir [glob -directory "${destroot}${prefix}/share/man" "man\[138\]"] {
-                foreach man [glob -directory "${dir}" -type f *] {
-                        file rename "${man}" [string range "${man}" 0 [expr [string last . "${man}"] - 1]]4[string range "${man}" [string last . "${man}"] [string length "${man}"]]
+        foreach f [glob ${destroot}${prefix}/*bin/*] {
+                if {[string equal [file type $f] "file"] && [file executable $f] &&
+                    ![catch {exec /usr/bin/file $f | grep -qw Mach-O} res]} {
+                        lappend dlist $f
                 }
         }
+        foreach f $dlist {
+                exec xargs -J % install_name_tool % "$f" << [join ${change} "\n"]
+        }
+}
+
+variant mitkrb5 description "Build with MIT Kerberos 5" {
+        depends_lib-append      kerberos5
+        config.args-append      --with-system-mitkrb5
 }
 
 livecheck.type  regex
-livecheck.url   http://us4.samba.org/samba/ftp/samba4/?M=D
+livecheck.url   [lindex ${master_sites} 0]
 livecheck.regex samba-(\[0-9a-z.\]+)\\.tar\\.gz