Recognise ar(1) archives (.a) as a valid entities to link with. This fixes

many places when it is necessary to link shared object with a static library.

10 files changed, 45 insertions, 20 deletions

diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile
index 824bcceb77b..3dfd5cf833e 100644
--- a/devel/gnu-libtool/Makefile
+++ b/devel/gnu-libtool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtool
 PORTVERSION=	1.3.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
diff --git a/devel/gnu-libtool/files/patch-ac b/devel/gnu-libtool/files/patch-ac
index d84fdde59b5..3a1894e1000 100644
--- a/devel/gnu-libtool/files/patch-ac
+++ b/devel/gnu-libtool/files/patch-ac
@@ -1,5 +1,8 @@
+
+$FreeBSD$
+
 --- ltconfig.orig	Tue Dec  7 23:50:48 1999
-+++ ltconfig	Wed Sep 20 11:11:39 2000
++++ ltconfig	Sat Jun  8 11:48:12 2002
 @@ -169,7 +169,7 @@
  # Constants:
  PROGRAM=ltconfig
@@ -104,15 +107,17 @@
  file_magic_cmd=
  file_magic_test_file=
  deplibs_check_method='unknown'
-@@ -1874,18 +1880,21 @@
+@@ -1873,19 +1879,22 @@
+   version_type=freebsd-$objformat
    case "$version_type" in
      freebsd-elf*)
-       deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+-      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
 -      file_magic_cmd=/usr/bin/file
 -      file_magic_test_file=`echo /usr/lib/libc.so*`
 -      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
 -      need_version=no
 -      need_lib_prefix=no
++      deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)'
        ;;
      freebsd-*)
 -      deplibs_check_method=unknown
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 824bcceb77b..3dfd5cf833e 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtool
 PORTVERSION=	1.3.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
diff --git a/devel/libtool/files/patch-ac b/devel/libtool/files/patch-ac
index d84fdde59b5..3a1894e1000 100644
--- a/devel/libtool/files/patch-ac
+++ b/devel/libtool/files/patch-ac
@@ -1,5 +1,8 @@
+
+$FreeBSD$
+
 --- ltconfig.orig	Tue Dec  7 23:50:48 1999
-+++ ltconfig	Wed Sep 20 11:11:39 2000
++++ ltconfig	Sat Jun  8 11:48:12 2002
 @@ -169,7 +169,7 @@
  # Constants:
  PROGRAM=ltconfig
@@ -104,15 +107,17 @@
  file_magic_cmd=
  file_magic_test_file=
  deplibs_check_method='unknown'
-@@ -1874,18 +1880,21 @@
+@@ -1873,19 +1879,22 @@
+   version_type=freebsd-$objformat
    case "$version_type" in
      freebsd-elf*)
-       deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+-      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
 -      file_magic_cmd=/usr/bin/file
 -      file_magic_test_file=`echo /usr/lib/libc.so*`
 -      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
 -      need_version=no
 -      need_lib_prefix=no
++      deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)'
        ;;
      freebsd-*)
 -      deplibs_check_method=unknown
diff --git a/devel/libtool13/Makefile b/devel/libtool13/Makefile
index 824bcceb77b..3dfd5cf833e 100644
--- a/devel/libtool13/Makefile
+++ b/devel/libtool13/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtool
 PORTVERSION=	1.3.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
diff --git a/devel/libtool13/files/patch-ac b/devel/libtool13/files/patch-ac
index d84fdde59b5..3a1894e1000 100644
--- a/devel/libtool13/files/patch-ac
+++ b/devel/libtool13/files/patch-ac
@@ -1,5 +1,8 @@
+
+$FreeBSD$
+
 --- ltconfig.orig	Tue Dec  7 23:50:48 1999
-+++ ltconfig	Wed Sep 20 11:11:39 2000
++++ ltconfig	Sat Jun  8 11:48:12 2002
 @@ -169,7 +169,7 @@
  # Constants:
  PROGRAM=ltconfig
@@ -104,15 +107,17 @@
  file_magic_cmd=
  file_magic_test_file=
  deplibs_check_method='unknown'
-@@ -1874,18 +1880,21 @@
+@@ -1873,19 +1879,22 @@
+   version_type=freebsd-$objformat
    case "$version_type" in
      freebsd-elf*)
-       deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+-      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
 -      file_magic_cmd=/usr/bin/file
 -      file_magic_test_file=`echo /usr/lib/libc.so*`
 -      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
 -      need_version=no
 -      need_lib_prefix=no
++      deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)'
        ;;
      freebsd-*)
 -      deplibs_check_method=unknown
diff --git a/devel/libtool14/Makefile b/devel/libtool14/Makefile
index 824bcceb77b..3dfd5cf833e 100644
--- a/devel/libtool14/Makefile
+++ b/devel/libtool14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtool
 PORTVERSION=	1.3.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
diff --git a/devel/libtool14/files/patch-ac b/devel/libtool14/files/patch-ac
index d84fdde59b5..3a1894e1000 100644
--- a/devel/libtool14/files/patch-ac
+++ b/devel/libtool14/files/patch-ac
@@ -1,5 +1,8 @@
+
+$FreeBSD$
+
 --- ltconfig.orig	Tue Dec  7 23:50:48 1999
-+++ ltconfig	Wed Sep 20 11:11:39 2000
++++ ltconfig	Sat Jun  8 11:48:12 2002
 @@ -169,7 +169,7 @@
  # Constants:
  PROGRAM=ltconfig
@@ -104,15 +107,17 @@
  file_magic_cmd=
  file_magic_test_file=
  deplibs_check_method='unknown'
-@@ -1874,18 +1880,21 @@
+@@ -1873,19 +1879,22 @@
+   version_type=freebsd-$objformat
    case "$version_type" in
      freebsd-elf*)
-       deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+-      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
 -      file_magic_cmd=/usr/bin/file
 -      file_magic_test_file=`echo /usr/lib/libc.so*`
 -      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
 -      need_version=no
 -      need_lib_prefix=no
++      deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)'
        ;;
      freebsd-*)
 -      deplibs_check_method=unknown
diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index 824bcceb77b..3dfd5cf833e 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtool
 PORTVERSION=	1.3.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
diff --git a/devel/libtool15/files/patch-ac b/devel/libtool15/files/patch-ac
index d84fdde59b5..3a1894e1000 100644
--- a/devel/libtool15/files/patch-ac
+++ b/devel/libtool15/files/patch-ac
@@ -1,5 +1,8 @@
+
+$FreeBSD$
+
 --- ltconfig.orig	Tue Dec  7 23:50:48 1999
-+++ ltconfig	Wed Sep 20 11:11:39 2000
++++ ltconfig	Sat Jun  8 11:48:12 2002
 @@ -169,7 +169,7 @@
  # Constants:
  PROGRAM=ltconfig
@@ -104,15 +107,17 @@
  file_magic_cmd=
  file_magic_test_file=
  deplibs_check_method='unknown'
-@@ -1874,18 +1880,21 @@
+@@ -1873,19 +1879,22 @@
+   version_type=freebsd-$objformat
    case "$version_type" in
      freebsd-elf*)
-       deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+-      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
 -      file_magic_cmd=/usr/bin/file
 -      file_magic_test_file=`echo /usr/lib/libc.so*`
 -      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
 -      need_version=no
 -      need_lib_prefix=no
++      deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)'
        ;;
      freebsd-*)
 -      deplibs_check_method=unknown