Ticket #14481: patch-subversion-svnmerge.diff

Portfile

@@ -4 +4 @@
 
 name                    subversion
 version                 1.4.6
+revision                1
 categories              devel
 platforms               darwin
 maintainers             dluke@geeklair.net
@@ -37 +38 @@
                         --mandir=\\\${prefix}/share/man \
                         --disable-neon-version-check
 
-build.target            all mucc
+build.target            all
 
 pre-test {
                         set x {}
@@ -97 +98 @@
                                         }
 
 variant tools           description {Install some optional extra subversion tools} {
+                        build.target-append mucc
                         post-destroot {
                                 xinstall -d -m 755 ${destroot}${prefix}/share/${name}
                                 copy ${worksrcpath}/tools ${destroot}${prefix}/share/${name}/tools
-                                copy ${worksrcpath}/contrib/client-side/mucc ${destroot}${prefix}/bin/
-                                eval delete [glob ${worksrcpath}/contrib/client-side/{mucc{,.{l,}o},.libs}]
                                 copy ${worksrcpath}/contrib ${destroot}${prefix}/share/${name}/contrib
+                                file delete ${worksrcpath}/contrib/client-side/mucc.o
+                                foreach tool {wcgrep mucc} {
+                                        ln -sf ${prefix}/share/${name}/contrib/client-side/$tool ${destroot}${prefix}/bin/
+                                }
+                                ln -sf ${prefix}/share/${name}/contrib/client-side/svnmerge.py ${destroot}${prefix}/bin/svnmerge
                                 }
                         }