41 files changed, 80 insertions, 55 deletions

diff --git a/UPDATING b/UPDATING
index b0c22b3b07b9..5030f588c447 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,19 @@ You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
 20110731:
+  AFFECTS: users of lang/guile
+  AUTHOR: jlaffaye@FreeBSD.org
+
+  guile has been updated to version 1.8.8. Please rebuild all ports that
+  depends on it.
+
+  If you use portmaster:
+  # portmaster -r guile
+
+  If you use portupgrade:
+  # portupgrade -fr lang/guile
+
+20110731:
   AFFECTS: users of www/typo3
   AUTHOR: Helmut Schneider <jumper99@gmx.de>
 
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 73a78f6cc390..8251a4d8d482 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	beast
 PORTVERSION=	0.7.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://beast.testbit.eu/_dist/beast/v${PORTVERSION:R}/
 
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 6261082690bf..3e41f4c9d9e8 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	denemo
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	GNU
 
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	portaudio>=19:${PORTSDIR}/audio/portaudio2
 LIB_DEPENDS=	aubio.3:${PORTSDIR}/audio/aubio \
 		fluidsynth.4:${PORTSDIR}/audio/fluidsynth \
 		jack.0:${PORTSDIR}/audio/jack \
-		guile.20:${PORTSDIR}/lang/guile \
+		guile.21:${PORTSDIR}/lang/guile \
 		fftw3.5:${PORTSDIR}/math/fftw3
 RUN_DEPENDS=	portaudio>=19:${PORTSDIR}/audio/portaudio2
 
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index ac93f03c40ce..a0a9fc3dc8b5 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glame
 PORTVERSION=	2.0.1
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	audio gnome
 MASTER_SITES=	SF
 
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
 		mad.2:${PORTSDIR}/audio/libmad \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
-		guile.20:${PORTSDIR}/lang/guile
+		guile.21:${PORTSDIR}/lang/guile
 
 USE_XORG=	xbitmaps x11
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index e44e108234ef..6eb47b8330e6 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	snd
 PORTVERSION=	12.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \
 		http://mirror.mcx2.org/
@@ -63,7 +64,7 @@ CONFIGURE_ARGS+=	--without-gsl
 
 .if !defined(WITHOUT_GUILE)
 CONFIGURE_ARGS+=	--with-guile
-LIB_DEPENDS+=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS+=	guile.21:${PORTSDIR}/lang/guile
 PLIST_SUB+=	SCHEME=""
 .else
 CONFIGURE_ARGS+=	--without-guile
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index ac29bd27e274..af82d22b5e01 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	gwave
 PORTVERSION=	20080127
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	http://geda.seul.org/dist/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Waveform viewer for analogue electronic simulation tools
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile \
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile \
 		guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
 
 USE_GNOME=	gtk12
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 9b5646163fa6..fdc1361c5956 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgeda
 PORTVERSION=	1.4.3
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PORTVERSION}/ \
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PORTVERSION}/ \
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	The gEDA's tools base utility library
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index 9a040d4b1aca..1be663112d44 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnotime
 PORTVERSION=	2.3.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		SF/qof/qof/${QOF_VERSION}:qof
@@ -18,7 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A time tracker for gnome2
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 USE_XORG=	xscrnsaver
 USE_GNOME=	gnomehack gnomeprefix gtkhtml3 intlhack libgnomeui
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index aea250f9ab5f..91d6104d2c77 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	autogen
 PORTVERSION=	5.9.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/AutoGen/AutoGen%20${PORTVERSION} \
 		${MASTER_SITE_GNU:S/$/:gnu/}
@@ -17,7 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT,gnu
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	The Automated Program Generator
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget libxml2
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index db085c2ef165..79fdf2e83d52 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	g-wrap
 PORTVERSION=	1.9.6
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	devel scheme
 MASTER_SITES=	SAVANNAH
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index a7847edbc39f..dc356c4e5c19 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gconf
 PORTVERSION=	1.0.9
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/GConf/1.0
@@ -18,7 +18,7 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A configuration database system for GNOME
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile
index 749e1df4883e..6d42832596eb 100644
--- a/devel/guile-lib/Makefile
+++ b/devel/guile-lib/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	guile-lib
 PORTVERSION=	0.1.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel scheme
 MASTER_SITES=	http://download.gna.org/guile-lib/
 
