Sync in libaura-3.1 from pkgsrc-wip. Take maintainership.

7 files changed, 25 insertions, 101 deletions

diff --git a/devel/libaura/DESCR b/devel/libaura/DESCR
index 4a58fd50999..c3bba1f703f 100644
--- a/devel/libaura/DESCR
+++ b/devel/libaura/DESCR
@@ -1,4 +1,10 @@
-libaura is a LIBrary of Assorted Useful Reusable Abstractions.  Notably,
-it provides dictionary and extensible buffer data types, memory management
-functions (wrappers to malloc() and free()), and filesystem predicates
-(is_file(), is_dir(), etc.)
+Libaura is a library of Assorted Useful Reusable Abstractions -
+data structures and utilities for C language programming.  At
+present, they include:
+
+- memory allocators/deallocators
+- key<->value dictionaries (hashed or sorted)
+- extensible buffers
+- filesystem predicates (is_dir, is_named_pipe, etc)
+- popen() variation which allows the caller to know the pid of
+  the process on the other end of the pipe.
diff --git a/devel/libaura/Makefile b/devel/libaura/Makefile
index be2145a7a96..45ed11db39f 100644
--- a/devel/libaura/Makefile
+++ b/devel/libaura/Makefile
@@ -1,29 +1,14 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:29:16 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/10 14:53:44 joerg Exp $
 #
 
-DISTNAME=	libaura-2.0
-PKGREVISION=	1
+DISTNAME=	libaura-3.1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.bsdinstaller.org/distfiles/
+MASTER_SITES=	ftp://packages.stura.uni-rostock.de/bsdinstaller/distfiles/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.bsdinstaller.org/
-COMMENT=	LIBrary of Assorted Useful Reusable Abstraction
+MAINTAINER=	joerg@NetBSD.org
+HOMEPAGE=	http://www.bsdinstaller.com/
+COMMENT=	Collection of useful C functions
 
-WRKSRC=		${WRKDIR}/libaura
+USE_LIBTOOL=	yes
 
-SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
-SUBST_FILES.prefix=	Makefile
-SUBST_SED.prefix=	-e "s,/usr/local,${PREFIX},g"
-SUBST_MESSAGE.prefix=	"Fixing hardcoded paths."
-
-INSTALLATION_DIRS=	include/aura lib
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/aura
-	${INSTALL_LIB} ${WRKSRC}/libaura.so* ${PREFIX}/lib
-	${INSTALL_LIB} ${WRKSRC}/*.a ${PREFIX}/lib
-
-.include "../../devel/sysexits/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libaura/PLIST b/devel/libaura/PLIST
index 89939c7774d..30710786c2a 100644
--- a/devel/libaura/PLIST
+++ b/devel/libaura/PLIST
@@ -1,12 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/20 00:52:46 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/04/10 14:53:44 joerg Exp $
 include/aura/buffer.h
 include/aura/dict.h
 include/aura/fspred.h
 include/aura/mem.h
 include/aura/popen.h
-lib/libaura.a
-lib/libaura.so
-lib/libaura.so.2
-lib/libaura.so.${PKGVERSION}
-lib/libaura_pic.a
-@dirrm include/aura
+lib/libaura.la
diff --git a/devel/libaura/buildlink3.mk b/devel/libaura/buildlink3.mk
index 04312fd7aa4..d1e8e8d1c5f 100644
--- a/devel/libaura/buildlink3.mk
+++ b/devel/libaura/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/10 14:53:44 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAURA_BUILDLINK3_MK:=	${LIBAURA_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibaura}
 BUILDLINK_PACKAGES+=	libaura
 
 .if !empty(LIBAURA_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libaura+=	libaura>=2.0
+BUILDLINK_API_DEPENDS.libaura+=	libaura>=3.1
 BUILDLINK_PKGSRCDIR.libaura?=	../../devel/libaura
 .endif	# LIBAURA_BUILDLINK3_MK
 
diff --git a/devel/libaura/distinfo b/devel/libaura/distinfo
index 5c4ba66593f..94cb4f136e0 100644
--- a/devel/libaura/distinfo
+++ b/devel/libaura/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/09/06 08:10:57 abs Exp $
+$NetBSD: distinfo,v 1.5 2006/04/10 14:53:44 joerg Exp $
 
-SHA1 (libaura-2.0.tar.gz) = 4f91d8efaca9ffb2b9ae244187bd49f7c1969d6a
-RMD160 (libaura-2.0.tar.gz) = 6901381e42abfbf323fccb735ffbd7fa5171ad8e
-Size (libaura-2.0.tar.gz) = 10682 bytes
-SHA1 (patch-aa) = 6973345c5476700565e230021e5d60350b86fa0d
-SHA1 (patch-ab) = 74c6510dcde9b579f39e089dae97c7a4cdd6869b
+SHA1 (libaura-3.1.tar.gz) = 48cba600fca2d332284b20b627049dbb9ea2b2f7
+RMD160 (libaura-3.1.tar.gz) = 89e404eb7b34184fde70732a8d61133e84427fde
+Size (libaura-3.1.tar.gz) = 11041 bytes
diff --git a/devel/libaura/patches/patch-aa b/devel/libaura/patches/patch-aa
deleted file mode 100644
index 7bb18dcdd8d..00000000000
--- a/devel/libaura/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/09/06 08:10:57 abs Exp $
-
---- fspred.c.orig	2005-02-09 04:36:15.000000000 +0100
-+++ fspred.c	2005-02-09 04:41:15.000000000 +0100
-@@ -49,6 +49,12 @@
- #include <stdlib.h>
- #include <string.h>
- 
-+#if (__NetBSD_Version__ >= 299000900)
-+#define STATFS statvfs
-+#else
-+#define STATFS statfs
-+#endif
-+
- /** PREDICATES **/
- 
- int
-@@ -160,7 +166,7 @@
- int
- is_mountpoint_mounted(char *mtpt)
- {
--	struct statfs *mt_array, *mt_ptr;
-+	struct STATFS *mt_array, *mt_ptr;
- 	int count;
- 
- 	count = getmntinfo(&mt_array, MNT_WAIT);
-@@ -174,7 +180,7 @@
- int
- is_device_mounted(char *device)
- {
--	struct statfs *mt_array, *mt_ptr;
-+	struct STATFS *mt_array, *mt_ptr;
- 	int count;
- 
- 	count = getmntinfo(&mt_array, MNT_WAIT);
-@@ -188,7 +194,7 @@
- int
- is_any_slice_mounted(char *diskdev)
- {
--	struct statfs *mt_array, *mt_ptr;
-+	struct STATFS *mt_array, *mt_ptr;
- 	int count;
- 
- 	count = getmntinfo(&mt_array, MNT_WAIT);
diff --git a/devel/libaura/patches/patch-ab b/devel/libaura/patches/patch-ab
deleted file mode 100644
index a4d7ef0a3f0..00000000000
--- a/devel/libaura/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/02/20 00:23:03 xtraeme Exp $
-
---- Makefile.orig	2005-02-20 01:20:44.000000000 +0100
-+++ Makefile	2005-02-20 01:21:38.000000000 +0100
-@@ -16,10 +16,10 @@
- .endif
- 
- .if ${OSTYPE} == "NetBSD"
--NOGCCERROR=D
- CPPFLAGS=${CFLAGS}
- SHLIBDIR=/usr/local/lib
- USE_SHLIBDIR=yes
-+NOLINT=yes
- .else
- INSTALL_FILE?=install -C
- .endif