Update to trio-1.11. Most important changes are various bug and

portability fixes, additional functions like trio_asprintfv,
customizable printf/scanf, overwriteable locale settings and more.

5 files changed, 20 insertions, 42 deletions

diff --git a/devel/trio/Makefile b/devel/trio/Makefile
index d559830d717..dc122cee185 100644
--- a/devel/trio/Makefile
+++ b/devel/trio/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2006/10/04 21:36:01 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/10/31 23:13:51 joerg Exp $
 #
 
-DISTNAME=	trio-1.3
-PKGREVISION=	1
+DISTNAME=	trio-1.11
 CATEGORIES=	devel
-MASTER_SITES=	http://daniel.haxx.se/projects/trio/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ctrio/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://daniel.haxx.se/projects/trio/
@@ -12,9 +11,9 @@ COMMENT=	Fully matured and stable set of printf and string functions
 
 USE_LIBTOOL=	yes
 
-INSTALLATION_DIRS=	include lib man/man3
+INSTALLATION_DIRS=	include lib
 
-post-patch:
+post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/trio/PLIST b/devel/trio/PLIST
index d755f034299..d7fe908ef80 100644
--- a/devel/trio/PLIST
+++ b/devel/trio/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2006/03/15 16:44:50 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/10/31 23:13:51 joerg Exp $
 include/trio.h
+include/triodef.h
+include/trionan.h
 include/triop.h
+include/triostr.h
 lib/libtrio.la
-man/man3/strio.3
-man/man3/trio_printf.3
-man/man3/trio_register.3
-man/man3/trio_scanf.3
diff --git a/devel/trio/distinfo b/devel/trio/distinfo
index bb1d5e28412..5980cc699df 100644
--- a/devel/trio/distinfo
+++ b/devel/trio/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/12/15 21:55:31 joerg Exp $
+$NetBSD: distinfo,v 1.4 2006/10/31 23:13:51 joerg Exp $
 
-SHA1 (trio-1.3.tar.gz) = 3d90f1e12b6986cf6d62999a2ac5c7921c4fb1ea
-RMD160 (trio-1.3.tar.gz) = 87f2cee37e01177b8bf78aa3394291eb1d1f7bcd
-Size (trio-1.3.tar.gz) = 60598 bytes
-SHA1 (patch-aa) = fe2516370ac43972ec6d56a669436079f766e013
+SHA1 (trio-1.11.tar.gz) = 5197d21dc6e52b96e10d259fc3c9ca09fe559836
+RMD160 (trio-1.11.tar.gz) = fa351909efea8d56c1469ae0d97347f870304540
+Size (trio-1.11.tar.gz) = 122959 bytes
diff --git a/devel/trio/files/Makefile b/devel/trio/files/Makefile
index 1a08d4e219e..b84d65709ad 100644
--- a/devel/trio/files/Makefile
+++ b/devel/trio/files/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.1 2006/03/15 16:44:50 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2006/10/31 23:13:51 joerg Exp $
 
 LIB=		libtrio
-LIB_VER=	1:0
+LIB_VER=	2:0:1
 LIBS?=		-lm
 
-SRCS=		trio.c strio.c
-HDRS=		trio.h triop.h
+SRCS=		trio.c triostr.c trionan.c
+HDRS=		trio.h triop.h triodef.h trionan.h triostr.h
 OBJS=		${SRCS:.c=.lo}
 
 PREFIX?=	/usr/local
 LIBDIR?=	${PREFIX}/lib
 INCLUDEDIR?=	${PREFIX}/include
-MANDIR?=	${PREFIX}/${PKGMANDIR}
-MANDIR3?=	${MANDIR}/man3
 
 BSD_INSTALL?=		install
 BSD_INSTALL_DIR?=	${BSD_INSTALL} -d
@@ -34,12 +32,9 @@ clean:
 	-${LIBTOOL} --mode=clean ${RM} ${OBJS} ${LIB}.la
 
 install:
-	${BSD_INSTALL_DIR} ${LIBDIR} ${INCLUDEDIR}
-	${BSD_INSTALL_DATA} ${HDRS} ${INCLUDEDIR}
-	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${LIB}.la ${LIBDIR}/${LIB}.la
-	${BSD_INSTALL_DIR} ${MANDIR3}
-	${BSD_INSTALL_DATA} man/man3/strio.3 man/man3/trio_printf.3 \
-	    man/man3/trio_register.3 man/man3/trio_scanf.3 ${MANDIR3}
+	${BSD_INSTALL_DIR} ${DESTDIR}${LIBDIR} ${DESTDIR}${INCLUDEDIR}
+	${BSD_INSTALL_DATA} ${HDRS} ${DESTDIR}${INCLUDEDIR}
+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${LIB}.la ${DESTDIR}${LIBDIR}/${LIB}.la
 
 ${LIB}.la: ${OBJS}
 	${LIBTOOL} --mode=link ${CC} -o $@ ${CFLAGS} ${LDFLAGS} \
diff --git a/devel/trio/patches/patch-aa b/devel/trio/patches/patch-aa
deleted file mode 100644
index c9fbb3a9cd7..00000000000
--- a/devel/trio/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/12/15 21:55:31 joerg Exp $
-
---- trio.c.orig	2005-12-15 21:49:33.000000000 +0000
-+++ trio.c
-@@ -536,9 +536,6 @@ typedef struct _userdef_T {
-  * Internal variables
-  */
- 
--#if defined(PLATFORM_UNIX)
--extern int errno;
--#endif
- static const char null[] = "(nil)";
- 
- #if defined(USE_LOCALE)