Updated to version 1.4.

5 files changed, 18 insertions, 92 deletions

diff --git a/devel/st/Makefile b/devel/st/Makefile
index da39605c0b6..5b304c319b9 100644
--- a/devel/st/Makefile
+++ b/devel/st/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/25 19:40:16 gson Exp $
+# $NetBSD: Makefile,v 1.2 2003/04/03 04:02:47 gson Exp $
 #
 
-DISTNAME=	st-1.3
+DISTNAME=	st-1.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=state-threads/}
 
diff --git a/devel/st/distinfo b/devel/st/distinfo
index 3d94f039682..1795cfa4ccb 100644
--- a/devel/st/distinfo
+++ b/devel/st/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/08/25 19:40:16 gson Exp $
+$NetBSD: distinfo,v 1.2 2003/04/03 04:02:47 gson Exp $
 
-SHA1 (st-1.3.tar.gz) = 5d97fc248a2a86602cbd3944ff78a9e916058672
-Size (st-1.3.tar.gz) = 75588 bytes
-SHA1 (patch-aa) = e01af9bcf55cbbbd0b4f2e93f5734a2c615431c3
-SHA1 (patch-ab) = 3c69a37f27c9d4fa4e85b23bb378ac2ae330c759
-SHA1 (patch-ac) = 7c832f17da0637d646685d49c0a43d12db066d65
+SHA1 (st-1.4.tar.gz) = 15065a9ef5982d1de77f40ad7e2d583dc7784b77
+Size (st-1.4.tar.gz) = 80245 bytes
+SHA1 (patch-aa) = 45ad36a0957ad9130b857eaa6eb6b5d693e9a1c8
+SHA1 (patch-ab) = d8b024bd5382c844dd42720d637f3adfb8cb0ac2
diff --git a/devel/st/patches/patch-aa b/devel/st/patches/patch-aa
index bec7f90a657..6b9c613131a 100644
--- a/devel/st/patches/patch-aa
+++ b/devel/st/patches/patch-aa
@@ -1,16 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/08/25 19:40:16 gson Exp $
+$NetBSD: patch-aa,v 1.2 2003/04/03 04:02:48 gson Exp $
 
---- Makefile.orig	Mon Jan 21 19:59:08 2002
+--- Makefile.orig	Tue Oct 29 16:28:26 2002
 +++ Makefile
-@@ -86,6 +86,7 @@
-               irix-64-debug irix-64-optimized       \
-               linux-debug linux-optimized           \
-               linux-ia64-debug linux-ia64-optimized \
-+              netbsd-debug netbsd-optimized	    \
-               openbsd-debug openbsd-optimized       \
-               osf1-debug osf1-optimized             \
-               solaris-debug solaris-optimized
-@@ -148,6 +149,13 @@
+@@ -181,6 +181,13 @@
  OTHER_FLAGS = -Wall
  endif
  
@@ -24,7 +16,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/25 19:40:16 gson Exp $
  ifeq ($(OS), OPENBSD)
  SFLAGS      = -fPIC
  LDFLAGS     = -shared -soname=$(SONAME) -lc
-@@ -203,14 +211,14 @@
+@@ -236,14 +243,14 @@
  
  CFLAGS      += $(DEFINES) $(OTHER_FLAGS)
  
@@ -45,7 +37,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/25 19:40:16 gson Exp $
  DLIBRARY    = $(TARGETDIR)/libst.$(DSO_SUFFIX).$(VERSION)
  EXAMPLES    = examples
  
-@@ -248,8 +256,7 @@
+@@ -294,8 +301,7 @@
  	if [ ! -d $(TARGETDIR) ]; then mkdir $(TARGETDIR); fi
  
  $(SLIBRARY): $(OBJS)
@@ -55,7 +47,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/25 19:40:16 gson Exp $
  	rm -f obj; $(LN) $(LNFLAGS) $(TARGETDIR) obj
  
  $(DLIBRARY): $(OBJS:%.o=%-pic.o)
-@@ -261,11 +268,11 @@
+@@ -311,11 +317,11 @@
  	rm -f $@
  	cp public.h $@
  
@@ -71,15 +63,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/25 19:40:16 gson Exp $
  
  examples::
  	@cd $@; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" OS="$(OS)" TARGETDIR="$(TARGETDIR)"
