From efb528fb82e4b00bbe053419b0a73ca49e28b14f Mon Sep 17 00:00:00 2001
From: gdt <gdt@pkgsrc.org>
Date: Mon, 15 Dec 2008 15:02:13 +0000
Subject: Remove patch to add -Wl,-R to guile-config link.  I had borked it
 when merging to the new guile-config code, and it turns out not to be
 necessary since there is some other mechanism to add rpath.  Arguably it
 should still be added, as the later rpath might only be there for
 dependencies.  (Plus, depending programs should use pkg-config instead.)

---
 lang/guile/Makefile         |  3 ++-
 lang/guile/distinfo         |  3 +--
 lang/guile/patches/patch-ah | 13 -------------
 3 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 lang/guile/patches/patch-ah

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index aca21f48cc8..acd8e5bb54f 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2008/12/10 23:11:55 gdt Exp $
+# $NetBSD: Makefile,v 1.88 2008/12/15 15:02:13 gdt Exp $
 
 DISTNAME=		guile-1.8.6
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index 014c614f60f..539c2cf349b 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.38 2008/12/10 23:11:55 gdt Exp $
+$NetBSD: distinfo,v 1.39 2008/12/15 15:02:13 gdt Exp $
 
 SHA1 (guile-1.8.6.tar.gz) = a3896f86044a2b3740dac43e045c349d656fba31
 RMD160 (guile-1.8.6.tar.gz) = d6695d266a6091dc5fb1c688e3f0286f1c6d382e
 Size (guile-1.8.6.tar.gz) = 3960608 bytes
 SHA1 (patch-ae) = c3e5065408082978df5b6ddd62e47dda8ab41f40
 SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
-SHA1 (patch-ah) = aebe45fdcebfbad5394a74fc96b8f1fc14703c2b
 SHA1 (patch-ak) = 6639ea95471a76893b0b074dcbfbd139a1571309
 SHA1 (patch-al) = 6a5fb3136028bb5a5185ce7174a20d5f9d227e18
diff --git a/lang/guile/patches/patch-ah b/lang/guile/patches/patch-ah
deleted file mode 100644
index 414ab58bb3b..00000000000
--- a/lang/guile/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2008/12/10 23:11:55 gdt Exp $
-
---- guile-config/guile-config.in.orig	2008-12-04 13:30:41.000000000 -0500
-+++ guile-config/guile-config.in
-@@ -154,6 +154,8 @@
-                (if (or (string=? libdir "/usr/lib")
-                        (string=? libdir "/usr/lib/"))
- 		   ""
-+		   ;; On BSD (all pksrc??), include rpath as well
-+		   (string-append "-Wl,-R" (get-build-info 'libdir)))
- 		   (string-append "-L" (get-build-info 'libdir)))
-                "-lguile -lltdl"
- 	       (string-join other-flags)
-- 
cgit v1.2.3