Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE.

17 files changed, 17 insertions, 94 deletions

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}
diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index 09719ce07ed..210f8555dac 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/27 09:16:08 rh Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/30 03:09:35 rh Exp $
 #
 
 DISTNAME=		ORBit2-2.5.0
@@ -15,6 +15,8 @@ USE_LIBTOOL=		YES
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/ORBit-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/ORBit-CosNaming-2.0.pc.in
 
 .include "../../net/linc/buildlink2.mk"
 .include "../../net/libIDL/buildlink2.mk"
diff --git a/net/ORBit2/distinfo b/net/ORBit2/distinfo
index eee6d42c24f..35d78e4fb69 100644
--- a/net/ORBit2/distinfo
+++ b/net/ORBit2/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/10/27 09:16:09 rh Exp $
+$NetBSD: distinfo,v 1.10 2002/10/30 03:09:35 rh Exp $
 
 SHA1 (ORBit2-2.5.0.tar.bz2) = bce1b2ce54fbb0e2d699a2ebe0b9b46ef0284aca
 Size (ORBit2-2.5.0.tar.bz2) = 429821 bytes
-SHA1 (patch-aa) = 41e3dd08b704ed3fc20161e2c151bfc58b969eaa
-SHA1 (patch-ab) = 1dee388a93179376810250207e52cebeb55af875
diff --git a/net/ORBit2/patches/patch-aa b/net/ORBit2/patches/patch-aa
deleted file mode 100644
index a9b665445bb..00000000000
--- a/net/ORBit2/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/08/25 19:23:10 jlam Exp $
-
---- ORBit-2.0.pc.in.orig	Sat Apr 27 18:24:08 2002
-+++ ORBit-2.0.pc.in
-@@ -9,5 +9,5 @@
- Description: High-performance CORBA Object Request Broker.
- Version: @ORBIT_VERSION@
- Requires: linc glib-2.0 gmodule-2.0
--Libs: -L${libdir} -lORBit-2 @ORBIT_LIBS@ @LIBS@ -lm
-+Libs: -Wl,-R${libdir} -L${libdir} -lORBit-2 @ORBIT_LIBS@ @LIBS@ -lm
- Cflags: -I${includedir}/orbit-2.0 -DORBIT2=1
diff --git a/net/ORBit2/patches/patch-ab b/net/ORBit2/patches/patch-ab
deleted file mode 100644
index e7f70c1e6b5..00000000000
--- a/net/ORBit2/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:10 jlam Exp $
-
---- ORBit-CosNaming-2.0.pc.in.orig	Thu Nov  1 11:50:44 2001
-+++ ORBit-CosNaming-2.0.pc.in
-@@ -8,5 +8,5 @@ Name: ORBit-CosNaming-2.0
- Description: High-performance CORBA Object Request Broker - Naming Service.
- Version: @ORBIT_VERSION@
- Requires: ORBit-2.0
--Libs: -L${libdir} -lORBitCosNaming-2
-+Libs: -L${libdir} -Wl,-R${libdir} -lORBitCosNaming-2
- Cflags: -I${includedir}/orbit-2.0
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index 482c4d105bb..a6433223d0e 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/16 07:58:55 rh Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/30 03:09:36 rh Exp $
 #
 
 DISTNAME=		gnet-1.1.7
@@ -11,6 +11,7 @@ COMMENT=		simple network library
 
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/gnet.pc.in
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 CONFIGURE_ARGS=		--enable-glib2
diff --git a/net/gnet/distinfo b/net/gnet/distinfo
index 4485c756827..7d1a81efa4e 100644
--- a/net/gnet/distinfo
+++ b/net/gnet/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/10/16 07:58:57 rh Exp $
+$NetBSD: distinfo,v 1.5 2002/10/30 03:09:36 rh Exp $
 
 SHA1 (gnet-1.1.7.tar.gz) = 42e68deee3c82c38153ae361edee785399476f5d
 Size (gnet-1.1.7.tar.gz) = 367915 bytes
