From a8f9a4f0105af27d6865f434eb4b42812d40aa97 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Sun, 5 Oct 2003 08:19:19 +0000
Subject: make the library names we create on Darwin be consistent with what
 pkgsrc expects and what other platforms use.

note that we can't simply use version_type=sunos, since the Darwin
linker requires libtool to pass -compatibility_version and
-current_version so they are coded into the library header.

this fixes the problem of having libname.x.dylib files which were not
registered in the PLIST, and thus were leftover after package removal.

ok'd by jlam.
---
 devel/libtool/Makefile.common  |  4 ++--
 devel/libtool/distinfo         |  4 ++--
 devel/libtool/patches/patch-ab | 15 +++++++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'devel')

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 9476001edd7..379b721f5ba 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.33 2003/09/25 02:09:03 danw Exp $
+# $NetBSD: Makefile.common,v 1.34 2003/10/05 08:19:19 grant Exp $
 #
 
 DISTNAME=	libtool-ml-20010614
 PKGPFX=		${DISTNAME:C/ml-/1.4./}
-PKGREVISION=	15
+PKGREVISION=	16
 WRKSRC=		${WRKDIR}/libtool-ml
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index c228a4424dc..f6588539035 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.27 2003/09/25 02:41:52 danw Exp $
+$NetBSD: distinfo,v 1.28 2003/10/05 08:19:19 grant Exp $
 
 SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac
 Size (libtool-ml-20010614.tar.gz) = 784246 bytes
 SHA1 (patch-aa) = a3b37684e39b34077c3026a72787218942648bdf
-SHA1 (patch-ab) = 82350e1a9b03ecb8a26ebd02692f5cb3bb289fae
+SHA1 (patch-ab) = 76d0762ff80ddeac72a740383797502ab2ee4921
 SHA1 (patch-ac) = 61196acaa12edee0b1209b2ba7c6414453bfa438
 SHA1 (patch-ad) = 6aab76688d0f55648e35adc45a3492ba9c87acfb
 SHA1 (patch-ae) = 03de2a4fc9d828d62c6e6126ecf2dbbfeb1d82ea
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 6a7bf6d6ee7..42c47115dd2 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.28 2003/01/21 22:43:42 grant Exp $
+$NetBSD: patch-ab,v 1.29 2003/10/05 08:19:19 grant Exp $
 
---- ltmain.sh.orig	Thu Jun 14 14:06:50 2001
+--- ltmain.sh.orig	2001-06-14 14:06:50.000000000 +1000
 +++ ltmain.sh
 @@ -211,6 +211,8 @@ do
    --mode) prevopt="--mode" prev=mode ;;
@@ -151,6 +151,17 @@ $NetBSD: patch-ab,v 1.28 2003/01/21 22:43:42 grant Exp $
  	    tmp_libs="$tmp_libs $deplib"
  	  done
  
+@@ -2564,8 +2592,8 @@ EOF
+ 	darwin)
+ 	  # Like Linux, but with the current version available in
+ 	  # verstring for coding it into the library header
+-	  major=.`expr $current - $age`
+-	  versuffix="$major.$age.$revision"
++	  major=".$current"
++	  versuffix=".$current.$revision"
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  minor_current=`expr $current + 1`
+ 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 @@ -2582,7 +2610,7 @@ EOF
  	  ;;
  
-- 
cgit v1.2.3