9 files changed, 22 insertions, 74 deletions

diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index 8daca0e52662..b6d10a8f3432 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tla
-PORTVERSION=	1.2
-PORTREVISION=   1
+PORTVERSION=	1.2.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		http://regexps.srparish.net/src/${PORTNAME}/ \
@@ -25,6 +24,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 ORIGWRKSRC=	${WRKDIR}/${DISTNAME}/src
+PATCH_WRKSRC=	${ORIGWRKSRC}
 WRKSRC=		${ORIGWRKSRC}/=build
 
 pre-patch:
diff --git a/devel/tla/distinfo b/devel/tla/distinfo
index 5e244bc28950..ab5bddffb8c2 100644
--- a/devel/tla/distinfo
+++ b/devel/tla/distinfo
@@ -1,2 +1,2 @@
-MD5 (tla-1.2.tar.gz) = 1fbc9cd83c37ad6e88e9e6a5f0b62871
-SIZE (tla-1.2.tar.gz) = 4421771
+MD5 (tla-1.2.1.tar.gz) = 40c70c9f881a2b0258441a447e1bd53d
+SIZE (tla-1.2.1.tar.gz) = 4539239
diff --git a/devel/tla/files/patch-libneon-ne_207.c b/devel/tla/files/patch-libneon-ne_207.c
deleted file mode 100644
index 961ae0fe329c..000000000000
--- a/devel/tla/files/patch-libneon-ne_207.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../tla/libneon.orig/ne_207.c	Sat Dec  6 20:35:28 2003
-+++ ../tla/libneon/ne_207.c	Sat Apr 17 20:25:46 2004
-@@ -320,12 +320,12 @@
- 	if (ne_get_status(req)->code == 207) {
- 	    if (!ne_xml_valid(p)) { 
- 		/* The parse was invalid */
--		ne_set_error(sess, ne_xml_get_error(p));
-+		ne_set_error(sess, "%s", ne_xml_get_error(p));
-		ret = NE_ERROR;
- 	    } else if (ctx.is_error) {
- 		/* If we've actually got any error information
- 		 * from the 207, then set that as the error */
--		ne_set_error(sess, ctx.buf->data);
-+               ne_set_error(sess, "%s", ctx.buf->data);
- 		ret = NE_ERROR;
- 	    }
- 	} else if (ne_get_status(req)->klass != 2) {
diff --git a/devel/tla/files/patch-libneon-ne_auth.c b/devel/tla/files/patch-libneon-ne_auth.c
deleted file mode 100644
index 1b4f7da06600..000000000000
--- a/devel/tla/files/patch-libneon-ne_auth.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../tla/libneon.orig/ne_auth.c	Sat Dec  6 20:35:28 2003
-+++ ../tla/libneon/ne_auth.c	Sat Apr 17 20:11:55 2004
-@@ -950,7 +950,7 @@
-     if (areq->auth_info_hdr != NULL && 
- 	verify_response(areq, sess, areq->auth_info_hdr)) {
- 	NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n");
--	ne_set_error(sess->sess, _(sess->spec->fail_msg));
-+	ne_set_error(sess->sess, "%s", _(sess->spec->fail_msg));
- 	ret = NE_ERROR;
-     } else if (status->code == sess->spec->status_code && 
- 	       areq->auth_hdr != NULL) {
diff --git a/devel/tla/files/patch-libneon-ne_locks.c b/devel/tla/files/patch-libneon-ne_locks.c
deleted file mode 100644
index 26784fe47908..000000000000
--- a/devel/tla/files/patch-libneon-ne_locks.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../tla/libneon.orig/ne_locks.c	Sat Dec  6 20:35:28 2003
-+++ ../tla/libneon/ne_locks.c	Sat Apr 17 20:11:55 2004
-@@ -734,7 +734,7 @@
- 	}
- 	else if (parse_failed) {
- 	    ret = NE_ERROR;
--	    ne_set_error(sess, ne_xml_get_error(parser));
-+	    ne_set_error(sess, "%s", ne_xml_get_error(parser));
- 	}
- 	else if (ne_get_status(req)->code == 207) {
- 	    ret = NE_ERROR;
-@@ -802,7 +802,7 @@
-     if (ret == NE_OK && ne_get_status(req)->klass == 2) {
- 	if (parse_failed) {
- 	    ret = NE_ERROR;
--	    ne_set_error(sess, ne_xml_get_error(parser));
-+	    ne_set_error(sess, "%s", ne_xml_get_error(parser));
- 	}
- 	else if (ne_get_status(req)->code == 207) {
- 	    ret = NE_ERROR;
diff --git a/devel/tla/files/patch-libneon-ne_props.c b/devel/tla/files/patch-libneon-ne_props.c
deleted file mode 100644
index c307849658f5..000000000000
--- a/devel/tla/files/patch-libneon-ne_props.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../tla/libneon.orig/ne_props.c	Sat Dec  6 20:35:28 2003
-+++ ../tla/libneon/ne_props.c	Sat Apr 17 20:11:55 2004
-@@ -142,7 +142,7 @@
-     if (ret == NE_OK && ne_get_status(req)->klass != 2) {
- 	ret = NE_ERROR;
-     } else if (!ne_xml_valid(handler->parser)) {
--	ne_set_error(handler->sess, ne_xml_get_error(handler->parser));
-+	ne_set_error(handler->sess, "%s", ne_xml_get_error(handler->parser));
- 	ret = NE_ERROR;
-     }
- 
diff --git a/devel/tla/files/patch-libneon-ne_xml.c b/devel/tla/files/patch-libneon-ne_xml.c
deleted file mode 100644
index 240cba1b1ce2..000000000000
--- a/devel/tla/files/patch-libneon-ne_xml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../tla/libneon.orig/ne_xml.c	Sat Dec  6 20:35:29 2003
-+++ ../tla/libneon/ne_xml.c	Sat Apr 17 20:11:55 2004
-@@ -538,7 +538,7 @@
- 
- void ne_xml_set_error(ne_xml_parser *p, const char *msg)
- {
--    ne_snprintf(p->error, ERR_SIZE, msg);
-+    ne_snprintf(p->error, ERR_SIZE, "%s", msg);
- }
- 
- #ifdef HAVE_LIBXML
diff --git a/devel/tla/files/patch-tla::libneon::PLUGIN::AUTOCONF b/devel/tla/files/patch-tla::libneon::PLUGIN::AUTOCONF
new file mode 100644
index 000000000000..dd07d7780409
--- /dev/null
+++ b/devel/tla/files/patch-tla::libneon::PLUGIN::AUTOCONF
@@ -0,0 +1,8 @@
+--- tla/libneon/PLUGIN/AUTOCONF.orig	Sat Dec  6 11:35:27 2003
++++ tla/libneon/PLUGIN/AUTOCONF	Tue Aug 31 13:22:59 2004
+@@ -1,4 +1,4 @@
+ #!/bin/sh
+ 
+-"$1" --with-expat --with-included-expat --with-included-neon
++"$1" --with-expat --with-included-expat --with-included-neon --with-ssl
+ 
diff --git a/devel/tla/files/patch-tla::tla::Makefile.in b/devel/tla/files/patch-tla::tla::Makefile.in
new file mode 100644
index 000000000000..ae155bdc1b51
--- /dev/null
+++ b/devel/tla/files/patch-tla::tla::Makefile.in
@@ -0,0 +1,10 @@
+--- tla/tla/Makefile.in.orig	Tue Aug 31 13:35:23 2004
++++ tla/tla/Makefile.in	Tue Aug 31 13:35:45 2004
+@@ -4,6 +4,7 @@
+ 				../libdate/libdate.a \
+ 				$(objroot)/hackerlab/libhackerlab/libhackerlab.a \
+ 				../libneon/libneon.a \
++				-lssl -lcrypto \
+ 				-lm
+ 
+ mains			:=	tla.c