4 files changed, 47 insertions, 13 deletions

diff --git a/devel/baz/Makefile b/devel/baz/Makefile
index 462670e46976..4e8bb0238da4 100644
--- a/devel/baz/Makefile
+++ b/devel/baz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bazaar
 PORTVERSION=	1.4.2
-PORTREVISION?=	4
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/obsolete/
 DISTNAME=	bazaar_${PORTVERSION}
@@ -15,8 +15,7 @@ DISTNAME=	bazaar_${PORTVERSION}
 MAINTAINER=	lulf@kerneled.org
 COMMENT=	An implementation of the GNU Arch RCS protocol in C by Canonical
 
-BUILD_DEPENDS=	gmake:${PORTSDIR}/devel/gmake \
-		gpatch:${PORTSDIR}/devel/patch \
+BUILD_DEPENDS=	gpatch:${PORTSDIR}/devel/patch \
 		gdiff:${PORTSDIR}/textproc/diffutils \
 		gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS=	${BUILD_DEPENDS}
@@ -28,8 +27,6 @@ USE_GETTEXT=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 
-BROKEN=		does not build with www/neon 0.26.x
-
 MAN1=		baz.1
 
 MAJORVERSION=	1.4
@@ -41,10 +38,6 @@ CFLAGS+=	-I ${LOCALBASE}/include ${LDFLAGS}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-IGNORE=		does not compile (missing va_copy)
-.endif
-
 pre-patch:
 	${MKDIR} ${WRKSRC}
 
diff --git a/devel/baz/files/patch-pfs-sftp.c b/devel/baz/files/patch-pfs-sftp.c
new file mode 100644
index 000000000000..be725a45a68f
--- /dev/null
+++ b/devel/baz/files/patch-pfs-sftp.c
@@ -0,0 +1,11 @@
+--- src/baz/libarch/pfs-sftp.c.orig	Mon Jun 20 23:59:37 2005
++++ src/baz/libarch/pfs-sftp.c	Thu Apr  5 09:16:19 2007
+@@ -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)
+     {
diff --git a/devel/baz/files/patch-pfs.c b/devel/baz/files/patch-pfs.c
index be346bfac9fe..22399f9c314d 100644
--- a/devel/baz/files/patch-pfs.c
+++ b/devel/baz/files/patch-pfs.c
@@ -1,7 +1,17 @@
-diff -uN -r src/baz/libarch/pfs.c src/baz/libarch/pfs.c
---- src/baz/libarch/pfs.c	2005-06-20 23:59:37.000000000 +0200
-+++ src/baz/libarch/pfs.c	2006-01-14 17:12:24.000000000 +0100
-@@ -520,6 +520,66 @@
+--- src/baz/libarch/pfs.c.orig	Mon Jun 20 23:59:37 2005
++++ src/baz/libarch/pfs.c	Thu Apr  5 09:23:25 2007
+@@ -513,13 +513,73 @@
+     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));
  }
  
diff --git a/devel/baz/files/patch-unit-sftp.c b/devel/baz/files/patch-unit-sftp.c
new file mode 100644
index 000000000000..f0a049289de8
--- /dev/null
+++ b/devel/baz/files/patch-unit-sftp.c
@@ -0,0 +1,20 @@
+--- src/baz/libarch/tests/unit-sftp.c.orig	Mon Jun 20 23:59:37 2005
++++ src/baz/libarch/tests/unit-sftp.c	Thu Apr  5 09:58:45 2007
+@@ -35,7 +35,7 @@
+     char *host;
+     unsigned int port;
+     char *path;
+-    char *authinfo;
++    char *userinfo;
+ } ne_uri;
+ */
+   invariant_int_cmp (ne_uri_parse ("sftp://user@email.com@host.phwoar/root/path", &parsed_uri), 0);
+@@ -44,7 +44,7 @@
+   invariant_str_cmp (parsed_uri.host, "email.com@host.phwoar");
+   arch_uri_heuristics (&parsed_uri);
+   invariant_str_cmp (parsed_uri.host, "host.phwoar");
+-  invariant_str_cmp (parsed_uri.authinfo, "user@email.com");
++  invariant_str_cmp (parsed_uri.userinfo, "user@email.com");
+   invariant_int_cmp (parsed_uri.port, 0);
+   ne_uri_free(&parsed_uri);
+