-SHA1 (patch-aa) = 2a3b2229b69f4276d939bbd3716a17a4ba225cb4
diff --git a/net/gnet/patches/patch-aa b/net/gnet/patches/patch-aa
deleted file mode 100644
index 19fa7288ea8..00000000000
--- a/net/gnet/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/10/16 07:58:57 rh Exp $
-
---- gnet.pc.in.orig	Sat Apr 13 06:20:37 2002
-+++ gnet.pc.in
-@@ -6,5 +6,5 @@ includedir=@includedir@
- Name: Gnet
- Description: A network compatibility layer library
- Version: @VERSION@
--Libs: -L${libdir} -lgnet @GLIB_LIBS@ @GTHREAD_LIBS@
-+Libs: -Wl,-R${libdir} -L${libdir} -lgnet @GLIB_LIBS@ @GTHREAD_LIBS@
- Cflags: -I${includedir}/gnet -I${libdir}/gnet/include/ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@
diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile
index 4957fbb7714..a315fe85fb1 100644
--- a/net/libIDL/Makefile
+++ b/net/libIDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/10/19 10:54:56 rh Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/30 03:09:36 rh Exp $
 #
 
 DISTNAME=		libIDL-0.7.4
@@ -15,6 +15,7 @@ USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/libIDL-2.0.pc.in
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
diff --git a/net/libIDL/distinfo b/net/libIDL/distinfo
index 51a3e4b9825..8dea116815f 100644
--- a/net/libIDL/distinfo
+++ b/net/libIDL/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/04/27 08:49:14 rh Exp $
+$NetBSD: distinfo,v 1.3 2002/10/30 03:09:36 rh Exp $
 
 SHA1 (libIDL-0.7.4.tar.bz2) = c371334d04145f7ccf869305069fee545f093cee
 Size (libIDL-0.7.4.tar.bz2) = 265009 bytes
-SHA1 (patch-aa) = caba0f73305316d7e01682767660d383e6e23bac
diff --git a/net/libIDL/patches/patch-aa b/net/libIDL/patches/patch-aa
deleted file mode 100644
index d74d7b073a5..00000000000
--- a/net/libIDL/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/04/27 08:49:14 rh Exp $
-
---- libIDL-2.0.pc.in.orig	Sat Apr 27 18:27:04 2002
-+++ libIDL-2.0.pc.in
-@@ -8,5 +8,5 @@
- Description: IDL parsing library
- Version: @LIBIDL_VERSION@
- Requires: glib-2.0
--Libs: -L${libdir} -lIDL-2
-+Libs: -Wl,-R${libdir} -L${libdir} -lIDL-2
- Cflags: -I${includedir}/libIDL-2.0
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 077320e64e5..d48436233fe 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/10/27 09:08:41 rh Exp $
+# $NetBSD: Makefile,v 1.10 2002/10/30 03:09:37 rh Exp $
 #
 
 DISTNAME=		linc-0.7.0
@@ -16,6 +16,7 @@ USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/linc.pc.in
 
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
diff --git a/net/linc/distinfo b/net/linc/distinfo
index 716e4d4fedc..8eca74aa76e 100644
--- a/net/linc/distinfo
+++ b/net/linc/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/10/27 09:08:41 rh Exp $
+$NetBSD: distinfo,v 1.6 2002/10/30 03:09:37 rh Exp $
 
 SHA1 (linc-0.7.0.tar.bz2) = 0e5670a952bf7ca74f27a8c82148391868f8d500
 Size (linc-0.7.0.tar.bz2) = 181681 bytes
 SHA1 (patch-aa) = 1643b8decf11568a2aaaf8cbe8c0e0989a897196
-SHA1 (patch-ab) = c39278f85cd48413523252a6a12e7c042386dfce
diff --git a/net/linc/patches/patch-ab b/net/linc/patches/patch-ab
deleted file mode 100644
index 709d6724e36..00000000000
--- a/net/linc/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/04/27 08:48:34 rh Exp $
-
---- linc.pc.in.orig	Sat Apr 27 18:18:53 2002
-+++ linc.pc.in
-@@ -7,5 +7,5 @@
- Description: ORBit2 network transport library
- Version: @LINC_VERSION@
- Requires: glib-2.0 gobject-2.0 gthread-2.0
--Libs: -L${libdir} -llinc
-+Libs: -Wl,-R${libdir} -L${libdir} -llinc
- Cflags: -I${includedir}/linc-1.0