- Add patch-configure containing my currently preferred workaround for the

  problem described in PR 31142
- Remove patch for same from patch-aa
- Tidy up pkg-{comment,desc} somewhat

4 files changed, 33 insertions, 29 deletions

diff --git a/devel/zthread/files/patch-aa b/devel/zthread/files/patch-aa
index 0a8e4d879235..82746b033729 100644
--- a/devel/zthread/files/patch-aa
+++ b/devel/zthread/files/patch-aa
@@ -1,25 +1,6 @@
---- Makefile.in.orig	Thu Jul 12 23:46:03 2001
-+++ Makefile.in	Fri Aug  3 12:52:00 2001
-@@ -146,6 +146,9 @@
- 	cd $(top_srcdir) && $(AUTOHEADER)
- 	@echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null
- 
-+$(srcdir)/libtool: ltconfig
-+	$(srcdir)/ltconfig $(srcdir)/ltmain.sh
-+
- mostlyclean-hdr:
- 
- clean-hdr:
-@@ -327,7 +330,7 @@
- uninstall-am: uninstall-local
- uninstall: uninstall-recursive
- all-am: Makefile
--all-redirect: all-recursive
-+all-redirect: $(srcdir)/libtool all-recursive
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs: installdirs-recursive
-@@ -382,7 +385,7 @@
+--- Makefile.in.orig	Fri Aug 31 15:12:28 2001
++++ Makefile.in	Wed Nov 14 16:04:12 2001
+@@ -382,7 +382,7 @@
  
  install-exec-hook:
  	$(mkinstalldirs) $(bindir)
diff --git a/devel/zthread/files/patch-configure b/devel/zthread/files/patch-configure
new file mode 100644
index 000000000000..461b73379c18
--- /dev/null
+++ b/devel/zthread/files/patch-configure
@@ -0,0 +1,12 @@
+--- configure.orig	Sun Aug 26 20:27:01 2001
++++ configure	Wed Nov 14 16:02:31 2001
+@@ -4428,7 +4428,8 @@
+ # All known linkers require a `.a' archive for static linking (except M$VC,
+ # which needs '.lib').
+ libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
++ac_aux_dir_tmp="$ac_aux_dir"
++ltmain="$ac_aux_dir_tmp/ltmain.sh"
+ ofile="$default_ofile"
+ with_gnu_ld="$lt_cv_prog_gnu_ld"
+ need_locks="$enable_libtool_lock"
diff --git a/devel/zthread/pkg-comment b/devel/zthread/pkg-comment
index 29e5492b3941..12925387766f 100644
--- a/devel/zthread/pkg-comment
+++ b/devel/zthread/pkg-comment
@@ -1 +1 @@
-ZThreads: a platform-independent object-oriented threading package
+A platform-independent object-oriented C++ threading library
diff --git a/devel/zthread/pkg-descr b/devel/zthread/pkg-descr
index 4952a3e77bd3..91abdf7c12a3 100644
--- a/devel/zthread/pkg-descr
+++ b/devel/zthread/pkg-descr
@@ -1,7 +1,18 @@
-The ZThread package is an advanced object-oriented, cross-platform, 
-C++ threading and synchronization library. It provides a high level 
-abstraction of the native threading mechanisms to offer a great deal of 
-flexibility and control. 
+Paraphrasing the website:
 
-More information is available at the ZThreads homepage:
-WWW: http://zthread.sourceforge.net/
+  The ZThread package is an advanced object-oriented, cross-platform, C++
+  threading and synchronization library.  It provides a high level
+  abstraction of the native threading mechanisms to offer a great deal of
+  flexibility and control. 
+
+  ZThread features interruptible Thread and Runnable objects for C++, control
+  objects and implementations of concurrency design patterns.  This includes
+  semaphores, mutexes, condition variabes as well as other more complex
+  components.
+
+ZThread implementations are provided for POSIX and Win32 platforms.
+
+Author: Eric Crahen <crahen@cse.buffalo.edu>
+WWW:    http://www.cse.buffalo.edu/~crahen/projects/zthread/
+
+-- Johann Visagie <wjv@FreeBSD.org>