update to tla 1.3.2

This release fixes a number of minor bugs and adds initial support
for more extensive metadata support, upgrades `libneon', and
includes internal improvements.

5 files changed, 126 insertions, 52 deletions

diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index e65582e823d..565d7439fe9 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2005/03/31 19:33:01 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/10 21:10:24 recht Exp $
 #
 
-DISTNAME=	tla-1.3.1
+DISTNAME=	tla-1.3.2
 CATEGORIES=	devel
-MASTER_SITES=	http://www.gnuarch.org/releases/	\
+MASTER_SITES=	${MASTER_SITE_GNU:=gnu-arch/}		\
+		http://www.gnuarch.org/releases/	\
 		http://www.seyza.com/gnu-releases/
-#${MASTER_SITE_GNU:=gnu-arch/}		\
 
 MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://regexps.srparish.net/www/
@@ -28,18 +28,20 @@ CONFIGURE_ARGS+= --with-gnu-diff3=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff3
 CONFIGURE_ARGS+= --with-gnu-patch=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch
 CONFIGURE_ARGS+= --with-gnu-tar=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}tar
 
-HTMLDIR=	${PREFIX}/share/doc/html/arch
+DOCDIR=	${PREFIX}/share/doc/tla
 
 post-extract:
 	${MKDIR} ${WRKSRC}
 
 post-install:
 	# Install arch documentation.
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	cd ${WRKDIR}/${DISTNAME}/src/docs-tla/html && \
-		${PAX} -s ',.*/\.arch-ids.*,,' -rwppm . ${HTMLDIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${HTMLDIR}
-	${FIND} ${SMDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-	${FIND} ${SMDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} 
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	cd ${WRKDIR}/${DISTNAME}/src/docs-tla &&		\
+		find . \( -name \*.css -or -name \*.html	\
+			-or -name \*.txt \) -print		\
+		| ${PAX} -rwppm ${DOCDIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR}
+	${FIND} ${DOCDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+	${FIND} ${DOCDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} 
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/tla/PLIST b/devel/tla/PLIST
index cd82e26f45f..cc961c920f9 100644
--- a/devel/tla/PLIST
+++ b/devel/tla/PLIST
@@ -1,38 +1,82 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/28 19:51:16 recht Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/05/10 21:10:24 recht Exp $
 bin/tla
-share/doc/html/arch/advanced-revision-libraries.html
-share/doc/html/arch/arch.html
-share/doc/html/arch/archive-caching.html
-share/doc/html/arch/changeset-format.html
-share/doc/html/arch/checking-in-changes.html
-share/doc/html/arch/cherrypicking-changes.html
-share/doc/html/arch/development-branches.html
-share/doc/html/arch/elementary-branches.html
-share/doc/html/arch/exploring-changesets.html
-share/doc/html/arch/importing-first.html
-share/doc/html/arch/in-general.html
-share/doc/html/arch/indexes.html
-share/doc/html/arch/introducing-changesets.html
-share/doc/html/arch/introducing-replay.html
-share/doc/html/arch/introducing-yourself.html
-share/doc/html/arch/introduction.html
-share/doc/html/arch/inventories.html
-share/doc/html/arch/inventory-ids.html
-share/doc/html/arch/little-help.html
-share/doc/html/arch/multi-tree-projects.html
-share/doc/html/arch/naming-conventions.html
-share/doc/html/arch/new-archive.html
-share/doc/html/arch/new-project.html
-share/doc/html/arch/new-source.html
-share/doc/html/arch/project-management.html
-share/doc/html/arch/retrieving-earlier-revisions.html
-share/doc/html/arch/revision-libraries.html
-share/doc/html/arch/selected-files-commits.html
-share/doc/html/arch/shared-and-public-archives.html
-share/doc/html/arch/source-license.html
-share/doc/html/arch/symbolic-tags.html
-share/doc/html/arch/system-requirements.html
-share/doc/html/arch/tree-history.html
-share/doc/html/arch/update-commit.html
-share/doc/html/arch/using-hooks.html
-@dirrm share/doc/html/arch
+share/doc/tla/COPYING.html
+share/doc/tla/COPYING.txt
+share/doc/tla/archreg/coords.html
+share/doc/tla/archreg/coords.txt
+share/doc/tla/archreg/mirrormgt.html
+share/doc/tla/archreg/mirrormgt.txt
+share/doc/tla/archreg/register.html
+share/doc/tla/archreg/register.txt
+share/doc/tla/archreg/top-nav.html
+share/doc/tla/archreg/top-nav.txt
+share/doc/tla/build/help.html
+share/doc/tla/build/help.txt
+share/doc/tla/build/install.html
+share/doc/tla/build/install.txt
+share/doc/tla/build/othertools.html
+share/doc/tla/build/othertools.txt
+share/doc/tla/build/sources.html
+share/doc/tla/build/sources.txt
+share/doc/tla/build/top-nav.html
+share/doc/tla/build/top-nav.txt
+share/doc/tla/build/why.html
+share/doc/tla/build/why.txt
+share/doc/tla/checkout/checkout-config.html
+share/doc/tla/checkout/checkout-config.txt
+share/doc/tla/checkout/checkout.html
+share/doc/tla/checkout/checkout.txt
+share/doc/tla/checkout/top-nav.html
+share/doc/tla/checkout/top-nav.txt
+share/doc/tla/checkout/tree-state.html
+share/doc/tla/checkout/tree-state.txt
+share/doc/tla/gnuarch.css
+share/doc/tla/hacking/branch-publishing.html
+share/doc/tla/hacking/branch-publishing.txt
+share/doc/tla/hacking/changes.html
+share/doc/tla/hacking/changes.txt
+share/doc/tla/hacking/commit.html
+share/doc/tla/hacking/commit.txt
+share/doc/tla/hacking/merge-from-upstream.html
+share/doc/tla/hacking/merge-from-upstream.txt
+share/doc/tla/hacking/my-archive.html
+share/doc/tla/hacking/my-archive.txt
+share/doc/tla/hacking/my-branch.html
+share/doc/tla/hacking/my-branch.txt
+share/doc/tla/hacking/my-config.html
+share/doc/tla/hacking/my-config.txt
+share/doc/tla/hacking/top-nav.html
+share/doc/tla/hacking/top-nav.txt
+share/doc/tla/index.html
+share/doc/tla/index.txt
+share/doc/tla/my/archloc.html
+share/doc/tla/my/archloc.txt
+share/doc/tla/my/id.html
+share/doc/tla/my/id.txt
+share/doc/tla/my/mirrorloc.html
+share/doc/tla/my/mirrorloc.txt
+share/doc/tla/my/revlib.html
+share/doc/tla/my/revlib.txt
+share/doc/tla/my/top-nav.html
+share/doc/tla/my/top-nav.txt
+share/doc/tla/top-nav.html
+share/doc/tla/top-nav.txt
+share/doc/tla/treedelta/add.html
+share/doc/tla/treedelta/add.txt
+share/doc/tla/treedelta/delete.html
+share/doc/tla/treedelta/delete.txt
+share/doc/tla/treedelta/inventory.html
+share/doc/tla/treedelta/inventory.txt
+share/doc/tla/treedelta/naming-conventions.html
+share/doc/tla/treedelta/naming-conventions.txt
+share/doc/tla/treedelta/rename.html
+share/doc/tla/treedelta/rename.txt
+share/doc/tla/treedelta/top-nav.html
+share/doc/tla/treedelta/top-nav.txt
+@dirrm share/doc/tla/treedelta
+@dirrm share/doc/tla/my
+@dirrm share/doc/tla/hacking
+@dirrm share/doc/tla/checkout
+@dirrm share/doc/tla/build
+@dirrm share/doc/tla/archreg
+@dirrm share/doc/tla
diff --git a/devel/tla/distinfo b/devel/tla/distinfo
index 302021ed66f..0172113e2ea 100644
--- a/devel/tla/distinfo
+++ b/devel/tla/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.9 2005/03/21 23:49:48 recht Exp $
+$NetBSD: distinfo,v 1.10 2005/05/10 21:10:24 recht Exp $
 
-SHA1 (tla-1.3.1.tar.gz) = bebd3012880be1fc91b06590aed670fab0bf3035
-RMD160 (tla-1.3.1.tar.gz) = 1da9937e614b045b594ec95118cab4ef1804d8c5
-Size (tla-1.3.1.tar.gz) = 4175745 bytes
+SHA1 (tla-1.3.2.tar.gz) = 596cae5c20be15970ab51bd776f0c8d74abecec8
+RMD160 (tla-1.3.2.tar.gz) = 74a0b70f1d9f1b4da274f9b5011a312db793f4a6
+Size (tla-1.3.2.tar.gz) = 3965027 bytes
+SHA1 (patch-aa) = f41250fbe00b1a88da78d88ca4d81df241d45f28
+SHA1 (patch-ab) = 36c006d072d350d729dc29dd8d6159c8463eed9a
diff --git a/devel/tla/patches/patch-aa b/devel/tla/patches/patch-aa
new file mode 100644
index 00000000000..4c94e5932fa
--- /dev/null
+++ b/devel/tla/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/05/10 21:10:24 recht Exp $
+
+--- ../libneon/Makefile.in.orig	2005-05-03 01:46:50.000000000 +0200
++++ ../libneon/Makefile.in	2005-05-08 12:31:16.000000000 +0200
+@@ -33,7 +33,7 @@
+ 
+ @SET_MAKE@
+ 
+-LDFLAGS = -L. @LDFLAGS@
++LDFLAGS = -L. -L../expat @LDFLAGS@
+ LIBS = @LIBS@
+ CC = @CC@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/devel/tla/patches/patch-ab b/devel/tla/patches/patch-ab
new file mode 100644
index 00000000000..3e153a52371
--- /dev/null
+++ b/devel/tla/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/05/10 21:10:24 recht Exp $
+
+--- ../libneon/src/Makefile.in.orig	2005-05-03 01:46:54.000000000 +0200
++++ ../libneon/src/Makefile.in	2005-05-08 12:31:18.000000000 +0200
+@@ -26,7 +26,7 @@
+ # Flags
+ CPPFLAGS = @DEFS@ @CPPFLAGS@
+ CFLAGS = @CFLAGS@  -I$(top_builddir) -I$(top_srcdir)/../expat/lib @NEON_CFLAGS@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = -L../../expat @LDFLAGS@
+ NEON_LINK_FLAGS = @NEON_LINK_FLAGS@
+ # Note: don't substitute @LIBS@ in here; during a bundled
+ # build of this directory, @LIBS@ may include -lneon.