sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set EXPR_COMPAT environment variable to workaround a problem with expr(1)

Browse source 
on -current.
This commit is contained in:
Maxim Sobolev 2002-05-02 07:49:56 +00:00
parent f096dafe1f
commit ab99cf22d5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=58456
10 changed files with 145 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devel/gnu-libtool/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= libtool PORTNAME= libtool
PORTVERSION= 1.3.4 PORTVERSION= 1.3.4
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool MASTER_SITE_SUBDIR= libtool

43
devel/gnu-libtool/files/patch-ad
View file

@ -1,6 +1,19 @@
--- ltmain.sh.orig Tue Dec 7 13:50:49 1999
+++ ltmain.sh Mon Jan 17 16:33:06 2000 $FreeBSD$
@@ -54,7 +54,7 @@
--- ltmain.sh.orig Tue Dec 7 23:50:49 1999
+++ ltmain.sh Thu May 2 10:24:05 2002
@@ -23,6 +23,9 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+EXPR_COMPAT=1
+export EXPR_COMPAT
+
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
@@ -54,7 +57,7 @@
# Constants. # Constants.
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
PACKAGE=libtool PACKAGE=libtool
@ -9,7 +22,7 @@
TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
default_mode= default_mode=
@@ -952,7 +952,11 @@ @@ -952,7 +955,11 @@
continue continue
;; ;;
release) release)
@ -22,7 +35,7 @@
prev= prev=
continue continue
;; ;;
@@ -1005,6 +1009,7 @@ @@ -1005,6 +1012,7 @@
;; ;;
-avoid-version) -avoid-version)
@ -30,7 +43,7 @@
avoid_version=yes avoid_version=yes
continue continue
;; ;;
@@ -1091,6 +1096,10 @@ @@ -1091,6 +1099,10 @@
deplibs="$deplibs $arg" deplibs="$deplibs $arg"
;; ;;
@ -41,7 +54,7 @@
-module) -module)
module=yes module=yes
continue continue
@@ -1168,7 +1177,7 @@ @@ -1168,7 +1180,7 @@
*.o | *.obj | *.a | *.lib) *.o | *.obj | *.a | *.lib)
# A standard object. # A standard object.
@ -50,7 +63,7 @@
;; ;;
*.lo) *.lo)
@@ -1603,12 +1612,6 @@ @@ -1603,12 +1615,6 @@
exit 1 exit 1
fi fi
@ -63,7 +76,7 @@
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
fi fi
@@ -1795,6 +1798,9 @@ @@ -1795,6 +1801,9 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)! # these systems don't actually have a c library (as such)!
;; ;;
@ -73,7 +86,7 @@
*) *)
# Add libc to deplibs on all other systems. # Add libc to deplibs on all other systems.
deplibs="$deplibs -lc" deplibs="$deplibs -lc"
@@ -1802,6 +1808,94 @@ @@ -1802,6 +1811,94 @@
esac esac
fi fi
@ -168,7 +181,7 @@
# Create the output directory, or remove our outputs if we need to. # Create the output directory, or remove our outputs if we need to.
if test -d $output_objdir; then if test -d $output_objdir; then
$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
@@ -1817,7 +1911,11 @@ @@ -1817,7 +1914,11 @@
# Now set the variables for building old libraries. # Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
@ -181,7 +194,7 @@
# Transform .lo files to .o files. # Transform .lo files to .o files.
oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
@@ -2011,7 +2109,11 @@ @@ -2011,7 +2112,11 @@
echo "*** \`nm' from GNU binutils and a full rebuild may help." echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi fi
if test "$build_old_libs" = no; then if test "$build_old_libs" = no; then
@ -194,7 +207,7 @@
build_libtool_libs=module build_libtool_libs=module
build_old_libs=yes build_old_libs=yes
else else
@@ -3059,7 +3161,11 @@ @@ -3059,7 +3164,11 @@
case "$output" in case "$output" in
*.la) *.la)
old_library= old_library=
@ -207,7 +220,7 @@
$show "creating $output" $show "creating $output"
if test -n "$xrpath"; then if test -n "$xrpath"; then
@@ -3348,10 +3454,12 @@ @@ -3348,10 +3457,12 @@
fi fi
# Install the pseudo-library for information purposes. # Install the pseudo-library for information purposes.
@ -224,7 +237,7 @@
# Maybe install the static library, too. # Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -3440,7 +3548,6 @@ @@ -3440,7 +3551,6 @@
fi fi
libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
if test -n "$libdir" && test ! -f "$libfile"; then if test -n "$libdir" && test ! -f "$libfile"; then

