[23497] trunk/dports/devel/bazaar

[source_changes at macosforge.org]

Revision: 23497
          http://trac.macosforge.org/projects/macports/changeset/23497
Author:   markd at macports.org
Date:     2007-04-02 21:21:57 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
Closes #11031 and #11458.  Fixes for broken tarball and add patches.

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

Added Paths:
-----------
    trunk/dports/devel/bazaar/files/
    trunk/dports/devel/bazaar/files/patch-pfs-sftp.c
    trunk/dports/devel/bazaar/files/patch-pfs.c
    trunk/dports/devel/bazaar/files/patch-unit-sftp.c

Modified: trunk/dports/devel/bazaar/Portfile
===================================================================
--- trunk/dports/devel/bazaar/Portfile	2007-04-03 04:06:18 UTC (rev 23496)
+++ trunk/dports/devel/bazaar/Portfile	2007-04-03 04:21:57 UTC (rev 23497)
@@ -2,9 +2,11 @@
 PortSystem 1.0
 name              bazaar
 version           1.4.2
+revision          1
 distname          bazaar_${version}
 categories        devel
-maintainers       josh_root at users.sourceforge.net
+maintainers       josh-macports at root.id.au \
+                  openmaintainer at macports.org
 description       an improved GNU Arch client
 long_description \
 	Bazaar is intended to be an implementation of the GNU Arch \
@@ -17,11 +19,14 @@
 	multiple people or at different times.
 homepage          http://bazaar.canonical.com/
 
-master_sites      http://bazaar.canonical.com/releases/src/
+master_sites      http://bazaar-vcs.org/releases/src/obsolete
 checksums      md5 6e61d7aeec990a801977ee6cdc3958d5 \
                sha1 030fcf1d2de6392c6ab3c23d7af1fddbbeb65a73 \
                rmd160 8a9d8159ead224b24ab84d0fd6cbc23ac004eb51
 
+worksrcdir	thelove at canonical.com---dists--bazaar--1.4
+patchfiles	patch-pfs.c patch-pfs-sftp.c patch-unit-sftp.c
+
 configure.env 	CFLAGS="-I'${prefix}/include' -L'${prefix}/lib'"
 configure.dir    ${workpath}/thelove at canonical.com---dists--bazaar--1.4/build
 build.dir        ${configure.dir}

Added: trunk/dports/devel/bazaar/files/patch-pfs-sftp.c
===================================================================
--- trunk/dports/devel/bazaar/files/patch-pfs-sftp.c	                        (rev 0)
+++ trunk/dports/devel/bazaar/files/patch-pfs-sftp.c	2007-04-03 04:21:57 UTC (rev 23497)
@@ -0,0 +1,11 @@
+--- src/baz/libarch/pfs-sftp.c.orig	2005-06-21 07:59:37.000000000 +1000
++++ src/baz/libarch/pfs-sftp.c	2006-11-16 03:16:14.000000000 +1100
+@@ -1496,7 +1496,7 @@
+    */
+   arch_uri_heuristics (&parsed_uri);
+ 
+-  *user = str_save (0, parsed_uri.authinfo);
++  *user = str_save (0, parsed_uri.userinfo);
+   *hostname = str_save (0, parsed_uri.host);
+   if (parsed_uri.port)
+     {

Added: trunk/dports/devel/bazaar/files/patch-pfs.c
===================================================================
--- trunk/dports/devel/bazaar/files/patch-pfs.c	                        (rev 0)
+++ trunk/dports/devel/bazaar/files/patch-pfs.c	2007-04-03 04:21:57 UTC (rev 23497)
@@ -0,0 +1,17 @@
+--- src/baz/libarch/pfs.c.orig	2005-06-21 07:59:37.000000000 +1000
++++ src/baz/libarch/pfs.c	2006-11-16 02:44:41.000000000 +1100
+@@ -513,10 +513,10 @@
+     char *at_pos = str_chr_index (parsed_uri->host, '@');
+     if (!at_pos)
+         return;
+-    parsed_uri->authinfo = str_replace (parsed_uri->authinfo, 
+-					str_alloc_cat (0, parsed_uri->authinfo, "@"));
+-    parsed_uri->authinfo = str_replace (parsed_uri->authinfo, 
+-					str_alloc_cat_n (0, parsed_uri->authinfo, parsed_uri->host, at_pos - parsed_uri->host));
++    parsed_uri->userinfo = str_replace (parsed_uri->userinfo, 
++					str_alloc_cat (0, parsed_uri->userinfo, "@"));
++    parsed_uri->userinfo = str_replace (parsed_uri->userinfo, 
++					str_alloc_cat_n (0, parsed_uri->userinfo, parsed_uri->host, at_pos - parsed_uri->host));
+     parsed_uri->host = str_replace (parsed_uri->host, str_save (0, at_pos + 1));
+ }
+ 

Added: trunk/dports/devel/bazaar/files/patch-unit-sftp.c
===================================================================
--- trunk/dports/devel/bazaar/files/patch-unit-sftp.c	                        (rev 0)
+++ trunk/dports/devel/bazaar/files/patch-unit-sftp.c	2007-04-03 04:21:57 UTC (rev 23497)
@@ -0,0 +1,11 @@
+--- src/baz/libarch/tests/unit-sftp.c.orig	2005-06-21 07:59:37.000000000 +1000
++++ src/baz/libarch/tests/unit-sftp.c	2006-11-16 03:22:04.000000000 +1100
+@@ -44,7 +44,7 @@
+   invariant_str_cmp (parsed_uri.host, "email.com at host.phwoar");
+   arch_uri_heuristics (&parsed_uri);
+   invariant_str_cmp (parsed_uri.host, "host.phwoar");
+-  invariant_str_cmp (parsed_uri.authinfo, "user at email.com");
++  invariant_str_cmp (parsed_uri.userinfo, "user at email.com");
+   invariant_int_cmp (parsed_uri.port, 0);
+   ne_uri_free(&parsed_uri);
+ 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070402/2e71abea/attachment.html