automake-1.13 compat.

11 files changed, 91 insertions, 27 deletions

diff --git a/audio/trm/distinfo b/audio/trm/distinfo
index 549158b1e22..d2d7b675200 100644
--- a/audio/trm/distinfo
+++ b/audio/trm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2011/11/27 11:40:07 marino Exp $
+$NetBSD: distinfo,v 1.7 2013/01/26 23:19:11 wiz Exp $
 
 SHA1 (trm-0.2.1.tar.gz) = ea032c38ca83266026e0c10919749814282994e9
 RMD160 (trm-0.2.1.tar.gz) = fb74d692920af62a7fcbbacfb32cd0e277e56126
 Size (trm-0.2.1.tar.gz) = 131349 bytes
-SHA1 (patch-aa) = 152a7b8503ca887c641aeedfdd78f2520b88763b
+SHA1 (patch-aa) = 10110243330c41bc9ba71d21bcb9ff4283267ffb
 SHA1 (patch-ab) = 909c55da818a72b687c88c69a4e8d682f5a02df5
 SHA1 (patch-ac) = a189db1a7b5b85baa0cd813e10869146045303c7
 SHA1 (patch-ad) = 25f315cea3298c136f23b0b10479436546eaf382
diff --git a/audio/trm/patches/patch-aa b/audio/trm/patches/patch-aa
index 5989870ee45..d7fdda48f21 100644
--- a/audio/trm/patches/patch-aa
+++ b/audio/trm/patches/patch-aa
@@ -1,6 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2007/07/01 11:59:01 chris Exp $
+$NetBSD: patch-aa,v 1.3 2013/01/26 23:19:11 wiz Exp $
 
