From 347ac13ae282cce645a8c27c16fbde4a7b0ef5fb Mon Sep 17 00:00:00 2001
From: marcm <marcm@openbsd.org>
Date: Tue, 24 May 2005 21:39:04 +0000
Subject: [PATCH] Update to 0.8.5 for Gnome 2.10 platform.

---
 devel/libIDL/Makefile                |  6 +--
 devel/libIDL/distinfo                |  8 ++--
 devel/libIDL/patches/patch-ltmain_sh | 64 +++++++++++-----------------
 3 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 185d9ce1fbf..3d448f2ad57 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.15 2004/12/10 20:33:59 marcm Exp $
+# $OpenBSD: Makefile,v 1.16 2005/05/24 21:39:04 marcm Exp $
 
 COMMENT=		"IDL parsing library"
 
-DISTNAME=		libIDL-0.8.4
+DISTNAME=		libIDL-0.8.5
 CATEGORIES=		devel
 
 HOMEPAGE=		http://www.gnome.org/
 
-MAINTAINER=		Marc Matteo <marcm@openbsd.org>
-
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/devel/libIDL/distinfo b/devel/libIDL/distinfo
index 8406fb05718..529687d56d6 100644
--- a/devel/libIDL/distinfo
+++ b/devel/libIDL/distinfo
@@ -1,4 +1,4 @@
-MD5 (libIDL-0.8.4.tar.bz2) = f94a690454b4f9d448c2e51792f81365
-RMD160 (libIDL-0.8.4.tar.bz2) = 723fe47b2df5a99dccf926ab1de2a6bd61dabb88
-SHA1 (libIDL-0.8.4.tar.bz2) = e09153fdc6c1fd7c8520df7d551bf1e760b79667
-SIZE (libIDL-0.8.4.tar.bz2) = 326519
+MD5 (libIDL-0.8.5.tar.bz2) = c63f6513dc7789d0575bea02d62d58d7
+RMD160 (libIDL-0.8.5.tar.bz2) = e8650e7339b5586b28de602ee5dcce7a2cba3890
+SHA1 (libIDL-0.8.5.tar.bz2) = e48f4935bc15c0c342068169f088af0efc709943
+SIZE (libIDL-0.8.5.tar.bz2) = 339015
diff --git a/devel/libIDL/patches/patch-ltmain_sh b/devel/libIDL/patches/patch-ltmain_sh
index 2f51d20aab2..e027e92bdb6 100644
--- a/devel/libIDL/patches/patch-ltmain_sh
+++ b/devel/libIDL/patches/patch-ltmain_sh
@@ -1,46 +1,32 @@
---- ltmain.sh.orig	Wed Dec  1 14:27:04 2004
-+++ ltmain.sh	Wed Dec  1 14:30:40 2004
-@@ -1374,6 +1374,17 @@
- 	continue
- 	;;
- 
-+	-pthread)
-+	case $host in
-+	    *-*-openbsd*)
-+	    deplibs="$deplibs $arg"
-+	    ;;
-+	    *)
+--- ltmain.sh.orig	Sun Jan 16 11:16:28 2005
++++ ltmain.sh	Mon Apr  4 21:48:13 2005
+@@ -1975,9 +1975,12 @@ EOF
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"
+ 	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    deplibs="$deplib $deplibs"
 +	    continue
-+	    ;;
-+	esac
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -2024,6 +2035,21 @@
  	  fi
++	  if test "$linkmode" = "lib"; then
++	      newdependency_libs="$deplib $newdependency_libs"
++	  fi
++	  deplibs="$deplib $deplibs"
  	  continue
  	  ;;
-+
-+	  -pthread)
-+	  case $linkmode in
-+	      lib)
-+	      deplibs="$deplib $deplibs"
-+	      newdependency_libs="$deplib $newdependency_libs"
-+	      ;;
-+	      prog)
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	      ;;
-+	  esac
-+	  continue
-+	  ;;
-+
- 	%DEPLIBS%)
- 	  alldeplibs=yes
- 	  continue
-@@ -5827,40 +5853,6 @@
+ 	-l*)
+@@ -2410,10 +2413,6 @@ EOF
+ 	link_static=no # Whether the deplib will be linked statically
+ 	if test -n "$library_names" &&
+ 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+-	  if test "$installed" = no; then
+-	    notinst_deplibs="$notinst_deplibs $lib"
+-	    need_relink=yes
+-	  fi
+ 	  # This is a shared library
+ 
+ 	  # Warn about portability, can't link against -module's on
+@@ -5800,40 +5799,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
      test "$show" = : && exit $EXIT_SUCCESS