-@@ -330,6 +337,11 @@
- 	$(MAKE) OS="LINUX_IA64" BUILD="DBG"
- linux-ia64-optimized:
- 	$(MAKE) OS="LINUX_IA64" BUILD="OPT"
-+
-+netbsd-debug:
-+	$(MAKE) OS="NETBSD" BUILD="DBG"
-+netbsd-optimized:
-+	$(MAKE) OS="NETBSD" BUILD="OPT"
- 
- openbsd-debug:
- 	$(MAKE) OS="OPENBSD" BUILD="DBG"
diff --git a/devel/st/patches/patch-ab b/devel/st/patches/patch-ab
index 9b461be1a97..1b6c48cccca 100644
--- a/devel/st/patches/patch-ab
+++ b/devel/st/patches/patch-ab
@@ -1,16 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/08/25 19:40:16 gson Exp $
+$NetBSD: patch-ab,v 1.2 2003/04/03 04:02:48 gson Exp $
 
---- examples/Makefile.orig	Sat Nov  3 13:18:42 2001
+--- examples/Makefile.orig	Mon Feb 18 20:26:38 2002
 +++ examples/Makefile
-@@ -38,6 +38,7 @@
- # IRIX_64
- # LINUX
- # LINUX_IA64
-+# NETBSD
- # OPENBSD
- # OSF1
- # SOLARIS
-@@ -58,9 +59,9 @@
+@@ -59,9 +59,9 @@
  OTHER_FLAGS =
  
  OBJDIR      = $(DEPTH)/$(TARGETDIR)
@@ -23,7 +15,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/08/25 19:40:16 gson Exp $
  
  LIBRESOLV   =
  EXTRALIBS   =
-@@ -68,7 +69,7 @@
+@@ -69,7 +69,7 @@
  ifeq ($(OS),)
  EXAMPLES    = unknown
  else
@@ -32,7 +24,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/08/25 19:40:16 gson Exp $
  endif
  
  
-@@ -92,17 +93,17 @@
+@@ -93,17 +93,17 @@
  
  all: $(EXAMPLES)
  
diff --git a/devel/st/patches/patch-ac b/devel/st/patches/patch-ac
deleted file mode 100644
index bb8b75d85ef..00000000000
--- a/devel/st/patches/patch-ac
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/08/25 19:40:16 gson Exp $
-
---- md.h.orig	Tue Jan 15 22:20:40 2002
-+++ md.h
-@@ -245,6 +245,40 @@
-   (void) gettimeofday(&tv, NULL); \
-   return (tv.tv_sec * 1000000LL + tv.tv_usec)
- 
-+#elif defined (NETBSD)
-+
-+#define MD_STACK_GROWS_DOWN
-+#define MD_USE_BSD_ANON_MMAP
-+#define MD_ACCEPT_NB_INHERITED
-+#define MD_ALWAYS_UNSERIALIZED_ACCEPT
-+#define MD_HAVE_SOCKLEN_T
-+
-+#define MD_SETJMP(env) _setjmp(env)
-+#define MD_LONGJMP(env, val) _longjmp(env, val)
-+
-+#if __sparc__
-+#define MD_INIT_CONTEXT(_thread, _sp, _main) \
-+  ST_BEGIN_MACRO                             \
-+  (void) MD_SETJMP((_thread)->context);      \
-+  (_thread)->context[0] = (long) (_sp);      \
-+  (_thread)->context[1] = (long) (_main) - 8; \
-+  ST_END_MACRO
-+#elif __i386__
-+#define MD_INIT_CONTEXT(_thread, _sp, _main) \
-+  ST_BEGIN_MACRO                             \
-+  (void) MD_SETJMP((_thread)->context);      \
-+  (_thread)->context[0] = (long) _main;      \
-+  (_thread)->context[2] = (long) (_sp);      \
-+  ST_END_MACRO
-+#else
-+#error Unsupported architecture
-+#endif
-+
-+#define MD_GET_UTIME()            \
-+  struct timeval tv;              \
-+  (void) gettimeofday(&tv, NULL); \
-+  return (tv.tv_sec * 1000000LL + tv.tv_usec)
-+
- #elif defined (OPENBSD)
- 
- #define MD_STACK_GROWS_DOWN