2
devel/libtool/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= libtool PORTNAME= libtool
PORTVERSION= 1.3.4 PORTVERSION= 1.3.4
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool MASTER_SITE_SUBDIR= libtool

43
devel/libtool/files/patch-ad
View file

@ -1,6 +1,19 @@
--- ltmain.sh.orig Tue Dec 7 13:50:49 1999
+++ ltmain.sh Mon Jan 17 16:33:06 2000 $FreeBSD$
@@ -54,7 +54,7 @@
--- ltmain.sh.orig Tue Dec 7 23:50:49 1999
+++ ltmain.sh Thu May 2 10:24:05 2002
@@ -23,6 +23,9 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+EXPR_COMPAT=1
+export EXPR_COMPAT
+
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
@@ -54,7 +57,7 @@
# Constants. # Constants.
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
PACKAGE=libtool PACKAGE=libtool
@ -9,7 +22,7 @@
TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
default_mode= default_mode=
@@ -952,7 +952,11 @@ @@ -952,7 +955,11 @@
continue continue
;; ;;
release) release)
@ -22,7 +35,7 @@
prev= prev=
continue continue
;; ;;
@@ -1005,6 +1009,7 @@ @@ -1005,6 +1012,7 @@
;; ;;
-avoid-version) -avoid-version)
@ -30,7 +43,7 @@
avoid_version=yes avoid_version=yes
continue continue
;; ;;
@@ -1091,6 +1096,10 @@ @@ -1091,6 +1099,10 @@
deplibs="$deplibs $arg" deplibs="$deplibs $arg"
;; ;;
@ -41,7 +54,7 @@
-module) -module)
module=yes module=yes
continue continue
@@ -1168,7 +1177,7 @@ @@ -1168,7 +1180,7 @@
*.o | *.obj | *.a | *.lib) *.o | *.obj | *.a | *.lib)
# A standard object. # A standard object.
@ -50,7 +63,7 @@
;; ;;
*.lo) *.lo)
@@ -1603,12 +1612,6 @@ @@ -1603,12 +1615,6 @@
exit 1 exit 1
fi fi
@ -63,7 +76,7 @@
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
fi fi
@@ -1795,6 +1798,9 @@ @@ -1795,6 +1801,9 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)! # these systems don't actually have a c library (as such)!
;; ;;
@ -73,7 +86,7 @@
*) *)
# Add libc to deplibs on all other systems. # Add libc to deplibs on all other systems.
deplibs="$deplibs -lc" deplibs="$deplibs -lc"
@@ -1802,6 +1808,94 @@ @@ -1802,6 +1811,94 @@
esac esac
fi fi
@ -168,7 +181,7 @@
# Create the output directory, or remove our outputs if we need to. # Create the output directory, or remove our outputs if we need to.
if test -d $output_objdir; then if test -d $output_objdir; then
$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
@@ -1817,7 +1911,11 @@ @@ -1817,7 +1914,11 @@
# Now set the variables for building old libraries. # Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
@ -181,7 +194,7 @@
# Transform .lo files to .o files. # Transform .lo files to .o files.
oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
@@ -2011,7 +2109,11 @@ @@ -2011,7 +2112,11 @@
echo "*** \`nm' from GNU binutils and a full rebuild may help." echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi fi
if test "$build_old_libs" = no; then if test "$build_old_libs" = no; then
@ -194,7 +207,7 @@
build_libtool_libs=module build_libtool_libs=module
build_old_libs=yes build_old_libs=yes
else else
@@ -3059,7 +3161,11 @@ @@ -3059,7 +3164,11 @@
case "$output" in case "$output" in
*.la) *.la)
old_library= old_library=
@ -207,7 +220,7 @@
$show "creating $output" $show "creating $output"
if test -n "$xrpath"; then if test -n "$xrpath"; then
@@ -3348,10 +3454,12 @@ @@ -3348,10 +3457,12 @@
fi fi
# Install the pseudo-library for information purposes. # Install the pseudo-library for information purposes.
@ -224,7 +237,7 @@
# Maybe install the static library, too. # Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -3440,7 +3548,6 @@ @@ -3440,7 +3551,6 @@
fi fi
libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
if test -n "$libdir" && test ! -f "$libfile"; then if test -n "$libdir" && test ! -f "$libfile"; then

