[90123] trunk/dports/devel/subversion

[dluke at macports.org]

Revision: 90123
          http://trac.macports.org/changeset/90123
Author:   dluke at macports.org
Date:     2012-02-22 08:32:24 -0800 (Wed, 22 Feb 2012)
Log Message:
-----------
subversion: use curl-ca-bundle certificates fixes #19247

Modified Paths:
--------------
    trunk/dports/devel/subversion/Portfile

Added Paths:
-----------
    trunk/dports/devel/subversion/files/config_impl.h.patch
    trunk/dports/devel/subversion/files/servers.default

Modified: trunk/dports/devel/subversion/Portfile
===================================================================
--- trunk/dports/devel/subversion/Portfile	2012-02-22 16:09:38 UTC (rev 90122)
+++ trunk/dports/devel/subversion/Portfile	2012-02-22 16:32:24 UTC (rev 90123)
@@ -4,6 +4,7 @@
 
 name			subversion
 version			1.7.3
+revision		1
 categories		devel
 platforms		darwin
 maintainers		geeklair.net:dluke blair
@@ -26,13 +27,17 @@
 			port:db46 port:sqlite3 \
 			port:gettext port:libiconv \
 			port:serf1 port:cyrus-sasl2
+depends_run		port:curl-ca-bundle
 
 test.run		yes
 test.target		check
 test.env		CLEANUP=true
 
-patchfiles		patch-Makefile.in.diff
+patchfiles		patch-Makefile.in.diff config_impl.h.patch
 
+post-patch {		reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/subversion/libsvn_subr/config_impl.h
+			}
+
 configure.args		--with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6 \
 			--with-neon=${prefix} --with-apr=${prefix}/bin/apr-1-config \
 			--with-apr-util=${prefix}/bin/apu-1-config --without-apxs \
@@ -43,14 +48,13 @@
 use_parallel_build	yes
 build.target		all
 
-pre-test {
-			set x {}
+pre-test {		set x {}
 			fs-traverse dir ${worksrcpath}/subversion {
 				if {[file tail ${dir}] == ".libs" && [file isdirectory ${dir}]} {
 					lappend x ${dir}
 					continue
+					}
 				}
-			}
 
 			test.env-append DYLD_LIBRARY_PATH=[join ${x} ":"]
 			}
@@ -63,6 +67,16 @@
 				${worksrcpath}/libtool
 			}
 
+post-destroot {		# install global config file so curl-ca-bundle certs are used
+			xinstall -d ${destroot}${prefix}/etc/subversion
+			xinstall -m 644 ${filespath}/servers.default ${destroot}${prefix}/etc/subversion
+			}
+
+post-activate {		if {![file exists ${prefix}/etc/subversion/servers]} {
+				copy ${prefix}/etc/subversion/servers.default ${prefix}/etc/subversion/servers
+				}
+			}
+
 variant mod_dav_svn 	description {Install the subversion apache module (mod_dav_svn)} {
 			depends_build path:apache2/bin/apxs:apache2
 			configure.args-append \
@@ -95,8 +109,8 @@
 
 					post-install {
 							ui_warn "This variant (+mac_os_x_server_mod_dav_svn) builds against the Apple-supplied apache2 in /opt/apache2 and thus may have problems that the normal variant (+mod_dav_svn) which builds against the macports supplied apache2 will not have."
-					    		 }
-                       	 		}
+					}
+					}
 
 variant tools 		description {Install some optional extra subversion tools} {
 			build.target-append svnmucc
@@ -110,7 +124,7 @@
 
 # see http://subversion.tigris.org/issues/show_bug.cgi?id=2464
 variant unicode_path	description {Installs a hack to workaround Mac OS X unicode path issues} {
-			patchfiles-append  patch-path.c.diff
+			patchfiles-append patch-path.c.diff
 			post-install {
 				ui_warn "This variant (+unicode_path) implements a hack to deal with composed/decomposed unicode handling on Mac OS X which is different from linux and windows. It is an implementation of solution 1 from http://svn.collab.net/repos/svn/trunk/notes/unicode-composition-for-filenames which _WILL_ break some setups. Please be sure you understand what you are asking for when you install this variant."
 				}
@@ -133,6 +147,6 @@
 					--disable-keychain
 				}
 
-livecheck.type  regex
+livecheck.type	regex
 livecheck.url	http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74
 livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Added: trunk/dports/devel/subversion/files/config_impl.h.patch
===================================================================
--- trunk/dports/devel/subversion/files/config_impl.h.patch	                        (rev 0)
+++ trunk/dports/devel/subversion/files/config_impl.h.patch	2012-02-22 16:32:24 UTC (rev 90123)
@@ -0,0 +1,11 @@
+--- subversion/libsvn_subr/config_impl.h.orig	2011-02-12 00:18:15.000000000 +1100
++++ subversion/libsvn_subr/config_impl.h	2012-02-21 21:07:53.000000000 +1100
+@@ -121,7 +121,7 @@ svn_error_t *svn_config__parse_registry(
+ #  define SVN_CONFIG__SYS_DIRECTORY   "subversion"
+ #  define SVN_CONFIG__USR_DIRECTORY   "subversion"
+ #else  /* ! WIN32 && ! __HAIKU__ */
+-#  define SVN_CONFIG__SYS_DIRECTORY   "/etc/subversion"
++#  define SVN_CONFIG__SYS_DIRECTORY   "__PREFIX__/etc/subversion"
+ #  define SVN_CONFIG__USR_DIRECTORY   ".subversion"
+ #endif /* WIN32 */
+ 

Added: trunk/dports/devel/subversion/files/servers.default
===================================================================
--- trunk/dports/devel/subversion/files/servers.default	                        (rev 0)
+++ trunk/dports/devel/subversion/files/servers.default	2012-02-22 16:32:24 UTC (rev 90123)
@@ -0,0 +1,2 @@
+[global]
+ssl-trust-default-ca = yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120222/8867cc2c/attachment.html>