From 1356695910ac95ef4c4832f2910baf0147e352a7 Mon Sep 17 00:00:00 2001
From: Clement Laforet <clement@FreeBSD.org>
Date: Thu, 1 Jul 2004 18:06:35 +0000
Subject: [PATCH] - revert ade's commit, since it breaks the ports due to
 something   looking like a reverse patching.

---
 www/apache2/Makefile  | 8 +-------
 www/apache20/Makefile | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 4c7b58b4a71e..d74fdf707aad 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -44,14 +44,8 @@ SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
 			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
 			AUTOHEADER=${AUTOHEADER}
-
 USE_ICONV=		yes
-SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
-			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
-			AUTOHEADER=${AUTOHEADER}
-
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 USE_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_RC_SUBR=		yes
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 4c7b58b4a71e..d74fdf707aad 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -44,14 +44,8 @@ SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
 			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
 			AUTOHEADER=${AUTOHEADER}
-
 USE_ICONV=		yes
-SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
-			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
-			AUTOHEADER=${AUTOHEADER}
-
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 USE_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_RC_SUBR=		yes