2
devel/libtool13/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= libtool PORTNAME= libtool
PORTVERSION= 1.3.4 PORTVERSION= 1.3.4
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool MASTER_SITE_SUBDIR= libtool

43
devel/libtool13/files/patch-ad
View file

@ -1,6 +1,19 @@
--- ltmain.sh.orig Tue Dec 7 13:50:49 1999
+++ ltmain.sh Mon Jan 17 16:33:06 2000 $FreeBSD$
@@ -54,7 +54,7 @@
--- ltmain.sh.orig Tue Dec 7 23:50:49 1999
+++ ltmain.sh Thu May 2 10:24:05 2002
@@ -23,6 +23,9 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+EXPR_COMPAT=1
+export EXPR_COMPAT
+
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
@@ -54,7 +57,7 @@
# Constants. # Constants.
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
PACKAGE=libtool PACKAGE=libtool
@ -9,7 +22,7 @@
TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
default_mode= default_mode=
@@ -952,7 +952,11 @@ @@ -952,7 +955,11 @@
continue continue
;; ;;
release) release)
@ -22,7 +35,7 @@
prev= prev=
continue continue
;; ;;
@@ -1005,6 +1009,7 @@ @@ -1005,6 +1012,7 @@
;; ;;
-avoid-version) -avoid-version)
@ -30,7 +43,7 @@
avoid_version=yes avoid_version=yes
continue continue
;; ;;
@@ -1091,6 +1096,10 @@ @@ -1091,6 +1099,10 @@
deplibs="$deplibs $arg" deplibs="$deplibs $arg"
;; ;;
@ -41,7 +54,7 @@
-module) -module)
module=yes module=yes
continue continue
@@ -1168,7 +1177,7 @@ @@ -1168,7 +1180,7 @@
*.o | *.obj | *.a | *.lib) *.o | *.obj | *.a | *.lib)
# A standard object. # A standard object.
@ -50,7 +63,7 @@
;; ;;
*.lo) *.lo)
@@ -1603,12 +1612,6 @@ @@ -1603,12 +1615,6 @@
exit 1 exit 1
fi fi
@ -63,7 +76,7 @@
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
fi fi
@@ -1795,6 +1798,9 @@ @@ -1795,6 +1801,9 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)! # these systems don't actually have a c library (as such)!
;; ;;
@ -73,7 +86,7 @@
*) *)
# Add libc to deplibs on all other systems. # Add libc to deplibs on all other systems.
deplibs="$deplibs -lc" deplibs="$deplibs -lc"
@@ -1802,6 +1808,94 @@ @@ -1802,6 +1811,94 @@
esac esac
fi fi
@ -168,7 +181,7 @@
# Create the output directory, or remove our outputs if we need to. # Create the output directory, or remove our outputs if we need to.
if test -d $output_objdir; then if test -d $output_objdir; then
$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
@@ -1817,7 +1911,11 @@ @@ -1817,7 +1914,11 @@
# Now set the variables for building old libraries. # Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
@ -181,7 +194,7 @@
# Transform .lo files to .o files. # Transform .lo files to .o files.
oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
@@ -2011,7 +2109,11 @@ @@ -2011,7 +2112,11 @@
echo "*** \`nm' from GNU binutils and a full rebuild may help." echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi fi
if test "$build_old_libs" = no; then if test "$build_old_libs" = no; then
@ -194,7 +207,7 @@
build_libtool_libs=module build_libtool_libs=module
build_old_libs=yes build_old_libs=yes
else else
@@ -3059,7 +3161,11 @@ @@ -3059,7 +3164,11 @@
case "$output" in case "$output" in
*.la) *.la)
old_library= old_library=
@ -207,7 +220,7 @@
$show "creating $output" $show "creating $output"
if test -n "$xrpath"; then if test -n "$xrpath"; then
@@ -3348,10 +3454,12 @@ @@ -3348,10 +3457,12 @@
fi fi
# Install the pseudo-library for information purposes. # Install the pseudo-library for information purposes.
@ -224,7 +237,7 @@
# Maybe install the static library, too. # Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -3440,7 +3548,6 @@ @@ -3440,7 +3551,6 @@
fi fi
libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
if test -n "$libdir" && test ! -f "$libfile"; then if test -n "$libdir" && test ! -f "$libfile"; then

