Merge changes in the main trunk into the buildlink2 branch for thosebuildlink2

packages that have been converted to USE_BUILDLINK2.

9 files changed, 38 insertions, 12 deletions

diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 3e33ee7a544..9078bd0bbc8 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7.2.1 2002/06/30 06:24:38 jlam Exp $
+# $NetBSD: Makefile,v 1.7.2.2 2002/08/25 21:22:47 jlam Exp $
 #
 
 DISTNAME=	aterm-0.4.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aterm/}
 
diff --git a/x11/aterm/distinfo b/x11/aterm/distinfo
index e754858a026..72ae51eceba 100644
--- a/x11/aterm/distinfo
+++ b/x11/aterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3.2.1 2002/06/23 19:04:54 jlam Exp $
+$NetBSD: distinfo,v 1.3.2.2 2002/08/25 21:22:47 jlam Exp $
 
 SHA1 (aterm-0.4.2.tar.gz) = 8ce3f1fcdc12805068ff5acde6f130a22e1f5b9b
 Size (aterm-0.4.2.tar.gz) = 312730 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-aa) = 59cf8fe42bf4291b2a98c0d95170a02308197645
 SHA1 (patch-ab) = 9b4e6785912de338db958e9ad48c4cafcb344270
 SHA1 (patch-ac) = 28c79343079680251a013ec3fe364b01f5a5ccac
 SHA1 (patch-ad) = 0c87ee69672e98189afa2cfdcdd9691a1571f354
+SHA1 (patch-ae) = b4bbe033f29a8ee24cfff511fb59739d3582341d
diff --git a/x11/aterm/patches/patch-ae b/x11/aterm/patches/patch-ae
new file mode 100644
index 00000000000..20192241526
--- /dev/null
+++ b/x11/aterm/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.1.2.2 2002/08/25 21:22:48 jlam Exp $
+
+--- src/command.c.orig	Thu Sep  6 18:38:07 2001
++++ src/command.c
+@@ -1146,6 +1146,11 @@
+     num_fds = getdtablesize();
+ #endif
+ 
++#if defined(__NetBSD__)
++    if (num_fds > FD_SETSIZE)
++      num_fds = FD_SETSIZE;
++#endif
++    
+ #ifdef META8_OPTION
+     meta_char = (Options & Opt_meta8 ? 0x80 : 033);
+     if (rs_modifier
+@@ -2024,7 +2029,7 @@
+ #endif
+ 
+     /* See if we can read from the application */
+-	if (FD_ISSET(cmd_fd, &readfds)) {
++	if (retval > 0 && FD_ISSET(cmd_fd, &readfds)) {
+ 	    unsigned int    count = BUFSIZ;
+ 
+ 	    cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
diff --git a/x11/ttmkfdir/Makefile b/x11/ttmkfdir/Makefile
index 03d5e36c774..990ae3c67ad 100644
--- a/x11/ttmkfdir/Makefile
+++ b/x11/ttmkfdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1.2.3 2002/06/30 06:24:45 jlam Exp $
+# $NetBSD: Makefile,v 1.1.1.1.2.4 2002/08/25 21:22:50 jlam Exp $
 #
 
 DISTNAME=	ttmkfdir
diff --git a/x11/ttmkfdir/PLIST b/x11/ttmkfdir/PLIST
index c0e6ce148b0..31fabebf405 100644
--- a/x11/ttmkfdir/PLIST
+++ b/x11/ttmkfdir/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 19:06:54 jlam Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.2.3 2002/08/25 21:22:51 jlam Exp $
 bin/ttmkfdir
diff --git a/x11/ttmkfdir/patches/patch-aa b/x11/ttmkfdir/patches/patch-aa
index 4fafa2d39cf..7ffc35187b2 100644
--- a/x11/ttmkfdir/patches/patch-aa
+++ b/x11/ttmkfdir/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 19:06:56 jlam Exp $
+$NetBSD: patch-aa,v 1.1.1.1.2.3 2002/08/25 21:22:52 jlam Exp $
 
 --- Makefile.orig	Sat Jun  8 21:36:43 2002
 +++ Makefile	Sat Jun  8 21:42:01 2002
diff --git a/x11/ttmkfdir/patches/patch-ab b/x11/ttmkfdir/patches/patch-ab
index 88c6d6fc6dd..8696b97077d 100644
--- a/x11/ttmkfdir/patches/patch-ab
+++ b/x11/ttmkfdir/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 19:06:57 jlam Exp $
+$NetBSD: patch-ab,v 1.1.1.1.2.3 2002/08/25 21:22:53 jlam Exp $
 
 --- ttmkfdir.c.orig	Sat Jun  8 21:37:58 2002
 +++ ttmkfdir.c	Sat Jun  8 21:38:18 2002
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index 3bcf01f57f5..9d38a9affbe 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26.2.2 2002/06/30 06:24:48 jlam Exp $
+# $NetBSD: Makefile,v 1.26.2.3 2002/08/25 21:22:54 jlam Exp $
 #
 
 DISTNAME=       fvwm-${PKG_VERSION}
@@ -11,7 +11,7 @@ MAINTAINER=	martti@netbsd.org
 HOMEPAGE=	http://www.fvwm.org/generated/manpages/xpmroot.html
 COMMENT=	Sets the root window to an Xpm pixmap
 
-PKG_VERSION=		2.4.8
+PKG_VERSION=		2.4.9
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
diff --git a/x11/xpmroot/distinfo b/x11/xpmroot/distinfo
index e9710a0559b..0768391d7db 100644
--- a/x11/xpmroot/distinfo
+++ b/x11/xpmroot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9.2.1 2002/06/23 19:07:23 jlam Exp $
+$NetBSD: distinfo,v 1.9.2.2 2002/08/25 21:22:54 jlam Exp $
 
-SHA1 (fvwm-2.4.8.tar.gz) = 42e1b90ceab2414536af4ee5de47e90b08b0ce6f
-Size (fvwm-2.4.8.tar.gz) = 1716147 bytes
+SHA1 (fvwm-2.4.9.tar.gz) = 67da9f8ba8aae0315b18074d1e0ec0e57668e786
+Size (fvwm-2.4.9.tar.gz) = 1721388 bytes