diff --git a/devel/libmatheval/Makefile b/devel/libmatheval/Makefile
index 6bb264a6b97f..5599222d3154 100644
--- a/devel/libmatheval/Makefile
+++ b/devel/libmatheval/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libmatheval
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 CATEGORIES=	devel math
 MASTER_SITES=	GNU
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,7 @@ MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A library of procedures for evaluating mathematical functions
 
 BUILD_DEPENDS=	flex>0:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index e282c5f4f847..cfbf7881cc7a 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	texmacs
 PORTVERSION=	1.0.7.10
+PORTREVISION=	1
 CATEGORIES=	editors print
 MASTER_SITES=	ftp://ftp.texmacs.org/pub/TeXmacs/targz/ \
 		http://www.predatorlabs.net/dl/
@@ -16,7 +17,7 @@ MAINTAINER=	rfarmer@predatorlabs.net
 COMMENT=	A free WYSIWYG scientific text editor
 
 BUILD_DEPENDS=	tex:${PORTSDIR}/print/teTeX-base
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile \
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile \
 		freetype.9:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	tex:${PORTSDIR}/print/teTeX-base
 
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 8410089501c3..b09280facfb8 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	2.4.7
+PORTREVISION=	1
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index af880a4c176a..aaf749c81a00 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-games
 PORTVERSION=	2.32.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The game applications package for the GNOME 2 Desktop Environment
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile \
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile \
 		clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
 		clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter
 RUN_DEPENDS=	seed:${PORTSDIR}/devel/seed
diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile
index 0b15e6db14d0..40da7ed28477 100644
--- a/games/gnurobots/Makefile
+++ b/games/gnurobots/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	gnurobots
 PORTVERSION=	1.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU diversion wherein Scheme-coded robots explore a world
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 USE_GNOME=	gnometarget vte
 GNU_CONFIGURE=	yes
diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index 4167e81bc93e..93b26f63b4ad 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	trackballs
 PORTVERSION=	1.1.4
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	SF
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	SDL-based Marble Madness clone
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 LICENSE=	GPLv2
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 3996972d1ad0..bd3c5b321022 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -384,7 +384,7 @@ PLIST_SUB+=		WITH_TCL="@comment "
 .if defined(WITH_GUILE)
 CONFIGURE_ARGS+=	--enable-guile
 PLIST_SUB+=		WITH_GUILE=""
-LIB_DEPENDS+=		guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS+=		guile.21:${PORTSDIR}/lang/guile
 MAN3+=			gv.3guile
 .else
 CONFIGURE_ARGS+=	--disable-guile
diff --git a/irc/bobot++/Makefile b/irc/bobot++/Makefile
index 7f7de6129acb..4869e098511a 100644
--- a/irc/bobot++/Makefile
+++ b/irc/bobot++/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bobotpp
 PORTVERSION=	2.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	irc
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	bobotpp
@@ -23,7 +23,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 .if defined(WITHOUT_GUILE)
 CONFIGURE_ARGS+=	--disable-scripting
 .else
-LIB_DEPENDS+=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS+=	guile.21:${PORTSDIR}/lang/guile
 CONFIGURE_ARGS+=	--enable-scripting
 .endif
 
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index 671e6dbce54d..ec6904998ed7 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guile
 PORTVERSION=	1.1.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	libs
@@ -18,7 +18,7 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep interface to the GUILE scheme interpreter
 
-LIB_DEPENDS+=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS+=	guile.21:${PORTSDIR}/lang/guile
 
 LICENSE=	GPLv2
 
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index 750eb0c2f17f..30acaa88d495 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mdk
 PORTVERSION=	1.2.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	lang gnome
 MASTER_SITES=	${MASTER_SITE_GNU:S/%SUBDIR%/${PORTNAME}\/v${PORTVERSION}/} \
 		SF
