Update to 1.5.5. No longer need hack for running autogen.sh.

svn path=/head/; revision=98494

mail/xfmail/Makefile

@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	xfmail
-PORTVERSION=	1.5.4
-PORTREVISION=	1
+PORTVERSION=	1.5.5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://xfmail.cfreeze.com/pub/xfmail/release/%SUBDIR%/	\
 		ftp://ftp.welcomes-you.com/pub/xfmail/release/%SUBDIR%/	\
 		ftp://xfmail.ufies.org/pub/xfmail/release/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTVERSION}rc1/source/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-rc1
+MASTER_SITE_SUBDIR=	${PORTVERSION}/source/
 
 MAINTAINER=	mikeh@FreeBSD.org
 COMMENT=	An X Window System application for receiving electronic mail
@@ -23,8 +21,6 @@ LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
 
 CONFLICTS=	qt-3.*
 
-USE_AUTOMAKE_VER=	15
-USE_AUTOCONF=	yes
 USE_BZIP2=	yes
 USE_GNOME=	glib12
 USE_GMAKE=	yes
@@ -32,9 +28,7 @@ USE_LIBTOOL=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 INSTALLS_SHLIB=	yes
-
-# XXX: Disable patching for libtool until we can generate the files
-LIBTOOLFILES=
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -78,8 +72,4 @@ pre-everything::
 .endif
 	@echo
 
-pre-configure:
-	@(cd ${WRKSRC} && ${ENV} ${SCRIPTS_ENV} ${SH} autogen.sh);	\
-	${MAKE} LIBTOOLFILES=aclocal.m4 patch-libtool
-
 .include <bsd.port.post.mk>

mail/xfmail/distinfo

@@ -1 +1 @@
-MD5 (xfmail-1.5.4-rc1.tar.bz2) = f974622fe5abbafe46154cb1fab0fb10
+MD5 (xfmail-1.5.5.tar.bz2) = a30f92b44aff4a546ea10907f5819960

mail/xfmail/files/patch-ab

@@ -1,18 +0,0 @@
---- autogen.sh.orig	Wed Nov  6 00:30:46 2002
-+++ autogen.sh	Wed Nov  6 00:31:22 2002
-@@ -42,15 +42,4 @@
- automake -a --gnu --add-missing
- cd "$THEDIR"
- 
--if test -z "$*"; then
--	echo "I am going to run ./configure with no arguments - if you wish "
--        echo "to pass any to it, please specify them on the $0 command line."
--fi
--
--$srcdir/configure "$@"
- cd $srcdir/src/ui && ./help_gen
--
--echo 
--echo "Now type 'make' to compile xfmail."
--echo "If you have problems, please see the directory docs/"
--echo "for possible resolutions."