2
devel/libtool14/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= libtool PORTNAME= libtool
PORTVERSION= 1.3.4 PORTVERSION= 1.3.4
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool MASTER_SITE_SUBDIR= libtool

43
devel/libtool14/files/patch-ad
View file

@ -1,6 +1,19 @@
--- ltmain.sh.orig Tue Dec 7 13:50:49 1999
+++ ltmain.sh Mon Jan 17 16:33:06 2000 $FreeBSD$
@@ -54,7 +54,7 @@
--- ltmain.sh.orig Tue Dec 7 23:50:49 1999
+++ ltmain.sh Thu May 2 10:24:05 2002
@@ -23,6 +23,9 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+EXPR_COMPAT=1
+export EXPR_COMPAT
+
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
@@ -54,7 +57,7 @@
# Constants. # Constants.
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
PACKAGE=libtool PACKAGE=libtool
@ -9,7 +22,7 @@
TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
default_mode= default_mode=
@@ -952,7 +952,11 @@ @@ -952,7 +955,11 @@
continue continue
;; ;;
release) release)
@ -22,7 +35,7 @@
prev= prev=
continue continue
;; ;;
@@ -1005,6 +1009,7 @@ @@ -1005,6 +1012,7 @@
;; ;;
-avoid-version) -avoid-version)
@ -30,7 +43,7 @@
avoid_version=yes avoid_version=yes
continue continue
;; ;;
@@ -1091,6 +1096,10 @@ @@ -1091,6 +1099,10 @@
deplibs="$deplibs $arg" deplibs="$deplibs $arg"
;; ;;
@ -41,7 +54,7 @@
-module) -module)
module=yes module=yes
continue continue
@@ -1168,7 +1177,7 @@ @@ -1168,7 +1180,7 @@
*.o | *.obj | *.a | *.lib) *.o | *.obj | *.a | *.lib)
# A standard object. # A standard object.
@ -50,7 +63,7 @@
;; ;;
*.lo) *.lo)
@@ -1603,12 +1612,6 @@ @@ -1603,12 +1615,6 @@
exit 1 exit 1
fi fi
@ -63,7 +76,7 @@
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
fi fi
@@ -1795,6 +1798,9 @@ @@ -1795,6 +1801,9 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)! # these systems don't actually have a c library (as such)!
;; ;;
@ -73,7 +86,7 @@
*) *)
# Add libc to deplibs on all other systems. # Add libc to deplibs on all other systems.
deplibs="$deplibs -lc" deplibs="$deplibs -lc"
@@ -1802,6 +1808,94 @@ @@ -1802,6 +1811,94 @@
esac esac
fi fi
@ -168,7 +181,7 @@
# Create the output directory, or remove our outputs if we need to. # Create the output directory, or remove our outputs if we need to.
if test -d $output_objdir; then if test -d $output_objdir; then
$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
@@ -1817,7 +1911,11 @@ @@ -1817,7 +1914,11 @@
# Now set the variables for building old libraries. # Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
@ -181,7 +194,7 @@
# Transform .lo files to .o files. # Transform .lo files to .o files.
oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
@@ -2011,7 +2109,11 @@ @@ -2011,7 +2112,11 @@
echo "*** \`nm' from GNU binutils and a full rebuild may help." echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi fi
if test "$build_old_libs" = no; then if test "$build_old_libs" = no; then
@ -194,7 +207,7 @@
build_libtool_libs=module build_libtool_libs=module
build_old_libs=yes build_old_libs=yes
else else
@@ -3059,7 +3161,11 @@ @@ -3059,7 +3164,11 @@
case "$output" in case "$output" in
*.la) *.la)
old_library= old_library=
@ -207,7 +220,7 @@
$show "creating $output" $show "creating $output"
if test -n "$xrpath"; then if test -n "$xrpath"; then
@@ -3348,10 +3454,12 @@ @@ -3348,10 +3457,12 @@
fi fi
# Install the pseudo-library for information purposes. # Install the pseudo-library for information purposes.
@ -224,7 +237,7 @@
# Maybe install the static library, too. # Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -3440,7 +3548,6 @@ @@ -3440,7 +3551,6 @@
fi fi
libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
if test -n "$libdir" && test ! -f "$libfile"; then if test -n "$libdir" && test ! -f "$libfile"; then

