5 files changed, 38 insertions, 11 deletions

diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index b556f0118bdc..1e7d999735ac 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	autogen
-PORTVERSION=	5.4.4
+PORTVERSION=	5.4.6
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		${MASTER_SITE_GNU}
@@ -29,4 +29,8 @@ MAN1=	autogen.1 autoopts-config.1 columns.1 getdefs.1 xml2ag.1
 MAN3=	optionFree.3 optionLoadLine.3 optionProcess.3 optionRestore.3 \
 	optionSaveFile.3 optionSaveState.3 optionVersion.3
 
+pre-build:
+	@cd ${WRKSRC}/snprintfv && ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
+
 .include <bsd.port.mk>
diff --git a/devel/autogen/distinfo b/devel/autogen/distinfo
index 4b190926eb33..8590615d2ce7 100644
--- a/devel/autogen/distinfo
+++ b/devel/autogen/distinfo
@@ -1 +1 @@
-MD5 (autogen-5.4.4.tar.gz) = f150c77565da6d3f17f5ce3a012167c7
+MD5 (autogen-5.4.6.tar.gz) = 4335e6929a8ab477547db6d50edfd2db
diff --git a/devel/autogen/files/patch-Makefile.in b/devel/autogen/files/patch-Makefile.in
new file mode 100644
index 000000000000..b37f45eea2cf
--- /dev/null
+++ b/devel/autogen/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Sep 29 09:24:39 2002
++++ Makefile.in	Tue Oct 15 02:32:20 2002
+@@ -110,7 +110,7 @@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+ 
+-NOSHELL_DIRS = compat snprintfv autoopts agen5
++NOSHELL_DIRS = compat autoopts agen5
+ SHELL_DIRS = $(NOSHELL_DIRS) columns getdefs
+ SUBDIRS = @TOP_DIRLIST@
+ config_dist = config/missing config/misc.def config/libopts.def
diff --git a/devel/autogen/files/patch-autogen:Makefile.in b/devel/autogen/files/patch-autogen:Makefile.in
new file mode 100644
index 000000000000..ac7f7845beac
--- /dev/null
+++ b/devel/autogen/files/patch-autogen:Makefile.in
@@ -0,0 +1,20 @@
+--- autoopts/Makefile.in.orig	Mon Oct 14 04:22:43 2002
++++ autoopts/Makefile.in	Tue Oct 15 21:45:17 2002
+@@ -117,7 +117,7 @@
+ DISTCLEANFILES = option*.3 libopts.????
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+-INCLUDES = @INCLIST@
++INCLUDES = @INCLIST@ @GUILE_CPPFLAGS@
+ GENMAN = optionFree.3 optionLoadLine.3 optionProcess.3 optionRestore.3 \
+ optionSaveFile.3 optionSaveState.3 optionVersion.3
+ 
+@@ -148,7 +148,7 @@
+ 
+ libopts_la_SOURCES = $(HDRS) $(CSRC)
+ 
+-libopts_la_LIBADD = ../snprintfv/snprintfv/libsnprintfvc.la
++libopts_la_LIBADD = ../snprintfv/snprintfv/libsnprintfvc.la @GUILE_LDFLAGS@
+ libopts_la_LDFLAGS = -version-info @AO_CURRENT@:@AO_REVISION@:@AO_AGE@
+ 
+ libguileopts_la_SOURCES = guileopt.c
diff --git a/devel/autogen/pkg-plist b/devel/autogen/pkg-plist
index 5c9f4a2b4184..bd685368c0fd 100644
--- a/devel/autogen/pkg-plist
+++ b/devel/autogen/pkg-plist
@@ -7,18 +7,12 @@ include/options.h
 @unexec install-info --delete %D/info/autogen.info %D/info/dir
 info/autogen.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.18
-lib/libsnprintfv.a
-lib/libsnprintfv.so
-lib/libsnprintfv.so.1
 share/aclocal/autoopts.m4
 share/autogen/aginfo.tpl
 share/autogen/aginfo3.tpl
@@ -29,7 +23,7 @@ share/autogen/conftest.tpl
 share/autogen/fsm-macro.tpl
 share/autogen/fsm-trans.tpl
 share/autogen/fsm.tpl
-share/autogen/libopts-18.3.9.tar.gz
+share/autogen/libopts-18.4.9.tar.gz
 share/autogen/optcode.tpl
 share/autogen/opthead.tpl
 share/autogen/options.tpl
@@ -39,5 +33,3 @@ share/autogen/optmain.tpl
 share/autogen/schemedef.scm
 share/autogen/stdoptions.def
 @dirrm share/autogen
-@exec mkdir -p %D/include/snprintfv
-@unexec rmdir %D/include/snprintfv 2>/dev/null || true