@@ -16,7 +16,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:S/%SUBDIR%/${PORTNAME}\/v${PORTVERSION}/} \
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A set of utilities for developing programs using MIX and MIXAL
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile \
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile \
 		readline.6:${PORTSDIR}/devel/readline
 
 USE_GNOME=	gnometarget libglade2
diff --git a/lang/slib-guile/Makefile b/lang/slib-guile/Makefile
index 05531c13b429..f0115eb17882 100644
--- a/lang/slib-guile/Makefile
+++ b/lang/slib-guile/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	slib
 PORTVERSION=	3b3 # Keep this in sync with lang/slib
+PORTREVISION=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	# empty
 PKGNAMESUFFIX=	-guile
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 9bc86e7d145d..61808475a335 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	anubis
 PORTVERSION=	4.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index cdf377132958..be630acc41b2 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	drgeo
 PORTVERSION=	1.1.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	math
 MASTER_SITES=	SF/ofset/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	A GTK interactive geometry sofware
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack libglade2
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index f6693b7ac246..87bb6a4d3fb7 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guppi
 PORTVERSION=	0.40.3
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/Guppi/0.40
@@ -16,7 +16,7 @@ DISTNAME=	Guppi-${PORTVERSION}
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A plotting program for GNOME
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/net-im/freetalk/Makefile b/net-im/freetalk/Makefile
index 54b5da261d5f..e211bc3593e5 100644
--- a/net-im/freetalk/Makefile
+++ b/net-im/freetalk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freetalk
 PORTVERSION=	3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	SAVANNAH/freetalk \
 		http://itdev.spb.ru/mirror/
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 07eb2a2681a2..03e2217461fe 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnunet
 PORTVERSION=	0.8.1b
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	GNU \
 		http://gnunet.org/download/
@@ -20,7 +20,7 @@ COMMENT=	An anonymous, distributed, reputation-based network
 LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns \
 		cares.2:${PORTSDIR}/dns/c-ares \
 		curl.6:${PORTSDIR}/ftp/curl \
-		guile.20:${PORTSDIR}/lang/guile \
+		guile.21:${PORTSDIR}/lang/guile \
 		esmtp.6:${PORTSDIR}/mail/libesmtp \
 		gmp.10:${PORTSDIR}/math/gmp \
 		gcrypt.18:${PORTSDIR}/security/libgcrypt \
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index d75863a029a0..c3ed3783e07f 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dico
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	net textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -41,7 +42,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if defined(WITH_GUILE)
-LIB_DEPENDS+=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS+=	guile.21:${PORTSDIR}/lang/guile
 PLIST_SUB+=	GUILE=""
 .else
 CONFIGURE_ARGS+=--without-guile
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index ba003a519f38..d075795db797 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+=--enable-snmp
 .endif
 
 .if defined(WITH_CLIENT)
-LIB_DEPENDS+=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS+=	guile.21:${PORTSDIR}/lang/guile
 CONFIGURE_ARGS+=--enable-client
 PLIST_SUB+=	CLIENT=""
 .else
diff --git a/net/net-http/Makefile b/net/net-http/Makefile
index dca86d834306..1b27a9961f55 100644
--- a/net/net-http/Makefile
+++ b/net/net-http/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	net-http
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net scheme
 MASTER_SITES=	http://evan.prodromou.name/software/net-http/
 
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index 67b22eb3d6c2..a572f4f2e838 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -8,14 +8,14 @@
 
 PORTNAME=	serveez
 PORTVERSION=	0.1.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A server framework
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 GUILE_CONFIG?=	${LOCALBASE}/bin/guile-config
 
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index a75c750444f4..e03b3f567d5d 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	lilypond
 PORTVERSION=	2.14.1
+PORTREVISION=	1
 CATEGORIES=	print audio
 MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v2.14/
 
