5 files changed, 18 insertions, 31 deletions

diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index d0bcfcfc8962..751cf9ff54c9 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	autogen
-PORTVERSION=	5.2.3
+PORTVERSION=	5.2.9
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,15 +17,19 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	guile:${PORTSDIR}/lang/guile
 LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile
 
-USE_LIBTOOL=	yes
-
 USE_GMAKE=	yes
-
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure snprintfv/configure
+CONFIGURE_TARGET=	# none
 INSTALLS_SHLIB=	yes
 
 MAN1=	autogen.1 columns.1 getdefs.1
 
-post-install:
-	@${RM} ${PREFIX}/lib/libsnprintfv.la
+pre-patch:
+	@${PERL} -pi -e 's|values.h ||g' ${WRKSRC}/snprintfv/configure
+
+pre-build:
+	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}/libtool
+	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}/snprintfv/libtool
 
 .include <bsd.port.mk>
diff --git a/devel/autogen/distinfo b/devel/autogen/distinfo
index 2c982d6901dd..ea7e18615c09 100644
--- a/devel/autogen/distinfo
+++ b/devel/autogen/distinfo
@@ -1 +1 @@
-MD5 (autogen-5.2.3.tar.gz) = 06b8f94a0d6c36b4f9742beb7fc2448d
+MD5 (autogen-5.2.9.tar.gz) = cbf0300c7107868f3ee34ce4bd35af6d
diff --git a/devel/autogen/files/patch-snprintfv::Makefile.in b/devel/autogen/files/patch-snprintfv::Makefile.in
deleted file mode 100644
index c0e083c35f90..000000000000
--- a/devel/autogen/files/patch-snprintfv::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- snprintfv/Makefile.in.orig	Mon Mar 12 01:30:19 2001
-+++ snprintfv/Makefile.in	Mon Mar 12 01:31:11 2001
-@@ -43,7 +43,7 @@
- AUTOMAKE = @AUTOMAKE@
- AUTOHEADER = @AUTOHEADER@
- 
--INSTALL = @INSTALL@
-+INSTALL = /usr/bin/install -c -o root -g wheel
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/devel/autogen/files/patch-snprintfv::snprintfv::Makefile.in b/devel/autogen/files/patch-snprintfv::snprintfv::Makefile.in
deleted file mode 100644
index c9fc714338a8..000000000000
--- a/devel/autogen/files/patch-snprintfv::snprintfv::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- snprintfv/snprintfv/Makefile.in.orig	Mon Mar 12 01:31:49 2001
-+++ snprintfv/snprintfv/Makefile.in	Mon Mar 12 01:31:59 2001
-@@ -43,7 +43,7 @@
- AUTOMAKE = @AUTOMAKE@
- AUTOHEADER = @AUTOHEADER@
- 
--INSTALL = @INSTALL@
-+INSTALL = /usr/bin/install -c -o root -g wheel
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/devel/autogen/pkg-plist b/devel/autogen/pkg-plist
index c4b30526b29b..a2d57c5a3d84 100644
--- a/devel/autogen/pkg-plist
+++ b/devel/autogen/pkg-plist
@@ -10,18 +10,23 @@ info/snprintfv.info
 @exec install-info %D/info/autogen.info %D/info/dir
 @exec install-info %D/info/snprintfv.info %D/info/dir
 lib/libguileopts.a
+lib/libguileopts.la
 lib/libguileopts.so
 lib/libguileopts.so.0
 lib/libopts.a
+lib/libopts.la
 lib/libopts.so
-lib/libopts.so.9
+lib/libopts.so.10
 lib/libsnprintfv.a
+lib/libsnprintfv.la
+lib/libsnprintfv.so
+lib/libsnprintfv.so.1
 share/aclocal/autoopts.m4
 share/autogen/aginfo.tpl
 share/autogen/agman1.tpl
-share/autogen/fsm.tpl
 share/autogen/fsm-macro.tpl
 share/autogen/fsm-trans.tpl
+share/autogen/fsm.tpl
 share/autogen/optcode.tpl
 share/autogen/opthead.tpl
 share/autogen/options.tpl