Sync in libinstaller-5.1 from pkgsrc-wip.

8 files changed, 14 insertions, 137 deletions

diff --git a/devel/libinstaller/Makefile b/devel/libinstaller/Makefile
index ad3ad7e261e..76ef55693a4 100644
--- a/devel/libinstaller/Makefile
+++ b/devel/libinstaller/Makefile
@@ -1,33 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:17 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/10 15:06:13 joerg Exp $
 #
 
-DISTNAME=	libinstaller-4.0
-PKGREVISION=	1
+DISTNAME=	libinstaller-5.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/
+MAINTAINER=	joerg@NetBSD.org
+HOMEPAGE=	http://www.bsdinstaller.com/
 COMMENT=	Library of support functions for the BSD Installer application
 
-WRKSRC=		${WRKDIR}/libinstaller
-
-SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	pre-patch
-SUBST_FILES.prefix=	Makefile
-SUBST_SED.prefix=	-e "s,/usr/local,${PREFIX},g"
-SUBST_MESSAGE.prefix=	"Fixing hardcoded paths."
-
-INSTALLATION_DIRS=	include/installer lib
-
-HEADER_FILES=		commands confed diskutil functions package uiutil
-
-do-install:
-.for f in ${HEADER_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f}.h ${PREFIX}/include/installer
-.endfor
-	${INSTALL_LIB} ${WRKSRC}/libinstaller.so* ${PREFIX}/lib
-	${INSTALL_LIB} ${WRKSRC}/libinstaller*.a ${PREFIX}/lib
+USE_LIBTOOL=	yes
 
 .include "../../devel/libaura/buildlink3.mk"
 .include "../../devel/libdfui/buildlink3.mk"
diff --git a/devel/libinstaller/PLIST b/devel/libinstaller/PLIST
index dec9154deec..1ebe30a9bf5 100644
--- a/devel/libinstaller/PLIST
+++ b/devel/libinstaller/PLIST
@@ -1,13 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/09 05:44:18 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/10 15:06:13 joerg Exp $
 include/installer/commands.h
 include/installer/confed.h
 include/installer/diskutil.h
 include/installer/functions.h
 include/installer/package.h
 include/installer/uiutil.h