@@ -23,7 +24,7 @@ BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		zip:${PORTSDIR}/archivers/zip \
 		gsed:${PORTSDIR}/textproc/gsed \
 		${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:${PORTSDIR}/print/gsfonts
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile \
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile \
     		gmp.10:${PORTSDIR}/math/gmp
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
     		mftrace:${PORTSDIR}/print/mftrace \
diff --git a/science/harminv/Makefile b/science/harminv/Makefile
index 584e68aa69f3..5fcea58ac61f 100644
--- a/science/harminv/Makefile
+++ b/science/harminv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	harminv
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/harminv/
 
@@ -25,7 +26,7 @@ USE_LDCONFIG=	yes
 
 MAN1=	harminv.1
 
-LIB_DEPENDS+=	guile.20:${PORTSDIR}/lang/guile \
+LIB_DEPENDS+=	guile.21:${PORTSDIR}/lang/guile \
 		blas.2:${PORTSDIR}/math/blas \
 		lapack.4:${PORTSDIR}/math/lapack
 
diff --git a/science/libctl/Makefile b/science/libctl/Makefile
index 55f588f7b941..d400b38a3c12 100644
--- a/science/libctl/Makefile
+++ b/science/libctl/Makefile
@@ -8,13 +8,14 @@
 
 PORTNAME=	libctl
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	science math
 MASTER_SITES=	http://ab-initio.mit.edu/libctl/
 
 MAINTAINER=	devel@stasyan.com
 COMMENT=	Control Language Library
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 USE_AUTOTOOLS=	libtool
 USE_FORTRAN=	yes
diff --git a/science/meep/Makefile b/science/meep/Makefile
index 19d927604f9e..4826e9952a2b 100644
--- a/science/meep/Makefile
+++ b/science/meep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	meep
 PORTVERSION=	1.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/meep/
 
@@ -17,7 +17,7 @@ COMMENT=	FDTD simulation software to model electromagnetic systems
 BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash \
 		harminv:${PORTSDIR}/science/harminv \
 		gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS+=	guile.20:${PORTSDIR}/lang/guile \
+LIB_DEPENDS+=	guile.21:${PORTSDIR}/lang/guile \
 		blas.2:${PORTSDIR}/math/blas \
 		ctl.4:${PORTSDIR}/science/libctl \
 		hdf5.0:${PORTSDIR}/science/hdf5
diff --git a/science/mpb/Makefile b/science/mpb/Makefile
index c70809c8d9d4..09c8b32b4db9 100644
--- a/science/mpb/Makefile
+++ b/science/mpb/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mpb
 PORTVERSION=	1.4.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/mpb/
 
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
 		hdf5.0:${PORTSDIR}/science/hdf5 \
 		ctl.4:${PORTSDIR}/science/libctl \
-		guile.20:${PORTSDIR}/lang/guile
+		guile.21:${PORTSDIR}/lang/guile
 
 USE_FORTRAN=	yes
 
diff --git a/security/crank/Makefile b/security/crank/Makefile
index 4108e1bf7d0d..da656f488911 100644
--- a/security/crank/Makefile
+++ b/security/crank/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	crank
 PORTVERSION=	0.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	SF
 
diff --git a/sysutils/mcron/Makefile b/sysutils/mcron/Makefile
index d1abc9365894..449e92d87cda 100644
--- a/sysutils/mcron/Makefile
+++ b/sysutils/mcron/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mcron
 PORTVERSION=	1.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	mcron
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 66b136c15ed3..45b5519a0bb7 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guile-gtk
 PORTVERSION=	0.60
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-toolkits scheme
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Guile binding library for GTK+
 
-LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget ltverhack gdkpixbuf libglade
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 9809c11d2155..acca370e86f4 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -32,7 +32,7 @@ WISH=		${LOCALBASE}/bin/wish8.4
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_GUILE)
-LIB_DEPENDS+=	guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS+=	guile.21:${PORTSDIR}/lang/guile
 .else
 CONFIGURE_ARGS+=	--disable-guile
 .endif