Update devel/st all the way from 1.5.1 to 1.8.

Changes from 1.7 to 1.8.
--------------------------
o  Added support for kqueue and epoll on platforms that support them.
   Added ability to choose the event notification system at program
   startup.

o  Long-overdue public definitions of ST_UTIME_NO_TIMEOUT (-1ULL) and
   ST_UTIME_NO_WAIT (0) [bug 1514436].

o  Documentation patch for st_utime() [bug 1514484].

o  Documentation patch for st_timecache_set() [bug 1514486].

o  Documentation patch for st_netfd_serialize_accept() [bug 1514494].

o  Added st_writev_resid() [rfe 1538344].

o  Added st_readv_resid() [rfe 1538768] and, for symmetry, st_readv().


Changes from 1.6 to 1.7.
------------------------
o  Support glibc 2.4, which breaks programs that manipulate jump buffers.
   Replaced Linux IA64 special cases with new md.S that covers all
   Linux.


Changes from 1.5.2 to 1.6.
--------------------------
none


Changes from 1.5.1 to 1.5.2.
----------------------------
o  Alfred Perlstein's context switch callback feature.

o  Claus Assmann's st_recvmsg/st_sendmsg wrappers.

o  Extra stack padding for platforms that need it.

o  Ron Arts's timeout clarifications in the reference manual.

o  Raymond Bero and Anton Berezin's AMD64 FreeBSD port.

o  Claus Assmann's AMD64 SunOS 5.10 port.

o  Claus Assmann's AMD64 OpenBSD port.

o  Michael Abd-El-Malek's Mac OS X port.

o  Michael Abd-El-Malek's stack printing patch.

5 files changed, 31 insertions, 29 deletions

diff --git a/devel/st/Makefile b/devel/st/Makefile
index b64241a2150..62e1b89a77f 100644
--- a/devel/st/Makefile
+++ b/devel/st/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2008/03/03 17:45:37 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2009/03/10 11:13:09 gson Exp $
 #
 
-DISTNAME=	st-1.5.1
-PKGREVISION=	1
+DISTNAME=	st-1.8
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=state-threads/}
 
@@ -20,10 +19,10 @@ BUILD_TARGET=	netbsd-debug
 
 HTMLDIR=	${PREFIX}/share/doc/html/st
 
-INSTALLATION_DIRS=	bin lib
+INSTALLATION_DIRS=	bin include lib
 
 do-install:
-	${LIBTOOL} --mode=install ${INSTALL_DATA} \
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/libst.la ${DESTDIR}${PREFIX}/lib
 	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
 		${WRKSRC}/examples/lookupdns ${DESTDIR}${PREFIX}/bin/st-lookupdns
@@ -31,7 +30,6 @@ do-install:
 		${WRKSRC}/examples/proxy ${DESTDIR}${PREFIX}/bin/st-proxy
 	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
 		${WRKSRC}/examples/server ${DESTDIR}${PREFIX}/bin/st-server
-	${INSTALL_DATA_DIR} ${PREFIX}/include/st
 	${INSTALL_DATA} ${WRKSRC}/public.h ${DESTDIR}${PREFIX}/include/st.h
 	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
 	cd ${WRKSRC}/docs; ${INSTALL_DATA} *.html *.gif ${DESTDIR}${HTMLDIR}
diff --git a/devel/st/PLIST b/devel/st/PLIST
index b4657581cfb..f2efb5a8007 100644
--- a/devel/st/PLIST
+++ b/devel/st/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/03/10 11:13:09 gson Exp $
 bin/st-lookupdns
 bin/st-proxy
 bin/st-server
@@ -9,3 +9,5 @@ share/doc/html/st/notes.html
 share/doc/html/st/reference.html
 share/doc/html/st/st.html
 @dirrm share/doc/html/st
+@exec ${MKDIR} %D/include/st
+@dirrm include/st
diff --git a/devel/st/distinfo b/devel/st/distinfo
index 9bdac8ca0b8..d80d0508ee1 100644
--- a/devel/st/distinfo
+++ b/devel/st/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 22:24:34 agc Exp $
+$NetBSD: distinfo,v 1.6 2009/03/10 11:13:09 gson Exp $
 
-SHA1 (st-1.5.1.tar.gz) = 5dcc4146a30b82f8e8ca076f298cddb2a19ba93e
-RMD160 (st-1.5.1.tar.gz) = 341713fc544d58bfc9b1e2e6f43e3c74df0108d3
-Size (st-1.5.1.tar.gz) = 90372 bytes
-SHA1 (patch-aa) = a975923396f713a64a9a321c753539909fb3e69c
-SHA1 (patch-ab) = d8b024bd5382c844dd42720d637f3adfb8cb0ac2
+SHA1 (st-1.8.tar.gz) = 3f9c9bfe0a6074ccfcb642c1b95320dba496b9e8
+RMD160 (st-1.8.tar.gz) = 951c55807d2164c1a8f1fcde75d97aeb6a47a256
+Size (st-1.8.tar.gz) = 106604 bytes
+SHA1 (patch-aa) = 81dccd050f11e06bee7c8c07870091741b49d3f7
+SHA1 (patch-ab) = b1967d6ee1dcdd549f3f90f53f51aa253be2dc5c
diff --git a/devel/st/patches/patch-aa b/devel/st/patches/patch-aa
index 0524c7f192e..a4cbfa569a1 100644
--- a/devel/st/patches/patch-aa
+++ b/devel/st/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2004/11/27 12:12:16 gson Exp $
+$NetBSD: patch-aa,v 1.4 2009/03/10 11:13:09 gson Exp $
 