-lib/libinstaller.a
-lib/libinstaller.so
-lib/libinstaller.so.4
-lib/libinstaller.so.${PKGVERSION}
-lib/libinstaller_pic.a
-@dirrm include/installer
+lib/libinstaller.la
diff --git a/devel/libinstaller/buildlink3.mk b/devel/libinstaller/buildlink3.mk
index 60e29b7e791..079e5d48c34 100644
--- a/devel/libinstaller/buildlink3.mk
+++ b/devel/libinstaller/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:51 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/10 15:06:13 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBINSTALLER_BUILDLINK3_MK:=	${LIBINSTALLER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibinstaller}
 BUILDLINK_PACKAGES+=	libinstaller
 
 .if !empty(LIBINSTALLER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libinstaller+=	libinstaller>=4.0
+BUILDLINK_API_DEPENDS.libinstaller+=	libinstaller>=5.1
 BUILDLINK_PKGSRCDIR.libinstaller?=	../../devel/libinstaller
 .endif	# LIBINSTALLER_BUILDLINK3_MK
 
diff --git a/devel/libinstaller/distinfo b/devel/libinstaller/distinfo
index ea48319bed0..9b0ff90c8ae 100644
--- a/devel/libinstaller/distinfo
+++ b/devel/libinstaller/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/09/06 08:10:57 abs Exp $
+$NetBSD: distinfo,v 1.5 2006/04/10 15:06:13 joerg Exp $
 
-SHA1 (libinstaller-4.0.tar.gz) = caeadbd8c6d31266c78b3f2ce0669336cb2dd0ce
-RMD160 (libinstaller-4.0.tar.gz) = 44a222bc4ca2874e85d9b9785d72a9b09c04be91
-Size (libinstaller-4.0.tar.gz) = 20889 bytes
-SHA1 (patch-aa) = 50df08fc142ba427f38fe4aae63fa180b6fff872
-SHA1 (patch-ab) = 04948d74af934cb95c045868b8fca3538271465c
-SHA1 (patch-ac) = 9f9a8a71b0ef7283146ffc80fe3ff7f3c289cfd2
-SHA1 (patch-ad) = 3dc1320562d5dbca60fce9c404039b8a92420991
+SHA1 (libinstaller-5.1.tar.gz) = 18e1465052943bf7e259597daa1d53cac45bd84c
+RMD160 (libinstaller-5.1.tar.gz) = 370cf49ed8876000b830a3929d43dbcefea27b15
+Size (libinstaller-5.1.tar.gz) = 20871 bytes
diff --git a/devel/libinstaller/patches/patch-aa b/devel/libinstaller/patches/patch-aa
deleted file mode 100644
index ac3113f0b46..00000000000
--- a/devel/libinstaller/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/09/06 08:10:57 abs Exp $
-
---- mount.c.orig	2005-02-09 04:51:24.000000000 +0100
-+++ mount.c	2005-02-09 04:52:38.000000000 +0100
-@@ -52,11 +52,18 @@
- #include "commands.h"
- #include "functions.h"
- 
-+#if (__NetBSD_Version__ >= 299000900)
-+#define STATFS statvfs
-+#else
-+#define STATFS statfs
-+#endif
-+	
-+
- void
- unmount_all_under_r(struct i_fn_args *a, struct commands *cmds,
--		    char *mtpt, struct statfs *mt_array, int count)
-+		    char *mtpt, struct STATFS *mt_array, int count)
- {
--	struct statfs *mt_ptr;
-+	struct STATFS *mt_ptr;
- 	int k = count;
- 	int unmount_me = 0;
- 
-@@ -85,7 +92,7 @@
- void
- unmount_all_under(struct i_fn_args *a, struct commands *cmds, char *fmt, ...)
- {
--	struct statfs *mt_array;
-+	struct STATFS *mt_array;
- 	int count;
- 	char *mtpt;
- 	va_list args;
diff --git a/devel/libinstaller/patches/patch-ab b/devel/libinstaller/patches/patch-ab
deleted file mode 100644
index 96396e78aa5..00000000000
--- a/devel/libinstaller/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/02/20 00:57:39 xtraeme Exp $
-
---- Makefile.orig	2005-02-20 01:34:41.000000000 +0100
-+++ Makefile	2005-02-20 01:34:52.000000000 +0100
-@@ -14,7 +14,7 @@
- .endif
- 
- .if ${OSTYPE} == "NetBSD"
--NOGCCERROR=D
-+NOLINT=yes
- CPPFLAGS=${CFLAGS}
- SHLIBDIR=/usr/pkg/lib
- USE_SHLIBDIR=yes
diff --git a/devel/libinstaller/patches/patch-ac b/devel/libinstaller/patches/patch-ac
deleted file mode 100644
index bbf0ee096d0..00000000000
--- a/devel/libinstaller/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/02/20 00:57:39 xtraeme Exp $
-
---- functions.c.orig	2005-02-20 01:36:07.000000000 +0100
-+++ functions.c	2005-02-20 01:37:42.000000000 +0100
-@@ -202,10 +202,10 @@
- 		return(0);
- 
- 	for (i = 2; hex[i] != '\0'; i++) {
--		d = toupper(hex[i]);
--		if (isspace(d))
-+		d = toupper((int)hex[i]);
-+		if (isspace((int)d))
- 			continue;
--		if (isdigit(d))
-+		if (isdigit((int)d))
- 			a = a * 16 + (d - '0');
- 		else if (d >= 'A' && d <= 'F')
- 			a = a * 16 + (d + 10 - 'A');
-@@ -223,7 +223,7 @@
- 	int i;
- 
- 	for (i = 0; line[i] != '\0'; i++) {
--		if (isspace(line[i]))
-+		if (isspace((int)line[i]))
- 			continue;
- 		if (line[i] == x)
- 			return(1);
diff --git a/devel/libinstaller/patches/patch-ad b/devel/libinstaller/patches/patch-ad
deleted file mode 100644
index e5a457f1cf4..00000000000
--- a/devel/libinstaller/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/02/20 00:57:39 xtraeme Exp $
-
---- package.c.orig	2005-02-20 01:38:02.000000000 +0100
-+++ package.c	2005-02-20 01:38:29.000000000 +0100
-@@ -110,7 +110,7 @@
- 		 * Strip any trailing whitespace.
- 		 */
- 		while (strlen(rpkg_name) > 0 &&
--		       isspace(rpkg_name[strlen(rpkg_name) - 1])) {
-+		       isspace((int)rpkg_name[strlen(rpkg_name) - 1])) {
- 			rpkg_name[strlen(rpkg_name) - 1] = '\0';
- 		}
- 
-@@ -184,7 +184,7 @@
- 			 * Strip any trailing whitespace.
- 			 */
- 			while (strlen(rpkg_name) > 0 &&
--			       isspace(rpkg_name[strlen(rpkg_name) - 1])) {
-+			       isspace((int)rpkg_name[strlen(rpkg_name) - 1])) {
- 				rpkg_name[strlen(rpkg_name) - 1] = '\0';
- 			}
-