automake-1.13 compat.

3 files changed, 28 insertions, 11 deletions

diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile
index e26f35b6167..64b349275fe 100644
--- a/emulators/ski/Makefile
+++ b/emulators/ski/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/03 12:55:17 asau Exp $
+# $NetBSD: Makefile,v 1.13 2013/01/26 23:11:13 wiz Exp $
 #
 
 DISTNAME=	ski-1.3.2
@@ -10,20 +10,20 @@ HOMEPAGE=	http://ski.sourceforge.net/
 COMMENT=	The ia64 instruction set simulator
 
 BUILD_DEPENDS+= libelf>=0.8.13:../../devel/libelf
+
 GNU_CONFIGURE=	yes
 USE_LANGUAGES+= c fortran77 c++
 CONFIGURE_ARGS+= --prefix=${PREFIX}
 
 CPPFLAGS+=	-I${PREFIX}/include/libelf -L ${PREFIX}/lib
 
-USE_TOOLS+=	pkg-config aclocal autoconf automake
+USE_TOOLS+=	pkg-config aclocal autoconf automake autoreconf
 USE_LIBTOOL=	yes
 USE_NCURSES=	yes
 
-
 pre-configure:
 #	cd  ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${SH} ./autogen.sh ${CONFIGURE_ARGS}
-	cd ${WRKSRC} && ${SH} ./autogen.sh ${CONFIGURE_ARGS}
+	cd ${WRKSRC} && autoreconf -fi -I macros
 
 post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/X11/app-defaults
diff --git a/emulators/ski/distinfo b/emulators/ski/distinfo
index a3986d71d5d..a04d2436c9b 100644
--- a/emulators/ski/distinfo
+++ b/emulators/ski/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2011/07/27 11:14:22 cherry Exp $
+$NetBSD: distinfo,v 1.4 2013/01/26 23:11:13 wiz Exp $
 
 SHA1 (ski-1.3.2.tar.gz) = fc067041a70cf45cad6af42da7ffe5bf100d7c65
 RMD160 (ski-1.3.2.tar.gz) = 1ff739eac7b8163026d208ee9b51d134f524e73f
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 60003cef1eef2bbb6ce535c137fa15a76b0e4f13
 SHA1 (patch-ab) = 23076061dac3a0488d2f5b7b0ac022d095568d80
 SHA1 (patch-ac) = 769b847c5564565617be8043e0c736e12c296d40
 SHA1 (patch-ad) = d1680c77d837a8c3c371e7bd624cb1fa87ea6724
-SHA1 (patch-ae) = c2c8075ee9fa214aca31c7291075911efb686710
+SHA1 (patch-ae) = 036804384c4a4a694529092a8819c90abbc6e9ae
 SHA1 (patch-af) = f4048bccb6809ad69527352bcc4c32f8b109b437
 SHA1 (patch-ag) = 973a8f5c1cc5cc36bb8aa1e1e21769f51194967e
 SHA1 (patch-ah) = 31e4807b546c69aa43c7bddc4f16ba3b99d8da3e
diff --git a/emulators/ski/patches/patch-ae b/emulators/ski/patches/patch-ae
index de9faed1442..6ff527d03e2 100644
--- a/emulators/ski/patches/patch-ae
+++ b/emulators/ski/patches/patch-ae
@@ -1,6 +1,9 @@
-$NetBSD: patch-ae,v 1.1.1.1 2011/07/27 10:23:48 cherry Exp $
+$NetBSD: patch-ae,v 1.2 2013/01/26 23:11:14 wiz Exp $
 
---- configure.ac.orig	2008-02-05 09:41:37.000000000 +0530
+Second chunk: automake-1.13 compat
+Rest: ?
+
+--- configure.ac.orig	2008-02-05 04:11:37.000000000 +0000
 +++ configure.ac
 @@ -33,12 +33,14 @@ case $host_os in
      linux*)	HOST_OS=linux;;
@@ -17,7 +20,21 @@ $NetBSD: patch-ae,v 1.1.1.1 2011/07/27 10:23:48 cherry Exp $
  
  # Version number definitions
  #
-@@ -259,6 +261,10 @@ if test "$HOST_OS" = freebsd; then
+@@ -80,12 +82,11 @@ AC_PREFIX_DEFAULT(/usr/local)
+ AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
+ 
+ # Specify a configuration file
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_ACLOCAL_INCLUDE(macros)
+ 
+ # Checks for programs.
+ AC_PROG_CC( icc ecc gcc3 cc gcc )
+-AM_PROG_CC_STDC
+ AM_PROG_AS
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+@@ -259,6 +260,10 @@ if test "$HOST_OS" = freebsd; then
  	LDFLAGS="$LDFLAGS -lutil"
  fi
  
@@ -28,7 +45,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2011/07/27 10:23:48 cherry Exp $
  dnl Check for optional libs
  AC_CHECK_LIB(unwind-ia64, _Uia64_get_proc_name, )
  
-@@ -331,6 +337,13 @@ if test "$HOST_OS" = hpux; then
+@@ -331,6 +336,13 @@ if test "$HOST_OS" = hpux; then
          check_curses=no], [])
  fi    
  
@@ -42,7 +59,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2011/07/27 10:23:48 cherry Exp $
  if test "x$check_curses" != xno; then
  AC_CHECK_LIB(curses, tgetent, [],
      [AC_CHECK_LIB(ncurses, tgetent, ,
-@@ -347,6 +360,7 @@ case $host_os in
+@@ -347,6 +359,7 @@ case $host_os in
      hpux10*)	CFLAGS="$CFLAGS -DHPUX1020";;
      hpux11*)	CFLAGS="$CFLAGS -DHPUX1100";;
      freebsd*)	CFLAGS="$CFLAGS -DFREEBSD -D__linux__";;