From bb6889faebc06a0b5fe80d78d687bd13ac110945 Mon Sep 17 00:00:00 2001 From: drochner Date: Sun, 16 Dec 2007 14:38:29 +0000 Subject: update to 5.9.3 many bugfixes and feature additions, too much to list here Thanks to Ulrich Etile for help and testing. (There might be remaining issues on some platforms, but I wanted to checkpoint before the Q4 freeze.) There also seem to be issues with guile's thread support. --- devel/autogen/Makefile | 8 +-- devel/autogen/PLIST | 6 +- devel/autogen/distinfo | 10 ++-- devel/autogen/patches/patch-aa | 128 ----------------------------------------- devel/autogen/patches/patch-ab | 13 +++++ 5 files changed, 25 insertions(+), 140 deletions(-) delete mode 100644 devel/autogen/patches/patch-aa create mode 100644 devel/autogen/patches/patch-ab (limited to 'devel/autogen') diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile index b45e13a3eef..981e48b3845 100644 --- a/devel/autogen/Makefile +++ b/devel/autogen/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.24 2007/06/13 16:35:31 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.25 2007/12/16 14:38:29 drochner Exp $ -DISTNAME= autogen-5.8.3 -PKGREVISION= 1 +DISTNAME= autogen-5.9.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=autogen/} EXTRACT_SUFX= .tar.bz2 @@ -18,7 +17,6 @@ INFO_FILES= # PLIST pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/autoopts -# explicitly checks for guile <= 1.7 in the configure test. -.include "../../lang/guile16/buildlink3.mk" +.include "../../lang/guile/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/autogen/PLIST b/devel/autogen/PLIST index b514c67287f..b935a98b0f9 100644 --- a/devel/autogen/PLIST +++ b/devel/autogen/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2006/03/30 03:44:42 jlam Exp $ +@comment $NetBSD: PLIST,v 1.11 2007/12/16 14:38:29 drochner Exp $ bin/autogen bin/autoopts-config bin/columns @@ -24,6 +24,7 @@ man/man3/optionFree.3 man/man3/optionGetValue.3 man/man3/optionLoadLine.3 man/man3/optionNextValue.3 +man/man3/optionOnlyUsage.3 man/man3/optionProcess.3 man/man3/optionRestore.3 man/man3/optionSaveFile.3 @@ -49,7 +50,7 @@ share/autogen/fsm-macro.tpl share/autogen/fsm-trans.tpl share/autogen/fsm.tpl share/autogen/getopt.tpl -share/autogen/libopts-27.1.2.tar.gz +share/autogen/libopts-31.0.6.tar.gz share/autogen/optcode.tpl share/autogen/opthead.tpl share/autogen/options.tpl @@ -57,5 +58,6 @@ share/autogen/optlib.tpl share/autogen/optmain.tpl share/autogen/rc-sample.tpl share/autogen/stdoptions.def +share/autogen/usage.tpl @dirrm share/autogen @dirrm include/autoopts diff --git a/devel/autogen/distinfo b/devel/autogen/distinfo index 3a7a9057848..d72bf35de15 100644 --- a/devel/autogen/distinfo +++ b/devel/autogen/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2006/03/09 20:45:20 kristerw Exp $ +$NetBSD: distinfo,v 1.8 2007/12/16 14:38:29 drochner Exp $ -SHA1 (autogen-5.8.3.tar.bz2) = 267d381134054fe5aac61eebf4a7401eb1f8c5cd -RMD160 (autogen-5.8.3.tar.bz2) = c55b5486336caaf937f1a05e8afe133ea9fcd140 -Size (autogen-5.8.3.tar.bz2) = 929965 bytes -SHA1 (patch-aa) = f5477f8e09242d58f840a86447db1f2c6d7ed8db +SHA1 (autogen-5.9.3.tar.bz2) = bc75e876ea8effd705d96542baa2c214df2134d8 +RMD160 (autogen-5.9.3.tar.bz2) = dd7d549243efd3d6570f01a40ebb36335b72cb59 +Size (autogen-5.9.3.tar.bz2) = 974406 bytes +SHA1 (patch-ab) = d407fc36dc22ac22fc44597c4002268644c930fa diff --git a/devel/autogen/patches/patch-aa b/devel/autogen/patches/patch-aa deleted file mode 100644 index 043df677a13..00000000000 --- a/devel/autogen/patches/patch-aa +++ /dev/null @@ -1,128 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2006/03/09 20:45:20 kristerw Exp $ - ---- agen5/bootstrap.dir.orig 2006-03-09 20:25:30.000000000 +0100 -+++ agen5/bootstrap.dir 2006-03-09 20:28:42.000000000 +0100 -@@ -1,4 +1,4 @@ --#! /bin/bash -+#! /bin/sh - # - # ---------------------------------------------------------------------- - # agen5/bootstrap.dir --- maintainer's bootstrap script -@@ -27,7 +27,7 @@ - # Otherwise, we are being invoked from "make". - # - case "${1}" in --(recursive) -+recursive) - top_srcdir=`cd ..;pwd` - top_builddir=${top_srcdir} - srcdir=`pwd` -@@ -43,12 +43,12 @@ - set -- $t - ;; - --("") -+"") - echo "Specify what you want bootstrapped" - exit 1 - ;; - --(*) -+*) - builddir=`pwd` - top_srcdir=${top_srcdir-`cd ..;pwd`} - top_builddir=${top_builddir-`cd ..;pwd`} -@@ -127,7 +127,7 @@ - do - echo Re-building "$t" - case "$t" in -- ( stamp-parse | \ -+ stamp-parse | \ - defParse-fsm.c | \ - defParse-fsm.h ) - # Make the definition parser -@@ -145,7 +145,7 @@ - date > stamp-parse - ;; - -- (stamp-opts | opts.[ch]) -+ stamp-opts | opts.[ch]) - # Make the option processing files: - # - if test -z "${AGexe}" -o -z "${CLexe}" -@@ -159,7 +159,7 @@ - date > stamp-opts - ;; - -- (stamp-fsm) -+ stamp-fsm) - # Make the pseudo-macro processing Finite State Machine - # - if [ -z "${AGexe}" ] -@@ -176,7 +176,7 @@ - date > stamp-fsm - ;; - -- ( stamp-exprini | \ -+ stamp-exprini | \ - expr.h | \ - expr.def | \ - expr.ini ) -@@ -210,7 +210,7 @@ - date > stamp-exprini - ;; - -- (stamp-directive | \ -+ stamp-directive | \ - directive.def | \ - directive.h ) - if test -z "${AGexe}" -o -z "${CLexe}" -@@ -232,7 +232,7 @@ - date > stamp-directive - ;; - -- (stamp-texi | autogen.texi | autogen.menu) -+ stamp-texi | autogen.texi | autogen.menu) - # Construct the info doc - # - if test -z "${AGexe}" -o -z "${CLexe}" -@@ -246,7 +246,7 @@ - ${AGexe} ${eopt} ${srcdir}/opts.def - ;; - -- (stamp-man | autogen.1) -+ stamp-man | autogen.1) - # Construct the man page - # - if test -z "${AGexe}" -o -z "${CLexe}" -@@ -260,26 +260,26 @@ - ${AGexe} ${eopt} ${srcdir}/opts.def - ;; - -- (fmemopen.3) -+ fmemopen.3) - ${GDexe} templ=agman3.tpl linenum output=fmemopen.def fmemopen.c - ${AGexe} -L ${top_srcdir}/autoopts fmemopen.def - rm -f fmemopen.def - ;; - -- (proto.h) -+ proto.h) - files=`allbut *.c - *fsm.c` 2>/dev/null - test -z "${files}" && files=`echo *.c` - :mkfwd -p ${files} - ;; - -- (functions.h) -+ functions.h) - files=`fgrep -l '/*=macfunc' *.c` - opts='template=functions.tpl srcfile linenum defs=macfunc listattr=alias' - getdefs output=functions.def ${opts} ${files} - autogen functions.def - ;; - -- (*) -+ *) - echo "Don't know how to make $t" - exit 1 - ;; diff --git a/devel/autogen/patches/patch-ab b/devel/autogen/patches/patch-ab new file mode 100644 index 00000000000..5d74349c90e --- /dev/null +++ b/devel/autogen/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2007/12/16 14:38:30 drochner Exp $ + +--- ./autoopts/optlib.tpl.orig 2007-11-21 11:26:19.000000000 +0100 ++++ ./autoopts/optlib.tpl +@@ -465,7 +465,7 @@ Define the arrays of values associated w + DEFINE emit-nondoc-option =][= + (if (exist? "translators") + (string-append "\n" (shellf +-"(fmt --width 60|columns -I16 -c1 --first='/* TRANSLATORS:')<<\\_EOF_ ++"(fmt|columns -I16 -c1 --first='/* TRANSLATORS:')<<\\_EOF_ + %s + _EOF_" (get "translators") ) " */" ) ) =][= + -- cgit v1.2.3