properly fix the configure failures

3 files changed, 73 insertions, 24 deletions

diff --git a/dev-lang/wml/ChangeLog b/dev-lang/wml/ChangeLog
index 864edb93d6c6..6788151a8466 100644
--- a/dev-lang/wml/ChangeLog
+++ b/dev-lang/wml/ChangeLog
@@ -1,18 +1,17 @@
 # ChangeLog for dev-lang/wml
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.7 2003/02/12 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.8 2003/11/13 21:48:46 vapier Exp $
 
-  12 Dec 2002; George Shapovalov <george@gentoo.org> wml-2.0.9.ebuild :
+*wml-2.0.9.ebuild  (11 Nov 2002)
+
+  13 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Fix the subscripts properly (patch and run autotools).
 
+  12 Dec 2002; George Shapovalov <george@gentoo.org> wml-2.0.9.ebuild :
   fixed misconfiguration
   one of the subidr' configure scripts did not like --host option supplied by econf,
   See #12028, thanks to Bardur Arantsson <bardur-gta@odense.kollegienet.dk> for report and suggestion
 
-* Autoupdate keywords (12-6-02)
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*wml-2.0.9.ebuild  (11 Nov 2002)
-
   11 Nov 2002; Karl Trygve Kalleberg <karltk@gentoo.org> wml-2.0.9.ebuild files/digest-wml-2.0.9 : 
   New upstream version.
 
diff --git a/dev-lang/wml/files/2.0.9-fix-configure.in.patch b/dev-lang/wml/files/2.0.9-fix-configure.in.patch
new file mode 100644
index 000000000000..924edaee9dfa
--- /dev/null
+++ b/dev-lang/wml/files/2.0.9-fix-configure.in.patch
@@ -0,0 +1,45 @@
+--- wml_aux/iselect/configure.in.orig	2003-11-13 16:34:23.159508600 -0500
++++ wml_aux/iselect/configure.in	2003-11-13 16:34:29.242583832 -0500
+@@ -3,6 +3,7 @@
+ dnl ##  Copyright (c) Ralf S. Engelschall, <rse@engelschall.com>
+ dnl ##
+ 
++AC_INIT(README)
+ AC_PREREQ(2.10)dnl
+ AC_REVISION($Revision: 1.1 $)
+ SHTOOL="./etc/shtool"
+@@ -11,7 +12,6 @@
+ echo "${T_MD}Configuring for iSelect `./etc/shtool version -l c -d long iselect_version.c`${T_ME}"
+ echo "Copyright (c) 1996-1999 Ralf S. Engelschall, All Rights Reserved."
+ 
+-AC_INIT(README)
+ AC_CONFIG_HEADER(config_ac.h)dnl
+ AC_PREFIX_DEFAULT(/usr/local)
+ 
+--- wml_aux/iselect/aclocal.m4.orig	2003-11-13 16:39:36.541867240 -0500
++++ wml_aux/iselect/aclocal.m4	2003-11-13 16:39:47.631181408 -0500
+@@ -186,24 +186,6 @@
+ dnl ##
+ dnl ##########################################################
+ dnl
+-AC_DEFUN(AC_C_PROTOTYPES,
+-[AC_MSG_CHECKING([for function prototypes])
+-AC_CACHE_VAL(ac_cv_c_prototypes,
+-[AC_TRY_LINK([#ifndef __STDC__
+-Syntax Error
+-#endif], [extern int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};],
+-  ac_cv_c_prototypes=yes, ac_cv_c_prototypes=no)])dnl
+-AC_MSG_RESULT([$ac_cv_c_prototypes])
+-if test $ac_cv_c_prototypes = yes; then
+-  AC_DEFINE(HAVE_PROTOTYPES)
+-  ANSI_CC=yes
+-else
+-  ANSI_CC=no
+-fi
+-AC_SUBST(ANSI_CC)
+-])dnl
+ dnl
+ dnl
+ dnl ##########################################################
diff --git a/dev-lang/wml/wml-2.0.9.ebuild b/dev-lang/wml/wml-2.0.9.ebuild
index 09dcd51ae5bb..50318dbab411 100644
--- a/dev-lang/wml/wml-2.0.9.ebuild
+++ b/dev-lang/wml/wml-2.0.9.ebuild
@@ -1,32 +1,37 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/wml-2.0.9.ebuild,v 1.6 2003/04/06 04:42:55 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/wml-2.0.9.ebuild,v 1.7 2003/11/13 21:48:46 vapier Exp $
 
-IUSE=""
+inherit fixheadtails
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Website META Language"
-SRC_URI="http://www.engelschall.com/sw/wml/distrib/${P}.tar.gz"
 HOMEPAGE="http://www.engelschall.com/sw/wml/"
-DEPEND=">=dev-lang/perl-5.6.1-r3"
+SRC_URI="http://www.engelschall.com/sw/wml/distrib/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
 SLOT="0"
+KEYWORDS="x86 sparc"
+
+DEPEND="dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	ht_fix_all
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-fix-configure.in.patch
+	export WANT_AUTOCONF='2.5'
+	for d in `find ${S} -name configure -mindepth 2 -printf '%h '` ; do
+		cd ${d}
+		autoconf || die "autoconf in ${d}"
+	done
+}
 
 src_compile() {
-	# 2002-11-11: karltk@gentoo.org
-	# It barfs if CFLAGS is set. Dunno why.
-	# It'll default to -O2, which is probably safest.
-	unset CFLAGS
-	unset CC
-#	econf || die "./configure failed"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info || die "./configure failed"
-	emake || die
+	econf || die "./configure failed"
+	emake || die "emake failed"
 }
 
-src_install () {
+src_install() {
 	einstall || die
 	dodoc ANNOUNCE BUGREPORT C* INSTALL MANIFEST README* SUPPORT VERSION*
 }