- Replace patch-configure.ac with patch-configure

- remove USE_AUTOTOOLS

As we want to use xz for extraction of port's distfiles,
it cannot depend on autoconf.

PR:		ports/147280
Approved by:	maintainer (private e-mail)

3 files changed, 111 insertions, 42 deletions

diff --git a/archivers/xz/Makefile b/archivers/xz/Makefile
index b6340bc8235a..35453e412795 100644
--- a/archivers/xz/Makefile
+++ b/archivers/xz/Makefile
@@ -18,9 +18,9 @@ COMMENT=	LZMA compression and decompression tools
 CONFLICTS=	lzma-[0-9]* lzmautils-[0-9]* lzmalib-[0-9]*
 
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	autoheader:262 autoconf:262
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--enable-dynamic=yes
 CONFIGURE_ARGS+=--disable-nls	# no translations available
@@ -46,10 +46,6 @@ MLINKS=	xz.1 lzcat.1		xzdiff.1 lzcmp.1 \
 PORTDOCS=	AUTHORS COPYING COPYING.GPLv2 NEWS README THANKS TODO \
 		faq.txt history.txt lzma-file-format.txt xz-file-format.txt
 
-# no need to (attempt to) run aclocal
-pre-build:
-	@touch -r ${WRKSRC}/configure.ac ${WRKSRC}/aclocal.m4
-
 regression-test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
 
diff --git a/archivers/xz/files/patch-configure b/archivers/xz/files/patch-configure
new file mode 100644
index 000000000000..5dd0f9141250
--- /dev/null
+++ b/archivers/xz/files/patch-configure
@@ -0,0 +1,110 @@
+--- /tmp/configure	2010-06-01 15:06:19.000000000 +0200
++++ configure	2010-06-01 15:06:40.813799251 +0200
+@@ -15182,7 +15182,7 @@
+ 
+ 
+ # If any of these headers are missing, things should still work correctly:
+-for ac_header in sys/param.h sys/sysctl.h byteswap.h
++for ac_header in sys/param.h sys/sysctl.h byteswap.h sys/endian.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+@@ -15296,6 +15296,98 @@
+ 
+ 	fi
+ 
++if test x$ac_cv_header_sys_endian_h = xyes ; then
++
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if bswap16 is available" >&5
++$as_echo_n "checking if bswap16 is available... " >&6; }
++		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#include <sys/endian.h>
++int
++main(void)
++{
++	bswap16(42);
++	return 0;
++}
++
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++
++
++$as_echo "#define HAVE_BSWAP16 1" >>confdefs.h
++
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++
++
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if bswap32 is available" >&5
++$as_echo_n "checking if bswap32 is available... " >&6; }
++		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#include <sys/endian.h>
++int
++main(void)
++{
++	bswap32(42);
++	return 0;
++}
++
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++
++
++$as_echo "#define HAVE_BSWAP32 1" >>confdefs.h
++
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++
++
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if bswap64 is available" >&5
++$as_echo_n "checking if bswap64 is available... " >&6; }
++		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#include <sys/endian.h>
++int
++main(void)
++{
++	bswap64(42);
++	return 0;
++}
++
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++
++
++$as_echo "#define HAVE_BSWAP64 1" >>confdefs.h
++
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++
++	fi
+ 
+ ###############################################################################
+ # Checks for typedefs, structures, and compiler characteristics.
diff --git a/archivers/xz/files/patch-configure.ac b/archivers/xz/files/patch-configure.ac
deleted file mode 100644
index f0efb5e60b9f..000000000000
--- a/archivers/xz/files/patch-configure.ac
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.ac.orig	2009-08-27 17:37:12.000000000 +0200
-+++ configure.ac	2009-09-29 20:32:39.000000000 +0200
-@@ -476,7 +476,7 @@ AC_CHECK_HEADERS([fcntl.h limits.h sys/t
- 	[AC_MSG_ERROR([Required header file(s) are missing.])])
- 
- # If any of these headers are missing, things should still work correctly:
--AC_CHECK_HEADERS([sys/param.h sys/sysctl.h byteswap.h],
-+AC_CHECK_HEADERS([sys/param.h sys/sysctl.h byteswap.h sys/endian.h],
- 	[], [], [
- #ifdef HAVE_SYS_PARAM_H
- #	include <sys/param.h>
-@@ -504,6 +504,25 @@ main(void)
- 	])dnl
- fi
- 
-+if test x$ac_cv_header_sys_endian_h = xyes ; then
-+	m4_foreach([FUNC], [bswap16,bswap32,bswap64], [
-+		AC_MSG_CHECKING([if FUNC is available])
-+		AC_LINK_IFELSE([AC_LANG_SOURCE([
-+#include <sys/endian.h>
-+int
-+main(void)
-+{
-+	FUNC[](42);
-+	return 0;
-+}
-+		])], [
-+			AC_DEFINE(HAVE_[]m4_toupper(FUNC), [1],
-+					[Define to 1 if] FUNC [is available.])
-+			AC_MSG_RESULT([yes])
-+		], [AC_MSG_RESULT([no])])
-+
-+	])dnl
-+fi
- 
- ###############################################################################
- # Checks for typedefs, structures, and compiler characteristics.