diff -urN /usr/ports/devel/autogen/Makefile devel/autogen/Makefile
--- /usr/ports/devel/autogen/Makefile	Wed Jul 17 21:26:48 2002
+++ devel/autogen/Makefile	Tue Aug 27 00:28:57 2002
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	autogen
-PORTVERSION=	5.3.9
-PORTREVISION=	1
+PORTVERSION=	5.4.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		${MASTER_SITE_GNU}
@@ -16,22 +15,18 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	guile:${PORTSDIR}/lang/guile
-LIB_DEPENDS=	guile.10:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.10:${PORTSDIR}/lang/guile \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	AUTOCONF="${TRUE}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-libguile=${LOCALBASE} --with-libxml2=${LOCALBASE}
 INSTALLS_SHLIB=	yes
 
 MAN1=	autogen.1 autoopts-config.1 columns.1 getdefs.1
 MAN3=	optionFree.3 optionLoadLine.3 optionProcess.3 optionRestore.3 \
 	optionSaveState.3 optionVersion.3
-
-pre-patch:
-	@${PERL} -pi -e 's|values.h ||g' ${WRKSRC}/snprintfv/configure
 
 .include <bsd.port.mk>
diff -urN /usr/ports/devel/autogen/distinfo devel/autogen/distinfo
--- /usr/ports/devel/autogen/distinfo	Fri Jul  5 20:18:44 2002
+++ devel/autogen/distinfo	Sat Aug 24 19:23:07 2002
@@ -1 +1 @@
-MD5 (autogen-5.3.9.tar.gz) = c7db8eaa312929bf6ca07e7d98e061df
+MD5 (autogen-5.4.2.tar.gz) = a16402aae43bd89eabb02e355c4eb4fc
diff -urN /usr/ports/devel/autogen/files/patch-doc::autogen.texi devel/autogen/files/patch-doc::autogen.texi
--- /usr/ports/devel/autogen/files/patch-doc::autogen.texi	Thu Jan  1 09:00:00 1970
+++ devel/autogen/files/patch-doc::autogen.texi	Tue Aug 27 00:28:44 2002
@@ -0,0 +1,11 @@
+--- doc/autogen.texi.orig	Sat Aug 24 12:35:53 2002
++++ doc/autogen.texi	Tue Aug 27 00:28:17 2002
+@@ -6849,7 +6849,7 @@
+ be on the stack or deallocated in any other way for as long as the value
+ might get referenced.
+ 
+-If you have supplied at least one @file{homerc} file (@pxref{}),
++If you have supplied at least one @file{homerc} file,
+ this macro will be emitted for the @code{--save-opts} option.
+ 
+ @example
diff -urN /usr/ports/devel/autogen/pkg-plist devel/autogen/pkg-plist
--- /usr/ports/devel/autogen/pkg-plist	Wed Jun 19 02:16:19 2002
+++ devel/autogen/pkg-plist	Sat Aug 24 20:18:28 2002
@@ -4,18 +4,17 @@
 bin/getdefs
 include/options.h
 @unexec install-info --delete %D/info/autogen.info %D/info/dir
-@unexec install-info --delete %D/info/snprintfv.info %D/info/dir
 info/autogen.info
-info/snprintfv.info
 @exec install-info %D/info/autogen.info %D/info/dir
+@unexec install-info --delete %D/info/snprintfv.info %D/info/dir
+info/snprintfv.info
 @exec install-info %D/info/snprintfv.info %D/info/dir
 lib/libguileopts.a
 lib/libguileopts.so
 lib/libguileopts.so.0
 lib/libopts.a
 lib/libopts.so
-lib/libopts.so.15
-lib/libsnprintfv.a
+lib/libopts.so.18
 lib/libsnprintfv.so
 lib/libsnprintfv.so.1
 share/aclocal/autoopts.m4
@@ -28,6 +27,7 @@
 share/autogen/fsm-macro.tpl
 share/autogen/fsm-trans.tpl
 share/autogen/fsm.tpl
+share/autogen/libopts-18.1.9.tar.gz
 share/autogen/optcode.tpl
 share/autogen/opthead.tpl
 share/autogen/options.tpl