[pkgsrc/trunk]: pkgsrc/devel Update libtool* packages to account for libltdl ...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f54c0e3474f2
branches:  trunk
changeset: 481916:f54c0e3474f2
user:      tv <tv%pkgsrc.org@localhost>
date:      Thu Oct 14 19:04:56 2004 +0000

description:
Update libtool* packages to account for libltdl split, and simplify by
moving some common things into Makefile.common.

diffstat:

 devel/libtool-base/Makefile   |  48 +++++++++---------------------------------
 devel/libtool-base/PLIST      |   4 +--
 devel/libtool-info/Makefile   |   4 +-
 devel/libtool/Makefile        |   5 +++-
 devel/libtool/Makefile.common |  24 ++++++++++++++++++++-
 5 files changed, 41 insertions(+), 44 deletions(-)

diffs (161 lines):

diff -r 886e40842a96 -r f54c0e3474f2 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Thu Oct 14 19:03:45 2004 +0000
+++ b/devel/libtool-base/Makefile       Thu Oct 14 19:04:56 2004 +0000
@@ -1,57 +1,32 @@
-# $NetBSD: Makefile,v 1.43 2004/10/12 04:41:39 tv Exp $
+# $NetBSD: Makefile,v 1.44 2004/10/14 19:04:56 tv Exp $
 #
 
-PKGNAME=       ${DISTNAME:C/-/-base-/}
-PKGREVISION=   4
+.include "../../devel/libtool/Makefile.common"
+
+PKGNAME=       ${DISTNAME:S/-/-base-/}
+PKGREVISION=   5
 SVR4_PKGNAME=  ltoob
 
 COMMENT=       Generic shared library support script (the script itself)
 
 CONFLICTS+=    libtool<=1.3.5nb11
 
-# We are going to want libtool to find the same versions of the C, C++,
-# and Fortran compilers.
-#
-USE_LANGUAGES= c c++ fortran
-
-.include "../../devel/libtool/Makefile.common"
-
 TEST_TARGET=   check
 
-.include "../../mk/bsd.prefs.mk"
-
 .if ${OPSYS} == "NetBSD"
 .  if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so)
 CONFIGURE_ARGS+=       --disable-shared
 BUILD_SHLIBTOOL=       NO
 .  endif
-.else
-CONFIGURE_ARGS+=       --enable-ltdl-install
 .endif
-
-CONFIGURE_ARGS+=       --with-tags=CXX,F77,GCJ
-
-# The configure script persists in trying to find the path to ld, which
-# always ends up in ${BUILDLINK_DIR}.  Prevent it from caring.
-#
-CONFIGURE_ENV+=                lt_cv_path_LD=${LD:Q}
+CONFIGURE_ARGS+=       --disable-ltdl-install
+BUILD_SHLIBTOOL?=      YES
 
-# The configure script persists in trying to find the path to sed or gsed,
-# which breaks when SED is nbsed.  Tell it explicitly to use the sed
-# named by ${SED}.
+# We are going to want libtool to find the same versions of the C, C++,
+# and Fortran compilers.
 #
-CONFIGURE_ENV+=                SED=${SED:Q}
-CONFIGURE_ENV+=                lt_cv_path_SED=${SED:Q}
-
-# The configure script doesn't seem to be working out the need for -p
-# or -B, so tell it
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=                lt_cv_path_NM="nm -p"
-.elif ${OPSYS} == "IRIX"
-CONFIGURE_ENV+=                lt_cv_path_NM="nm -B"
-.endif
-
-BUILD_SHLIBTOOL?=      YES
+USE_LANGUAGES=         c c++ fortran
+CONFIGURE_ARGS+=       --with-tags=CXX,F77,GCJ
 
 .PHONY: fix-libtool
 fix-libtool:
@@ -77,5 +52,4 @@
        ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${PREFIX}/bin/shlibtool
 .endif
 
-.include "../../devel/dlcompat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 886e40842a96 -r f54c0e3474f2 devel/libtool-base/PLIST
--- a/devel/libtool-base/PLIST  Thu Oct 14 19:03:45 2004 +0000
+++ b/devel/libtool-base/PLIST  Thu Oct 14 19:04:56 2004 +0000
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:28 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/10/14 19:04:56 tv Exp $
 bin/libtool
 bin/libtoolize
 ${SHLIBTOOL}bin/shlibtool
-include/ltdl.h
-lib/libltdl.la
 share/aclocal/libtool.m4
 share/aclocal/ltdl.m4
 share/libtool/config.guess
diff -r 886e40842a96 -r f54c0e3474f2 devel/libtool-info/Makefile
--- a/devel/libtool-info/Makefile       Thu Oct 14 19:03:45 2004 +0000
+++ b/devel/libtool-info/Makefile       Thu Oct 14 19:04:56 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2004/02/05 20:14:06 skrll Exp $
+# $NetBSD: Makefile,v 1.14 2004/10/14 19:04:56 tv Exp $
 #
 
 .include "../../devel/libtool/Makefile.common"
 
-PKGNAME=       ${DISTNAME:C/-/-info-/}
+PKGNAME=       ${DISTNAME:S/-/-info-/}
 SVR4_PKGNAME=  ltooi
 
 COMMENT=       Generic shared library support script - info pages
diff -r 886e40842a96 -r f54c0e3474f2 devel/libtool/Makefile
--- a/devel/libtool/Makefile    Thu Oct 14 19:03:45 2004 +0000
+++ b/devel/libtool/Makefile    Thu Oct 14 19:04:56 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2004/05/26 13:51:07 tron Exp $
+# $NetBSD: Makefile,v 1.43 2004/10/14 19:04:56 tv Exp $
 
 .include "Makefile.common"
 
@@ -7,6 +7,9 @@
 DEPENDS+=      ${DISTNAME:S/-/-base-/}{,nb[0-9]*}:../libtool-base
 DEPENDS+=      ${DISTNAME:S/-/-info-/}{,nb[0-9]*}:../libtool-info
 
+# There is no libltdl dependency here; this is deliberate, so that libltdl
+# can be updated independently of the rest of libtool.
+
 COMMENT=       Generic shared library support script
 
 NO_CONFIGURE=  yes
diff -r 886e40842a96 -r f54c0e3474f2 devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common     Thu Oct 14 19:03:45 2004 +0000
+++ b/devel/libtool/Makefile.common     Thu Oct 14 19:04:56 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2004/10/14 16:15:26 tv Exp $
+# $NetBSD: Makefile.common,v 1.55 2004/10/14 19:04:56 tv Exp $
 #
 
 DISTNAME=      libtool-1.5.10
@@ -22,3 +22,25 @@
 AUTOMAKE_OVERRIDE=     NO
 
 CONFIGURE_ARGS+=       -C # autoconf cache speedup
+
+.include "../../mk/bsd.prefs.mk"
+
+# The configure script persists in trying to find the path to ld, which
+# always ends up in ${BUILDLINK_DIR}.  Prevent it from caring.
+#
+CONFIGURE_ENV+=                lt_cv_path_LD=${LD:Q}
+
+# The configure script persists in trying to find the path to sed or gsed,
+# which breaks when SED is nbsed.  Tell it explicitly to use the sed
+# named by ${SED}.
+#
+CONFIGURE_ENV+=                SED=${SED:Q}
+CONFIGURE_ENV+=                lt_cv_path_SED=${SED:Q}
+
+# The configure script doesn't seem to be working out the need for -p
+# or -B, so tell it
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=                lt_cv_path_NM="nm -p"
+.elif ${OPSYS} == "IRIX"
+CONFIGURE_ENV+=                lt_cv_path_NM="nm -B"
+.endif