From 2b468ecd6f8466807b848a653c22944a71125900 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 27 Sep 2002 00:45:13 +0000
Subject: Remove dependency on automake by patching the Makefile.in file
 instead of the Makefile.am file.

---
 net/ORBit/Makefile         | 6 ++----
 net/ORBit/distinfo         | 4 ++--
 net/ORBit/patches/patch-ad | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'net/ORBit')

diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index dfc48b9f672..132888940e9 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2002/08/25 18:39:30 jlam Exp $
+# $NetBSD: Makefile,v 1.79 2002/09/27 00:45:13 jlam Exp $
 #
 
 DISTNAME=		ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -11,8 +11,8 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		high-performance CORBA ORB with support for the C language
 
 DEPENDS+=		gindent-[0-9]*:../../devel/gindent
-BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 
+AUTOMAKE_OVERRIDE=	NO	# Otherwise breaks 1.5 arm32
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libtool
@@ -31,8 +31,6 @@ PLIST_SUBST+=		ORBIT_MAJOR=${ORBIT_MAJOR} ORBIT_MINOR=${ORBIT_MINOR}
 
 INFO_FILES=		libIDL.info
 
-AUTOMAKE_OVERRIDE=	NO	# Otherwise breaks 1.5 arm32
-
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib/buildlink2.mk"
 .include "../../security/tcp_wrappers/buildlink2.mk"
diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo
index 7343fb73e27..5bf3db90605 100644
--- a/net/ORBit/distinfo
+++ b/net/ORBit/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2002/08/25 18:39:31 jlam Exp $
+$NetBSD: distinfo,v 1.13 2002/09/27 00:45:13 jlam Exp $
 
 SHA1 (ORBit-0.5.15.tar.gz) = 1571976662311060175008d225de05e9bc2eb038
 Size (ORBit-0.5.15.tar.gz) = 1335272 bytes
 SHA1 (patch-aa) = ef745d3d279d57dbdf6380053b6b4a7e63322671
 SHA1 (patch-ab) = c2b7cc5f83230035c214600bff59d4dfefd92422
 SHA1 (patch-ac) = cc073ac41f69671fe10be3975cb0753e163a10dd
-SHA1 (patch-ad) = 688920ba423aa2994d9e2e6540f8738305cb7fd9
+SHA1 (patch-ad) = d4f61e2fef4b862606473ced8f0b27ea3b7f22b3
 SHA1 (patch-ae) = 95cc6f46fa2cfcd34af2e546f3d4a8d55194e5eb
 SHA1 (patch-af) = b88b26b8fe7d42f267c6761edc3e3b8250bd14fb
 SHA1 (patch-ag) = 875e83a597ab39d57abcfd9259d8ec15707ea45c
diff --git a/net/ORBit/patches/patch-ad b/net/ORBit/patches/patch-ad
index 410533baeb9..666ce0ae343 100644
--- a/net/ORBit/patches/patch-ad
+++ b/net/ORBit/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2001/02/07 03:23:08 fredb Exp $
+$NetBSD: patch-ad,v 1.7 2002/09/27 00:45:14 jlam Exp $
 
---- popt/Makefile.am.orig	Mon Feb 21 12:39:52 2000
-+++ popt/Makefile.am	Tue Feb  6 18:20:34 2001
-@@ -12,10 +12,10 @@
+--- popt/Makefile.in.orig	Wed Mar 20 06:46:09 2002
++++ popt/Makefile.in
+@@ -114,10 +114,10 @@ INCLUDES = -I$(top_srcdir)
  
  noinst_PROGRAMS = test1 test2
  test1_SOURCES = test1.c
-- 
cgit v1.2.3