[96942] trunk/dports/devel/subversion

[dluke at macports.org]

Revision: 96942
          https://trac.macports.org/changeset/96942
Author:   dluke at macports.org
Date:     2012-08-22 07:35:51 -0700 (Wed, 22 Aug 2012)
Log 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

Modified Paths:
--------------
    trunk/dports/devel/subversion/Portfile
    trunk/dports/devel/subversion/files/mod_dontdothat_build.patch.diff

Modified: trunk/dports/devel/subversion/Portfile
===================================================================
--- trunk/dports/devel/subversion/Portfile	2012-08-22 14:12:11 UTC (rev 96941)
+++ trunk/dports/devel/subversion/Portfile	2012-08-22 14:35:51 UTC (rev 96942)
@@ -4,6 +4,7 @@
 
 name			subversion
 version			1.7.6
+revision		1
 categories		devel
 platforms		darwin
 maintainers		geeklair.net:dluke blair
@@ -47,7 +48,8 @@
 			--with-sasl=${prefix}
 
 use_parallel_build	yes
-build.target		all
+build.target		all tools
+destroot.target-append install-tools
 
 pre-test {		set x {}
 			fs-traverse dir ${worksrcpath}/subversion {
@@ -114,11 +116,15 @@
 					}
 
 variant tools 		description {Install some optional extra subversion tools} {
-			build.target-append svnmucc
 			post-destroot {
 				xinstall -d -m 755 ${destroot}${prefix}/share/${name}
-				ln -s ../share/${name}/tools/client-side/svnmucc/svnmucc ${destroot}${prefix}/bin/
-				eval delete [glob ${worksrcpath}/tools/client-side/svnmucc/svnmucc{.o,.libs}]
+				delete ${worksrcpath}/tools/client-side/svnmucc/
+				delete ${worksrcpath}/tools/diff/
+				delete ${worksrcpath}/tools/server-side/mod_dontdothat
+				eval delete [glob ${worksrcpath}/tools/server-side/*{.o,.lo,.c}]
+				delete ${worksrcpath}/tools/server-side/svn-populate-node-origins-index
+				delete ${worksrcpath}/tools/server-side/svn-rep-sharing-stats
+				delete ${worksrcpath}/tools/server-side/svnauthz-validate
 				copy ${worksrcpath}/tools ${destroot}${prefix}/share/${name}/tools
 				}
 			}

Modified: trunk/dports/devel/subversion/files/mod_dontdothat_build.patch.diff
===================================================================
--- trunk/dports/devel/subversion/files/mod_dontdothat_build.patch.diff	2012-08-22 14:12:11 UTC (rev 96941)
+++ trunk/dports/devel/subversion/files/mod_dontdothat_build.patch.diff	2012-08-22 14:35:51 UTC (rev 96942)
@@ -29,3 +29,34 @@
  msvc-libs = libhttpd.lib
 
  # ----------------------------------------------------------------------------
+--- build-outputs.mk.orig	2012-08-22 09:48:10.000000000 -0400
++++ build-outputs.mk	2012-08-22 09:49:27.000000000 -0400
+@@ -884,9 +884,10 @@
+ # Section 7: Install-Group install targets
+ ########################################
+ 
+-install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la
++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
+ 	cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
+ 	cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
++	cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
+ 
+ install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la 
+ 	$(MKDIR) $(DESTDIR)$(bdb_libdir)
+@@ -1036,7 +1037,7 @@
+ 	$(MKDIR) $(DESTDIR)$(swig_rb_libdir)
+ 	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
+ 
+-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
++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)
+ 	$(MKDIR) $(DESTDIR)$(toolsdir)
+ 	cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
+ 	cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
+@@ -1046,7 +1047,6 @@
+ 	cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT)
+ 	cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
+ 	cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT)
+-	cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
+ 
+ 
+ ########################################
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120822/d432256d/attachment-0001.html>