Sync in libdfui-4.2 from pkgsrc-wip.

7 files changed, 15 insertions, 89 deletions

diff --git a/devel/libdfui/Makefile b/devel/libdfui/Makefile
index e07a9975ea4..683db18a7f6 100644
--- a/devel/libdfui/Makefile
+++ b/devel/libdfui/Makefile
@@ -1,33 +1,15 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:16 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/10 14:58:48 joerg Exp $
 #
 
-DISTNAME=	libdfui-3.0
-PKGREVISION=	1
+DISTNAME=	libdfui-4.2
 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 for DragonFly User Interfaces
 
-WRKSRC=		${WRKDIR}/libdfui
-
-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/dfui lib
-
-HEADER_FILES=		dfui dump lang system
-
-do-install:
-.for f in ${HEADER_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f}.h ${PREFIX}/include/dfui
-.endfor
-	${INSTALL_LIB} ${WRKSRC}/libdfui.so* ${PREFIX}/lib
-	${INSTALL_LIB} ${WRKSRC}/libdfui*.a ${PREFIX}/lib
+USE_LIBTOOL=	yes
 
 .include "../../devel/libaura/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libdfui/PLIST b/devel/libdfui/PLIST
index 5f9133e47fb..eb0189b35b1 100644
--- a/devel/libdfui/PLIST
+++ b/devel/libdfui/PLIST
@@ -1,11 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/09 05:41:35 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/10 14:58:48 joerg Exp $
 include/dfui/dfui.h
 include/dfui/dump.h
 include/dfui/lang.h
 include/dfui/system.h
-lib/libdfui.a
-lib/libdfui.so
-lib/libdfui.so.3
-lib/libdfui.so.${PKGVERSION}
-lib/libdfui_pic.a
-@dirrm include/dfui
+lib/libdfui.la
diff --git a/devel/libdfui/buildlink3.mk b/devel/libdfui/buildlink3.mk
index 84d42f55a97..07de4c8c497 100644
--- a/devel/libdfui/buildlink3.mk
+++ b/devel/libdfui/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:58:48 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBDFUI_BUILDLINK3_MK:=	${LIBDFUI_BUILDLINK3_MK}+
@@ -11,10 +11,10 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdfui}
 BUILDLINK_PACKAGES+=	libdfui
 
 .if !empty(LIBDFUI_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libdfui+=	libdfui>=3.0
+BUILDLINK_API_DEPENDS.libdfui+=	libdfui>=4.1
 BUILDLINK_PKGSRCDIR.libdfui?=	../../devel/libdfui
 .endif	# LIBDFUI_BUILDLINK3_MK
 
-.include "../../devel/libaura/buildlink3.mk"
+.include "../../wip/libaura/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libdfui/distinfo b/devel/libdfui/distinfo
index 9fbeef78dc8..eb5ae251eba 100644
--- a/devel/libdfui/distinfo
+++ b/devel/libdfui/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:17 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/04/10 14:58:48 joerg Exp $
 
-SHA1 (libdfui-3.0.tar.gz) = 7a30125df8d9c29a0b4db69add3953011f34076e
-RMD160 (libdfui-3.0.tar.gz) = df2943ca6054ea6d32977946e5be9c5ba429c46a
-Size (libdfui-3.0.tar.gz) = 29346 bytes
-SHA1 (patch-aa) = 0e7f7f5062ff42da25a4058d1e3e1912d0fa38bb
-SHA1 (patch-ab) = fc93cf0285348b16d4169c57edc512fc87635682
-SHA1 (patch-ac) = 2f14683e034a22fd752f58468143f68d5f3ed44e
+SHA1 (libdfui-4.2.tar.gz) = 952e7c16c7ed9e8a047b8c905e8ecd3193849cb0
+RMD160 (libdfui-4.2.tar.gz) = ba394dc2eb16f5b3161532196624b88b4f195091
+Size (libdfui-4.2.tar.gz) = 22553 bytes
diff --git a/devel/libdfui/patches/patch-aa b/devel/libdfui/patches/patch-aa
deleted file mode 100644
index 5bb48fd3c33..00000000000
--- a/devel/libdfui/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/02/20 00:33:18 xtraeme Exp $
-
---- Makefile.orig	2005-02-20 01:23:24.000000000 +0100
-+++ Makefile	2005-02-20 01:23:35.000000000 +0100
-@@ -20,7 +20,7 @@
- .endif
- 
- .if ${OSTYPE} == "NetBSD"
--NOGCCERROR=D
-+NOLINT=yes
- CPPFLAGS=${CFLAGS}
- SHLIBDIR=/usr/local/lib
- USE_SHLIBDIR=yes
diff --git a/devel/libdfui/patches/patch-ab b/devel/libdfui/patches/patch-ab
deleted file mode 100644
index 24921ec2952..00000000000
--- a/devel/libdfui/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/02/20 00:33:18 xtraeme Exp $
-
---- decode.c.orig	2005-02-20 01:27:53.000000000 +0100
-+++ decode.c	2005-02-20 01:28:18.000000000 +0100
-@@ -61,7 +61,7 @@
- 	int i = 0;
- 	int len = 0;
- 
--	while (isdigit(aura_buffer_peek_char(e)) && !aura_buffer_eof(e)) {
-+	while (isdigit((int)aura_buffer_peek_char(e)) && !aura_buffer_eof(e)) {
- 		len = len * 10 + aura_buffer_scan_char(e) - '0';
- 	}
- 
-@@ -83,7 +83,7 @@
- {
- 	int x = 0;
- 
--	while (isdigit(aura_buffer_peek_char(e)) && !aura_buffer_eof(e)) {
-+	while (isdigit((int)aura_buffer_peek_char(e)) && !aura_buffer_eof(e)) {
- 		x = x * 10 + aura_buffer_scan_char(e) - '0';
- 	}
- 	if (aura_buffer_expect(e, " ")) {
diff --git a/devel/libdfui/patches/patch-ac b/devel/libdfui/patches/patch-ac
deleted file mode 100644
index 477fd7da9f7..00000000000
--- a/devel/libdfui/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/02/20 00:33:18 xtraeme Exp $
-
---- form.c.orig	2005-02-20 01:29:05.000000000 +0100
-+++ form.c	2005-02-20 01:31:00.000000000 +0100
-@@ -791,7 +791,7 @@
- 	struct dfui_action *a;
- 
- 	if (f == NULL)
--		return(NULL);
-+		return((int)NULL);
- 
- 	a = f->action_head;
- 	while (a != NULL) {