diff -ruN sylpheed.old/Makefile sylpheed/Makefile
--- sylpheed.old/Makefile	Tue Nov 27 13:04:05 2001
+++ sylpheed/Makefile	Tue Nov 27 13:43:50 2001
@@ -7,6 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
 
@@ -14,12 +15,10 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
 USE_X_PREFIX=	yes
 USE_IMLIB=	yes
 USE_LIBTOOL=	yes
 
-CONFIGURE_SCRIPT=	autogen.sh
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-compface --disable-gdk-pixbuf --enable-ipv6 --prefix=${PREFIX} --with-included-gettext
@@ -51,11 +50,8 @@
 .endif
 	@${ECHO_MSG}
 
-pre-configure:
-	${PERL} -pi -e "s|AM_PROG_INSTALL|AC_PROG_INSTALL|g" ${WRKSRC}/aclocal.m4
-	if ([ ${WITH_GPGME} ] || [ -f "${LOCALBASE}/share/aclocal/gpgme.m4" ]) ; then \
-		${RM} -f ${WRKSRC}/ac/gpgme.m4 ; \
-	fi
+pre-build:
+	${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -ruN sylpheed.old/files/patch-ad sylpheed/files/patch-ad
--- sylpheed.old/files/patch-ad	Tue Nov 27 13:04:05 2001
+++ sylpheed/files/patch-ad	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- intl/Makefile.in.orig	Wed Oct 24 03:57:52 2001
-+++ intl/Makefile.in	Wed Oct 24 03:58:06 2001
-@@ -41,7 +41,7 @@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
- 
--l = @INTL_LIBTOOL_SUFFIX_PREFIX@
-+l = 
- 
- AR = ar
- CC = @CC@