---- configure.in.orig	2007-07-01 12:45:08.000000000 +0100
+Remove hardcoded libdl (not needed on all systems).
+automake-1.13 compat.
+
+--- configure.in.orig	2003-02-12 06:41:12.000000000 +0000
 +++ configure.in
 @@ -50,7 +50,7 @@ AC_CHECK_LIB(musicbrainz, mb_GetVersion,
               echo "*  http://www.musicbrainz.org/download " 
@@ -11,3 +14,11 @@ $NetBSD: patch-aa,v 1.2 2007/07/01 11:59:01 chris Exp $
  
  AC_TRY_RUN([
  #include <musicbrainz/mb_c.h>
+@@ -107,6 +107,6 @@ fi
+ 
+ AC_SUBST(CFLAGS)  
+ AC_DEFINE_UNQUOTED(PREFIX, "${prefix}", "PREFIX") 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT(Makefile)
+ touch .config.check
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__";;
diff --git a/lang/see/distinfo b/lang/see/distinfo
index 7f34e21bdd2..6989a351712 100644
--- a/lang/see/distinfo
+++ b/lang/see/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2009/10/25 12:49:04 ahoka Exp $
+$NetBSD: distinfo,v 1.5 2013/01/26 23:15:44 wiz Exp $
 
 SHA1 (see-3.0.1376.tar.gz) = d803adac6298a0f556d59f501f0376d9196d0821
 RMD160 (see-3.0.1376.tar.gz) = 1fb3eb7a796ba96fe68fbc3225bcaafff5692f6f
 Size (see-3.0.1376.tar.gz) = 1066852 bytes
 SHA1 (patch-aa) = 00d5260d023bc4f03239aa42eff0ced616a9691f
-SHA1 (patch-ab) = bddefab3a0c5f2026aee408227c3fa09536c80ed
+SHA1 (patch-ab) = 401d11cc4a476bb8751e97e04d35ae006cb64971
 SHA1 (patch-ac) = 387fcc2139fe2b558ea1556770b40bc339b195ff
diff --git a/lang/see/patches/patch-ab b/lang/see/patches/patch-ab
index 728ed39baf7..d4f60718f85 100644
--- a/lang/see/patches/patch-ab
+++ b/lang/see/patches/patch-ab
@@ -1,7 +1,19 @@
-$NetBSD: patch-ab,v 1.2 2009/10/25 12:49:04 ahoka Exp $
+$NetBSD: patch-ab,v 1.3 2013/01/26 23:15:44 wiz Exp $
 
---- configure.ac.orig	2008-02-10 11:31:33.000000000 +0100
+First chunk: automake-1.13 compat.
+Rest: ?
+
+--- configure.ac.orig	2008-02-10 10:31:33.000000000 +0000
 +++ configure.ac
+@@ -5,7 +5,7 @@ AC_INIT([see],
+ 	[leonard@users.sourceforge.net])
+ AC_PREREQ(2.52)
+ AM_INIT_AUTOMAKE
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADERS(include/config.h)
+ AC_CONFIG_FILES([Makefile
+ 		 include/Makefile
+ 		 include/see/Makefile
 @@ -206,11 +206,12 @@ SEE_ARG_ENABLE(longjmperror,[yes],
          [Define if you want SEE to catch longjmp corruption])
  ])
diff --git a/multimedia/tvtime/distinfo b/multimedia/tvtime/distinfo
index a832503c3a7..17515477536 100644
--- a/multimedia/tvtime/distinfo
+++ b/multimedia/tvtime/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2011/01/17 17:57:01 jnemeth Exp $
+$NetBSD: distinfo,v 1.5 2013/01/26 23:13:47 wiz Exp $
 
 SHA1 (tvtime-1.0.2.tar.gz) = ea609876084b2d627a84a1f77bf81cc2175ee58e
 RMD160 (tvtime-1.0.2.tar.gz) = e7d9621054edba5833f4ea002be8979983fbf3dc
@@ -11,7 +11,7 @@ SHA1 (patch-ae) = 8abb4a7cc0cbaa41da060c89d3c230b1b0c2a005
 SHA1 (patch-af) = 4aef2ec42fe627b108e5565db5337c4f01e99bb1
 SHA1 (patch-ag) = 1872b404615f54736b5cc143fb4f783d3f2e6709
 SHA1 (patch-ah) = eba4315dc77956fcbe648c0d3b2ee1c6e9046334
-SHA1 (patch-ai) = 3b8519579d1afe2f73ca70a30a640c43a27f3c2a
+SHA1 (patch-ai) = 4a97047148528d37245899cc396cbf0b7926350a
 SHA1 (patch-aj) = 4200e919df91d2a29e577459a9056203b2074254
 SHA1 (patch-ak) = 1b0bc021387b6ab31ff32b173b6897364dc7fa4c
 SHA1 (patch-al) = b183822cff1f5b022e0509b33299f7b99ab57442
diff --git a/multimedia/tvtime/patches/patch-ai b/multimedia/tvtime/patches/patch-ai
index c9285434cef..30e8f363772 100644
--- a/multimedia/tvtime/patches/patch-ai
+++ b/multimedia/tvtime/patches/patch-ai
@@ -1,7 +1,19 @@
-$NetBSD: patch-ai,v 1.1.1.1 2008/09/15 13:15:46 jmcneill Exp $
+$NetBSD: patch-ai,v 1.2 2013/01/26 23:13:48 wiz Exp $
 
---- configure.ac.orig	2005-09-08 00:08:23.000000000 -0400
+First chunk: automake-1.13 compat.
+Rest: ?
+
+--- configure.ac.orig	2005-09-14 21:40:44.000000000 +0000
 +++ configure.ac
+@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
+ AC_INIT(tvtime, 1.0.2, http://tvtime.net/)
+ AC_CONFIG_SRCDIR([src/tvtime.c])
+ AM_INIT_AUTOMAKE(tvtime,1.0.2)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ AC_CANONICAL_HOST
+ if test x"$host_alias" = x""; then host_alias="$host"; fi
 @@ -86,6 +86,41 @@ fi
  AC_SUBST(XML2_LIBS)
  AC_SUBST(XML2_FLAG)
diff --git a/security/prelude-pflogger/distinfo b/security/prelude-pflogger/distinfo
index f6aeba06f8f..40ace25d977 100644
--- a/security/prelude-pflogger/distinfo
+++ b/security/prelude-pflogger/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2009/08/23 20:02:28 hasso Exp $
+$NetBSD: distinfo,v 1.6 2013/01/26 23:17:35 wiz Exp $
 
 SHA1 (prelude-pflogger-0.9.0-rc2.tar.gz) = ae354809dae5f04392a1c93a88be4cf9993c3b43
 RMD160 (prelude-pflogger-0.9.0-rc2.tar.gz) = 7c5808b0ca515c8080c64b52aa0aae166831e4d4
 Size (prelude-pflogger-0.9.0-rc2.tar.gz) = 303763 bytes
 SHA1 (patch-aa) = b7f7623e75c324e593aec10d921ee5364a2fa542
-SHA1 (patch-ab) = 75a78b3d50067b07448aff9fde565f8bd5ab1b54
+SHA1 (patch-ab) = e13fe4c090a1bb17fc552a0c6ca061da0f7ad1a4
 SHA1 (patch-ac) = 18e596f3de2835fa31062e42d3760f70707c8812
diff --git a/security/prelude-pflogger/patches/patch-ab b/security/prelude-pflogger/patches/patch-ab
index a1b160ce18e..400d4026210 100644
--- a/security/prelude-pflogger/patches/patch-ab
+++ b/security/prelude-pflogger/patches/patch-ab
@@ -1,7 +1,19 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/09/03 13:50:49 shannonjr Exp $
+$NetBSD: patch-ab,v 1.2 2013/01/26 23:17:35 wiz Exp $
 
---- configure.in.orig	2007-09-03 04:45:30.000000000 -0600
+First chunk: automake-1.13 compat.
+Second chunk: adapt paths for pkgsrc.
+
+--- configure.in.orig	2005-09-18 14:30:46.000000000 +0000
 +++ configure.in
+@@ -3,7 +3,7 @@ dnl Process this file with autoconf to p
+ AC_INIT(src/pflogger.c)
+ AC_CANONICAL_SYSTEM
+ AM_INIT_AUTOMAKE(prelude-pflogger, 0.9.0-rc2)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_DISABLE_STATIC
+ 
+ AM_MAINTAINER_MODE
 @@ -57,7 +57,7 @@ AC_TYPE_SIGNAL
  AC_FUNC_VPRINTF
  AC_CHECK_FUNCS(gettimeofday select socket strdup strerror strstr)