Changeset 96942


Ignore:
Timestamp:
Aug 22, 2012, 2:35:51 PM (8 years ago)
Author:
dluke@…
Message:

subversion: use install-tools target by default (to install svnmucc + some other misc), and patch it to not try to build mod_dontdothat, update +tools variant to match this change

Location:
trunk/dports/devel/subversion
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/subversion/Portfile

    r96665 r96942  
    55name                    subversion
    66version                 1.7.6
     7revision                1
    78categories              devel
    89platforms               darwin
     
    4849
    4950use_parallel_build      yes
    50 build.target            all
     51build.target            all tools
     52destroot.target-append install-tools
    5153
    5254pre-test {              set x {}
     
    115117
    116118variant tools           description {Install some optional extra subversion tools} {
    117                         build.target-append svnmucc
    118119                        post-destroot {
    119120                                xinstall -d -m 755 ${destroot}${prefix}/share/${name}
    120                                 ln -s ../share/${name}/tools/client-side/svnmucc/svnmucc ${destroot}${prefix}/bin/
    121                                 eval delete [glob ${worksrcpath}/tools/client-side/svnmucc/svnmucc{.o,.libs}]
     121                                delete ${worksrcpath}/tools/client-side/svnmucc/
     122                                delete ${worksrcpath}/tools/diff/
     123                                delete ${worksrcpath}/tools/server-side/mod_dontdothat
     124                                eval delete [glob ${worksrcpath}/tools/server-side/*{.o,.lo,.c}]
     125                                delete ${worksrcpath}/tools/server-side/svn-populate-node-origins-index
     126                                delete ${worksrcpath}/tools/server-side/svn-rep-sharing-stats
     127                                delete ${worksrcpath}/tools/server-side/svnauthz-validate
    122128                                copy ${worksrcpath}/tools ${destroot}${prefix}/share/${name}/tools
    123129                                }
  • trunk/dports/devel/subversion/files/mod_dontdothat_build.patch.diff

    r96665 r96942  
    3030
    3131 # ----------------------------------------------------------------------------
     32--- build-outputs.mk.orig       2012-08-22 09:48:10.000000000 -0400
     33+++ build-outputs.mk    2012-08-22 09:49:27.000000000 -0400
     34@@ -884,9 +884,10 @@
     35 # Section 7: Install-Group install targets
     36 ########################################
     37 
     38-install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la
     39+install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
     40        cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
     41        cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
     42+       cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
     43 
     44 install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
     45        $(MKDIR) $(DESTDIR)$(bdb_libdir)
     46@@ -1036,7 +1037,7 @@
     47        $(MKDIR) $(DESTDIR)$(swig_rb_libdir)
     48        cd subversion/bindings/swig/ruby/libsvn_swig_ruby ; $(INSTALL_SWIG_RB_LIB) libsvn_swig_ruby-1.la $(DESTDIR)$(swig_rb_libdir)/libsvn_swig_ruby-1.la
     49 
     50-install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)  tools/server-side/mod_dontdothat/mod_dontdothat.la
     51+install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
     52        $(MKDIR) $(DESTDIR)$(toolsdir)
     53        cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
     54        cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
     55@@ -1046,7 +1047,6 @@
     56        cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT)
     57        cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
     58        cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT)
     59-       cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
     60 
     61 
     62 ########################################
Note: See TracChangeset for help on using the changeset viewer.