---- Makefile.orig	Tue Oct 29 16:28:26 2002
+--- Makefile.orig	2007-03-14 04:34:20.000000000 +0200
 +++ Makefile
-@@ -181,6 +181,13 @@
+@@ -184,6 +184,13 @@ LDFLAGS     = -shared -soname=$(SONAME) 
  OTHER_FLAGS = -Wall
  endif
  
@@ -16,20 +16,22 @@ $NetBSD: patch-aa,v 1.3 2004/11/27 12:12:16 gson Exp $
  ifeq ($(OS), OPENBSD)
  SFLAGS      = -fPIC
  LDFLAGS     = -shared -soname=$(SONAME) -lc
-@@ -236,14 +243,14 @@
+@@ -273,15 +280,15 @@ endif
  
- CFLAGS      += $(DEFINES) $(OTHER_FLAGS)
+ CFLAGS      += $(DEFINES) $(OTHER_FLAGS) $(EXTRA_CFLAGS)
  
 -OBJS        = $(TARGETDIR)/sched.o \
 -              $(TARGETDIR)/stk.o   \
 -              $(TARGETDIR)/sync.o  \
 -              $(TARGETDIR)/key.o   \
--              $(TARGETDIR)/io.o
+-              $(TARGETDIR)/io.o    \
+-              $(TARGETDIR)/event.o
 +OBJS        = $(TARGETDIR)/sched.lo \
 +              $(TARGETDIR)/stk.lo   \
 +              $(TARGETDIR)/sync.lo  \
 +              $(TARGETDIR)/key.lo   \
-+              $(TARGETDIR)/io.lo
++              $(TARGETDIR)/io.lo    \
++              $(TARGETDIR)/event.lo
  OBJS        += $(EXTRA_OBJS)
  HEADER      = $(TARGETDIR)/st.h
 -SLIBRARY    = $(TARGETDIR)/libst.a
@@ -37,7 +39,7 @@ $NetBSD: patch-aa,v 1.3 2004/11/27 12:12:16 gson Exp $
  DLIBRARY    = $(TARGETDIR)/libst.$(DSO_SUFFIX).$(VERSION)
  EXAMPLES    = examples
  
-@@ -294,8 +301,7 @@
+@@ -332,8 +339,7 @@ $(TARGETDIR):
  	if [ ! -d $(TARGETDIR) ]; then mkdir $(TARGETDIR); fi
  
  $(SLIBRARY): $(OBJS)
@@ -47,13 +49,13 @@ $NetBSD: patch-aa,v 1.3 2004/11/27 12:12:16 gson Exp $
  	rm -f obj; $(LN) $(LNFLAGS) $(TARGETDIR) obj
  
  $(DLIBRARY): $(OBJS:%.o=%-pic.o)
-@@ -311,11 +317,11 @@
+@@ -349,11 +355,11 @@ $(HEADER): public.h
  	rm -f $@
  	cp public.h $@
  
--$(TARGETDIR)/%asm.o: %asm.S
+-$(TARGETDIR)/md.o: md.S
 -	$(CC) $(CFLAGS) -c $< -o $@
-+$(TARGETDIR)/%asm.lo: %asm.S
++$(TARGETDIR)/md.lo: md.S
 +	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< -o $@
  
 -$(TARGETDIR)/%.o: %.c common.h md.h
diff --git a/devel/st/patches/patch-ab b/devel/st/patches/patch-ab
index 1b6c48cccca..5e7ea21cb48 100644
--- a/devel/st/patches/patch-ab
+++ b/devel/st/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/04/03 04:02:48 gson Exp $
+$NetBSD: patch-ab,v 1.3 2009/03/10 11:13:09 gson Exp $
 
---- examples/Makefile.orig	Mon Feb 18 20:26:38 2002
+--- examples/Makefile.orig	2004-01-11 02:15:17.000000000 +0200
 +++ examples/Makefile
-@@ -59,9 +59,9 @@
+@@ -60,9 +60,9 @@ CFLAGS      =
  OTHER_FLAGS =
  
  OBJDIR      = $(DEPTH)/$(TARGETDIR)
@@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.2 2003/04/03 04:02:48 gson Exp $
  
  LIBRESOLV   =
  EXTRALIBS   =
-@@ -69,7 +69,7 @@
+@@ -70,7 +70,7 @@ EXTRALIBS   =
  ifeq ($(OS),)
  EXAMPLES    = unknown
  else
@@ -24,7 +24,7 @@ $NetBSD: patch-ab,v 1.2 2003/04/03 04:02:48 gson Exp $
  endif
  
  
-@@ -93,17 +93,17 @@
+@@ -94,17 +94,17 @@ endif
  
  all: $(EXAMPLES)