2
devel/libtool15/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= libtool PORTNAME= libtool
PORTVERSION= 1.3.4 PORTVERSION= 1.3.4
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool MASTER_SITE_SUBDIR= libtool

43
devel/libtool15/files/patch-ad
View file

@ -1,6 +1,19 @@
--- ltmain.sh.orig Tue Dec 7 13:50:49 1999
+++ ltmain.sh Mon Jan 17 16:33:06 2000 $FreeBSD$
@@ -54,7 +54,7 @@
--- ltmain.sh.orig Tue Dec 7 23:50:49 1999
+++ ltmain.sh Thu May 2 10:24:05 2002
@@ -23,6 +23,9 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+EXPR_COMPAT=1
+export EXPR_COMPAT
+
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
@@ -54,7 +57,7 @@
# Constants. # Constants.
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
PACKAGE=libtool PACKAGE=libtool
@ -9,7 +22,7 @@
TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
default_mode= default_mode=
@@ -952,7 +952,11 @@ @@ -952,7 +955,11 @@
continue continue
;; ;;
release) release)
@ -22,7 +35,7 @@
prev= prev=
continue continue
;; ;;
@@ -1005,6 +1009,7 @@ @@ -1005,6 +1012,7 @@
;; ;;
-avoid-version) -avoid-version)
@ -30,7 +43,7 @@
avoid_version=yes avoid_version=yes
continue continue
;; ;;
@@ -1091,6 +1096,10 @@ @@ -1091,6 +1099,10 @@
deplibs="$deplibs $arg" deplibs="$deplibs $arg"
;; ;;
@ -41,7 +54,7 @@
-module) -module)
module=yes module=yes
continue continue
@@ -1168,7 +1177,7 @@ @@ -1168,7 +1180,7 @@
*.o | *.obj | *.a | *.lib) *.o | *.obj | *.a | *.lib)
# A standard object. # A standard object.
@ -50,7 +63,7 @@
;; ;;
*.lo) *.lo)
@@ -1603,12 +1612,6 @@ @@ -1603,12 +1615,6 @@
exit 1 exit 1
fi fi
@ -63,7 +76,7 @@
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
fi fi
@@ -1795,6 +1798,9 @@ @@ -1795,6 +1801,9 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)! # these systems don't actually have a c library (as such)!
;; ;;
@ -73,7 +86,7 @@
*) *)
# Add libc to deplibs on all other systems. # Add libc to deplibs on all other systems.
deplibs="$deplibs -lc" deplibs="$deplibs -lc"
@@ -1802,6 +1808,94 @@ @@ -1802,6 +1811,94 @@
esac esac
fi fi
@ -168,7 +181,7 @@
# Create the output directory, or remove our outputs if we need to. # Create the output directory, or remove our outputs if we need to.
if test -d $output_objdir; then if test -d $output_objdir; then
$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
@@ -1817,7 +1911,11 @@ @@ -1817,7 +1914,11 @@
# Now set the variables for building old libraries. # Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
@ -181,7 +194,7 @@
# Transform .lo files to .o files. # Transform .lo files to .o files.
oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
@@ -2011,7 +2109,11 @@ @@ -2011,7 +2112,11 @@
echo "*** \`nm' from GNU binutils and a full rebuild may help." echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi fi
if test "$build_old_libs" = no; then if test "$build_old_libs" = no; then
@ -194,7 +207,7 @@
build_libtool_libs=module build_libtool_libs=module
build_old_libs=yes build_old_libs=yes
else else
@@ -3059,7 +3161,11 @@ @@ -3059,7 +3164,11 @@
case "$output" in case "$output" in
*.la) *.la)
old_library= old_library=
@ -207,7 +220,7 @@
$show "creating $output" $show "creating $output"
if test -n "$xrpath"; then if test -n "$xrpath"; then
@@ -3348,10 +3454,12 @@ @@ -3348,10 +3457,12 @@
fi fi
# Install the pseudo-library for information purposes. # Install the pseudo-library for information purposes.
@ -224,7 +237,7 @@
# Maybe install the static library, too. # Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -3440,7 +3548,6 @@ @@ -3440,7 +3551,6 @@
fi fi
libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
if test -n "$libdir" && test ! -f "$libfile"; then if test -n "$libdir" && test ! -f "$libfile"; then