diff --git a/biology/gff2ps/Makefile b/biology/gff2ps/Makefile
index b74eaf304b66..666add58ebd9 100644
--- a/biology/gff2ps/Makefile
+++ b/biology/gff2ps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gff2ps
 PORTVERSION=	0.98d
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://www1.imim.es/pub/gff_tools/gff2ps/:prog \
 		http://www1.imim.es/software/gfftools/gff2ps_docs/manual/:doc
@@ -16,7 +17,7 @@ MAINTAINER=	chuynh@biolateral.com.au
 COMMENT=	Converts gff-formated genomic data-sets to PostScript
 
 RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk \
-		bash:${PORTSDIR}/shells/bash2
+		bash:${PORTSDIR}/shells/bash
 
 GFF2PS_MAN=	MANUAL_GFF2PS_v0.96.ps
 PATCH_WRKSRC=	${WRKDIR}
diff --git a/converters/konwert/Makefile b/converters/konwert/Makefile
index 5067f212142d..aaabfb4ba796 100644
--- a/converters/konwert/Makefile
+++ b/converters/konwert/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	konwert
 PORTVERSION=	1.8
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/${DISTNAME:C/${DISTNAME:C/.//}//}/${PORTNAME}
@@ -15,13 +15,14 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	${PORTNAME}_${PORTVERSION}-${PORTREVISION}.diff.gz
+PATCHLEVEL=	11
+PATCHFILES=	${PORTNAME}_${PORTVERSION}-${PATCHLEVEL}.diff.gz
 
 MAINTAINER=	alexs@snark.rinet.ru
 COMMENT=	Modular converter between charsets and filter
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PATCH_WRKSRC=	${WRKDIR}
diff --git a/converters/konwert/distinfo b/converters/konwert/distinfo
index 9fabd500024d..135ab459e172 100644
--- a/converters/konwert/distinfo
+++ b/converters/konwert/distinfo
@@ -1,6 +1,6 @@
 MD5 (konwert_1.8.orig.tar.gz) = 838e73ec911ebf25816135cbfd0f7a04
 SHA256 (konwert_1.8.orig.tar.gz) = 152d4ba63e61949502f3d3305a700308cf938118d232834c67365acbcba32d32
 SIZE (konwert_1.8.orig.tar.gz) = 196871
-MD5 (konwert_1.8-9.diff.gz) = a90cd6c0560d6682800d840fc17adbc2
-SHA256 (konwert_1.8-9.diff.gz) = 70c5f12d20d0075b2b424afcabfe79bb8892468dd9d58da4bff714db01a87693
-SIZE (konwert_1.8-9.diff.gz) = 8979
+MD5 (konwert_1.8-11.diff.gz) = b378b5fda8a4ce57d62a3f363ae93f75
+SHA256 (konwert_1.8-11.diff.gz) = 2b6ae905d39690e16fcece578368840eb6708d076a370eb3a89424b69dcb5636
+SIZE (konwert_1.8-11.diff.gz) = 9382
diff --git a/mail/mailscanner-devel/Makefile b/mail/mailscanner-devel/Makefile
index 98c946ea59a9..5fde2729b546 100644
--- a/mail/mailscanner-devel/Makefile
+++ b/mail/mailscanner-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	MailScanner
 PORTVERSION=	4.45.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 PKGNAMESUFFIX=	-devel
@@ -30,7 +31,7 @@ BUILD_DEPENDS=	\
 	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 	${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
 RUN_DEPENDS=	${BUILD_DEPENDS} \
-		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
+		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
 		${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef \
 		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/mail/qmrtg/Makefile b/mail/qmrtg/Makefile
index 7c8619991dfb..f17a75193058 100644
--- a/mail/qmrtg/Makefile
+++ b/mail/qmrtg/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	qmrtg
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	mail net-mgmt
 MASTER_SITES=	http://dev.publicshout.org/qmrtg/download/
 
 MAINTAINER=	mij@bitchx.it
 COMMENT=	A simple tool for monitoring and graphing qmail activity through MRTG
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 RUN_DEPENDS=	${BUILD_DEPENDS}
 .if !defined(WITHOUT_MRTG)
 RUN_DEPENDS+=	mrtg:${PORTSDIR}/net-mgmt/mrtg