pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel Update to 1.5.6 (OK'd by skrll).
details: https://anonhg.NetBSD.org/pkgsrc/rev/4c5a6eee615d
branches: trunk
changeset: 473651:4c5a6eee615d
user: tv <tv%pkgsrc.org@localhost>
date: Thu Apr 22 14:40:29 2004 +0000
description:
Update to 1.5.6 (OK'd by skrll).
* In libtool-base, generate shlibtool with a simple sed script; no full
build is actually needed.
Changelog:
New in 1.5.6: 2004-04-11; CVS version 1.5.5a, Libtool team:
* Installs libltdl files properly in $prefix/share/libtool/libltdl. 1.5.4
did not install them at all.
* libltdl correctly guesses the extension for loadable modules again.
New in 1.5.4: 2004-04-03; CVS version 1.5.3a, Libtool team:
* Bug fixes.
diffstat:
devel/libtool-base/Makefile | 25 +-
devel/libtool/Makefile.common | 5 +-
devel/libtool/distinfo | 12 +-
devel/libtool/patches/patch-ab | 629 +---------------
devel/libtool/patches/patch-ac | 99 +--
devel/libtool/patches/patch-ad | 1489 +++++++++------------------------------
6 files changed, 427 insertions(+), 1832 deletions(-)
diffs (truncated from 2738 to 300 lines):
diff -r 380c3ec889ce -r 4c5a6eee615d devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile Thu Apr 22 14:31:35 2004 +0000
+++ b/devel/libtool-base/Makefile Thu Apr 22 14:40:29 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/02/29 10:28:24 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2004/04/22 14:40:29 tv Exp $
#
PKGNAME= ${DISTNAME:C/-/-base-/}
@@ -26,7 +26,7 @@
.if ${OPSYS} == "NetBSD"
. if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so)
-CONFIGURE_ARGS= --disable-shared
+5~CONFIGURE_ARGS= --disable-shared
BUILD_SHLIBTOOL= NO
. endif
.else
@@ -56,7 +56,6 @@
.endif
BUILD_SHLIBTOOL?= YES
-BUILDING_SHLIBTOOL?= NO
.PHONY: fix-libtool
fix-libtool:
@@ -68,26 +67,18 @@
post-build: fix-libtool
-.if ${BUILDING_SHLIBTOOL} == "YES"
-CONFIGURE_ARGS+= --disable-static
+.if ${BUILD_SHLIBTOOL} == "NO"
+PLIST_SUBST+= SHLIBTOOL="@comment "
.else
-SHLIBTOOL_WRKDIR= ${WRKDIR}/shlibtool
-SHLIBTOOL_WRKSRC= ${WRKSRC:S/${WRKDIR}/${SHLIBTOOL_WRKDIR}/}
-SHLIBTOOL_MAKEFLAGS= BUILDING_SHLIBTOOL=YES
-SHLIBTOOL_MAKEFLAGS+= WRKDIR=${SHLIBTOOL_WRKDIR}
-
-. if ${BUILD_SHLIBTOOL} == "NO"
-PLIST_SUBST+= SHLIBTOOL="@comment "
-. else
PLIST_SUBST+= SHLIBTOOL=
post-build:
- cd ${.CURDIR} && ${MAKE} build ${SHLIBTOOL_MAKEFLAGS}
+ cd ${WRKSRC} && \
+ ${SED} -e '/^# Whether or not to build static/{n;s/yes/no/;}' \
+ < libtool > shlibtool
post-install:
- ${INSTALL_SCRIPT} ${SHLIBTOOL_WRKSRC}/libtool \
- ${PREFIX}/bin/shlibtool
-. endif
+ ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${PREFIX}/bin/shlibtool
.endif
.include "../../mk/bsd.pkg.mk"
diff -r 380c3ec889ce -r 4c5a6eee615d devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common Thu Apr 22 14:31:35 2004 +0000
+++ b/devel/libtool/Makefile.common Thu Apr 22 14:40:29 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.common,v 1.50 2004/04/21 14:55:32 tv Exp $
+# $NetBSD: Makefile.common,v 1.51 2004/04/22 14:40:29 tv Exp $
#
-DISTNAME= libtool-1.5.2
-PKGREVISION= 7
+DISTNAME= libtool-1.5.6
CATEGORIES= devel pkgtools
MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}
diff -r 380c3ec889ce -r 4c5a6eee615d devel/libtool/distinfo
--- a/devel/libtool/distinfo Thu Apr 22 14:31:35 2004 +0000
+++ b/devel/libtool/distinfo Thu Apr 22 14:40:29 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.41 2004/04/21 19:24:49 tv Exp $
+$NetBSD: distinfo,v 1.42 2004/04/22 14:40:29 tv Exp $
-SHA1 (libtool-1.5.2.tar.gz) = d6f1e8fb544d71b3c88fb959521b34b9b6290260
-Size (libtool-1.5.2.tar.gz) = 2653072 bytes
+SHA1 (libtool-1.5.6.tar.gz) = 6018b2661725e9689d7f782c5a2a489e928698ba
+Size (libtool-1.5.6.tar.gz) = 2665434 bytes
SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = 9579b82ec97663665f1cfc6e61f965f95b0e0b95
-SHA1 (patch-ac) = b09fb38a59875a60bb51c9fb487e940521a71715
-SHA1 (patch-ad) = 97be231b803d8a058dfa11930f3314126837ed35
+SHA1 (patch-ab) = 8fd750bc0d6a5cd247f7788909325abd073efabf
+SHA1 (patch-ac) = 998846b81d9e69d4ff469d644377a57f83a1adc1
+SHA1 (patch-ad) = 83172e62964fd3e666b4e47101970ec27769dc5c
diff -r 380c3ec889ce -r 4c5a6eee615d devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab Thu Apr 22 14:31:35 2004 +0000
+++ b/devel/libtool/patches/patch-ab Thu Apr 22 14:40:29 2004 +0000
@@ -1,177 +1,8 @@
-$NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
+$NetBSD: patch-ab,v 1.37 2004/04/22 14:40:29 tv Exp $
---- configure.orig Sun Jan 25 07:36:38 2004
+--- configure.orig Thu Apr 22 10:23:09 2004
+++ configure
-@@ -1156,7 +1156,7 @@ esac
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
-- cd "$ac_popdir"
-+ cd $ac_popdir
- done
- fi
-
-@@ -1717,7 +1717,7 @@ else
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
-
--if mkdir -p -- . 2>/dev/null; then
-+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # Keeping the `.' argument allows $(mkdir_p) to be used without
- # argument. Indeed, we sometimes output rules like
- # $(mkdir_p) $(somedir)
-@@ -1730,7 +1730,7 @@ else
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
-- for d in ./-p ./--;
-+ for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
-@@ -2580,7 +2580,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2638,7 +2639,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2754,7 +2756,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2808,7 +2811,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2853,7 +2857,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2897,7 +2902,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3042,7 +3048,9 @@ else
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- : > sub/conftst$i.h
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-@@ -3543,7 +3551,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3601,7 +3610,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3672,7 +3682,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3716,7 +3727,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3790,7 +3802,9 @@ else
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- : > sub/conftst$i.h
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-@@ -4002,7 +4016,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4051,7 +4066,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_f77_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4424,10 +4440,13 @@ beos*)
+@@ -4440,10 +4440,13 @@ beos*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -189,7 +20,7 @@
;;
cygwin*)
-@@ -4485,6 +4504,10 @@ hpux10.20* | hpux11*)
+@@ -4501,6 +4504,10 @@ hpux10.20* | hpux11*)
esac
;;
@@ -200,47 +31,7 @@
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
-@@ -4745,7 +4768,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5296,7 +5320,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
Home |
Main Index |
Thread Index |
Old Index