Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10

in the process. (More information on tech-pkg.) Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and installing .la files. Bump PKGREVISION (only) of all packages depending directly on the above via a buildlink3 include.
author: tv <tv> 2004-10-03 00:12:51 +0000
committer: tv <tv> 2004-10-03 00:12:51 +0000
commit: b5510d5a2d7f9a1406603d922ae5d8548950233c (patch)
tree: 7a77b0b911386450709129a67eb0551755a34953 /devel
parent: 3addbafa22111ee3e2673d59835bf69a03a74306 (diff)
download: pkgsrc-b5510d5a2d7f9a1406603d922ae5d8548950233c.tar.gz
302 files changed, 979 insertions, 810 deletions
diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile
index dca6b30c032..bb12a3757a2 100644
--- a/devel/ArX/Makefile
+++ b/devel/ArX/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/08/13 08:21:40 recht Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:24 tv Exp $
 #
 
 DISTNAME=	ArX-1.0.20
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://superbeast.ucsd.edu/~landry/ArX/
 
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index df1250742bc..9fbf225460a 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2004/04/27 04:59:42 snj Exp $
+# $NetBSD: Makefile,v 1.45 2004/10/03 00:13:24 tv Exp $
 #
 
 DISTNAME=		GConf-1.0.9
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/1.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
index de0c2091099..fca797302f8 100644
--- a/devel/GConf/buildlink3.mk
+++ b/devel/GConf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:24 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCONF_BUILDLINK3_MK:=	${GCONF_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	GConf
 
 .if !empty(GCONF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.GConf+=	GConf>=1.0.9nb5
+BUILDLINK_RECOMMENDED.GConf+=	GConf>=1.0.9nb6
 BUILDLINK_PKGSRCDIR.GConf?=	../../devel/GConf
 .endif	# GCONF_BUILDLINK3_MK
 
diff --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile
index efaf3cf5bd6..b52d95976ec 100644
--- a/devel/GConf2-ui/Makefile
+++ b/devel/GConf2-ui/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2004/09/21 16:44:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:24 tv Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/GConf/GConf2-ui/}
+PKGREVISION=	1
 
 CONFIGURE_ARGS+=	--enable-gtk
 
diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index 2aa0af1f3a2..eb92adae10c 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2004/09/02 11:50:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2004/10/03 00:13:24 tv Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/GConf/GConf2/}
+PKGREVISION=	1
 
 USE_PKGINSTALL=	YES
 
diff --git a/devel/Gorm/Makefile b/devel/Gorm/Makefile
index 326a2abcda3..1a7e773f44f 100644
--- a/devel/Gorm/Makefile
+++ b/devel/Gorm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2004/09/27 01:23:13 rh Exp $
+# $NetBSD: Makefile,v 1.21 2004/10/03 00:13:24 tv Exp $
 
 DISTNAME=	Gorm-0.8.0
+PKGREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=dev-apps/}
 
diff --git a/devel/ProjectCenter/Makefile b/devel/ProjectCenter/Makefile
index b6133c48d71..575332345b3 100644
--- a/devel/ProjectCenter/Makefile
+++ b/devel/ProjectCenter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/09/24 01:56:54 rh Exp $
+# $NetBSD: Makefile,v 1.15 2004/10/03 00:13:24 tv Exp $
 
 DISTNAME=	ProjectCenter-0.4.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=dev-apps/}
 
