Fix regression on DragonFly where two config variables were no longer being

set (thinko by person implementing the change between 1.5.18 and 1.5.22).
Bump PKGREVISION.

5 files changed, 91 insertions, 10 deletions

diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 526ee06f234..c74ba6e3517 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2006/01/30 22:19:56 tv Exp $
+# $NetBSD: Makefile,v 1.75 2006/02/06 18:57:30 tv Exp $
 
 ###########################################################################
 ###########################################################################
@@ -26,7 +26,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-base-/}
-#PKGREVISION=	
+PKGREVISION=	1
 SVR4_PKGNAME=	ltoob
 
 COMMENT=	Generic shared library support script (the script itself)
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 988764e2d13..bb876b3f237 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.65 2006/01/30 22:19:56 tv Exp $
+$NetBSD: distinfo,v 1.66 2006/02/06 18:57:30 tv Exp $
 
 SHA1 (libtool-1.5.22.tar.gz) = 17353e66aeaac80ae188ea0a3a90609550ce3254
 RMD160 (libtool-1.5.22.tar.gz) = 7cbe793ee0509908daac928b4dc3a0f16f7293bf
 Size (libtool-1.5.22.tar.gz) = 2921483 bytes
 SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6
-SHA1 (patch-ab) = 9a0c0223d5cf2ae518157e0198b63eba844efecd
+SHA1 (patch-ab) = e8cf42513805e70a96536c55921c230a7e5244b1
 SHA1 (patch-ac) = 61a5c1ace76beeeb64388726e6a0772e8f1828e0
-SHA1 (patch-ad) = 371ef534ec576d031bf82898b9d1d8a2d5829ef0
+SHA1 (patch-ad) = 22b871497d955b2de26a632513a11f3dd16e7286
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 439b9b93352..1be0bc58ca3 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.18 2006/01/30 22:19:56 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
 
 --- libtool.m4.orig	2005-12-18 16:53:17.000000000 -0500
 +++ libtool.m4
@@ -47,6 +47,15 @@ $NetBSD: manual-libtool.m4,v 1.18 2006/01/30 22:19:56 tv Exp $
        need_version=yes
        ;;
    esac
+@@ -1440,7 +1442,7 @@ freebsd* | dragonfly*)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
 @@ -1518,12 +1520,7 @@ interix3*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index e52c41f7de7..e7e486bc5e2 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.56 2006/01/30 22:19:56 tv Exp $
+$NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 
---- configure.orig	2006-01-30 17:05:54.000000000 -0500
+--- configure.orig	2006-02-06 13:54:53.000000000 -0500
 +++ configure
 @@ -76,7 +76,6 @@ if test "x$as_myself" = x; then
    as_myself=$0
@@ -173,6 +173,15 @@ $NetBSD: patch-ab,v 1.56 2006/01/30 22:19:56 tv Exp $
        need_version=yes
        ;;
    esac
+@@ -9509,7 +9500,7 @@ freebsd* | dragonfly*)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
 @@ -9587,12 +9578,7 @@ interix3*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
@@ -328,6 +337,15 @@ $NetBSD: patch-ab,v 1.56 2006/01/30 22:19:56 tv Exp $
        need_version=yes
        ;;
    esac
+@@ -13468,7 +13477,7 @@ freebsd* | dragonfly*)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
 @@ -13546,12 +13555,7 @@ interix3*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
@@ -427,6 +445,15 @@ $NetBSD: patch-ab,v 1.56 2006/01/30 22:19:56 tv Exp $
        need_version=yes
        ;;
    esac
+@@ -16059,7 +16067,7 @@ freebsd* | dragonfly*)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
 @@ -16137,12 +16145,7 @@ interix3*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
@@ -526,6 +553,15 @@ $NetBSD: patch-ab,v 1.56 2006/01/30 22:19:56 tv Exp $
        need_version=yes
        ;;
    esac
+@@ -18661,7 +18668,7 @@ freebsd* | dragonfly*)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
 @@ -18739,12 +18746,7 @@ interix3*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index f12a3bab26b..4e4c899cc4b 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.28 2006/01/30 22:19:56 tv Exp $
+$NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 
---- libltdl/configure.orig	2006-01-30 17:05:54.000000000 -0500
+--- libltdl/configure.orig	2006-02-06 13:54:53.000000000 -0500
 +++ libltdl/configure
 @@ -76,7 +76,6 @@ if test "x$as_myself" = x; then
    as_myself=$0
@@ -173,6 +173,15 @@ $NetBSD: patch-ad,v 1.28 2006/01/30 22:19:56 tv Exp $
        need_version=yes
        ;;
    esac
+@@ -9382,7 +9373,7 @@ freebsd* | dragonfly*)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
 @@ -9460,12 +9451,7 @@ interix3*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
@@ -328,6 +337,15 @@ $NetBSD: patch-ad,v 1.28 2006/01/30 22:19:56 tv Exp $
        need_version=yes
        ;;
    esac
+@@ -13341,7 +13350,7 @@ freebsd* | dragonfly*)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
 @@ -13419,12 +13428,7 @@ interix3*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
@@ -427,6 +445,15 @@ $NetBSD: patch-ad,v 1.28 2006/01/30 22:19:56 tv Exp $
        need_version=yes
        ;;
    esac
+@@ -15932,7 +15940,7 @@ freebsd* | dragonfly*)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
 @@ -16010,12 +16018,7 @@ interix3*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
@@ -526,6 +553,15 @@ $NetBSD: patch-ad,v 1.28 2006/01/30 22:19:56 tv Exp $
        need_version=yes
        ;;
    esac
+@@ -18534,7 +18541,7 @@ freebsd* | dragonfly*)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
 @@ -18612,12 +18619,7 @@ interix3*)
  irix5* | irix6* | nonstopux*)
    case $host_os in