Do not use the BSD makefiles to install the files, because it tries

to install the files into /lib, use our own do-install target.

Add required casts to make this build, bump PKGREVISION.

5 files changed, 80 insertions, 3 deletions

diff --git a/devel/libinstaller/Makefile b/devel/libinstaller/Makefile
index 39cc74f8f1c..ba9cac07c22 100644
--- a/devel/libinstaller/Makefile
+++ b/devel/libinstaller/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/02/09 05:44:18 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2005/02/20 00:57:39 xtraeme Exp $
 #
 
 DISTNAME=	libinstaller-4.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.bsdinstaller.org/distfiles/
 
@@ -13,11 +14,22 @@ WRKSRC=		${WRKDIR}/libinstaller
 USE_BUILDLINK3=	yes
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+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
+
 .include "../../devel/libaura/buildlink3.mk"
 .include "../../devel/libdfui/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libinstaller/distinfo b/devel/libinstaller/distinfo
index b683b2c85f6..bdd0cda79ea 100644
--- a/devel/libinstaller/distinfo
+++ b/devel/libinstaller/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/02/09 05:44:18 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2005/02/20 00:57:39 xtraeme Exp $
 
 SHA1 (libinstaller-4.0.tar.gz) = caeadbd8c6d31266c78b3f2ce0669336cb2dd0ce
 Size (libinstaller-4.0.tar.gz) = 20889 bytes
 SHA1 (patch-aa) = 7d0117d988b04c6af288858b0130d86a2937a468
+SHA1 (patch-ab) = 04948d74af934cb95c045868b8fca3538271465c
+SHA1 (patch-ac) = 9f9a8a71b0ef7283146ffc80fe3ff7f3c289cfd2
+SHA1 (patch-ad) = 3dc1320562d5dbca60fce9c404039b8a92420991
diff --git a/devel/libinstaller/patches/patch-ab b/devel/libinstaller/patches/patch-ab
new file mode 100644
index 00000000000..96396e78aa5
--- /dev/null
+++ b/devel/libinstaller/patches/patch-ab
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..bbf0ee096d0
--- /dev/null
+++ b/devel/libinstaller/patches/patch-ac
@@ -0,0 +1,27 @@
+$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
new file mode 100644
index 00000000000..e5a457f1cf4
--- /dev/null
+++ b/devel/libinstaller/patches/patch-ad
@@ -0,0 +1,22 @@
+$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';
+ 			}
+