diff --git a/devel/Renaissance/Makefile b/devel/Renaissance/Makefile
index 26edafdc529..ed572ab0a1c 100644
--- a/devel/Renaissance/Makefile
+++ b/devel/Renaissance/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/09/24 01:56:54 rh Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:24 tv Exp $
 #
 
 DISTNAME=	Renaissance-0.8.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://www.gnustep.it/Renaissance/Download/
 
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index adce45c9da9..2c1b12d1d34 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2004/07/26 20:42:27 dillo Exp $
+# $NetBSD: Makefile,v 1.58 2004/10/03 00:13:24 tv Exp $
 #
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKGREVISION=3
+PKGREVISION=4
 
 .include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index d2738282a25..eb22e513626 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/08/23 23:57:20 hubertf Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/10/03 00:13:24 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_BUILDLINK3_MK:=	${SDL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	SDL
 
 .if !empty(SDL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL+=		SDL>=1.2.5nb5
+BUILDLINK_RECOMMENDED.SDL+=	SDL>=1.2.7nb4
 BUILDLINK_PKGSRCDIR.SDL?=	../../devel/SDL
 .endif	# SDL_BUILDLINK3_MK
 
diff --git a/devel/SDL_gfx/Makefile b/devel/SDL_gfx/Makefile
index e1e2da71874..efb35756e8b 100644
--- a/devel/SDL_gfx/Makefile
+++ b/devel/SDL_gfx/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/09/24 13:49:13 adam Exp $
+# $NetBSD: Makefile,v 1.18 2004/10/03 00:13:24 tv Exp $
 
 DISTNAME=	SDL_gfx-2.0.12
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/
 
diff --git a/devel/SDL_ttf/Makefile b/devel/SDL_ttf/Makefile
index 09ed1988125..6b007f10d76 100644
--- a/devel/SDL_ttf/Makefile
+++ b/devel/SDL_ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/04/27 15:13:30 adam Exp $
+# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:24 tv Exp $
 #
 
 DISTNAME=	SDL_ttf-2.0.6
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_ttf/release/
 
diff --git a/devel/SDLmm/Makefile b/devel/SDLmm/Makefile
index 276091cc90e..f997cf77b59 100644
--- a/devel/SDLmm/Makefile
+++ b/devel/SDLmm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/05/07 01:14:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/10/03 00:13:24 tv Exp $
 #
 
 DISTNAME=	SDLmm-0.1.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sdlmm/}
 
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index ae2c7f7e24b..9f33fd56d88 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/06/03 23:29:53 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:24 tv Exp $
 #
 
 DISTNAME=	allegro-4.1.14
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=alleg/}
 
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 1b8aefa2291..a63fda64615 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2004/05/07 11:14:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/10/03 00:13:24 tv Exp $
 #
 
 DISTNAME=		anjuta-1.2.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=anjuta/}
 
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index c8f0235a378..e07098b251c 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2004/10/02 15:51:41 reed Exp $
+# $NetBSD: Makefile,v 1.24 2004/10/03 00:13:24 tv Exp $
 
 PKGNAME=	apr-${APR_VERSION}.${APACHE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	devel
 
 HOMEPAGE=	http://apr.apache.org/
diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk
index 6fbddfb739b..47a21e9fb31 100644
--- a/devel/apr/buildlink3.mk
+++ b/devel/apr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/02 07:01:00 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:24 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APR_BUILDLINK3_MK:=	${APR_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	apr
 
 .if !empty(APR_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.apr+=	apr>=0.9.5.2.0.51nb1
+BUILDLINK_RECOMMENDED.apr+=	apr>=0.9.5.2.0.52nb1
 BUILDLINK_PKGSRCDIR.apr?=	../../devel/apr
 
 BUILDLINK_FILES.apr+=	bin/apr-config
diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index 91f0acde160..99c003ddcc0 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/09/21 16:59:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=		at-spi-1.6.0
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/at-spi/1.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk
index ff7c7ba9fd6..2ea4adb5fac 100644
--- a/devel/at-spi/buildlink3.mk
+++ b/devel/at-spi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/09/21 16:59:05 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:25 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AT_SPI_BUILDLINK3_MK:=	${AT_SPI_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	at-spi
 
 .if !empty(AT_SPI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.at-spi+=	at-spi>=1.6.0
+BUILDLINK_RECOMMENDED.at-spi+=	at-spi>=1.6.0nb1
 BUILDLINK_PKGSRCDIR.at-spi?=	../../devel/at-spi
 .endif	# AT_SPI_BUILDLINK3_MK
 
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index a4514fa533d..0c074418fab 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2004/09/21 16:43:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=		atk-1.8.0
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/atk/1.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/atk/buildlink3.mk b/devel/atk/buildlink3.mk
index aa1662f93d0..08e301b8167 100644
--- a/devel/atk/buildlink3.mk
+++ b/devel/atk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/09/21 16:43:25 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:25 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ATK_BUILDLINK3_MK:=	${ATK_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	atk
 
 .if !empty(ATK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.atk+=		atk>=1.8.0
+BUILDLINK_RECOMMENDED.atk+=	atk>=1.8.0nb1
 BUILDLINK_PKGSRCDIR.atk?=	../../devel/atk
 .endif	# ATK_BUILDLINK3_MK
 
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index e96a261724a..11a5df12f5c 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/03/01 02:26:13 minskim Exp $
+# $NetBSD: Makefile,v 1.15 2004/10/03 00:13:25 tv Exp $
 
 DISTNAME=	autogen-5.6.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=autogen/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/blib/Makefile b/devel/blib/Makefile
index faf8c8089aa..f2fc84437a6 100644
--- a/devel/blib/Makefile
+++ b/devel/blib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/04/15 12:18:57 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=		blib-1.0.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel graphics
 MASTER_SITES=		http://sven.gimp.org/blinkenlights/old/
 
diff --git a/devel/blib/buildlink3.mk b/devel/blib/buildlink3.mk
index 10ff648b4e8..83b89d7dec3 100644
--- a/devel/blib/buildlink3.mk
+++ b/devel/blib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/15 12:27:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:25 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BLIB_BUILDLINK3_MK:=	${BLIB_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	blib
 
 .if !empty(BLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.blib+=	blib>=1.0.2nb1
+BUILDLINK_RECOMMENDED.blib+=	blib>=1.0.2nb2
 BUILDLINK_PKGSRCDIR.blib?=	../../devel/blib
 .endif	# BLIB_BUILDLINK3_MK
 
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index 613c5e8c7ac..4e1890e2344 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/08/27 15:07:11 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=		boa-constructor-0.2.3.src
 PKGNAME=		boaconstructor-0.2.3
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=boa-constructor/}
 EXTRACT_SUFX=		.zip
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 843bc597469..c72c3c00213 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2004/07/13 14:22:27 recht Exp $
+# $NetBSD: Makefile,v 1.42 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=	gc6.3
-PKGREVISION=	1
+PKGREVISION=	2
 PKGNAME=	${DISTNAME:S/gc/boehm-gc-/}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk
index 913fa2ab83f..bfd30a84f70 100644
--- a/devel/boehm-gc/buildlink3.mk
+++ b/devel/boehm-gc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/07/13 14:22:27 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:25 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BOEHM_GC_BUILDLINK3_MK:=	${BOEHM_GC_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	boehm-gc
 
 .if !empty(BOEHM_GC_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.boehm-gc+=	boehm-gc>=6.3nb1
+BUILDLINK_RECOMMENDED.boehm-gc+=	boehm-gc>=6.3nb2
 BUILDLINK_PKGSRCDIR.boehm-gc?=	../../devel/boehm-gc
 .endif	# BOEHM_GC_BUILDLINK3_MK
 
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 316a559308f..bbf947388df 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2004/04/25 20:48:01 snj Exp $
+# $NetBSD: Makefile,v 1.22 2004/10/03 00:13:25 tv Exp $
 
 DISTNAME=		bonobo-conf-0.14
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bonobo-conf/0.14/}
 
diff --git a/devel/bonobo-conf/buildlink3.mk b/devel/bonobo-conf/buildlink3.mk
index 3bae1ea8413..522793ffd07 100644
--- a/devel/bonobo-conf/buildlink3.mk
+++ b/devel/bonobo-conf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 20:48:01 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:25 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BONOBO_CONF_BUILDLINK3_MK:=	${BONOBO_CONF_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	bonobo-conf
 
 .if !empty(BONOBO_CONF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.bonobo-conf+=	bonobo-conf>=0.14nb7
+BUILDLINK_RECOMMENDED.bonobo-conf+=	bonobo-conf>=0.14nb9
 BUILDLINK_PKGSRCDIR.bonobo-conf?=	../../devel/bonobo-conf
 .endif	# BONOBO_CONF_BUILDLINK3_MK
 
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index d8acd746380..6a367f96860 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2004/03/29 18:20:13 tron Exp $
+# $NetBSD: Makefile,v 1.46 2004/10/03 00:13:25 tv Exp $
 
 DISTNAME=		bonobo-1.0.18
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bonobo/1.0/}
 
diff --git a/devel/bonobo/buildlink3.mk b/devel/bonobo/buildlink3.mk
index 6bc9bd3b472..96a28201167 100644
--- a/devel/bonobo/buildlink3.mk
+++ b/devel/bonobo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/29 18:20:13 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:25 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BONOBO_BUILDLINK3_MK:=	${BONOBO_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	bonobo
 
 .if !empty(BONOBO_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.bonobo+=	bonobo>=1.0.18nb7
+BUILDLINK_RECOMMENDED.bonobo+=	bonobo>=1.0.18nb8
 BUILDLINK_PKGSRCDIR.bonobo?=	../../devel/bonobo
 .endif	# BONOBO_BUILDLINK3_MK
 
diff --git a/devel/buildtool-doc/Makefile b/devel/buildtool-doc/Makefile
index b9997d9d9e0..73791bedd88 100644
--- a/devel/buildtool-doc/Makefile
+++ b/devel/buildtool-doc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/07/06 16:28:52 recht Exp $
+# $NetBSD: Makefile,v 1.12 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=	buildtool-doc-0.16
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=buildtool/}
 
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index 4925cff0819..dfaebe9b4c6 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/04/25 05:32:01 snj Exp $
+# $NetBSD: Makefile,v 1.17 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=	cdecl-2.5
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netsw.org/softeng/lang/c/tools/cdecl/ \
 		ftp://ftp-linux.cc.gatech.edu/pub/linux/devel/lang/c/ \
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 9835d570eae..14c8338399c 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2004/04/26 05:12:37 snj Exp $
+# $NetBSD: Makefile,v 1.25 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=		latestCDK
 PKGNAME=		cdk-4.9.9
-PKGREVISION=				1
+PKGREVISION=				2
 CATEGORIES=		devel
 MASTER_SITES=		http://www.vexus.ca/release/
 EXTRACT_SUFX=		.tgz
diff --git a/devel/cdk/buildlink3.mk b/devel/cdk/buildlink3.mk
index 11e924dab21..a30c40af5f4 100644
--- a/devel/cdk/buildlink3.mk
+++ b/devel/cdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 05:09:29 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:25 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CDK_BUILDLINK3_MK:=	${CDK_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	cdk
 
 .if !empty(CDK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.cdk+=		cdk>=4.9.9nb1
+BUILDLINK_RECOMMENDED.cdk+=	cdk>=4.9.9nb2
 BUILDLINK_PKGSRCDIR.cdk?=	../../devel/cdk
 .endif	# CDK_BUILDLINK3_MK
 
diff --git a/devel/cervisia2/Makefile b/devel/cervisia2/Makefile
index 43c54e19639..887768bdd2e 100644
--- a/devel/cervisia2/Makefile
+++ b/devel/cervisia2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/05/02 00:26:32 snj Exp $
+# $NetBSD: Makefile,v 1.14 2004/10/03 00:13:25 tv Exp $
 
 DISTNAME=	cervisia-1.4.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cervisia/}
 
diff --git a/devel/cfg+/Makefile b/devel/cfg+/Makefile
index aa65b66422f..5971cfa1227 100644
--- a/devel/cfg+/Makefile
+++ b/devel/cfg+/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/09/27 22:06:23 cube Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=		libcfg+-0.6.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		http://platon.sk/upload/_projects/00003/
 
diff --git a/devel/cfg+/buildlink3.mk b/devel/cfg+/buildlink3.mk
index 7e03675c53e..35eeb008b98 100644
--- a/devel/cfg+/buildlink3.mk
+++ b/devel/cfg+/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/09/06 20:38:36 danw Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:25 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBCFG_BUILDLINK3_MK:=	${LIBCFG_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libcfg
 
 .if !empty(LIBCFG_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libcfg+=	libcfg+>=0.6.2nb1
+BUILDLINK_RECOMMENDED.libcfg++=	libcfg+>=0.6.2nb2
 BUILDLINK_PKGSRCDIR.libcfg?=	../../devel/cfg+
 .endif	# LIBCFG_BUILDLINK3_MK
 
diff --git a/devel/cfitsio/Makefile b/devel/cfitsio/Makefile
index 9f7f24de03b..6890903d73c 100644
--- a/devel/cfitsio/Makefile
+++ b/devel/cfitsio/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/09/08 13:32:31 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:25 tv Exp $
 
 DISTNAME=	cfitsio2500
 PKGNAME=	cfitsio-2.500
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/
 
diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile
index 1915e50b146..18f024edfef 100644
--- a/devel/cgdb/Makefile
+++ b/devel/cgdb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/09/08 14:00:58 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=	cgdb-0.4.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cgdb/}
 
diff --git a/devel/chmlib/Makefile b/devel/chmlib/Makefile
index bf84457ec24..cbf953ebb15 100644
--- a/devel/chmlib/Makefile
+++ b/devel/chmlib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/03/07 01:17:12 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=	chmlib-0.31
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://66.93.236.84/%7Ejedwin/projects/chmlib/
 EXTRACT_SUFX=	.tbz
diff --git a/devel/chmlib/buildlink3.mk b/devel/chmlib/buildlink3.mk
index d169d5cb0b3..618c11cbaec 100644
--- a/devel/chmlib/buildlink3.mk
+++ b/devel/chmlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/07 01:17:12 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:25 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CHMLIB_BUILDLINK3_MK:=	${CHMLIB_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	chmlib
 
 .if !empty(CHMLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.chmlib+=	chmlib>=0.31
+BUILDLINK_RECOMMENDED.chmlib+=	chmlib>=0.31nb1
 BUILDLINK_PKGSRCDIR.chmlib?=	../../devel/chmlib
 .endif	# CHMLIB_BUILDLINK3_MK
 
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index f1f24f55d1d..9124fdd94b6 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/08/02 13:08:09 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2004/10/03 00:13:25 tv Exp $
 
 DISTNAME=	cmake-2.0.2
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v2.0/
 
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index 3118ebd7a06..d3ec8ba6d11 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/07/06 16:28:52 recht Exp $
+# $NetBSD: Makefile,v 1.22 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=	coconut-0.3.0
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	devel
 MASTER_SITES=	http://www.asahi-net.or.jp/~em7t-hmd/coconut/		\
 		${MASTER_SITE_SOURCEFORGE:=coconut-lib/}
diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile
index 77c4058b93b..21a5a54b28b 100644
--- a/devel/codeville/Makefile
+++ b/devel/codeville/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2004/08/19 15:27:25 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=		Codeville-0.1.8
 PKGNAME=		codeville-0.1.8
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		http://codeville.org/download/
 
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 2c9e09ce84c..9420564f555 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/04/25 03:59:47 snj Exp $
+# $NetBSD: Makefile,v 1.10 2004/10/03 00:13:25 tv Exp $
 
 DISTNAME=	cook-2.22
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.canb.auug.org.au/~millerp/cook/
 
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index b7caf83021a..793b84bb4c7 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2004/05/05 13:25:27 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=	cscope-15.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cscope/}
 
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index d95f56e94b5..d4163c4e833 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.79 2004/09/09 22:26:27 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2004/10/03 00:13:25 tv Exp $
 #
 
 DISTNAME=	cvs-1.11.17
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 # (SSL) download URL according to http://www.cvshome.org/ is
 # https://ccvs.cvshome.org/files/documents/19/191/cvs-1.11.17.tar.bz2
diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index 01e6f342790..e02aa2b1b7e 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/09/04 13:42:47 seb Exp $
+# $NetBSD: Makefile,v 1.5 2004/10/03 00:13:26 tv Exp $
 
 DISTNAME=	cvs2svn-1.0.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/15996/
 
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 69ab9397016..e811fedef83 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/08/10 15:10:50 adrianp Exp $
+# $NetBSD: Makefile,v 1.14 2004/10/03 00:13:26 tv Exp $
 #
 
 DISTNAME=	cvsgraph-1.4.1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.akhphd.au.dk/~bertho/cvsgraph/release/
 
diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile
index c267402ad3d..d076e4e0e1f 100644
--- a/devel/cvsps/Makefile
+++ b/devel/cvsps/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/09/02 16:53:20 schmonz Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:26 tv Exp $
 #
 
 DISTNAME=	cvsps-2.0rc1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/devel/cvsync/Makefile b/devel/cvsync/Makefile
index a1a1dc87163..fa08071c7fe 100644
--- a/devel/cvsync/Makefile
+++ b/devel/cvsync/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2004/08/15 04:20:59 minskim Exp $
+# $NetBSD: Makefile,v 1.69 2004/10/03 00:13:26 tv Exp $
 #
 
 DISTNAME=	cvsync-0.24.16
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cvsync.org/pub/cvsync/
 
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index f5f84f2f962..e3e209bb8c8 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2004/06/04 11:19:32 shannonjr Exp $
+# $NetBSD: Makefile,v 1.60 2004/10/03 00:13:26 tv Exp $
 #
 
 DISTNAME=	ddd-3.3.8
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=ddd/}
 
diff --git a/devel/devIL/Makefile b/devel/devIL/Makefile
index 4b38772d42e..aaacafb809d 100644
--- a/devel/devIL/Makefile
+++ b/devel/devIL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2004/05/07 01:14:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/10/03 00:13:26 tv Exp $
 #
 
 DISTNAME=	DevIL-1.6.6
 PKGNAME=	${DISTNAME:S/D/d/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openil/}
 
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index 184c0deea1f..16d626ae86a 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:26 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DEVIL_BUILDLINK3_MK:=	${DEVIL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	devIL
 
 .if !empty(DEVIL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.devIL+=	devIL>=1.6.6nb1
+BUILDLINK_RECOMMENDED.devIL+=	devIL>=1.6.6nb2
 BUILDLINK_PKGSRCDIR.devIL?=	../../devel/devIL
 .endif	# DEVIL_BUILDLINK3_MK
 
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 170b8a640b1..3d5b621785e 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/08/28 06:05:31 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:26 tv Exp $
 
 DISTNAME=		devhelp-0.7
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		devel x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/devhelp/0.7/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 02afa70b52e..524dbfcaa4b 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/07/07 11:43:58 martti Exp $
+# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:26 tv Exp $
 
 DISTNAME=		distcc-2.15
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		http://distcc.samba.org/ftp/distcc/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile
index cdc35d50323..a2330be6799 100644
--- a/devel/doc++/Makefile
+++ b/devel/doc++/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/09/08 14:32:34 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:26 tv Exp $
 
 DISTNAME=		doc++-3.4.10
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=docpp/}
 
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index cb080f71e68..1edb5709dfe 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/07/26 08:39:57 martti Exp $
+# $NetBSD: Makefile,v 1.24 2004/10/03 00:13:26 tv Exp $
 
 DISTNAME=		doxygen-1.3.8.src
 PKGNAME=		doxygen-1.3.8
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.stack.nl/pub/users/dimitri/
 
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index a0668636fd7..3deb269a6fe 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2004/04/25 04:16:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:26 tv Exp $
 #
 
 DISTNAME=		eel-1.0.1
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eel/1.0/}/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile
index d424a38ff6d..8c12e0bb575 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2004/09/21 16:54:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.34 2004/10/03 00:13:26 tv Exp $
 #
 
 DISTNAME=		eel-2.8.0
 PKGNAME=		${DISTNAME:S/-/2-/}
+PKGREVISION=		1
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eel/2.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/eel2/buildlink3.mk b/devel/eel2/buildlink3.mk
index 97f0a06597c..cea5f9c006f 100644
--- a/devel/eel2/buildlink3.mk
+++ b/devel/eel2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/09/21 16:54:32 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:13:26 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EEL2_BUILDLINK3_MK:=	${EEL2_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	eel2
 
 .if !empty(EEL2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.eel2+=	eel2>=2.8.0
+BUILDLINK_RECOMMENDED.eel2+=	eel2>=2.8.0nb1
 BUILDLINK_PKGSRCDIR.eel2?=	../../devel/eel2
 .endif	# EEL2_BUILDLINK3_MK
 
diff --git a/devel/elf/Makefile b/devel/elf/Makefile
index 6afda03a92b..ac61e3852fa 100644
--- a/devel/elf/Makefile
+++ b/devel/elf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/08/13 00:42:31 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2004/10/03 00:13:26 tv Exp $
 #
 
 DISTNAME=	elf-0.5.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kerneled.com/projects/elf/
 
diff --git a/devel/elfsh/Makefile b/devel/elfsh/Makefile
index 853f2b949c2..35a6ee79bff 100644
--- a/devel/elfsh/Makefile
+++ b/devel/elfsh/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2004/03/30 06:50:16 uebayasi Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:26 tv Exp $
 #
 
 VERS=		0.51b3
 DISTNAME=	${PKGNAME}-portable
 PKGNAME=	elfsh-${VERS}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://devhell.org/projects/elfsh/files/ \
 	http://www.hert.org/projects/elfsh/files/
diff --git a/devel/ffcall/Makefile b/devel/ffcall/Makefile
index 9ed2463746b..ff1f1c82ca0 100644
--- a/devel/ffcall/Makefile
+++ b/devel/ffcall/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/06/04 08:16:53 adam Exp $
+# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:26 tv Exp $
 
 DISTNAME=	ffcall-1.10
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.santafe.edu/pub/gnu/ \
 		http://www.haible.de/bruno/gnu/ \
diff --git a/devel/ffcall/PLIST.shared b/devel/ffcall/PLIST.shared
deleted file mode 100644
index 05954d9bf1c..00000000000
--- a/devel/ffcall/PLIST.shared
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST.shared,v 1.1 2003/05/11 07:12:49 jmc Exp $
-lib/libavcall.so.0.0
-lib/libavcall.so.0
-lib/libavcall.so
-lib/libcallback.so.0.0
-lib/libcallback.so.0
-lib/libcallback.so
diff --git a/devel/ffcall/buildlink3.mk b/devel/ffcall/buildlink3.mk
index c53af5aaa22..adc16c2d067 100644
--- a/devel/ffcall/buildlink3.mk
+++ b/devel/ffcall/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/06 23:46:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:26 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FFCALL_BUILDLINK3_MK:=	${FFCALL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	ffcall
 
 .if !empty(FFCALL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ffcall+=	ffcall>=1.9
+BUILDLINK_RECOMMENDED.ffcall+=	ffcall>=1.10nb1
 BUILDLINK_PKGSRCDIR.ffcall?=	../../devel/ffcall
 .endif	# FFCALL_BUILDLINK3_MK
 
diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index f1006750c29..fe359798260 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/04/25 04:04:07 snj Exp $
+# $NetBSD: Makefile,v 1.6 2004/10/03 00:13:26 tv Exp $
 #
 
 DISTNAME=		fhist-1.13
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		http://fhist.sourceforge.net/
 
diff --git a/devel/florist/Makefile b/devel/florist/Makefile
index e1bcaebdfcc..c63d988f2db 100644
--- a/devel/florist/Makefile
+++ b/devel/florist/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2004/06/30 11:23:43 shannonjr Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:26 tv Exp $
 #
 
 DISTNAME=		florist-3.15p-src
 PKGNAME=		florist-3.15p
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.cs.nyu.edu/pub/gnat/3.15p/
 EXTRACT_SUFX=		.tgz
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index 2e69d1a9b18..d016e692736 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2004/05/03 15:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2004/10/03 00:13:26 tv Exp $
 
 DISTNAME=	g-wrap-1.3.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gnucash.org/pub/g-wrap/source/
 
diff --git a/devel/g-wrap/buildlink3.mk b/devel/g-wrap/buildlink3.mk
index b118a77bc3a..67ae824269e 100644
--- a/devel/g-wrap/buildlink3.mk
+++ b/devel/g-wrap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 15:58:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:26 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 G_WRAP_BUILDLINK3_MK:=	${G_WRAP_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	g-wrap
 
 .if !empty(G_WRAP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.g-wrap+=	g-wrap>=1.3.4nb3
+BUILDLINK_RECOMMENDED.g-wrap+=	g-wrap>=1.3.4nb4
 BUILDLINK_PKGSRCDIR.g-wrap?=	../../devel/g-wrap
 .endif	# G_WRAP_BUILDLINK3_MK
 
diff --git a/devel/gail/Makefile b/devel/gail/Makefile
index d9af3679942..7bceb67d9a7 100644
--- a/devel/gail/Makefile
+++ b/devel/gail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2004/09/21 16:52:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/10/03 00:13:26 tv Exp $
 #
 
 DISTNAME=	gail-1.8.0
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gail/1.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gail/buildlink3.mk b/devel/gail/buildlink3.mk
index 77deb145851..4aec86d98af 100644
--- a/devel/gail/buildlink3.mk
+++ b/devel/gail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/09/21 16:52:22 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:26 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAIL_BUILDLINK3_MK:=	${GAIL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gail
 
 .if !empty(GAIL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gail+=	gail>=1.8.0
+BUILDLINK_RECOMMENDED.gail+=	gail>=1.8.0nb1
 BUILDLINK_PKGSRCDIR.gail?=	../../devel/gail
 .endif	# GAIL_BUILDLINK3_MK
 
diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index c50d6e56dc9..5eb61685402 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2004/10/02 02:03:39 rh Exp $
+# $NetBSD: Makefile,v 1.41 2004/10/03 00:13:26 tv Exp $
 
 DISTNAME=		gal-0.22
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		gnome devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gal/0.22/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/gal/buildlink3.mk b/devel/gal/buildlink3.mk
index 0c26384eecd..a2fd1330bc9 100644
--- a/devel/gal/buildlink3.mk
+++ b/devel/gal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/15 11:27:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:27 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAL_BUILDLINK3_MK:=	${GAL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gal
 
 .if !empty(GAL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gal+=	gal>=0.22nb4
+BUILDLINK_RECOMMENDED.gal+=	gal>=0.22nb5
 BUILDLINK_PKGSRCDIR.gal?=	../../devel/gal
 .endif	# GAL_BUILDLINK3_MK
 
diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index 3b0501fd55d..a33ee4bf0fe 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/10/02 02:03:39 rh Exp $
+# $NetBSD: Makefile,v 1.27 2004/10/03 00:13:27 tv Exp $
 #
 # Check the API before updating this package!  gal-2.3 and above should
 # get their own gal24 package!
@@ -6,6 +6,7 @@
 
 DISTNAME=	gal-2.2.1
 PKGNAME=	${DISTNAME:S/gal/gal2/}
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gal/2.2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gal2/buildlink3.mk b/devel/gal2/buildlink3.mk
index 26998ddf1b3..36b826fc799 100644
--- a/devel/gal2/buildlink3.mk
+++ b/devel/gal2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/09/21 17:10:06 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:27 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAL2_BUILDLINK3_MK:=	${GAL2_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gal2
 
 .if !empty(GAL2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gal2+=	gal2>=2.2.1
+BUILDLINK_RECOMMENDED.gal2+=	gal2>=2.2.1nb1
 BUILDLINK_PKGSRCDIR.gal2?=	../../devel/gal2
 .endif	# GAL2_BUILDLINK3_MK
 
diff --git a/devel/gal20/Makefile b/devel/gal20/Makefile
index 72fbee199f1..d9ee03821e3 100644
--- a/devel/gal20/Makefile
+++ b/devel/gal20/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/01 12:42:50 rh Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:27 tv Exp $
 #
 
 DISTNAME=	gal-1.99.11
 PKGNAME=	${DISTNAME:S/gal/gal20/}
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gal/1.99/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index f2e287fc341..aa476422686 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/07/05 11:15:38 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2004/10/03 00:13:27 tv Exp $
 #
 
 DISTNAME=	gconfmm-2.0.2
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gconfmm/2.0/}
 
diff --git a/devel/gconfmm/buildlink3.mk b/devel/gconfmm/buildlink3.mk
index 00192bad944..28d7d19ea4f 100644
--- a/devel/gconfmm/buildlink3.mk
+++ b/devel/gconfmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 05:11:44 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:27 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCONFMM_BUILDLINK3_MK:=	${GCONFMM_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gconfmm
 
 .if !empty(GCONFMM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gconfmm+=	gconfmm>=2.0.1nb5
+BUILDLINK_RECOMMENDED.gconfmm+=	gconfmm>=2.0.2nb1
 BUILDLINK_PKGSRCDIR.gconfmm?=	../../devel/gconfmm
 .endif	# GCONFMM_BUILDLINK3_MK
 
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 88254dd5f72..97517551b8c 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/04 13:50:28 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:27 tv Exp $
 #
 
 DISTNAME=		gconfmm-2.6.1
 PKGNAME=		gconfmm26-2.6.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconfmm/2.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/gconfmm26/buildlink3.mk b/devel/gconfmm26/buildlink3.mk
index 2bc972c47be..0d4b487072a 100644
--- a/devel/gconfmm26/buildlink3.mk
+++ b/devel/gconfmm26/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/07/04 13:50:29 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:27 tv Exp $
 # XXX
 # XXX This file was created automatically using createbuildlink-3.4.
 # XXX After this file as been verified as correct, the comment lines
@@ -22,6 +22,7 @@ BUILDLINK_PACKAGES+=	gconfmm26
 
 .if !empty(GCONFMM26_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gconfmm26+=	gconfmm26>=2.6.1
+BUILDLINK_RECOMMENDED.gconfmm26+=	gconfmm26>=2.6.1nb1
 BUILDLINK_PKGSRCDIR.gconfmm26?=	../../devel/gconfmm26
 .endif	# GCONFMM26_BUILDLINK3_MK
 
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 8298d1d8caa..d90475a5115 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/09/08 16:21:53 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/10/03 00:13:27 tv Exp $
 
 DISTNAME=		gcvs-1.0
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cvsgui/}
 # extra distfile containing an updated configure script
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 858c827e16e..063cec1efba 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/04/26 06:05:24 snj Exp $
+# $NetBSD: Makefile,v 1.18 2004/10/03 00:13:27 tv Exp $
 #
 
 DISTNAME=       gdb-5.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=gdb/}
 
diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index 5c3719d6c3c..19198acca31 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/06/28 20:43:54 shannonjr Exp $
+# $NetBSD: Makefile,v 1.6 2004/10/03 00:13:27 tv Exp $
 #
 
 DISTNAME=		gdb-6.1.1
-#PKGREVISION=		1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://sources.redhat.com/pub/gdb/releases/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/gdbada/Makefile b/devel/gdbada/Makefile
index fa1dcea88de..ae534dd8650 100644
--- a/devel/gdbada/Makefile
+++ b/devel/gdbada/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/06/03 11:16:42 shannonjr Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:27 tv Exp $
 
 DISTNAME=	gdbada-5.3
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=		http://www.johnrshannon.com/download/
 EXTRACT_SUFX=		.tgz
diff --git a/devel/gdbada/buildlink3.mk b/devel/gdbada/buildlink3.mk
index 5a83e4d6ec9..809c7b2d538 100644
--- a/devel/gdbada/buildlink3.mk
+++ b/devel/gdbada/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/06/03 11:16:42 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:27 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GDBADA_BUILDLINK3_MK:=	${GDBADA_BUILDLINK3_MK}+
@@ -10,6 +10,7 @@ BUILDLINK_DEPENDS+=	gdbada
 .if !empty(GDBADA_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		gdbada
 BUILDLINK_DEPENDS.gdbada+=	gdbada>=5.3
+BUILDLINK_RECOMMENDED.gdbada+=	gdbada>=5.3nb1
 BUILDLINK_PKGSRCDIR.gdbada?=	../../devel/gdbada
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index 22436524c42..3b2a721a43c 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.33 2004/04/20 19:50:35 tv Exp $
+# $NetBSD: Makefile,v 1.34 2004/10/03 00:13:27 tv Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
 DISTNAME=		gettext-0.11.5
 PKGNAME=		gettext-lib-0.11.5
 SVR4_PKGNAME=		gttli
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
 
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index 0d5120e1fd7..d412e136d0f 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2004/05/17 21:32:34 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2004/10/03 00:13:27 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gettext
 
 .if !empty(GETTEXT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gettext+=	gettext-lib>=0.10.35nb1
+BUILDLINK_RECOMMENDED.gettext+=	gettext-lib>=0.11.5nb4
 BUILDLINK_PKGSRCDIR.gettext?=	../../devel/gettext-lib
 .endif	# GETTEXT_BUILDLINK3_MK
 
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 9b0f22bbd7e..14676730f04 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.60 2004/09/30 13:29:15 tv Exp $
+# $NetBSD: Makefile,v 1.61 2004/10/03 00:13:27 tv Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
 DISTNAME=		gettext-0.11.5
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
 
diff --git a/devel/giblib/Makefile b/devel/giblib/Makefile
index dd2c4d6a931..d47ca2ae519 100644
--- a/devel/giblib/Makefile
+++ b/devel/giblib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/09/20 21:56:49 snj Exp $
+# $NetBSD: Makefile,v 1.14 2004/10/03 00:13:27 tv Exp $
 
 DISTNAME=		giblib-1.2.4
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.linuxbrit.co.uk/downloads/
 
diff --git a/devel/giblib/buildlink3.mk b/devel/giblib/buildlink3.mk
index f66a31cf8eb..a0d0b1e5164 100644
--- a/devel/giblib/buildlink3.mk
+++ b/devel/giblib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:27 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIBLIB_BUILDLINK3_MK:=	${GIBLIB_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	giblib
 
 .if !empty(GIBLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.giblib+=	giblib>=1.2.3nb3
+BUILDLINK_RECOMMENDED.giblib+=	giblib>=1.2.4nb1
 BUILDLINK_PKGSRCDIR.giblib?=	../../devel/giblib
 .endif	# GIBLIB_BUILDLINK3_MK
 
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index aa653bd9f6d..116c86f7d84 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2004/04/22 23:57:53 minskim Exp $
+# $NetBSD: Makefile,v 1.38 2004/10/03 00:13:27 tv Exp $
 #
 
 DISTNAME=	indent-2.2.8a
 PKGNAME=	g${DISTNAME:S/a/.1/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://home.hccnet.nl/d.ingamells/
 #MASTER_SITES=	${MASTER_SITE_GNU:=indent/}
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index d5a058ed2c4..576daef43d5 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2004/04/14 19:30:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.50 2004/10/03 00:13:27 tv Exp $
 
 DISTNAME=	glade-0.6.4
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_GNOME:=sources/glade/0.6/}
 
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 35c60dc0852..2a43afec50e 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2004/09/02 19:24:15 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2004/10/03 00:13:27 tv Exp $
 #
 
 DISTNAME=		glade-2.6.0
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/glade/2.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 823100f4350..14084493a69 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.71 2004/04/15 00:07:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.72 2004/10/03 00:13:27 tv Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
 DISTNAME=		glib-1.2.10
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk
index 77cc5be1cc3..5a475e394a2 100644
--- a/devel/glib/buildlink3.mk
+++ b/devel/glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:27 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIB_BUILDLINK3_MK:=	${GLIB_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	glib
 
 .if !empty(GLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.glib+=	glib>=1.2.10nb5
+BUILDLINK_RECOMMENDED.glib+=	glib>=1.2.10nb7
 BUILDLINK_PKGSRCDIR.glib?=	../../devel/glib
 .endif	# GLIB_BUILDLINK3_MK
 
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 730e97852a9..ce464eebd0d 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2004/08/31 11:53:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.57 2004/10/03 00:13:27 tv Exp $
 
 DISTNAME=		glib-2.4.6
 PKGNAME=		${DISTNAME:S/glib/glib2/}
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.4/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.4/ \
diff --git a/devel/glibmm24/Makefile b/devel/glibmm24/Makefile
index aef1d166c34..ad6d6bfde33 100644
--- a/devel/glibmm24/Makefile
+++ b/devel/glibmm24/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/04 13:51:07 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:27 tv Exp $
 #
 
 DISTNAME=		glibmm-2.4.3
 PKGNAME=		glibmm24-2.4.3
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/glibmm/2.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index b07292031ef..a3977425217 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2004/03/31 05:19:46 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2004/10/03 00:13:28 tv Exp $
 
 DISTNAME=	make-3.80
 PKGNAME=	gmake-3.80
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=make/}
 
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index 9c0a342f09a..cff5cac3609 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2004/08/18 12:41:32 adam Exp $
+# $NetBSD: Makefile,v 1.30 2004/10/03 00:13:28 tv Exp $
 
 DISTNAME=	gmp-4.1.3
+PKGREVISION=	1
 CATEGORIES=	devel math
 MASTER_SITES=	${MASTER_SITE_GNU:=gmp/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gmp/buildlink3.mk b/devel/gmp/buildlink3.mk
index 8844639c81b..f3ba3a02536 100644
--- a/devel/gmp/buildlink3.mk
+++ b/devel/gmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:28 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GMP_BUILDLINK3_MK:=	${GMP_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gmp
 
 .if !empty(GMP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gmp+=		gmp>=4.1.2
+BUILDLINK_RECOMMENDED.gmp+=	gmp>=4.1.3nb1
 BUILDLINK_PKGSRCDIR.gmp?=	../../devel/gmp
 .endif	# GMP_BUILDLINK3_MK
 
diff --git a/devel/gnome-objc/Makefile b/devel/gnome-objc/Makefile
index 4bd99efcf1f..be5685f2e14 100644
--- a/devel/gnome-objc/Makefile
+++ b/devel/gnome-objc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/03/12 22:51:24 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:28 tv Exp $
 
 DISTNAME=	gnome-objc-1.0.40
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel lang gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-objc/1.0/}
 
diff --git a/devel/gnome-objc/buildlink3.mk b/devel/gnome-objc/buildlink3.mk
index afa316c7b85..6ffada49223 100644
--- a/devel/gnome-objc/buildlink3.mk
+++ b/devel/gnome-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:28 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_OBJC_BUILDLINK3_MK:=	${GNOME_OBJC_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gnome-objc
 
 .if !empty(GNOME_OBJC_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome-objc+=		gnome-objc>=1.0.40nb4
+BUILDLINK_RECOMMENDED.gnome-objc+=	gnome-objc>=1.0.40nb5
 BUILDLINK_PKGSRCDIR.gnome-objc?=	../../devel/gnome-objc
 .endif	# GNOME_OBJC_BUILDLINK3_MK
 
diff --git a/devel/gnome2-libole2/Makefile b/devel/gnome2-libole2/Makefile
index 2648b66dfe4..22017196e0d 100644
--- a/devel/gnome2-libole2/Makefile
+++ b/devel/gnome2-libole2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/04/27 03:09:58 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/03 00:13:28 tv Exp $
 #
 
 DISTNAME=		libole2-2.2.8
 PKGNAME=		gnome2-${DISTNAME}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libole2/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile
index 4b577e8be3f..1e27c7ed107 100644
--- a/devel/gnustep-base/Makefile
+++ b/devel/gnustep-base/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/09/24 01:56:53 rh Exp $
+# $NetBSD: Makefile,v 1.18 2004/10/03 00:13:28 tv Exp $
 
 DISTNAME=	gnustep-base-1.10.0
+PKGREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
 
diff --git a/devel/gnustep-examples/Makefile b/devel/gnustep-examples/Makefile
index 3a1bb9df781..b890dba3c1d 100644
--- a/devel/gnustep-examples/Makefile
+++ b/devel/gnustep-examples/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/09/27 01:14:18 rh Exp $
+# $NetBSD: Makefile,v 1.14 2004/10/03 00:13:28 tv Exp $
 #
 
 DISTNAME=	gnustep-examples-1.0.0
+PKGREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
diff --git a/devel/gob/Makefile b/devel/gob/Makefile
index 40da9006196..cbdcb66e3f3 100644
--- a/devel/gob/Makefile
+++ b/devel/gob/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/04/25 04:07:42 snj Exp $
+# $NetBSD: Makefile,v 1.6 2004/10/03 00:13:28 tv Exp $
 #
 
 DISTNAME=	gob-1.0.12
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://ftp.5z.com/pub/gob/
 
diff --git a/devel/gscope/Makefile b/devel/gscope/Makefile
index f8bbda2be48..651f3c8798f 100644
--- a/devel/gscope/Makefile
+++ b/devel/gscope/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/04/27 03:09:58 snj Exp $
+# $NetBSD: Makefile,v 1.13 2004/10/03 00:13:28 tv Exp $
 #
 
 DISTNAME=		gscope-0.4.1
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gscope/}
 
diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index 277c1f98389..c04785f6feb 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2004/07/12 21:28:28 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2004/10/03 00:13:28 tv Exp $
 
 DISTNAME=		texinfo-4.7
 PKGNAME=		g${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=texinfo/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/gtkdiff/Makefile b/devel/gtkdiff/Makefile
index 352221fdce9..ddb582f13d0 100644
--- a/devel/gtkdiff/Makefile
+++ b/devel/gtkdiff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/04/26 05:41:30 snj Exp $
+# $NetBSD: Makefile,v 1.20 2004/10/03 00:13:28 tv Exp $
 #
 
 DISTNAME=	gtkdiff-1.8.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://home.catv.ne.jp/pp/ginoue/software/gtkdiff/
 
diff --git a/devel/gtl/Makefile b/devel/gtl/Makefile
index 13bba844857..119133fa2e2 100644
--- a/devel/gtl/Makefile
+++ b/devel/gtl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/05/03 20:49:33 snj Exp $
+# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:28 tv Exp $
 
 DISTNAME=		GTL-0.3.3
 PKGNAME=		gtl-0.3.3
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://infosun.fmi.uni-passau.de/GTL/archive/
 
diff --git a/devel/gtl/buildlink3.mk b/devel/gtl/buildlink3.mk
index f833d6b0656..74be58c7dcb 100644
--- a/devel/gtl/buildlink3.mk
+++ b/devel/gtl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 20:49:33 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:28 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTL_BUILDLINK3_MK:=	${GTL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gtl
 
 .if !empty(GTL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtl+=	gtl>=0.3.3
+BUILDLINK_RECOMMENDED.gtl+=	gtl>=0.3.3nb1
 BUILDLINK_PKGSRCDIR.gtl?=	../../devel/gtl
 .endif	# GTL_BUILDLINK3_MK
 
diff --git a/devel/gtoolkit-examples/Makefile b/devel/gtoolkit-examples/Makefile
index db8ed132c15..d11811a4237 100644
--- a/devel/gtoolkit-examples/Makefile
+++ b/devel/gtoolkit-examples/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2004/05/13 13:10:19 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:28 tv Exp $
 #
 .include "../../x11/gtoolkit/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-examples-/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel
 
 COMMENT=	Objective-C examples for GToolKit
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index a49fadb342d..550793a3baf 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/05/07 01:14:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2004/10/03 00:13:28 tv Exp $
 #
 
 DISTNAME=	gtranslator-1.0
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	devel
 MASTER_SITES=	http://www.gtranslator.org/download/releases/1.0/
 
diff --git a/devel/guile-fcgi/Makefile b/devel/guile-fcgi/Makefile
index d2b8feaedb1..0bf4b246837 100644
--- a/devel/guile-fcgi/Makefile
+++ b/devel/guile-fcgi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/05/03 15:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:28 tv Exp $
 
 DISTNAME=	guile-fcgi-0.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel www
 MASTER_SITES=	http://www.bgu.ru/%7Edsa/
 
diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile
index b27ef872b6d..78f79eec553 100644
--- a/devel/guile-gtk/Makefile
+++ b/devel/guile-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/05/03 15:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2004/10/03 00:13:28 tv Exp $
 #
 
 DISTNAME=		guile-gtk-0.19
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel x11
 MASTER_SITES=		http://www.ping.de/sites/zagadka/guile-gtk/download/ \
 			http://erin.netpedia.net/download/ \
diff --git a/devel/guile-gtk/buildlink3.mk b/devel/guile-gtk/buildlink3.mk
index 9f7bb30b06a..63328b21813 100644
--- a/devel/guile-gtk/buildlink3.mk
+++ b/devel/guile-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 15:58:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:28 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GUILE_GTK_BUILDLINK3_MK:=	${GUILE_GTK_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	guile-gtk
 
 .if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.guile-gtk+=	guile-gtk>=0.19nb4
+BUILDLINK_RECOMMENDED.guile-gtk+=	guile-gtk>=0.19nb5
 BUILDLINK_PKGSRCDIR.guile-gtk?=	../../devel/guile-gtk
 .endif	# GUILE_GTK_BUILDLINK3_MK
 
diff --git a/devel/guile-oops/Makefile b/devel/guile-oops/Makefile
index bcf354fd26e..d06099252fd 100644
--- a/devel/guile-oops/Makefile
+++ b/devel/guile-oops/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/05/03 15:57:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/10/03 00:13:28 tv Exp $
 #
 
 DISTNAME=	guile-oops-0.9.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=guile/}
 
diff --git a/devel/guile-slib/Makefile b/devel/guile-slib/Makefile
index 9b8c663067d..f8e851e37fd 100644
--- a/devel/guile-slib/Makefile
+++ b/devel/guile-slib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2004/05/03 15:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2004/10/03 00:13:28 tv Exp $
 
 DISTNAME=	guile-slib-2.4.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/devel/guile-www/Makefile b/devel/guile-www/Makefile
index 5b30adb3cf7..40e409f994f 100644
--- a/devel/guile-www/Makefile
+++ b/devel/guile-www/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2004/05/03 15:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/03 00:13:28 tv Exp $
 
 DISTNAME=	guile-www-1.0.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_GNU:=guile/}
 
diff --git a/devel/hdf/Makefile b/devel/hdf/Makefile
index a3409498c82..3e03bab127c 100644
--- a/devel/hdf/Makefile
+++ b/devel/hdf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2004/04/25 02:16:42 snj Exp $
+# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:28 tv Exp $
 
 DISTNAME=		HDF4.2r0
 PKGNAME=		hdf-4.2r0
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF4.2r0/src/
 
diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile
index 8002c5614ab..3b3b91472ee 100644
--- a/devel/hdf5/Makefile
+++ b/devel/hdf5/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/04/22 15:00:08 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2004/10/03 00:13:28 tv Exp $
 
 DISTNAME=		hdf5-1.6.2
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://hdf.ncsa.uiuc.edu/HDF5/hdf5-1.6.2/src/ \
 			ftp://sunsite.doc.ic.ac.uk/packages/HDF/HDF5/hdf5-1.6.2/src/ \
diff --git a/devel/hdf5/buildlink3.mk b/devel/hdf5/buildlink3.mk
index de603985cb7..034e14e2108 100644
--- a/devel/hdf5/buildlink3.mk
+++ b/devel/hdf5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/22 15:00:08 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:28 tv Exp $
 # XXX
 # XXX This file was created automatically using createbuildlink-3.4.
 # XXX After this file as been verified as correct, the comment lines
@@ -22,6 +22,7 @@ BUILDLINK_PACKAGES+=	hdf5
 
 .if !empty(HDF5_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.hdf5+=	hdf5>=1.6.2
+BUILDLINK_RECOMMENDED.hdf5+=	hdf5>=1.6.2nb1
 BUILDLINK_PKGSRCDIR.hdf5?=	../../devel/hdf5
 .endif	# HDF5_BUILDLINK3_MK
 
diff --git a/devel/ht/Makefile b/devel/ht/Makefile
index 2c55242d908..e04d701ca9d 100644
--- a/devel/ht/Makefile
+++ b/devel/ht/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/08/30 14:44:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:28 tv Exp $
 #
 
 DISTNAME=	ht-0.8.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hte/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index 320f7483854..b714d9b3a41 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2004/04/27 04:59:42 snj Exp $
+# $NetBSD: Makefile,v 1.36 2004/10/03 00:13:28 tv Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
 #
 
 DISTNAME=	id-utils-3.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=id-utils/}
 
diff --git a/devel/isect/Makefile b/devel/isect/Makefile
index a43d1dba10f..679e1e8c06c 100644
--- a/devel/isect/Makefile
+++ b/devel/isect/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2004/04/25 04:09:01 snj Exp $
+# $NetBSD: Makefile,v 1.28 2004/10/03 00:13:29 tv Exp $
 #
 
 DISTNAME=	isect-1.6.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=isectd/}
 
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 9fa67575885..62818621a4e 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2004/05/29 13:01:42 markd Exp $
+# $NetBSD: Makefile,v 1.49 2004/10/03 00:13:29 tv Exp $
 
 DISTNAME=	kdbg-1.2.10
+PKGREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kdbg/} \
 		ftp://ftp.eudaptics.com/pub/people/jsixt/
diff --git a/devel/kdebindings2/Makefile b/devel/kdebindings2/Makefile
index a4da439f694..2279ade6877 100644
--- a/devel/kdebindings2/Makefile
+++ b/devel/kdebindings2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/05/02 00:26:32 snj Exp $
+# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:29 tv Exp $
 
 DISTNAME=	kdebindings-2.2.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel
 COMMENT=	Additional language bindings for KDE integrated X11 desktop
 
diff --git a/devel/kdesdk2/Makefile b/devel/kdesdk2/Makefile
index 8a346f6a188..5ea0f6e2541 100644
--- a/devel/kdesdk2/Makefile
+++ b/devel/kdesdk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/05/03 04:40:55 snj Exp $
+# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:29 tv Exp $
 
 DISTNAME=	kdesdk-2.2.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 71bc5e7a4ba..cacecc77f23 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2004/04/20 14:08:39 markd Exp $
+# $NetBSD: Makefile,v 1.26 2004/10/03 00:13:29 tv Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk
index 5f082b5e48b..183b265a90f 100644
--- a/devel/kdesdk3/buildlink3.mk
+++ b/devel/kdesdk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/20 14:08:39 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:29 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDESDK_BUILDLINK3_MK:=	${KDESDK_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	kdesdk
 
 .if !empty(KDESDK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.kdesdk+=	kdesdk>=3.2.0
-BUILDLINK_RECOMMENDED.kdesdk?=	kdesdk>=3.2.2
+BUILDLINK_RECOMMENDED.kdesdk?=	kdesdk>=3.3.0nb1
 BUILDLINK_PKGSRCDIR.kdesdk?=	../../devel/kdesdk3
 .endif	# KDESDK_BUILDLINK3_MK
 
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index b4bb62bd84b..490f00a3260 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2004/08/21 15:39:02 markd Exp $
+# $NetBSD: Makefile,v 1.34 2004/10/03 00:13:29 tv Exp $
 
 DISTNAME=	kdevelop-3.1.0
 PKGNAME=	kdevelop-base-3.1.0
+PKGREVISION=	1
 CATEGORIES=	devel kde
 
 HOMEPAGE=       http://www.kdevelop.org/
diff --git a/devel/libargparse/Makefile b/devel/libargparse/Makefile
index 2d77429a76e..4fb7e1c4c06 100644
--- a/devel/libargparse/Makefile
+++ b/devel/libargparse/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/04/25 17:12:30 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/03 00:13:29 tv Exp $
 #
 
 DISTNAME=		libargparse-0.1.0000
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=aqsis/}
 
diff --git a/devel/libargparse/buildlink3.mk b/devel/libargparse/buildlink3.mk
index c7d61034a5a..b5339b5eca1 100644
--- a/devel/libargparse/buildlink3.mk
+++ b/devel/libargparse/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 17:12:30 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:29 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBARGPARSE_BUILDLINK3_MK:=	${LIBARGPARSE_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libargparse
 
 .if !empty(LIBARGPARSE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libargparse+=	libargparse>=0.1.0000
+BUILDLINK_RECOMMENDED.libargparse+=	libargparse>=0.1.0000nb1
 BUILDLINK_PKGSRCDIR.libargparse?=	../../devel/libargparse
 .endif	# LIBARGPARSE_BUILDLINK3_MK
 
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 890db7e02d6..2bad810c3bc 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/07/12 19:27:05 cube Exp $
+# $NetBSD: Makefile,v 1.12 2004/10/03 00:13:29 tv Exp $
 
 DISTNAME=		libast-0.5
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		devel
 MASTER_SITES=   	http://www.eterm.org/download/
 
diff --git a/devel/libast/buildlink3.mk b/devel/libast/buildlink3.mk
index a8b2e139eec..3f2f014d99b 100644
--- a/devel/libast/buildlink3.mk
+++ b/devel/libast/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:29 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAST_BUILDLINK3_MK:=	${LIBAST_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libast
 
 .if !empty(LIBAST_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libast+=	libast>=0.5nb5
+BUILDLINK_RECOMMENDED.libast+=	libast>=0.5nb7
 BUILDLINK_PKGSRCDIR.libast?=	../../devel/libast
 .endif	# LIBAST_BUILDLINK3_MK
 
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 76f97e70a2b..d71c8fa1375 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2004/09/21 16:45:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2004/10/03 00:13:29 tv Exp $
 
 DISTNAME=		libbonobo-2.8.0
+PKGREVISION=	1
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonobo/2.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk
index 4baea6d74a4..6ab5d390aa1 100644
--- a/devel/libbonobo/buildlink3.mk
+++ b/devel/libbonobo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/09/21 16:45:12 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/10/03 00:13:29 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBBONOBO_BUILDLINK3_MK:=	${LIBBONOBO_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libbonobo
 
 .if !empty(LIBBONOBO_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libbonobo+=	libbonobo>=2.8.0
+BUILDLINK_RECOMMENDED.libbonobo+=	libbonobo>=2.8.0nb1
 BUILDLINK_PKGSRCDIR.libbonobo?=	../../devel/libbonobo
 
 BUILDLINK_FILES.libbonobo+=	share/idl/bonobo-2.0/*
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index cb5bfd1333d..8b404a5a903 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2004/09/21 16:47:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2004/10/03 00:13:29 tv Exp $
 #
 
 DISTNAME=	libbonoboui-2.8.0
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libbonoboui/2.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
index fd4dae39101..d213da9f318 100644
--- a/devel/libbonoboui/buildlink3.mk
+++ b/devel/libbonoboui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/09/21 16:47:10 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:29 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBBONOBOUI_BUILDLINK3_MK:=	${LIBBONOBOUI_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libbonoboui
 
 .if !empty(LIBBONOBOUI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libbonoboui+=		libbonoboui>=2.8.0
+BUILDLINK_RECOMMENDED.libbonoboui+=	libbonoboui>=2.8.0nb1
 BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
 .endif	# LIBBONOBOUI_BUILDLINK3_MK
 
diff --git a/devel/libctl/Makefile b/devel/libctl/Makefile
index 9c92aade5bf..1d01009057d 100644
--- a/devel/libctl/Makefile
+++ b/devel/libctl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/04/27 03:09:58 snj Exp $
+# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:29 tv Exp $
 
 DISTNAME=	libctl-2.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://ab-initio.mit.edu/libctl/
 
diff --git a/devel/libdockapp/Makefile b/devel/libdockapp/Makefile
index 0265c4bfce7..3a1b76ceb3f 100644
--- a/devel/libdockapp/Makefile
+++ b/devel/libdockapp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/03/07 14:10:39 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2004/10/03 00:13:29 tv Exp $
 #
 
 DISTNAME=	libdockapp-0.4.0
+PKGREVISION=	1
 CATEGORIES=	devel wm
 MASTER_SITES=	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
 
diff --git a/devel/libdockapp/buildlink3.mk b/devel/libdockapp/buildlink3.mk
index 5eb3422c599..573623f1589 100644
--- a/devel/libdockapp/buildlink3.mk
+++ b/devel/libdockapp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:29 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDOCKAPP_BUILDLINK3_MK:=	${LIBDOCKAPP_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libdockapp
 
 .if !empty(LIBDOCKAPP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libdockapp+=		libdockapp>=0.4.0
+BUILDLINK_RECOMMENDED.libdockapp+=	libdockapp>=0.4.0nb1
 BUILDLINK_PKGSRCDIR.libdockapp?=	../../devel/libdockapp
 .endif	# LIBDOCKAPP_BUILDLINK3_MK
 
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index d226df6761a..a007e8f4788 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:29 tv Exp $
 
 DISTNAME=	gcc-3.3
 PKGNAME=	libffi-2.0beta
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-3.3/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libffi/buildlink3.mk b/devel/libffi/buildlink3.mk
index 74499c22e35..876d947f8c1 100644
--- a/devel/libffi/buildlink3.mk
+++ b/devel/libffi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/28 20:46:52 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:29 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBFFI_BUILDLINK3_MK:=	${LIBFFI_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libffi
 
 .if !empty(LIBFFI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libffi+=	libffi>=1.20
+BUILDLINK_RECOMMENDED.libffi+=	libffi>=2.0betanb1
 BUILDLINK_PKGSRCDIR.libffi?=	../../devel/libffi
 .endif	# LIBFFI_BUILDLINK3_MK
 
diff --git a/devel/libgail-gnome/Makefile b/devel/libgail-gnome/Makefile
index ced2a6e8a14..870a8762c53 100644
--- a/devel/libgail-gnome/Makefile
+++ b/devel/libgail-gnome/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/09/21 16:59:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:29 tv Exp $
 #
 
 DISTNAME=	libgail-gnome-1.1.0
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgail-gnome/1.1/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgail-gnome/buildlink3.mk b/devel/libgail-gnome/buildlink3.mk
index 52a3544b88a..1821dc3a34a 100644
--- a/devel/libgail-gnome/buildlink3.mk
+++ b/devel/libgail-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/09/21 16:59:22 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:29 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGAIL_GNOME_BUILDLINK3_MK:=	${LIBGAIL_GNOME_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libgail-gnome
 
 .if !empty(LIBGAIL_GNOME_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgail-gnome+=	libgail-gnome>=1.1.0
+BUILDLINK_RECOMMENDED.libgail-gnome+=	libgail-gnome>=1.1.0nb1
 BUILDLINK_PKGSRCDIR.libgail-gnome?=	../../devel/libgail-gnome
 .endif	# LIBGAIL_GNOME_BUILDLINK3_MK
 
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 6cbc892f69b..fd4adf51aa7 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2004/02/15 12:35:11 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2004/10/03 00:13:29 tv Exp $
 
 DISTNAME=		libglade-0.17
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglade/0.17/}
 
diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk
index 386ffa2ead2..fa31c03f6db 100644
--- a/devel/libglade/buildlink3.mk
+++ b/devel/libglade/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:29 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGLADE_BUILDLINK3_MK:=	${LIBGLADE_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libglade
 
 .if !empty(LIBGLADE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libglade+=	libglade>=0.17nb5
+BUILDLINK_RECOMMENDED.libglade+=	libglade>=0.17nb6
 BUILDLINK_PKGSRCDIR.libglade?=	../../devel/libglade
 .endif	# LIBGLADE_BUILDLINK3_MK
 
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 93cf4332216..f82ad3042d0 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2004/09/02 12:14:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2004/10/03 00:13:29 tv Exp $
 #
 
 DISTNAME=		libglade-2.4.0
 PKGNAME=		${DISTNAME:S/libglade/libglade2/}
+PKGREVISION=	1
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglade/2.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/libglademm20/Makefile b/devel/libglademm20/Makefile
index c4f601dfbb3..59bedac0c5e 100644
--- a/devel/libglademm20/Makefile
+++ b/devel/libglademm20/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/06 20:41:07 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:29 tv Exp $
 #
 
 DISTNAME=		libglademm-2.2.0
 # The following is correct! This pkg installs itself into 2.0 paths.
 PKGNAME=		libglademm20-2.2.0
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglademm/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 093399a7291..f569e697acf 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/04 13:51:39 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:29 tv Exp $
 #
 
 DISTNAME=		libglademm-2.4.1
 PKGNAME=		libglademm24-2.4.1
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglademm/2.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index d9f1907ae2f..0a194e0b558 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2004/09/21 16:46:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2004/10/03 00:13:29 tv Exp $
 #
 
 DISTNAME=	libgnome-2.8.0
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk
index d82c7e9f983..2c2ea46d6c7 100644
--- a/devel/libgnome/buildlink3.mk
+++ b/devel/libgnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/09/21 16:46:14 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:29 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOME_BUILDLINK3_MK:=	${LIBGNOME_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libgnome
 
 .if !empty(LIBGNOME_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgnome+=	libgnome>=2.8.0
+BUILDLINK_RECOMMENDED.libgnome+=	libgnome>=2.8.0nb1
 BUILDLINK_PKGSRCDIR.libgnome?=	../../devel/libgnome
 .endif	# LIBGNOME_BUILDLINK3_MK
 
diff --git a/devel/libgnomemm20/Makefile b/devel/libgnomemm20/Makefile
index 7e80738e9de..d115dcc42ac 100644
--- a/devel/libgnomemm20/Makefile
+++ b/devel/libgnomemm20/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/06 20:42:55 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:29 tv Exp $
 #
 
 DISTNAME=		libgnomemm-2.0.1
 PKGNAME=		libgnomemm20-2.0.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomemm/2.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/libgnomemm20/buildlink3.mk b/devel/libgnomemm20/buildlink3.mk
index c69d46f8cbf..c74be641904 100644
--- a/devel/libgnomemm20/buildlink3.mk
+++ b/devel/libgnomemm20/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/07/06 20:42:56 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:29 tv Exp $
 # XXX
 # XXX This file was created automatically using createbuildlink-3.4.
 # XXX After this file as been verified as correct, the comment lines
@@ -22,6 +22,7 @@ BUILDLINK_PACKAGES+=	libgnomemm20
 
 .if !empty(LIBGNOMEMM20_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgnomemm20+=	libgnomemm20>=2.0.1
+BUILDLINK_RECOMMENDED.libgnomemm20+=	libgnomemm20>=2.0.1nb1
 BUILDLINK_PKGSRCDIR.libgnomemm20?=	../../devel/libgnomemm20
 .endif	# LIBGNOMEMM20_BUILDLINK3_MK
 
diff --git a/devel/libgnomemm26/Makefile b/devel/libgnomemm26/Makefile
index e782160f271..ed61d4ef6ac 100644
--- a/devel/libgnomemm26/Makefile
+++ b/devel/libgnomemm26/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/04 13:52:18 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=		libgnomemm-2.6.0
 PKGNAME=		libgnomemm26-2.6.0
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomemm/2.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/libgnomemm26/buildlink3.mk b/devel/libgnomemm26/buildlink3.mk
index 2057cda8323..739cce7a49e 100644
--- a/devel/libgnomemm26/buildlink3.mk
+++ b/devel/libgnomemm26/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/07/04 13:52:18 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
 # XXX
 # XXX This file was created automatically using createbuildlink-3.4.
 # XXX After this file as been verified as correct, the comment lines
@@ -22,6 +22,7 @@ BUILDLINK_PACKAGES+=	libgnomemm26
 
 .if !empty(LIBGNOMEMM26_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgnomemm26+=	libgnomemm26>=2.6.0
+BUILDLINK_RECOMMENDED.libgnomemm26+=	libgnomemm26>=2.6.0nb1
 BUILDLINK_PKGSRCDIR.libgnomemm26?=	../../devel/libgnomemm26
 .endif	# LIBGNOMEMM26_BUILDLINK3_MK
 
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index 86108e94f84..ff36e46cdec 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2004/09/21 16:47:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=	libgnomeui-2.8.0
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeui/2.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index 28fd0bf29ba..a4b4beface4 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/09/21 16:47:56 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEUI_BUILDLINK3_MK:=	${LIBGNOMEUI_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libgnomeui
 
 .if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgnomeui+=		libgnomeui>=2.8.0
+BUILDLINK_RECOMMENDED.libgnomeui+=	libgnomeui>=2.8.0nb1
 BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
 .endif	# LIBGNOMEUI_BUILDLINK3_MK
 
diff --git a/devel/libgnomeuimm20/Makefile b/devel/libgnomeuimm20/Makefile
index 6a8108d42f3..c3598752b08 100644
--- a/devel/libgnomeuimm20/Makefile
+++ b/devel/libgnomeuimm20/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/06 20:44:05 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=		libgnomeuimm-2.0.0
 PKGNAME=		libgnomeuimm20-2.0.0
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeuimm/2.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/libgnomeuimm20/buildlink3.mk b/devel/libgnomeuimm20/buildlink3.mk
index 6811e2ee1d9..b0195d362c9 100644
--- a/devel/libgnomeuimm20/buildlink3.mk
+++ b/devel/libgnomeuimm20/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/07/06 20:44:05 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
 # XXX
 # XXX This file was created automatically using createbuildlink-3.4.
 # XXX After this file as been verified as correct, the comment lines
@@ -22,6 +22,7 @@ BUILDLINK_PACKAGES+=	libgnomeuimm20
 
 .if !empty(LIBGNOMEUIMM20_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgnomeuimm20+=	libgnomeuimm20>=2.0.0
+BUILDLINK_RECOMMENDED.libgnomeuimm20+=	libgnomeuimm20>=2.0.0nb1
 BUILDLINK_PKGSRCDIR.libgnomeuimm20?=	../../devel/libgnomeuimm20
 .endif	# LIBGNOMEUIMM20_BUILDLINK3_MK
 
diff --git a/devel/libgnomeuimm26/Makefile b/devel/libgnomeuimm26/Makefile
index c6b2fa096d5..1894ee36544 100644
--- a/devel/libgnomeuimm26/Makefile
+++ b/devel/libgnomeuimm26/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/04 13:53:01 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=		libgnomeuimm-2.6.0
 PKGNAME=		libgnomeuimm26-2.6.0
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeuimm/2.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/libgnomeuimm26/buildlink3.mk b/devel/libgnomeuimm26/buildlink3.mk
index 9a61efec339..cd567129068 100644
--- a/devel/libgnomeuimm26/buildlink3.mk
+++ b/devel/libgnomeuimm26/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/07/04 13:53:01 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
 # XXX
 # XXX This file was created automatically using createbuildlink-3.4.
 # XXX After this file as been verified as correct, the comment lines
@@ -22,6 +22,7 @@ BUILDLINK_PACKAGES+=	libgnomeuimm26
 
 .if !empty(LIBGNOMEUIMM26_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgnomeuimm26+=	libgnomeuimm26>=2.6.0
+BUILDLINK_RECOMMENDED.libgnomeuimm26+=	libgnomeuimm26>=2.6.0nb1
 BUILDLINK_PKGSRCDIR.libgnomeuimm26?=	../../devel/libgnomeuimm26
 .endif	# LIBGNOMEUIMM26_BUILDLINK3_MK
 
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index aa8fab064c3..e656c22a64c 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/04/25 04:15:48 reed Exp $
+# $NetBSD: Makefile,v 1.17 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=	libgphoto2-2.1.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk
index 9b4d0fdcc01..33296588dbf 100644
--- a/devel/libgphoto2/buildlink3.mk
+++ b/devel/libgphoto2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/04/25 04:05:10 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGPHOTO2_BUILDLINK3_MK:=	${LIBGPHOTO2_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libgphoto2
 
 .if !empty(LIBGPHOTO2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgphoto2+=		libgphoto2>=2.1.2
+BUILDLINK_RECOMMENDED.libgphoto2+=	libgphoto2>=2.1.4nb2
 BUILDLINK_PKGSRCDIR.libgphoto2?=	../../devel/libgphoto2
 .endif	# LIBGPHOTO2_BUILDLINK3_MK
 
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 220576b14fd..9dd5b8849f5 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/05/24 18:07:13 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=	libgsf-1.9.1
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgsf/1.9/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk
index 0820c4a3bab..69c0cf6073e 100644
--- a/devel/libgsf/buildlink3.mk
+++ b/devel/libgsf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/05/05 14:06:35 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGSF_BUILDLINK3_MK:=	${LIBGSF_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libgsf
 
 .if !empty(LIBGSF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgsf+=	libgsf>=1.9.0
+BUILDLINK_RECOMMENDED.libgsf+=	libgsf>=1.9.1nb1
 BUILDLINK_PKGSRCDIR.libgsf?=	../../devel/libgsf
 .endif	# LIBGSF_BUILDLINK3_MK
 
diff --git a/devel/libhfs/Makefile b/devel/libhfs/Makefile
index 49b7017ca7c..f598e34a1df 100644
--- a/devel/libhfs/Makefile
+++ b/devel/libhfs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:43:30 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=	hfsutils-3.2.6
 PKGNAME=	libhfs-3.2.6
+PKGREVISION=	1
 CATEGORIES=	devel sysutils
 MASTER_SITES=	ftp://ftp.mars.org/pub/hfs/
 
diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index d9a3dde8b47..ae851b059bd 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/09/20 23:35:50 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=		libidn-0.5.5
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://alpha.gnu.org/pub/gnu/libidn/ \
 			http://josefsson.org/libidn/releases/
diff --git a/devel/libidn/buildlink3.mk b/devel/libidn/buildlink3.mk
index 7bf755fe3c6..0a24e8f0fe3 100644
--- a/devel/libidn/buildlink3.mk
+++ b/devel/libidn/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/05/26 14:55:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBIDN_BUILDLINK3_MK:=	${LIBIDN_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libidn
 
 .if !empty(LIBIDN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libidn+=	libidn>=0.4.6
+BUILDLINK_RECOMMENDED.libidn+=	libidn>=0.5.5nb1
 BUILDLINK_PKGSRCDIR.libidn?=	../../devel/libidn
 .endif	# LIBIDN_BUILDLINK3_MK
 
diff --git a/devel/libjit/Makefile b/devel/libjit/Makefile
index 1aac54f5bad..1fed99fd102 100644
--- a/devel/libjit/Makefile
+++ b/devel/libjit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/05/16 01:12:14 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=	libjit-0.0.2
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.southern-storm.com.au/download/
 
diff --git a/devel/libjit/buildlink3.mk b/devel/libjit/buildlink3.mk
index 8aa087504a4..f1ea93cfdfe 100644
--- a/devel/libjit/buildlink3.mk
+++ b/devel/libjit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/05/16 01:12:15 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBJIT_BUILDLINK3_MK:=	${LIBJIT_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libjit
 
 .if !empty(LIBJIT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libjit+=	libjit>=0.0.2
+BUILDLINK_RECOMMENDED.libjit+=	libjit>=0.0.2nb1
 BUILDLINK_PKGSRCDIR.libjit?=	../../devel/libjit
 .endif	# LIBJIT_BUILDLINK3_MK
 
diff --git a/devel/libmatchbox/Makefile b/devel/libmatchbox/Makefile
index 31d121717e6..2eda8e9b745 100644
--- a/devel/libmatchbox/Makefile
+++ b/devel/libmatchbox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/09/30 11:25:58 agc Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=	libmatchbox-1.4
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://matchbox.handhelds.org/sources/libmatchbox/1.4/
 
diff --git a/devel/libmatchbox/buildlink3.mk b/devel/libmatchbox/buildlink3.mk
index 62eefcb10e5..74d9b66801b 100644
--- a/devel/libmatchbox/buildlink3.mk
+++ b/devel/libmatchbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/09/30 11:25:58 agc Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMATCHBOX_BUILDLINK3_MK:=	${LIBMATCHBOX_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libmatchbox
 
 .if !empty(LIBMATCHBOX_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libmatchbox+=	libmatchbox>=1.4
+BUILDLINK_RECOMMENDED.libmatchbox+=	libmatchbox>=1.4nb1
 BUILDLINK_PKGSRCDIR.libmatchbox?=	../../devel/libmatchbox
 .endif	# LIBMATCHBOX_BUILDLINK3_MK
 
diff --git a/devel/libmm/Makefile b/devel/libmm/Makefile
index 88e94977917..a7681520eac 100644
--- a/devel/libmm/Makefile
+++ b/devel/libmm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:38 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=	mm-1.2.2
 PKGNAME=	lib${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.ossp.org/pkg/lib/mm/
 
diff --git a/devel/libmm/buildlink3.mk b/devel/libmm/buildlink3.mk
index 3efc3f3887c..1bce5d5b813 100644
--- a/devel/libmm/buildlink3.mk
+++ b/devel/libmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBMM_BUILDLINK3_MK:=	${LIBMM_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libmm
 
 .if !empty(LIBMM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libmm+=	libmm>=1.2.1
+BUILDLINK_RECOMMENDED.libmm+=	libmm>=1.2.2nb1
 BUILDLINK_PKGSRCDIR.libmm?=	../../devel/libmm
 .endif	# LIBMM_BUILDLINK3_MK
 
diff --git a/devel/libnet/Makefile b/devel/libnet/Makefile
index 0dd9f8ad8ff..4163a1d2837 100644
--- a/devel/libnet/Makefile
+++ b/devel/libnet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/04/25 05:40:44 minskim Exp $
+# $NetBSD: Makefile,v 1.20 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=	libnet-1.0.1b
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
 
diff --git a/devel/libnet/buildlink3.mk b/devel/libnet/buildlink3.mk
index 8ca0e11aa5d..b900dca7de4 100644
--- a/devel/libnet/buildlink3.mk
+++ b/devel/libnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 04:13:14 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBNET_BUILDLINK3_MK:=	${LIBNET_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libnet
 
 .if !empty(LIBNET_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libnet+=	libnet>=1.0.1bnb3
+BUILDLINK_RECOMMENDED.libnet+=	libnet>=1.0.1bnb4
 BUILDLINK_PKGSRCDIR.libnet?=	../../devel/libnet
 .endif	# LIBNET_BUILDLINK3_MK
 
diff --git a/devel/libntlm/Makefile b/devel/libntlm/Makefile
index 04ee2b436b4..55bf63b3bba 100644
--- a/devel/libntlm/Makefile
+++ b/devel/libntlm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/10/01 08:46:26 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=		libntlm-0.3.6
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://josefsson.org/libntlm/releases/
 
diff --git a/devel/libntlm/buildlink3.mk b/devel/libntlm/buildlink3.mk
index 85963a50dd9..81b0662b4ec 100644
--- a/devel/libntlm/buildlink3.mk
+++ b/devel/libntlm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBNTLM_BUILDLINK3_MK:=	${LIBNTLM_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libntlm
 
 .if !empty(LIBNTLM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libntlm+=	libntlm>=0.3.2
+BUILDLINK_RECOMMENDED.libntlm+=	libntlm>=0.3.6nb1
 BUILDLINK_PKGSRCDIR.libntlm?=	../../devel/libntlm
 .endif	# LIBNTLM_BUILDLINK3_MK
 
diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile
index 1d7bc98f529..53e72ecea5e 100644
--- a/devel/libole2/Makefile
+++ b/devel/libole2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/04/25 06:10:09 snj Exp $
+# $NetBSD: Makefile,v 1.18 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=		libole2-0.2.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libole2/0.2/}
 
diff --git a/devel/libole2/buildlink3.mk b/devel/libole2/buildlink3.mk
index 909fb898c9f..d471a3db3b3 100644
--- a/devel/libole2/buildlink3.mk
+++ b/devel/libole2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 06:10:09 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBOLE2_BUILDLINK3_MK:=	${LIBOLE2_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libole2
 
 .if !empty(LIBOLE2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libole2+=	libole2>=0.2.4nb1
+BUILDLINK_RECOMMENDED.libole2+=	libole2>=0.2.4nb2
 BUILDLINK_PKGSRCDIR.libole2?=	../../devel/libole2
 .endif	# LIBOLE2_BUILDLINK3_MK
 
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 6d817b63865..e1a13a417f6 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/04/25 03:47:44 snj Exp $
+# $NetBSD: Makefile,v 1.5 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=		liboop-1.0
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://download.ofb.net/liboop/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/liboop/buildlink3.mk b/devel/liboop/buildlink3.mk
index c017934a4fb..5d00bfa30d7 100644
--- a/devel/liboop/buildlink3.mk
+++ b/devel/liboop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 03:47:44 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBOOP_BUILDLINK3_MK:=	${LIBOOP_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	liboop
 
 .if !empty(LIBOOP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.liboop+=	liboop>=0.9
+BUILDLINK_RECOMMENDED.liboop+=	liboop>=1.0nb1
 BUILDLINK_PKGSRCDIR.liboop?=	../../devel/liboop
 .endif	# LIBOOP_BUILDLINK3_MK
 
diff --git a/devel/libosip/Makefile b/devel/libosip/Makefile
index efed6909e1e..3a4692251c9 100644
--- a/devel/libosip/Makefile
+++ b/devel/libosip/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/16 01:30:46 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=	libosip2-2.0.9
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=osip/}
 
diff --git a/devel/libosip/buildlink3.mk b/devel/libosip/buildlink3.mk
index 0df3770798c..48c6b7177b7 100644
--- a/devel/libosip/buildlink3.mk
+++ b/devel/libosip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/07/16 01:30:47 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBOSIP2_BUILDLINK3_MK:=	${LIBOSIP2_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libosip2
 
 .if !empty(LIBOSIP2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libosip2+=	libosip2>=2.0.9
+BUILDLINK_RECOMMENDED.libosip2+=	libosip2>=2.0.9nb1
 BUILDLINK_PKGSRCDIR.libosip2?=	../../devel/libosip
 .endif	# LIBOSIP2_BUILDLINK3_MK
 
diff --git a/devel/libproplist/Makefile b/devel/libproplist/Makefile
index 8792355fe88..94d58a9142e 100644
--- a/devel/libproplist/Makefile
+++ b/devel/libproplist/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/04/24 22:46:09 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/10/03 00:13:30 tv Exp $
 
 DISTNAME=		libPropList-0.10.1
 PKGNAME=		libproplist-0.10.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.windowmaker.org/pub/libs/
 
diff --git a/devel/libproplist/buildlink3.mk b/devel/libproplist/buildlink3.mk
index 0d46895df61..522800052ea 100644
--- a/devel/libproplist/buildlink3.mk
+++ b/devel/libproplist/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPROPLIST_BUILDLINK3_MK:=	${LIBPROPLIST_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libproplist
 
 .if !empty(LIBPROPLIST_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libproplist+=		libproplist>=0.10.1
+BUILDLINK_RECOMMENDED.libproplist+=	libproplist>=0.10.1nb1
 BUILDLINK_PKGSRCDIR.libproplist?=	../../devel/libproplist
 .endif	# LIBPROPLIST_BUILDLINK3_MK
 
diff --git a/devel/librsync/Makefile b/devel/librsync/Makefile
index c1156b01f8d..4dffd31167b 100644
--- a/devel/librsync/Makefile
+++ b/devel/librsync/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/04/18 23:31:34 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=		librsync-0.9.6
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=librsync/}
 
diff --git a/devel/librsync/buildlink3.mk b/devel/librsync/buildlink3.mk
index 4ee2eb5a67e..6167642f38c 100644
--- a/devel/librsync/buildlink3.mk
+++ b/devel/librsync/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/18 23:31:34 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBRSYNC_BUILDLINK3_MK:=	${LIBRSYNC_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	librsync
 
 .if !empty(LIBRSYNC_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.librsync+=	librsync>=0.9.6nb2
+BUILDLINK_RECOMMENDED.librsync+=	librsync>=0.9.6nb3
 BUILDLINK_PKGSRCDIR.librsync?=	../../devel/librsync
 .endif	# LIBRSYNC_BUILDLINK3_MK
 
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 4ed53ee9d1b..8fa6d5368ae 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/03/06 23:22:33 snj Exp $
+# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:30 tv Exp $
 
 DISTNAME=	libsigc++-1.2.5
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libsigc/}
 
diff --git a/devel/libsigc++/buildlink3.mk b/devel/libsigc++/buildlink3.mk
index e4edd20f730..a9a2610b467 100644
--- a/devel/libsigc++/buildlink3.mk
+++ b/devel/libsigc++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/05/17 21:32:34 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSIGC++_BUILDLINK3_MK:=	${LIBSIGC++_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libsigcxx
 
 .if !empty(LIBSIGC++_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libsigcxx+=	libsigc++>=1.2.3nb1
+BUILDLINK_RECOMMENDED.libsigcxx+=	libsigc++>=1.2.5nb1
 BUILDLINK_PKGSRCDIR.libsigcxx?=	../../devel/libsigc++
 .endif	# LIBSIGC++_BUILDLINK3_MK
 
diff --git a/devel/libsigc++10/Makefile b/devel/libsigc++10/Makefile
index 163296db5da..4e581a30c3e 100644
--- a/devel/libsigc++10/Makefile
+++ b/devel/libsigc++10/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/04/26 22:07:06 snj Exp $
+# $NetBSD: Makefile,v 1.6 2004/10/03 00:13:30 tv Exp $
 
 DISTNAME=	libsigc++-1.0.4
-PKGREVISION=	1
+PKGREVISION=	2
 PKGNAME=	${DISTNAME:S/libsigc++/libsigc++10/}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libsigc/}
diff --git a/devel/libsigc++10/buildlink3.mk b/devel/libsigc++10/buildlink3.mk
index ff821620065..4563ef0ea4f 100644
--- a/devel/libsigc++10/buildlink3.mk
+++ b/devel/libsigc++10/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 22:07:06 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSIGCXX10_BUILDLINK3_MK:=	${LIBSIGCXX10_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libsigcxx10
 
 .if !empty(LIBSIGCXX10_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libsigcxx10+=	libsigc++10>=1.0.4nb1
+BUILDLINK_RECOMMENDED.libsigcxx10+=	libsigc++10>=1.0.4nb2
 BUILDLINK_PKGSRCDIR.libsigcxx10?=	../../devel/libsigc++10
 .endif	# LIBSIGCXX10_BUILDLINK3_MK
 
diff --git a/devel/libsigc++2/Makefile b/devel/libsigc++2/Makefile
index 72efb3a0b0d..60497ebdb28 100644
--- a/devel/libsigc++2/Makefile
+++ b/devel/libsigc++2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/04 13:47:54 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:30 tv Exp $
 
 DISTNAME=	libsigc++-2.0.3
 PKGNAME=	libsigc++2-2.0.3
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libsigc/}
 
diff --git a/devel/libsigc++2/buildlink3.mk b/devel/libsigc++2/buildlink3.mk
index 141be055ea3..9e2a7a0104f 100644
--- a/devel/libsigc++2/buildlink3.mk
+++ b/devel/libsigc++2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/07/04 13:47:54 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSIGC++_BUILDLINK3_MK:=	${LIBSIGC++_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libsigcxx
 
 .if !empty(LIBSIGC++_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libsigcxx+=	libsigc++2>=2.0.3
+BUILDLINK_RECOMMENDED.libsigcxx+=	libsigc++2>=2.0.3nb1
 BUILDLINK_PKGSRCDIR.libsigcxx?=	../../devel/libsigc++2
 .endif	# LIBSIGC++_BUILDLINK3_MK
 
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 6be5cbdeaf0..9f0c6a5d69e 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.50 2004/08/28 06:05:32 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=	slang-1.4.9
 PKGNAME=	lib${DISTNAME}
 SVR4_PKGNAME=	lslan
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.4/ \
 		http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ \
diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index eae4c783592..ffca6c1826c 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:30 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSLANG_BUILDLINK3_MK:=	${LIBSLANG_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	libslang
 
 .if !empty(LIBSLANG_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libslang+=	libslang>=1.4.9nb1
+BUILDLINK_RECOMMENDED.libslang+=	libslang>=1.4.9nb2
 BUILDLINK_PKGSRCDIR.libslang?=	../../devel/libslang
 .endif	# LIBSLANG_BUILDLINK3_MK
 
diff --git a/devel/libsmi/Makefile b/devel/libsmi/Makefile
index 10d56fd2908..9971c23144b 100644
--- a/devel/libsmi/Makefile
+++ b/devel/libsmi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:31:42 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:30 tv Exp $
 #
 
 DISTNAME=	libsmi-0.1.6
+PKGREVISION=	1
 CATEGORIES=	devel net
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/
 
diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile
index 7e00077be29..e38e6323a52 100644
--- a/devel/libstatgrab/Makefile
+++ b/devel/libstatgrab/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/08/25 23:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:31 tv Exp $
 
 DISTNAME=	libstatgrab-0.10.3
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.uk.i-scream.org/pub/i-scream/libstatgrab/ \
 		http://ftp.uk.i-scream.org/pub/i-scream/libstatgrab/ \
diff --git a/devel/libstatgrab/buildlink3.mk b/devel/libstatgrab/buildlink3.mk
index 239b986bc2d..725ca5c93b7 100644
--- a/devel/libstatgrab/buildlink3.mk
+++ b/devel/libstatgrab/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/08/25 23:24:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:31 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSTATGRAB_BUILDLINK3_MK:=	${LIBSTATGRAB_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libstatgrab
 
 .if !empty(LIBSTATGRAB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libstatgrab+=	libstatgrab>=0.10
+BUILDLINK_RECOMMENDED.libstatgrab+=	libstatgrab>=0.10.3nb1
 BUILDLINK_PKGSRCDIR.libstatgrab?=	../../wip/libstatgrab
 .endif	# LIBSTATGRAB_BUILDLINK3_MK
 
diff --git a/devel/libstree/Makefile b/devel/libstree/Makefile
index 5653149d046..5ffa965e580 100644
--- a/devel/libstree/Makefile
+++ b/devel/libstree/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/08/22 16:49:39 gson Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:31 tv Exp $
 #
 
 DISTNAME=	libstree-0.4.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cl.cam.ac.uk/~cpk25/downloads/
 
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index 4d08b64f837..2da40ec3a2e 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/06/03 16:21:14 minskim Exp $
+# $NetBSD: Makefile,v 1.14 2004/10/03 00:13:31 tv Exp $
 #
 
 DISTNAME=		libstroke-0.5.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.etla.net/libstroke/
 
diff --git a/devel/libstroke/buildlink3.mk b/devel/libstroke/buildlink3.mk
index 2eabae15df3..96f419fb88b 100644
--- a/devel/libstroke/buildlink3.mk
+++ b/devel/libstroke/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/06/03 16:21:14 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:31 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSTROKE_BUILDLINK3_MK:=	${LIBSTROKE_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libstroke
 
 .if !empty(LIBSTROKE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libstroke+=	libstroke>=0.5.1
+BUILDLINK_RECOMMENDED.libstroke+=	libstroke>=0.5.1nb1
 BUILDLINK_PKGSRCDIR.libstroke?=	../../devel/libstroke
 .endif	# LIBSTROKE_BUILDLINK3_MK
 
diff --git a/devel/libtar/Makefile b/devel/libtar/Makefile
index 1409ed3c501..359632f3aa8 100644
--- a/devel/libtar/Makefile
+++ b/devel/libtar/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/07/08 12:06:22 seb Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:31 tv Exp $
 #
 
 DISTNAME=	libtar-1.2.11
+PKGREVISION=	1
 CATEGORIES=	devel archivers
 MASTER_SITES=	ftp://ftp.feep.net/pub/software/libtar
 
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 7e254a1fed8..aeb177fbccd 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2004/07/18 09:38:26 schmonz Exp $
+# $NetBSD: Makefile,v 1.39 2004/10/03 00:13:31 tv Exp $
 #
 
 PKGNAME=	${DISTNAME:C/-/-base-/}
-PKGREVISION=	1
 SVR4_PKGNAME=	ltoob
 
 COMMENT=	Generic shared library support script (the script itself)
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 19504c2234a..c2dd2ea72c5 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.52 2004/05/25 18:59:06 skrll Exp $
+# $NetBSD: Makefile.common,v 1.53 2004/10/03 00:13:31 tv Exp $
 #
 
-DISTNAME=	libtool-1.5.6
+DISTNAME=	libtool-1.5.10
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
 
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index dd159063200..68e562c8149 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.44 2004/05/25 15:17:07 grant Exp $
+$NetBSD: distinfo,v 1.45 2004/10/03 00:13:31 tv Exp $
 
-SHA1 (libtool-1.5.6.tar.gz) = 6018b2661725e9689d7f782c5a2a489e928698ba
-Size (libtool-1.5.6.tar.gz) = 2665434 bytes
+SHA1 (libtool-1.5.10.tar.gz) = bb2cab7f405c5eb08ab8ba193cbac59ebe6e6e9e
+Size (libtool-1.5.10.tar.gz) = 2699923 bytes
 SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = fae19da5c435255d9ae262930ed70bc43516a631
-SHA1 (patch-ac) = 998846b81d9e69d4ff469d644377a57f83a1adc1
-SHA1 (patch-ad) = b784b1d67f6e48da6d225d3c7054e5371eab3f56
+SHA1 (patch-ab) = b6602584eb17c343838af13c706961ffeae7745a
+SHA1 (patch-ac) = e5cb5ca2303ebb82bb17db6c785580c23db2c6d3
+SHA1 (patch-ad) = 10c4330056c6a7c20bff0ed81407c21a5ac00b32
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 6318b2093d0..531a269754d 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,30 +1,28 @@
-$NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
+$NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
 
---- libtool.m4.orig	Thu Apr  1 22:46:14 2004
+--- libtool.m4.orig	2004-09-19 08:15:08.000000000 -0400
 +++ libtool.m4
-@@ -1183,8 +1183,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -1201,6 +1201,7 @@ beos*)
+ bsdi[[45]]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -1300,15 +1301,15 @@ kfreebsd*-gnu)
+@@ -1315,16 +1316,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -32,15 +30,16 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -1384,15 +1385,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -1400,15 +1402,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -60,47 +59,38 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -1428,7 +1436,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -1485,11 +1494,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1552,7 +1560,7 @@ sco3.2v5*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -1520,10 +1529,10 @@ nto-qnx*)
    ;;
  
- solaris*)
--  version_type=linux
-+  version_type=sunos
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2110,10 +2118,13 @@ beos*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
--  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=/shlib/libc.so
-+# Versions of BSD/OS prior to 4.0 did no have real dynamic linking
-+bsdi1*|bsdi2*|bsdi3*)
-+  dynamic_linker=no
-+  ;;  
-+
-+bsdi*)  
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- cygwin*)
-@@ -2171,6 +2182,10 @@ hpux10.20* | hpux11*)
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+@@ -2198,6 +2207,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -111,7 +101,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -3089,6 +3104,8 @@ case $host_os in
+@@ -3091,6 +3104,8 @@ case $host_os in
  	;;
      esac
      ;;
@@ -120,7 +110,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -3197,6 +3214,13 @@ case $host_os in
+@@ -3210,6 +3225,13 @@ case $host_os in
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
@@ -134,7 +124,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -3622,6 +3646,14 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -3651,6 +3673,14 @@ if AC_TRY_EVAL(ac_compile); then
      esac
    done
  
@@ -149,7 +139,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -4555,9 +4587,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4591,9 +4621,11 @@ AC_MSG_CHECKING([for $compiler option to
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -162,7 +152,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -4579,6 +4613,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4615,6 +4647,10 @@ AC_MSG_CHECKING([for $compiler option to
  	;;
        esac
        ;;
@@ -173,7 +163,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -4643,6 +4681,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4689,6 +4725,8 @@ AC_MSG_CHECKING([for $compiler option to
  	    ;;
  	esac
  	;;
@@ -182,7 +172,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -4808,9 +4848,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4854,9 +4892,11 @@ AC_MSG_CHECKING([for $compiler option to
        ;;
  
      darwin* | rhapsody*)
@@ -195,7 +185,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
        ;;
  
      msdosdjgpp*)
-@@ -4839,6 +4881,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4885,6 +4925,11 @@ AC_MSG_CHECKING([for $compiler option to
        esac
        ;;
  
@@ -207,7 +197,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5131,6 +5178,17 @@ EOF
+@@ -5187,6 +5232,17 @@ EOF
        fi
        ;;
  
@@ -225,12 +215,10 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -5534,6 +5592,20 @@ $echo "local: *; };" >> $output_objdir/$
- 	  ;;
- 	esac
+@@ -5592,6 +5648,20 @@ $echo "local: *; };" >> $output_objdir/$
        fi
-+      ;;
-+
+       ;;
+ 
 +    interix3*)
 +      # Oy, what a hack.
 +      # Because shlibs are not compiled -fPIC due to broken code, we must
@@ -243,6 +231,8 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
 +      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-h,$libdir'
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
- 
++      ;;
++
      irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 3f92c20f725..ba8a0c1e12b 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,26 +1,8 @@
-$NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
+$NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
 
---- configure.orig	2004-04-11 15:35:42.000000000 +1000
+--- configure.orig	2004-09-19 08:22:04.000000000 -0400
 +++ configure
-@@ -4440,10 +4440,13 @@ beos*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
--  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=/shlib/libc.so
-+# Versions of BSD/OS prior to 4.0 did no have real dynamic linking
-+bsdi1*|bsdi2*|bsdi3*)
-+  dynamic_linker=no
-+  ;;
-+
-+bsdi*)
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- cygwin*)
-@@ -4501,6 +4504,10 @@ hpux10.20* | hpux11*)
+@@ -4534,6 +4534,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -31,7 +13,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -6857,9 +6864,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6909,9 +6913,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -44,7 +26,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
        ;;
  
      msdosdjgpp*)
-@@ -6888,6 +6897,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6940,6 +6946,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -56,7 +38,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7263,6 +7277,17 @@ EOF
+@@ -7325,6 +7336,17 @@ EOF
        fi
        ;;
  
@@ -74,7 +56,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7770,6 +7795,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7832,6 +7854,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -95,29 +77,27 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -8158,8 +8197,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -8223,6 +8259,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -8275,15 +8315,15 @@ kfreebsd*-gnu)
+@@ -8337,16 +8374,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -125,15 +105,16 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -8359,15 +8399,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8422,15 +8460,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -153,38 +134,38 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8403,7 +8450,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -8507,11 +8552,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8482,7 +8529,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -8542,10 +8587,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -8527,7 +8574,7 @@ sco3.2v5*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10777,6 +10824,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10817,6 +10862,8 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -193,7 +174,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10885,6 +10934,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10936,6 +10983,13 @@ if test -z "$aix_libpath"; then aix_libp
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
@@ -207,7 +188,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
        hardcode_libdir_flag_spec_CXX='-R$libdir'
        hardcode_direct_CXX=yes
        hardcode_shlibpath_var_CXX=no
-@@ -11257,6 +11313,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11324,6 +11378,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -222,7 +203,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11304,9 +11368,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11371,9 +11433,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -235,7 +216,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11328,6 +11394,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11395,6 +11459,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -246,7 +227,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11392,6 +11462,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11469,6 +11537,8 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -255,29 +236,27 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -11860,8 +11932,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -11939,6 +12009,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -11977,15 +12050,15 @@ kfreebsd*-gnu)
+@@ -12053,16 +12124,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -285,15 +264,16 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -12061,15 +12134,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12138,15 +12210,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -313,38 +293,38 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12105,7 +12185,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -12223,11 +12302,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -12184,7 +12264,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -12258,10 +12337,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -12229,7 +12309,7 @@ sco3.2v5*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -13728,9 +13808,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13805,9 +13884,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -357,7 +337,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
        ;;
  
      msdosdjgpp*)
-@@ -13759,6 +13841,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13836,6 +13917,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -369,7 +349,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14134,6 +14221,17 @@ EOF
+@@ -14221,6 +14307,17 @@ EOF
        fi
        ;;
  
@@ -387,7 +367,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14621,6 +14719,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14708,6 +14805,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -408,29 +388,27 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -15009,8 +15121,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -15099,6 +15210,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -15126,15 +15239,15 @@ kfreebsd*-gnu)
+@@ -15213,16 +15325,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -438,15 +416,16 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -15210,15 +15323,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15298,15 +15411,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -466,38 +445,38 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15254,7 +15374,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -15383,11 +15503,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15333,7 +15453,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -15418,10 +15538,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -15378,7 +15498,7 @@ sco3.2v5*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -16059,9 +16179,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16147,9 +16267,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -510,7 +489,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
        ;;
  
      msdosdjgpp*)
-@@ -16090,6 +16212,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16178,6 +16300,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -522,7 +501,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16465,6 +16592,17 @@ EOF
+@@ -16563,6 +16690,17 @@ EOF
        fi
        ;;
  
@@ -540,7 +519,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16972,6 +17110,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17070,6 +17208,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -561,29 +540,27 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -17360,8 +17512,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -17461,6 +17613,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -17477,15 +17630,15 @@ kfreebsd*-gnu)
+@@ -17575,16 +17728,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -591,15 +568,16 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -17561,15 +17714,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17660,15 +17814,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -619,34 +597,34 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17605,7 +17765,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -17745,11 +17906,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17684,7 +17844,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -17780,10 +17941,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -17729,7 +17889,7 @@ sco3.2v5*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index 61704587a41..d3d87622abe 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.12 2004/04/22 14:40:29 tv Exp $
+$NetBSD: patch-ac,v 1.13 2004/10/03 00:13:31 tv Exp $
 
---- ltmain.sh.orig	Sun Apr 11 01:44:45 2004
+--- ltmain.sh.orig	2004-09-19 08:34:44.000000000 -0400
 +++ ltmain.sh
-@@ -192,10 +192,26 @@ func_infer_tag () {
+@@ -197,10 +197,26 @@ func_infer_tag () {
        case $@ in
        # Blanks in the command may have been stripped by the calling shell,
        # but not from the CC environment variable when configure was run.
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.12 2004/04/22 14:40:29 tv Exp $
  	for z in $available_tags; do
  	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
  	    # Evaluate the configuration.
-@@ -231,8 +247,6 @@ func_infer_tag () {
+@@ -236,8 +252,6 @@ func_infer_tag () {
  #        else
  #          $echo "$modename: using $tagname tagged configuration"
  	fi
@@ -38,8 +38,8 @@ $NetBSD: patch-ac,v 1.12 2004/04/22 14:40:29 tv Exp $
 -      esac
      fi
  }
- # End of Shell function definitions
-@@ -401,7 +415,7 @@ if test -z "$show_help"; then
+ 
+@@ -522,7 +536,7 @@ if test -z "$show_help"; then
      $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
      $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
      case $nonopt in
@@ -48,7 +48,7 @@ $NetBSD: patch-ac,v 1.12 2004/04/22 14:40:29 tv Exp $
        mode=link
        for arg
        do
-@@ -1185,6 +1199,13 @@ EOF
+@@ -1306,6 +1320,13 @@ EOF
  	    exit $EXIT_FAILURE
  	    ;;
  	  esac
@@ -62,18 +62,15 @@ $NetBSD: patch-ac,v 1.12 2004/04/22 14:40:29 tv Exp $
  	  if test "$prev" = rpath; then
  	    case "$rpath " in
  	    *" $arg "*) ;;
-@@ -2983,8 +3004,8 @@ EOF
- 	darwin)
- 	  # Like Linux, but with the current version available in
- 	  # verstring for coding it into the library header
--	  major=.`expr $current - $age`
--	  versuffix="$major.$age.$revision"
-+	  major=".$current"
-+	  versuffix=".$current.$revision"
- 	  # Darwin ld doesn't like 0 for these options...
- 	  minor_current=`expr $current + 1`
- 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-@@ -5384,8 +5405,16 @@ relink_command=\"$relink_command\""
+@@ -3168,6 +3189,7 @@ EOF
+ 	linux)
+ 	  major=.`expr $current - $age`
+ 	  versuffix="$major.$age.$revision"
++	  versuffix2="$major.$age"
+ 	  ;;
+ 
+ 	osf)
+@@ -5364,8 +5386,16 @@ relink_command=\"$relink_command\""
        exit $EXIT_FAILURE
      fi
  
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 0cae03c5f8e..f98815b732c 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,26 +1,8 @@
-$NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
+$NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
 
---- libltdl/configure.orig	2004-04-11 15:36:50.000000000 +1000
+--- libltdl/configure.orig	2004-09-19 08:23:09.000000000 -0400
 +++ libltdl/configure
-@@ -3652,10 +3652,13 @@ beos*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
--  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=/shlib/libc.so
-+# Versions of BSD/OS prior to 4.0 did no have real dynamic linking
-+bsdi1*|bsdi2*|bsdi3*)
-+  dynamic_linker=no
-+  ;;
-+
-+bsdi*)
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- cygwin*)
-@@ -3713,6 +3716,10 @@ hpux10.20* | hpux11*)
+@@ -3739,6 +3739,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -31,7 +13,20 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -6795,6 +6802,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6814,9 +6818,11 @@ echo $ECHO_N "checking for $compiler opt
+       ;;
+ 
+     darwin* | rhapsody*)
+-      # PIC is the default on this platform
++      # PIC is the default on this platform, and static linking of
++      # binaries generally doesn't work
+       # Common symbols not allowed in MH_DYLIB files
+       lt_prog_compiler_pic='-fno-common'
++      lt_prog_compiler_static=''
+       ;;
+ 
+     msdosdjgpp*)
+@@ -6845,6 +6851,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -43,7 +38,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7170,6 +7182,17 @@ EOF
+@@ -7230,6 +7241,17 @@ EOF
        fi
        ;;
  
@@ -61,7 +56,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7677,6 +7700,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7737,6 +7759,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -82,29 +77,27 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -8065,8 +8102,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -8128,6 +8164,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -8182,15 +8220,15 @@ kfreebsd*-gnu)
+@@ -8242,16 +8279,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -112,15 +105,16 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -8266,15 +8304,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8327,15 +8365,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -140,38 +134,38 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8310,7 +8355,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -8412,11 +8457,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8389,7 +8434,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -8447,10 +8492,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -8434,7 +8479,7 @@ sco3.2v5*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10684,6 +10729,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10722,6 +10767,8 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -180,7 +174,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10792,6 +10839,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10841,6 +10888,13 @@ if test -z "$aix_libpath"; then aix_libp
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
@@ -194,7 +188,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
        hardcode_libdir_flag_spec_CXX='-R$libdir'
        hardcode_direct_CXX=yes
        hardcode_shlibpath_var_CXX=no
-@@ -11164,6 +11218,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11229,6 +11283,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -209,7 +203,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11211,9 +11273,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11276,9 +11338,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -222,7 +216,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11235,6 +11299,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11300,6 +11364,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -233,7 +227,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11299,6 +11367,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11374,6 +11442,8 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -242,29 +236,27 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -11767,8 +11837,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -11844,6 +11914,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -11884,15 +11955,15 @@ kfreebsd*-gnu)
+@@ -11958,16 +12029,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -272,15 +264,16 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -11968,15 +12039,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12043,15 +12115,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -300,38 +293,51 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12012,7 +12090,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -12128,11 +12207,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -12091,7 +12169,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -12163,10 +12242,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -12136,7 +12214,7 @@ sco3.2v5*)
-   ;;
+@@ -13710,9 +13789,11 @@ echo $ECHO_N "checking for $compiler opt
+       ;;
  
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -13666,6 +13744,11 @@ echo $ECHO_N "checking for $compiler opt
+     darwin* | rhapsody*)
+-      # PIC is the default on this platform
++      # PIC is the default on this platform, and static linking of
++      # binaries generally doesn't work
+       # Common symbols not allowed in MH_DYLIB files
+       lt_prog_compiler_pic_F77='-fno-common'
++      lt_prog_compiler_static_F77=''
+       ;;
+ 
+     msdosdjgpp*)
+@@ -13741,6 +13822,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -343,7 +349,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14041,6 +14124,17 @@ EOF
+@@ -14126,6 +14212,17 @@ EOF
        fi
        ;;
  
@@ -361,7 +367,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14528,6 +14622,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14613,6 +14710,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -382,29 +388,27 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -14916,8 +15024,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -15004,6 +15115,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -15033,15 +15142,15 @@ kfreebsd*-gnu)
+@@ -15118,16 +15230,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -412,15 +416,16 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -15117,15 +15226,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15203,15 +15316,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -440,38 +445,51 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15161,7 +15277,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -15288,11 +15408,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15240,7 +15356,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -15323,10 +15443,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -15285,7 +15401,7 @@ sco3.2v5*)
-   ;;
+@@ -16052,9 +16172,11 @@ echo $ECHO_N "checking for $compiler opt
+       ;;
  
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15997,6 +16113,11 @@ echo $ECHO_N "checking for $compiler opt
+     darwin* | rhapsody*)
+-      # PIC is the default on this platform
++      # PIC is the default on this platform, and static linking of
++      # binaries generally doesn't work
+       # Common symbols not allowed in MH_DYLIB files
+       lt_prog_compiler_pic_GCJ='-fno-common'
++      lt_prog_compiler_static_GCJ=''
+       ;;
+ 
+     msdosdjgpp*)
+@@ -16083,6 +16205,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -483,7 +501,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16372,6 +16493,17 @@ EOF
+@@ -16468,6 +16595,17 @@ EOF
        fi
        ;;
  
@@ -501,7 +519,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16879,6 +17011,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16975,6 +17113,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -522,29 +540,27 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -17267,8 +17413,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -17366,6 +17518,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -17384,15 +17531,15 @@ kfreebsd*-gnu)
+@@ -17480,16 +17633,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -552,15 +568,16 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -17468,15 +17615,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17565,15 +17719,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -580,43 +597,34 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17512,7 +17666,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -17650,11 +17811,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17591,7 +17745,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -17685,10 +17846,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -17636,7 +17790,7 @@ sco3.2v5*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19858,7 +20012,7 @@ if test "${libltdl_cv_shlibext+set}" = s
- else
- 
- module=yes
--eval libltdl_cv_shlibext=$shrext_cmds
-+eval libltdl_cv_shlibext=$shrext
- 
- fi
- echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index 58e56426e9b..593a716656e 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/06/23 08:45:59 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:31 tv Exp $
 
 DISTNAME=	libusb-0.1.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libusb/}
 
diff --git a/devel/libusb/buildlink3.mk b/devel/libusb/buildlink3.mk
index fb189637be4..0db33d03e8d 100644
--- a/devel/libusb/buildlink3.mk
+++ b/devel/libusb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:31 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBUSB_BUILDLINK3_MK:=	${LIBUSB_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libusb
 
 .if !empty(LIBUSB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libusb+=	libusb>=0.1.7
+BUILDLINK_RECOMMENDED.libusb+=	libusb>=0.1.8nb2
 BUILDLINK_PKGSRCDIR.libusb?=	../../devel/libusb
 .endif	# LIBUSB_BUILDLINK3_MK
 
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index 8c2bfb7906e..5276855548b 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/09/21 16:52:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/10/03 00:13:31 tv Exp $
 #
 
 DISTNAME=	libwnck-2.8.0
+PKGREVISION=	1
 CATEGORIES=	devel x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libwnck/2.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk
index 97127d5f40e..8ed8c9357f5 100644
--- a/devel/libwnck/buildlink3.mk
+++ b/devel/libwnck/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/09/21 16:52:05 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:31 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWNCK_BUILDLINK3_MK:=	${LIBWNCK_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libwnck
 
 .if !empty(LIBWNCK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libwnck+=	libwnck>=2.8.0
+BUILDLINK_RECOMMENDED.libwnck+=	libwnck>=2.8.0nb1
 BUILDLINK_PKGSRCDIR.libwnck?=	../../devel/libwnck
 .endif	# LIBWNCK_BUILDLINK3_MK
 
diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile
index 191e8e57099..5363cf29c1f 100644
--- a/devel/lwp/Makefile
+++ b/devel/lwp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/06/04 20:56:10 jschauma Exp $
+# $NetBSD: Makefile,v 1.20 2004/10/03 00:13:31 tv Exp $
 #
 
 DISTNAME=	lwp-1.10
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/lwp/src/ \
 		ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/
diff --git a/devel/lwp/buildlink3.mk b/devel/lwp/buildlink3.mk
index 2de64f56988..765ac7ad094 100644
--- a/devel/lwp/buildlink3.mk
+++ b/devel/lwp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 04:29:17 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:31 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LWP_BUILDLINK3_MK:=	${LWP_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	lwp
 
 .if !empty(LWP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.lwp+=	lwp>=1.6
+BUILDLINK_RECOMMENDED.lwp+=	lwp>=1.10nb1
 BUILDLINK_PKGSRCDIR.lwp?=	../../devel/lwp
 .endif	# LWP_BUILDLINK3_MK
 
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 3dc4056e569..1299a6a691f 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2004/04/22 04:02:46 snj Exp $
+# $NetBSD: Makefile,v 1.29 2004/10/03 00:13:31 tv Exp $
 #
 
 DISTNAME=	maketool-0.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.alphalink.com.au/~gnb/maketool/
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index f8aa73137ab..e0156f86890 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/08/15 14:38:38 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:31 tv Exp $
 #
 
 DISTNAME=		monotone-0.14
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.venge.net/monotone/
 
diff --git a/devel/mrproject/Makefile b/devel/mrproject/Makefile
index 25f55dc8ab4..54284747b96 100644
--- a/devel/mrproject/Makefile
+++ b/devel/mrproject/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2004/04/25 06:26:43 snj Exp $
+# $NetBSD: Makefile,v 1.27 2004/10/03 00:13:31 tv Exp $
 #
 
 DISTNAME=		mrproject-0.5.1
-PKGREVISION=		13
+PKGREVISION=		14
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.codefactory.se/pub/software/mrproject/source/
 
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index cd4f7309603..6a931665d86 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2004/07/21 19:58:57 jlam Exp $
+# $NetBSD: Makefile,v 1.62 2004/10/03 00:13:31 tv Exp $
 
 DISTNAME=	ncurses-${NC_VERS}
+PKGREVISION=	1
 NC_VERS=	5.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=ncurses/} \
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index e9a45bf445f..719b98f2100 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2004/10/03 00:13:31 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=	${NCURSES_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	ncurses
 
 .if !empty(NCURSES_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ncurses+=	ncurses>=5.3nb1
+BUILDLINK_RECOMMENDED.ncurses+=	ncurses>=5.4nb1
 BUILDLINK_PKGSRCDIR.ncurses?=	../../devel/ncurses
 .endif	# NCURSES_BUILDLINK3_MK
 
diff --git a/devel/netcdf/Makefile b/devel/netcdf/Makefile
index f0966d2c107..9fd54fe0652 100644
--- a/devel/netcdf/Makefile
+++ b/devel/netcdf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/04/12 03:51:16 snj Exp $
+# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:31 tv Exp $
 
 DISTNAME=	netcdf-3.5.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://www.gfd-dennou.org/arch/netcdf/unidata-mirror/
 EXTRACT_SUFX=	.tar.Z
diff --git a/devel/netcdf/buildlink3.mk b/devel/netcdf/buildlink3.mk
index ce8b4f87d12..31a0407872e 100644
--- a/devel/netcdf/buildlink3.mk
+++ b/devel/netcdf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 03:51:16 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:31 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NETCDF_BUILDLINK3_MK:=	${NETCDF_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	netcdf
 
 .if !empty(NETCDF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.netcdf+=	netcdf>=3.5
+BUILDLINK_RECOMMENDED.netcdf+=	netcdf>=3.5.0nb2
 BUILDLINK_PKGSRCDIR.netcdf?=	../../devel/netcdf
 .endif	# NETCDF_BUILDLINK3_MK
 
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 46e3fd7b475..ec1e499b7c3 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2004/02/21 19:17:33 minskim Exp $
+# $NetBSD: Makefile,v 1.38 2004/10/03 00:13:31 tv Exp $
 #
 
 DISTNAME=		oaf-0.6.10
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/oaf/0.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/oaf/buildlink3.mk b/devel/oaf/buildlink3.mk
index 8522e9424b6..f6a7c3d1cd6 100644
--- a/devel/oaf/buildlink3.mk
+++ b/devel/oaf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:32 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OAF_BUILDLINK3_MK:=	${OAF_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	oaf
 
 .if !empty(OAF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.oaf+=		oaf>=0.6.10nb4
+BUILDLINK_RECOMMENDED.oaf+=	oaf>=0.6.10nb5
 BUILDLINK_PKGSRCDIR.oaf?=	../../devel/oaf
 .endif	# OAF_BUILDLINK3_MK
 
diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index 9fae3b44d20..e36c356228f 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/05/07 01:14:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=	ogre-v0-12-1
 PKGNAME=	ogre-0.12.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ogre/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
index bed1f45d2ac..12e986ea426 100644
--- a/devel/ogre/buildlink3.mk
+++ b/devel/ogre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:32 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OGRE_BUILDLINK3_MK:=	${OGRE_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	ogre
 
 .if !empty(OGRE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ogre+=	ogre>=0.12.1nb1
+BUILDLINK_RECOMMENDED.ogre+=	ogre>=0.12.1nb2
 BUILDLINK_PKGSRCDIR.ogre?=	../../devel/ogre
 .endif	# OGRE_BUILDLINK3_MK
 
diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile
index 9038d7ebc6f..1f4b0b6dee0 100644
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2004/07/18 10:49:49 recht Exp $
+# $NetBSD: Makefile,v 1.29 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=	${OPENCM_VERSION}-1-src
 PKGNAME=	${OPENCM_VERSION:C/alpha/rc/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.opencm.org/releases/
 EXTRACT_SUFX=	.tgz
diff --git a/devel/p5-Compress-Zlib/Makefile b/devel/p5-Compress-Zlib/Makefile
index 4db3f971f97..701fa08cf7b 100644
--- a/devel/p5-Compress-Zlib/Makefile
+++ b/devel/p5-Compress-Zlib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/02/22 16:35:38 heinz Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:32 tv Exp $
 
 DISTNAME=		Compress-Zlib-1.33
 PKGNAME=		p5-${DISTNAME}
+PKGREVISION=	1
 SVR4_PKGNAME=		p5czl
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Compress/}
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index a18d8a25bda..6c82cf692de 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2004/04/25 03:29:44 minskim Exp $
+# $NetBSD: Makefile,v 1.22 2004/10/03 00:13:32 tv Exp $
 # FreeBSD Id: Makefile,v 1.8 1998/04/04 13:58:26 vanilla Exp
 #
 
 DISTNAME=	Curses-1.05
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5cur
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Curses/}
 
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index d930c2af624..055edca0f9a 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2004/09/29 21:24:18 kristerw Exp $
+# $NetBSD: Makefile,v 1.21 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=	SDL_perl-1.19.2
 PKGNAME=	p5-SDL-1.19.2
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	devel perl5
 MASTER_SITES=	ftp://sdlperl.org/SDL_perl/
 
diff --git a/devel/p5-Term-ReadLine/Makefile b/devel/p5-Term-ReadLine/Makefile
index 3cbbdacf7da..fea5b481fd3 100644
--- a/devel/p5-Term-ReadLine/Makefile
+++ b/devel/p5-Term-ReadLine/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/05/23 16:43:47 heinz Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:32 tv Exp $
 
 DISTNAME=	Term-ReadLine-Gnu-1.14
 PKGNAME=	p5-${DISTNAME:S/-Gnu//}
+PKGREVISION=	1
 SVR4_PKGNAME=	p5trl
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Term/}
diff --git a/devel/p5-gettext/Makefile b/devel/p5-gettext/Makefile
index 1e8df23d6ad..57494899a1c 100644
--- a/devel/p5-gettext/Makefile
+++ b/devel/p5-gettext/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2004/04/25 03:12:57 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=	gettext-1.01
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5gtx
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Locale/}
 
diff --git a/devel/p5-glib2/Makefile b/devel/p5-glib2/Makefile
index cfb5ec4b234..0346887a910 100644
--- a/devel/p5-glib2/Makefile
+++ b/devel/p5-glib2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2004/05/07 01:14:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=	Glib-${DIST_VERSION}
 PKGNAME=	p5-glib2-${DIST_VERSION}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtk2-perl/}
 
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 25af8e293f7..3a271457dc6 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/09/30 14:39:33 epg Exp $
+# $NetBSD: Makefile,v 1.12 2004/10/03 00:13:32 tv Exp $
 
 PKGNAME=	p5-subversion-${SVNVER}
+PKGREVISION=	1
 COMMENT=	Perl bindings for Subversion
 
 .include "../../devel/subversion/Makefile.common"
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index d509017ad5c..6fd1b78db5c 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2004/09/21 16:43:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.47 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=		pango-1.6.0
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.4/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.4/ \
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index 1a48b7ad213..5cdc3fee2e2 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/09/21 16:43:52 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:32 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PANGO_BUILDLINK3_MK:=	${PANGO_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	pango
 
 .if !empty(PANGO_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pango+=	pango>=1.6.0
+BUILDLINK_RECOMMENDED.pango+=	pango>=1.6.0nb1
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 .endif	# PANGO_BUILDLINK3_MK
 
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 1e449e6a1a6..6d4c8bcac35 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2004/09/28 15:59:49 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2004/10/03 00:13:32 tv Exp $
 
 DISTNAME=	pcre-5.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/	\
 		ftp://pcre.sourceforge.net/pub/pcre/
diff --git a/devel/pcre/buildlink3.mk b/devel/pcre/buildlink3.mk
index 8511768e680..2b4ff556b74 100644
--- a/devel/pcre/buildlink3.mk
+++ b/devel/pcre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:32 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PCRE_BUILDLINK3_MK:=	${PCRE_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	pcre
 
 .if !empty(PCRE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pcre+=	pcre>=3.4nb1
+BUILDLINK_RECOMMENDED.pcre+=	pcre>=5.0nb1
 BUILDLINK_PKGSRCDIR.pcre?=	../../devel/pcre
 .endif	# PCRE_BUILDLINK3_MK
 
diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile
index badaf4d5df5..ffa4a6cd26d 100644
--- a/devel/physfs/Makefile
+++ b/devel/physfs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/09/21 00:30:59 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=		physfs-1.0.0
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.icculus.org/physfs/downloads/
 
diff --git a/devel/physfs/buildlink3.mk b/devel/physfs/buildlink3.mk
index c93cef8ad07..7f3ca085418 100644
--- a/devel/physfs/buildlink3.mk
+++ b/devel/physfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/09/21 00:31:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:13:32 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PHYSFS_BUILDLINK3_MK:=	${PHYSFS_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	physfs
 
 .if !empty(PHYSFS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.physfs+=	physfs>=1.0.0
+BUILDLINK_RECOMMENDED.physfs+=	physfs>=1.0.0nb1
 BUILDLINK_PKGSRCDIR.physfs?=	../../devel/physfs
 .endif	# PHYSFS_BUILDLINK3_MK
 
diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile
index 21310581f93..442120b480e 100644
--- a/devel/pilrc/Makefile
+++ b/devel/pilrc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2004/06/12 09:06:51 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=	pilrc-2.9p9
 PKGNAME=	pilrc-2.9.10
-PKGREVISION=	2
+PKGREVISION=	3
 #WRKSRC=	${WRKDIR}/pilrc-2.9p9
 DIFFS=		pilrc-2.9p10.diff
 EXTRACT_SUFFIX=	.tgz
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 06296f594f9..19db2d8d854 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2004/02/14 17:21:39 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=	popt-1.7
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/		\
 		ftp://ftp.iks-jena.de/pub/software/unix/misc/		\
diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk
index ad256256f13..2aa85d403d9 100644
--- a/devel/popt/buildlink3.mk
+++ b/devel/popt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:32 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 POPT_BUILDLINK3_MK:=	${POPT_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	popt
 
 .if !empty(POPT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.popt+=	popt>=1.7nb3
+BUILDLINK_RECOMMENDED.popt+=	popt>=1.7nb5
 BUILDLINK_PKGSRCDIR.popt?=	../../devel/popt
 .endif	# POPT_BUILDLINK3_MK
 
diff --git a/devel/prc-tools/Makefile b/devel/prc-tools/Makefile
index 0f20c785d42..87ea96429ef 100644
--- a/devel/prc-tools/Makefile
+++ b/devel/prc-tools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/07/06 22:40:36 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=	prc-tools-2.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=prc-tools/}
 DISTFILES=	${DISTNAME}.tar.gz ${DIST_BINUTILS}.tar.bz2
diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 32d37e17a29..1ce8bdf91b7 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2004/09/22 08:09:29 jlam Exp $
+# $NetBSD: Makefile,v 1.65 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=		pth-2.0.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=pth/}
 
diff --git a/devel/pth/buildlink3.mk b/devel/pth/buildlink3.mk
index 6d7bed7edea..b24b5f4bf58 100644
--- a/devel/pth/buildlink3.mk
+++ b/devel/pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:32 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PTH_BUILDLINK3_MK:=	${PTH_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	pth
 
 .if !empty(PTH_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pth+=		pth>=2.0.0
+BUILDLINK_RECOMMENDED.pth+=	pth>=2.0.0nb2
 BUILDLINK_PKGSRCDIR.pth?=	../../devel/pth
 .endif	# PTH_BUILDLINK3_MK
 
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 81edeef801d..97ed9104a5d 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2004/05/08 06:41:33 snj Exp $
+# $NetBSD: Makefile,v 1.29 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=		pwlib_1.4.4
 PKGNAME=		pwlib-1.4.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel
 MASTER_SITES=		http://www.openh323.org/bin/
 COUNTRY_MIRRORS=	at us1 us2 ru de cz
diff --git a/devel/pwlib/buildlink3.mk b/devel/pwlib/buildlink3.mk
index a96f86fa610..bab9a85d360 100644
--- a/devel/pwlib/buildlink3.mk
+++ b/devel/pwlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/08 06:41:33 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:32 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PWLIB_BUILDLINK3_MK:=	${PWLIB_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	pwlib
 
 .if !empty(PWLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pwlib+=	pwlib>=1.4.4nb3
+BUILDLINK_RECOMMENDED.pwlib+=	pwlib>=1.4.4nb4
 BUILDLINK_PKGSRCDIR.pwlib?=	../../devel/pwlib
 .endif	# PWLIB_BUILDLINK3_MK
 
diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile
index 5175b103d01..d6b6b4151f1 100644
--- a/devel/py-curses/Makefile
+++ b/devel/py-curses/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2004/07/22 09:16:01 recht Exp $
+# $NetBSD: Makefile,v 1.25 2004/10/03 00:13:32 tv Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-curses-0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel python
 
 MAINTAINER=	tsarna@NetBSD.org
diff --git a/devel/py-cursespanel/Makefile b/devel/py-cursespanel/Makefile
index da8b7faf31c..46b8cf14d23 100644
--- a/devel/py-cursespanel/Makefile
+++ b/devel/py-cursespanel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/07/22 09:16:01 recht Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/03 00:13:32 tv Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-cursespanel-0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel python
 
 MAINTAINER=	tsarna@NetBSD.org
diff --git a/devel/py-expect/Makefile b/devel/py-expect/Makefile
index 815aadf1561..f0a3bc3704e 100644
--- a/devel/py-expect/Makefile
+++ b/devel/py-expect/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2004/07/22 09:16:01 recht Exp $
+# $NetBSD: Makefile,v 1.7 2004/10/03 00:13:32 tv Exp $
 #
 
 DISTNAME=	ExpectPy-1.9b1
 PKGNAME=	${PYPKGPREFIX}-expect-1.9b1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pub/sourceforge/expectpy/}
 
diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile
index 5e32a6a00ff..cdcc397ae18 100644
--- a/devel/py-idle/Makefile
+++ b/devel/py-idle/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/07/22 09:16:01 recht Exp $
+# $NetBSD: Makefile,v 1.14 2004/10/03 00:13:33 tv Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-idle-0
+PKGREVISION=	1
 CATEGORIES=	devel python
 
 MAINTAINER=	tech-pkg@NetBSD.org
diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile
index 8a1dad72a25..41c51216430 100644
--- a/devel/py-readline/Makefile
+++ b/devel/py-readline/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/07/22 09:16:01 recht Exp $
+# $NetBSD: Makefile,v 1.10 2004/10/03 00:13:33 tv Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-readline-0
+PKGREVISION=	1
 CATEGORIES=	devel misc python
 
 MAINTAINER=	tsarna@NetBSD.org
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index 21ed3dc707f..50a9b0c9c44 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2004/09/30 14:39:33 epg Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/03 00:13:33 tv Exp $
 
 PKGNAME=	${PYPKGPREFIX}-subversion-${SVNVER}
+PKGREVISION=	1
 COMMENT=	Python bindings and tools for Subversion
 
 .include "../../devel/subversion/Makefile.common"
diff --git a/devel/py-unitgui/Makefile b/devel/py-unitgui/Makefile
index 6d9609c49f1..dcf66d2cd08 100644
--- a/devel/py-unitgui/Makefile
+++ b/devel/py-unitgui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/07/22 09:16:01 recht Exp $
+# $NetBSD: Makefile,v 1.7 2004/10/03 00:13:33 tv Exp $
 
 DISTNAME=	pyunit-1.4.1
 PKGNAME=	${PYPKGPREFIX}-unitgui-1.4.1
+PKGREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyunit/}
 
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index a4838f10777..3e65acc7edf 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/09/26 17:15:18 epg Exp $
+# $NetBSD: Makefile,v 1.14 2004/10/03 00:13:33 tv Exp $
 
 DISTNAME=		rapidsvn-0.7.0
+PKGREVISION=		1
 CATEGORIES=		devel x11
 MASTER_SITES=		http://www.rapidsvn.org/download/
 
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 27ff01cee51..9577718e7b3 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2004/08/20 17:32:50 tv Exp $
+# $NetBSD: Makefile,v 1.32 2004/10/03 00:13:33 tv Exp $
 #
 
 DISTNAME=	readline-4.3
 PKGNAME=	${DISTNAME}pl5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=readline/}
 
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index 0b8a1030e99..eee154a42c9 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2004/10/03 00:13:33 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 READLINE_BUILDLINK3_MK:=	${READLINE_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	readline
 
 .if !empty(READLINE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.readline+=	readline>=2.2
+BUILDLINK_RECOMMENDED.readline+=	readline>=4.3pl5nb2
 BUILDLINK_PKGSRCDIR.readline?=	../../devel/readline
 
 BUILDLINK_FILES.readline+=	include/history.h
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 68f9d5ac592..0a435afc2ea 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/04/27 04:29:17 snj Exp $
+# $NetBSD: Makefile,v 1.18 2004/10/03 00:13:33 tv Exp $
 #
 
 DISTNAME=	rpc2-1.19
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/rpc2/src/ \
 		ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/
diff --git a/devel/rpc2/buildlink3.mk b/devel/rpc2/buildlink3.mk
index 70c2b7e9722..9edaaa6b5e6 100644
--- a/devel/rpc2/buildlink3.mk
+++ b/devel/rpc2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 04:29:17 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:33 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RPC2_BUILDLINK3_MK:=	${RPC2_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	rpc2
 
 .if !empty(RPC2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.rpc2+=	rpc2>=1.10
+BUILDLINK_RECOMMENDED.rpc2+=	rpc2>=1.19nb1
 BUILDLINK_PKGSRCDIR.rpc2?=	../../devel/rpc2
 .endif	# RPC2_BUILDLINK3_MK
 
diff --git a/devel/ruby-readline/Makefile b/devel/ruby-readline/Makefile
index ccf14ff9c79..9de9fe5ddde 100644
--- a/devel/ruby-readline/Makefile
+++ b/devel/ruby-readline/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2004/04/27 03:09:58 snj Exp $
+# $NetBSD: Makefile,v 1.12 2004/10/03 00:13:33 tv Exp $
 #
 
 DISTNAME=		${RUBY_DISTNAME}
 PKGNAME=		${RUBY_PKGNAMEPREFIX}readline-${RUBY_VERSION}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel ruby
 MASTER_SITES=		${MASTER_SITE_RUBY}
 
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index fbcc19043ad..2cbc16ca7db 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/05/13 18:00:51 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:33 tv Exp $
 #
 
 DISTNAME=		rudiments-0.25.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rudiments/}
 
diff --git a/devel/rudiments/buildlink3.mk b/devel/rudiments/buildlink3.mk
index 443ba1b122c..efcb32bfcc6 100644
--- a/devel/rudiments/buildlink3.mk
+++ b/devel/rudiments/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/15 10:41:02 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:33 tv Exp $
 #
 # This Makefile fragment is included by packages that use rudiments.
 #
@@ -15,6 +15,7 @@ BUILDLINK_DEPENDS+=	rudiments
 .if !empty(RUDIMENTS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			rudiments
 BUILDLINK_DEPENDS.rudiments+=		rudiments>=0.25.1
+BUILDLINK_RECOMMENDED.rudiments+=	rudiments>=0.25.1nb1
 BUILDLINK_PKGSRCDIR.rudiments?=		../../devel/rudiments
 
 .endif # RUDIMENTS_BUILDLINK3_MK
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index 5ae9d01ad0f..d887b01a240 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/04/27 04:29:17 snj Exp $
+# $NetBSD: Makefile,v 1.15 2004/10/03 00:13:33 tv Exp $
 #
 
 DISTNAME=	rvm-1.8
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/rvm/src/ \
 		ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/
diff --git a/devel/rvm/buildlink3.mk b/devel/rvm/buildlink3.mk
index 88c9a8aaadf..9bf0239f309 100644
--- a/devel/rvm/buildlink3.mk
+++ b/devel/rvm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 04:29:17 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:33 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RVM_BUILDLINK3_MK:=	${RVM_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	rvm
 
 .if !empty(RVM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.rvm+=	rvm>=1.3
+BUILDLINK_RECOMMENDED.rvm+=	rvm>=1.8nb1
 BUILDLINK_PKGSRCDIR.rvm?=	../../devel/rvm
 .endif	# RVM_BUILDLINK3_MK
 
diff --git a/devel/rx/Makefile b/devel/rx/Makefile
index 5716b3c535d..4cc18858f6a 100644
--- a/devel/rx/Makefile
+++ b/devel/rx/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/04/24 22:46:09 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:33 tv Exp $
 
 DISTNAME=	rx-1.5
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	#
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index cd4bb947ed8..1552b64dbb4 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2004/08/27 06:29:07 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2004/10/03 00:13:33 tv Exp $
 # FreeBSD: ports/devel/sdcc/Makefile,v 1.5 2000/04/15 15:13:38 knu Exp
 
 DISTNAME=	sdcc-2.4.0
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sdcc/}
 
diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile
index e98bf312e92..c43f33cbcc4 100644
--- a/devel/silc-toolkit/Makefile
+++ b/devel/silc-toolkit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/06/06 12:23:17 salo Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:33 tv Exp $
 #
 
 DISTNAME=		silc-toolkit-0.9.12
+PKGREVISION=		1
 CATEGORIES=		devel chat security
 MASTER_SITES=		http://www.silcnet.org/download/toolkit/sources/ \
 			ftp://ftp.silcnet.org/silc/toolkit/sources/ \
diff --git a/devel/silc-toolkit/buildlink3.mk b/devel/silc-toolkit/buildlink3.mk
index b8cf432535d..9dbcae91c51 100644
--- a/devel/silc-toolkit/buildlink3.mk
+++ b/devel/silc-toolkit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/06/06 12:23:17 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:33 tv Exp $
 #
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	silc-toolkit
 
 .if !empty(SILC_TOOLKIT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.silc-toolkit+=	silc-toolkit>=0.9.12
+BUILDLINK_RECOMMENDED.silc-toolkit+=	silc-toolkit>=0.9.12nb1
 BUILDLINK_PKGSRCDIR.silc-toolkit?=	../../devel/silc-toolkit
 .endif	# SILC_TOOLKIT_BUILDLINK3_MK
 
diff --git a/devel/st/Makefile b/devel/st/Makefile
index 438ba8c415e..b6365258ec1 100644
--- a/devel/st/Makefile
+++ b/devel/st/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/01/22 08:24:31 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/10/03 00:13:33 tv Exp $
 #
 
 DISTNAME=	st-1.4
-PKGREVISION=    1
+PKGREVISION=    2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=state-threads/}
 
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 24a853eb55e..db73701b6d9 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2004/04/27 03:09:58 snj Exp $
+# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:33 tv Exp $
 
 DISTNAME=	STLport-4.6
 PKGNAME=	stlport-4.6
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.stlport.com/archive/
 
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 0ad09d3ec38..14d78e9cd24 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/09/30 14:39:33 epg Exp $
+# $NetBSD: Makefile,v 1.17 2004/10/03 00:13:33 tv Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
+PKGREVISION=	1
 COMMENT=	Version control system, base programs and libraries
 
 .include "../subversion/Makefile.common"
diff --git a/devel/subversion/buildlink3.mk b/devel/subversion/buildlink3.mk
index 9b99cbf8c06..da7e3b2db6f 100644
--- a/devel/subversion/buildlink3.mk
+++ b/devel/subversion/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/09/30 14:39:33 epg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:13:33 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUBVERSION_BASE_BUILDLINK3_MK:=	${SUBVERSION_BASE_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	subversion-base
 
 .if !empty(SUBVERSION_BASE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.subversion-base+=	subversion-base>=1.0.0
-BUILDLINK_RECOMMENDED.subversion-base?=	subversion-base>=1.0.0
+BUILDLINK_RECOMMENDED.subversion-base?=	subversion-base>=1.1.0nb1
 BUILDLINK_PKGSRCDIR.subversion-base?=	../../devel/subversion-base
 
 BUILDLINK_FILES.subversion-base+=	bin/svn-config
diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index 1eee775cc9d..80b17ca405a 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/09/26 23:35:38 epg Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:33 tv Exp $
 
 DISTNAME=	SVK-0.21
 PKGNAME=	svk-0.21
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=OurNet/CLKAO/}
 
diff --git a/devel/swig-perl/Makefile b/devel/swig-perl/Makefile
index c7459228e01..5e42abbebb0 100644
--- a/devel/swig-perl/Makefile
+++ b/devel/swig-perl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/03/07 23:30:22 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:33 tv Exp $
 
 PKGNAME=	swig-perl-${SWIG_VERSION}
+PKGREVISION=	1
 COMMENT=	Simplified Wrapper and Interface Generator, Perl runtime
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/swig-perl/buildlink3.mk b/devel/swig-perl/buildlink3.mk
index ee28032d8d5..d77766a4213 100644
--- a/devel/swig-perl/buildlink3.mk
+++ b/devel/swig-perl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:33 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SWIG_PERL_BUILDLINK3_MK:=	${SWIG_PERL_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	swig-perl
 
 .if !empty(SWIG_PERL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.swig-perl+=	swig-perl>=${SWIG_VERSION}
+BUILDLINK_RECOMMENDED.swig-perl+=	swig-perl>=1.3.19nb1
 BUILDLINK_PKGSRCDIR.swig-perl?=	../../devel/swig-perl
 .endif	# SWIG_PERL_BUILDLINK3_MK
 
diff --git a/devel/swig-python/Makefile b/devel/swig-python/Makefile
index 27c25517771..12bb3f15388 100644
--- a/devel/swig-python/Makefile
+++ b/devel/swig-python/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/06/07 00:01:02 tv Exp $
+# $NetBSD: Makefile,v 1.6 2004/10/03 00:13:33 tv Exp $
 
 PKGNAME=	swig-python-${SWIG_VERSION}
+PKGREVISION=	1
 COMMENT=	Simplified Wrapper and Interface Generator, Python runtime
 
 .include "../swig-build/Makefile.common"
diff --git a/devel/swig-python/buildlink3.mk b/devel/swig-python/buildlink3.mk
index ad30cc7cf1a..6d7bb89ef3f 100644
--- a/devel/swig-python/buildlink3.mk
+++ b/devel/swig-python/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:33 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SWIG_PYTHON_BUILDLINK3_MK:=	${SWIG_PYTHON_BUILDLINK3_MK}+
@@ -17,6 +17,7 @@ BUILDLINK_PACKAGES+=	swig-python
 
 .if !empty(SWIG_PYTHON_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.swig-python+=		swig-python>=${SWIG_VERSION}
+BUILDLINK_RECOMMENDED.swig-python+=	swig-python>=1.3.19nb1
 BUILDLINK_PKGSRCDIR.swig-python?=	../../devel/swig-python
 .endif	# SWIG_PYTHON_BUILDLINK3_MK
 
diff --git a/devel/swig/Makefile b/devel/swig/Makefile
index 7173f372500..550eadd6554 100644
--- a/devel/swig/Makefile
+++ b/devel/swig/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/03/20 23:18:09 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:33 tv Exp $
 
 DISTNAME=       swig1.1p5
 PKGNAME=	swig-1.1p5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=   ftp://ftp.swig.org/pub/
 
diff --git a/devel/syncdir/Makefile b/devel/syncdir/Makefile
index 150034318b1..56e92c6ad36 100644
--- a/devel/syncdir/Makefile
+++ b/devel/syncdir/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/08/15 00:45:50 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:33 tv Exp $
 #
 
 DISTNAME=		syncdir-1.0
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/devel/syncdir/buildlink3.mk b/devel/syncdir/buildlink3.mk
index 1188a61eefa..bebf6d69038 100644
--- a/devel/syncdir/buildlink3.mk
+++ b/devel/syncdir/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/08/15 00:45:50 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:33 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SYNCDIR_BUILDLINK3_MK:=		${SYNCDIR_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=		syncdir
 
 .if !empty(SYNCDIR_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.syncdir+=	syncdir>=1.0
+BUILDLINK_RECOMMENDED.syncdir+=	syncdir>=1.0nb1
 BUILDLINK_PKGSRCDIR.syncdir?=	../../devel/syncdir
 .endif	# SYNCDIR_BUILDLINK3_MK
 
diff --git a/devel/tcl-tclcl/Makefile b/devel/tcl-tclcl/Makefile
index 11b39566653..3e82fadb1f8 100644
--- a/devel/tcl-tclcl/Makefile
+++ b/devel/tcl-tclcl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/03/08 23:49:41 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/03 00:13:33 tv Exp $
 
 DISTNAME=	tclcl-src-1.15
 PKGNAME=	tcl-${DISTNAME:S/-src//}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
 
diff --git a/devel/tcl-tclcl/buildlink3.mk b/devel/tcl-tclcl/buildlink3.mk
index 3729e503fdb..c2c0e13dc3e 100644
--- a/devel/tcl-tclcl/buildlink3.mk
+++ b/devel/tcl-tclcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:33 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_TCLCL_BUILDLINK3_MK:=	${TCL_TCLCL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	tcl-tclcl
 
 .if !empty(TCL_TCLCL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.tcl-tclcl+=	tcl-tclcl>=1.15
+BUILDLINK_RECOMMENDED.tcl-tclcl+=	tcl-tclcl>=1.15nb1
 BUILDLINK_PKGSRCDIR.tcl-tclcl?=	../../devel/tcl-tclcl
 .endif	# TCL_TCLCL_BUILDLINK3_MK
 
diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile
index fe24854af71..2adf6c10c0c 100644
--- a/devel/tvision/Makefile
+++ b/devel/tvision/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/09/10 19:32:44 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/10/03 00:13:33 tv Exp $
 #
 
 DISTNAME=		tvision-0.8
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=devel/lang/c++/}
 
diff --git a/devel/ucl/Makefile b/devel/ucl/Makefile
index 6114fe08351..86581131f87 100644
--- a/devel/ucl/Makefile
+++ b/devel/ucl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/08/03 16:36:13 snj Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:34 tv Exp $
 #
 
 DISTNAME=	ucl-1.02
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel archivers
 MASTER_SITES=	http://www.oberhumer.com/opensource/ucl/download/
 
diff --git a/devel/ucl/buildlink3.mk b/devel/ucl/buildlink3.mk
index ac02e4695d3..0503bda6a51 100644
--- a/devel/ucl/buildlink3.mk
+++ b/devel/ucl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/07/28 02:29:29 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:34 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 UCL_BUILDLINK3_MK:=	${UCL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	ucl
 
 .if !empty(UCL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ucl+=	ucl>=1.02
+BUILDLINK_RECOMMENDED.ucl+=	ucl>=1.02nb2
 BUILDLINK_PKGSRCDIR.ucl?=	../../devel/ucl
 .endif	# UCL_BUILDLINK3_MK
 
diff --git a/devel/uml/Makefile b/devel/uml/Makefile
index 0e4f1242e9b..dd6c6ad843f 100644
--- a/devel/uml/Makefile
+++ b/devel/uml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/05/03 04:16:57 snj Exp $
+# $NetBSD: Makefile,v 1.14 2004/10/03 00:13:34 tv Exp $
 
 DISTNAME=	uml-1.0.3-1
 PKGNAME=	uml-1.0.3
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=uml/}
 
diff --git a/devel/vanessa_adt/Makefile b/devel/vanessa_adt/Makefile
index cab394999a7..4cd2ba28d94 100644
--- a/devel/vanessa_adt/Makefile
+++ b/devel/vanessa_adt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/09/25 00:06:19 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:34 tv Exp $
 #
 
 DISTNAME=		vanessa_adt-0.0.6
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.vergenet.net/linux/vanessa/download/vanessa_adt/0.0.6/
 
diff --git a/devel/vanessa_adt/buildlink3.mk b/devel/vanessa_adt/buildlink3.mk
index 5dd9402ccce..15cb65bd5fb 100644
--- a/devel/vanessa_adt/buildlink3.mk
+++ b/devel/vanessa_adt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/09/25 00:06:19 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:34 tv Exp $
 #
 # This file was created automatically using createbuildlink-3.5.
 
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	vanessa_adt
 
 .if !empty(VANESSA_ADT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.vanessa_adt+=	vanessa_adt>=0.0.6
+BUILDLINK_RECOMMENDED.vanessa_adt+=	vanessa_adt>=0.0.6nb1
 BUILDLINK_PKGSRCDIR.vanessa_adt?=	../../devel/vanessa_adt
 .endif	# VANESSA_ADT_BUILDLINK3_MK
 
diff --git a/devel/vanessa_logger/Makefile b/devel/vanessa_logger/Makefile
index 16acfb44170..1d1f575d37c 100644
--- a/devel/vanessa_logger/Makefile
+++ b/devel/vanessa_logger/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/09/25 00:04:09 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:34 tv Exp $
 #
 
 DISTNAME=		vanessa_logger-0.0.7
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.vergenet.net/linux/vanessa/download/vanessa_logger/0.0.7/
 
diff --git a/devel/vanessa_logger/buildlink3.mk b/devel/vanessa_logger/buildlink3.mk
index 82a9e0ed9b5..c125c1e36cb 100644
--- a/devel/vanessa_logger/buildlink3.mk
+++ b/devel/vanessa_logger/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/09/25 00:04:09 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:34 tv Exp $
 #
 # This file was created automatically using createbuildlink-3.5.
 
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	vanessa_logger
 
 .if !empty(VANESSA_LOGGER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.vanessa_logger+=	vanessa_logger>=0.0.7
+BUILDLINK_RECOMMENDED.vanessa_logger+=	vanessa_logger>=0.0.7nb1
 BUILDLINK_PKGSRCDIR.vanessa_logger?=	../../devel/vanessa_logger
 .endif	# VANESSA_LOGGER_BUILDLINK3_MK
 
diff --git a/devel/vanessa_socket/Makefile b/devel/vanessa_socket/Makefile
index e7a6909da77..8f120299066 100644
--- a/devel/vanessa_socket/Makefile
+++ b/devel/vanessa_socket/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/09/25 00:05:06 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:34 tv Exp $
 #
 
 DISTNAME=		vanessa_socket-0.0.7
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.vergenet.net/linux/vanessa/download/vanessa_socket/0.0.7/
 
diff --git a/devel/vanessa_socket/buildlink3.mk b/devel/vanessa_socket/buildlink3.mk
index 85cbba81d75..87faa1b0c1e 100644
--- a/devel/vanessa_socket/buildlink3.mk
+++ b/devel/vanessa_socket/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/09/25 00:05:06 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:34 tv Exp $
 #
 # This file was created automatically using createbuildlink-3.5.
 
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	vanessa_socket
 
 .if !empty(VANESSA_SOCKET_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.vanessa_socket+=	vanessa_socket>=0.0.7
+BUILDLINK_RECOMMENDED.vanessa_socket+=	vanessa_socket>=0.0.7nb1
 BUILDLINK_PKGSRCDIR.vanessa_socket?=	../../devel/vanessa_socket
 .endif	# VANESSA_SOCKET_BUILDLINK3_MK
 
diff --git a/devel/xdelta/Makefile b/devel/xdelta/Makefile
index 0e431160629..b60e16b384c 100644
--- a/devel/xdelta/Makefile
+++ b/devel/xdelta/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2004/04/18 22:53:18 snj Exp $
+# $NetBSD: Makefile,v 1.27 2004/10/03 00:13:34 tv Exp $
 #
 
 DISTNAME=		xdelta-1.1.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.xcf.berkeley.edu/pub/xdelta/
 
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 90858008699..77f9075daed 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/05/07 01:14:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:34 tv Exp $
 #
 
 DISTNAME=	yasm-0.2.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tortall.net/projects/yasm/releases/
 
diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile
index 1b283cd29e6..8259e6c0a5d 100644
--- a/devel/zlib/Makefile
+++ b/devel/zlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2004/08/31 23:16:23 reed Exp $
+# $NetBSD: Makefile,v 1.27 2004/10/03 00:13:34 tv Exp $
 
 DISTNAME=	zlib-1.2.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
 		http://www.libpng.org/pub/png/src/ \
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index d578467b69f..3f67c30ae4d 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2004/08/31 23:16:23 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2004/10/03 00:13:34 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=	${ZLIB_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	zlib
 
 .if !empty(ZLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.zlib+=	zlib>=1.1.4nb1
-BUILDLINK_RECOMMENDED.zlib+=	zlib>=1.2.1nb2
+BUILDLINK_RECOMMENDED.zlib+=	zlib>=1.2.1nb3
 BUILDLINK_PKGSRCDIR.zlib?=	../../devel/zlib
 .endif	# ZLIB_BUILDLINK3_MK
author	tv <tv>	2004-10-03 00:12:51 +0000
committer	tv <tv>	2004-10-03 00:12:51 +0000
commit	b5510d5a2d7f9a1406603d922ae5d8548950233c (patch)
tree	7a77b0b911386450709129a67eb0551755a34953 /devel
parent	3addbafa22111ee3e2673d59835bf69a03a74306 (diff)
download	pkgsrc-b5510d5a2d7f9a1406603d922ae5d8548950233c.tar.gz