[34294] trunk/dports/devel/bazaar

jmr at macports.org jmr at macports.org
Wed Feb 20 23:46:35 PST 2008


Revision: 34294
          http://trac.macosforge.org/projects/macports/changeset/34294
Author:   jmr at macports.org
Date:     2008-02-20 23:46:34 -0800 (Wed, 20 Feb 2008)

Log Message:
-----------
bazaar: make lint happy

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

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

Removed Paths:
-------------
    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	2008-02-21 07:40:55 UTC (rev 34293)
+++ trunk/dports/devel/bazaar/Portfile	2008-02-21 07:46:34 UTC (rev 34294)
@@ -1,10 +1,13 @@
 # $Id$
+
 PortSystem 1.0
+
 name              bazaar
 version           1.4.2
 revision          1
 distname          bazaar_${version}
 categories        devel
+platforms         darwin
 maintainers       jmr \
                   openmaintainer
 description       an improved GNU Arch client
@@ -25,7 +28,7 @@
                rmd160 8a9d8159ead224b24ab84d0fd6cbc23ac004eb51
 
 worksrcdir	thelove at canonical.com---dists--bazaar--1.4
-patchfiles	patch-pfs.c patch-pfs-sftp.c patch-unit-sftp.c
+patchfiles	patch-pfs.c.diff patch-pfs-sftp.c.diff patch-unit-sftp.c.diff
 
 configure.cflags-append	-L${prefix}/lib
 configure.dir    ${workpath}/thelove at canonical.com---dists--bazaar--1.4/build
@@ -55,4 +58,3 @@
 	configure.args-append --with-gnu-diff=${prefix}/bin/gdiff \
 		                      --with-gnu-diff3=${prefix}/bin/gdiff3
 }
-

Deleted: trunk/dports/devel/bazaar/files/patch-pfs-sftp.c
===================================================================
--- trunk/dports/devel/bazaar/files/patch-pfs-sftp.c	2008-02-21 07:40:55 UTC (rev 34293)
+++ trunk/dports/devel/bazaar/files/patch-pfs-sftp.c	2008-02-21 07:46:34 UTC (rev 34294)
@@ -1,11 +0,0 @@
---- 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)
-     {

Copied: trunk/dports/devel/bazaar/files/patch-pfs-sftp.c.diff (from rev 34289, trunk/dports/devel/bazaar/files/patch-pfs-sftp.c)
===================================================================
--- trunk/dports/devel/bazaar/files/patch-pfs-sftp.c.diff	                        (rev 0)
+++ trunk/dports/devel/bazaar/files/patch-pfs-sftp.c.diff	2008-02-21 07:46:34 UTC (rev 34294)
@@ -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)
+     {

Deleted: trunk/dports/devel/bazaar/files/patch-pfs.c
===================================================================
--- trunk/dports/devel/bazaar/files/patch-pfs.c	2008-02-21 07:40:55 UTC (rev 34293)
+++ trunk/dports/devel/bazaar/files/patch-pfs.c	2008-02-21 07:46:34 UTC (rev 34294)
@@ -1,17 +0,0 @@
---- 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));
- }
- 

Copied: trunk/dports/devel/bazaar/files/patch-pfs.c.diff (from rev 34289, trunk/dports/devel/bazaar/files/patch-pfs.c)
===================================================================
--- trunk/dports/devel/bazaar/files/patch-pfs.c.diff	                        (rev 0)
+++ trunk/dports/devel/bazaar/files/patch-pfs.c.diff	2008-02-21 07:46:34 UTC (rev 34294)
@@ -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));
+ }
+ 

Deleted: trunk/dports/devel/bazaar/files/patch-unit-sftp.c
===================================================================
--- trunk/dports/devel/bazaar/files/patch-unit-sftp.c	2008-02-21 07:40:55 UTC (rev 34293)
+++ trunk/dports/devel/bazaar/files/patch-unit-sftp.c	2008-02-21 07:46:34 UTC (rev 34294)
@@ -1,11 +0,0 @@
---- 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);
- 

Copied: trunk/dports/devel/bazaar/files/patch-unit-sftp.c.diff (from rev 34289, trunk/dports/devel/bazaar/files/patch-unit-sftp.c)
===================================================================
--- trunk/dports/devel/bazaar/files/patch-unit-sftp.c.diff	                        (rev 0)
+++ trunk/dports/devel/bazaar/files/patch-unit-sftp.c.diff	2008-02-21 07:46:34 UTC (rev 34294)
@@ -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/20080220/c09f7cc8/attachment-0001.html 


More information about the macports-changes mailing list