diff -ur devel/sysconftool/Makefile.orig devel/sysconftool/Makefile
--- devel/sysconftool/Makefile.orig	Fri Feb 21 19:23:00 2003
+++ devel/sysconftool/Makefile	Thu Aug 21 00:21:11 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sysconftool
-PORTVERSION=	0.13
+PORTVERSION=	0.14
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -14,8 +14,9 @@
 MAINTAINER=	yds@CoolRat.org
 COMMENT=	Helps to install application configuration files
 
+USE_BZIP2=	yes
 USE_PERL5=	yes
-USE_AUTOMAKE_VER=	14
+WANT_AUTOMAKE_VER=	15
 
 MAN1=		sysconftool.1 sysconftoolcheck.1
 MAN7=		sysconftool.7
diff -ur devel/sysconftool/distinfo.orig devel/sysconftool/distinfo
--- devel/sysconftool/distinfo.orig	Wed Jan 30 09:36:44 2002
+++ devel/sysconftool/distinfo	Thu Aug 21 00:21:11 2003
@@ -1 +1 @@
-MD5 (sysconftool-0.13.tar.gz) = 151d2e4777ebbf26d8c8d4c4733772e9
+MD5 (sysconftool-0.14.tar.bz2) = 899bd76c99c9654160c046e04f74d2b1
diff -ur devel/sysconftool/pkg-plist.orig devel/sysconftool/pkg-plist
--- devel/sysconftool/pkg-plist.orig	Fri Dec 20 18:17:58 2002
+++ devel/sysconftool/pkg-plist	Thu Aug 21 00:21:11 2003
@@ -1,6 +1,6 @@
 bin/sysconftoolize
 bin/sysconftoolcheck
-share/aclocal14/sysconftool.m4
+share/aclocal/sysconftool.m4
 share/sysconftool/sysconftool
 share/sysconftool/sysconftoolize.pl
 share/sysconftool/sysconftoolcheck
diff -ur mail/courier/Makefile.orig mail/courier/Makefile
--- mail/courier/Makefile.orig	Sun Aug 10 06:40:31 2003
+++ mail/courier/Makefile	Thu Aug 21 02:51:46 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier
-PORTVERSION=	0.42.2
+PORTVERSION=	0.43.1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -52,8 +52,6 @@
 USE_SUBMAKE=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
-USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
 USE_AUTOMAKE_VER=15
 CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
diff -ur mail/courier/Makefile.man.orig mail/courier/Makefile.man
--- mail/courier/Makefile.man.orig	Sun Aug 10 06:40:31 2003
+++ mail/courier/Makefile.man	Thu Aug 21 00:21:11 2003
@@ -6,6 +6,7 @@
 	dot-forward.1 \
 	lockmail.1 \
 	mailbot.1 \
+	maildirkw.1 \
 	maildirmake.1 \
 	maildrop.1 \
 	mailq.1 \
diff -ur mail/courier/distinfo.orig mail/courier/distinfo
--- mail/courier/distinfo.orig	Sun Aug 10 06:40:31 2003
+++ mail/courier/distinfo	Thu Aug 21 00:21:11 2003
@@ -1 +1 @@
-MD5 (courier-0.42.2.tar.bz2) = f607cbd949dd0fe7f138cf3b65d702f4
+MD5 (courier-0.43.1.tar.bz2) = ff08b1be931fd720704a71d3045cb212
diff -ur mail/courier/pkg-plist.orig mail/courier/pkg-plist
--- mail/courier/pkg-plist.orig	Tue Aug 19 23:36:02 2003
+++ mail/courier/pkg-plist	Thu Aug 21 00:21:11 2003
@@ -37,6 +37,7 @@
 bin/imapd
 bin/lockmail
 bin/mailbot
+bin/maildirkw
 bin/maildirmake
 bin/maildrop
 bin/mailq
@@ -652,6 +653,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/lockmail.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mailbot.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildir.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildirkw.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildirmake.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildirquota.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildrop.README.html