diff -ruN sylpheed.old/Makefile sylpheed/Makefile
--- sylpheed.old/Makefile	Wed Nov  7 16:15:57 2001
+++ sylpheed/Makefile	Wed Nov  7 16:38:19 2001
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sylpheed
-PORTVERSION=	0.6.4
+PORTVERSION=	0.6.5
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
 
@@ -53,9 +53,9 @@
 
 pre-configure:
 	${PERL} -pi -e "s|AM_PROG_INSTALL|AC_PROG_INSTALL|g" ${WRKSRC}/aclocal.m4
-.if defined(WITH_GPGME)
-	${RM} -f ${WRKSRC}/ac/gpgme.m4
-.endif
+	if ([ ${WITH_GPGME} ] || [ -f "${LOCALBASE}/share/aclocal/gpgme.m4" ]) ; then \
+		${RM} -f ${WRKSRC}/ac/gpgme.m4 ; \
+	fi
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -ruN sylpheed.old/distinfo sylpheed/distinfo
--- sylpheed.old/distinfo	Wed Nov  7 16:15:57 2001
+++ sylpheed/distinfo	Wed Nov  7 16:48:42 2001
@@ -1 +1 @@
-MD5 (sylpheed-0.6.4.tar.bz2) = 517ed25347565e776526364566163c10
+MD5 (sylpheed-0.6.5.tar.bz2) = 60016b1319df112172fa5623308afe2c