From e525650d57c64ed0d063922256be9d4729b94bf6 Mon Sep 17 00:00:00 2001
From: rh <rh@pkgsrc.org>
Date: Wed, 30 Oct 2002 03:09:25 +0000
Subject: Replace hand made patches for pkgconfig tempates with
 PKGCONFIG_OVERRIDE.

---
 net/ORBit/Makefile         |  4 +++-
 net/ORBit/distinfo         |  4 +---
 net/ORBit/patches/patch-ah | 11 -----------
 net/ORBit/patches/patch-aj | 11 -----------
 4 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 net/ORBit/patches/patch-ah
 delete mode 100644 net/ORBit/patches/patch-aj

(limited to 'net/ORBit')

diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index fde810479a6..a54b3db934f 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2002/10/19 10:54:55 rh Exp $
+# $NetBSD: Makefile,v 1.81 2002/10/30 03:09:34 rh Exp $
 #
 
 DISTNAME=		ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -18,6 +18,8 @@ USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/popt/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libIDL/libtool
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/ORBit.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/libIDL/libIDL.pc.in
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo
index 5bf3db90605..f61649fa30f 100644
--- a/net/ORBit/distinfo
+++ b/net/ORBit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/09/27 00:45:13 jlam Exp $
+$NetBSD: distinfo,v 1.14 2002/10/30 03:09:35 rh Exp $
 
 SHA1 (ORBit-0.5.15.tar.gz) = 1571976662311060175008d225de05e9bc2eb038
 Size (ORBit-0.5.15.tar.gz) = 1335272 bytes
@@ -9,9 +9,7 @@ SHA1 (patch-ad) = d4f61e2fef4b862606473ced8f0b27ea3b7f22b3
 SHA1 (patch-ae) = 95cc6f46fa2cfcd34af2e546f3d4a8d55194e5eb
 SHA1 (patch-af) = b88b26b8fe7d42f267c6761edc3e3b8250bd14fb
 SHA1 (patch-ag) = 875e83a597ab39d57abcfd9259d8ec15707ea45c
-SHA1 (patch-ah) = 1b05e1f77ddc3a0ee6637822d4f7359e9329fff9
 SHA1 (patch-ai) = 06e1cb2bc9f4f5460cdde71526417cdaa38ff310
-SHA1 (patch-aj) = 4bb189b042058671a08de84028097bf87f4dbf3b
 SHA1 (patch-ak) = d569014320dbea40ccdb9e369e07c984ee7bd9de
 SHA1 (patch-al) = 7f2992136c3f7b1badfc76a83d6fed0aa73a8873
 SHA1 (patch-am) = f52369447d04a382d6e93a6bddaf3962a3ab6677
diff --git a/net/ORBit/patches/patch-ah b/net/ORBit/patches/patch-ah
deleted file mode 100644
index 790a964b9d9..00000000000
--- a/net/ORBit/patches/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ah,v 1.7 2002/08/25 18:39:32 jlam Exp $
-
---- ORBit.pc.in.orig	Sat Sep 30 12:09:43 2000
-+++ ORBit.pc.in
-@@ -7,5 +7,5 @@ Name: ORBit
- Description: High-performance CORBA Object Request Broker.
- Version: @VERSION@
- Requires: glib
--Libs: -L${libdir} -lORBit -lIIOP -lORBitutil @LIBS@ -lm
-+Libs: -L${libdir} -Wl,-R${libdir} -lORBit -lIIOP -lORBitutil @LIBS@ -lm
- Cflags: -I${includedir}
diff --git a/net/ORBit/patches/patch-aj b/net/ORBit/patches/patch-aj
deleted file mode 100644
index b6d1608c4e8..00000000000
--- a/net/ORBit/patches/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aj,v 1.9 2002/08/25 18:39:32 jlam Exp $
-
---- libIDL/libIDL.pc.in.orig	Sat Sep 30 12:09:43 2000
-+++ libIDL/libIDL.pc.in
-@@ -8,5 +8,5 @@ Name: libIDL
- Description: IDL parsing library
- Version: @VERSION@
- Requires: glib
--Libs: -L${libdir} -lIDL
-+Libs: -L${libdir} -Wl,-R${libdir} -lIDL
- Cflags: -I${includedir}
-- 
cgit v1.2.3