cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to 2.27

Browse Source 
- Remove not-used patches
- Add patch for libiconv
- fixes non-root users to 'make configure' problem
This commit is contained in:
shell 2001-07-18 13:56:29 +00:00
parent 75f449b010
commit 444d10b721
13 changed files with 164 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/clisp/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.8 2001/05/30 10:46:45 shell Exp $
# $OpenBSD: Makefile,v 1.9 2001/07/18 13:56:29 shell Exp $
# $FreeBSD: ports/lang/clisp/Makefile,v 1.4 2000/05/14 05:40:46 billf Exp $
NOT_FOR_ARCHS= powerpc sparc
COMMENT= "ANSI Common Lisp compiler"
VERSION= 2.26
VERSION= 2.27
DISTNAME= clisp-${VERSION}
CATEGORIES= lang
NEED_VERSION= 1.378

6
lang/clisp/files/md5
View File

@ -1,3 +1,3 @@
MD5 (clisp-2.26.tar.bz2) = c933df9f6b22ea09f27221a3a58de90b
RMD160 (clisp-2.26.tar.bz2) = 514d0a839fd1829a9a995781ddcce5fe2a9b770c
SHA1 (clisp-2.26.tar.bz2) = 69d2423ed72f8363cd85ae4c06e9a63800e9d7d9
MD5 (clisp-2.27.tar.bz2) = d4939d1dbc1d4625dadc9e619d78eccc
RMD160 (clisp-2.27.tar.bz2) = 29084554ac5cd8b12930e9bca02a5fc5f6f8dd0a
SHA1 (clisp-2.27.tar.bz2) = ee0a9bfcb9c4d86bdcb8e0bfd3b9ff3defe4c1a8

27
lang/clisp/patches/patch-ffcall_autoconf_ltconfig
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-ffcall_autoconf_ltconfig,v 1.2 2001/05/25 19:40:06 shell Exp $
--- ffcall/autoconf/ltconfig.orig Fri May 25 13:02:38 2001
+++ ffcall/autoconf/ltconfig Fri May 25 13:04:03 2001
@@ -1396,10 +1396,21 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib$libobjs'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib$libobjs'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)

22
lang/clisp/patches/patch-ffcall_autoconf_ltmain_sh
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06 shell Exp $
--- ffcall/autoconf/ltmain.sh.orig Fri May 25 13:05:26 2001
+++ ffcall/autoconf/ltmain.sh Sat May 26 01:06:23 2001
@@ -1080,6 +1080,13 @@
continue
$OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.3 2001/07/18 13:56:29 shell Exp $
--- ffcall/autoconf/ltmain.sh.orig Wed Jul 18 19:38:59 2001
+++ ffcall/autoconf/ltmain.sh Wed Jul 18 19:39:53 2001
@@ -1032,6 +1032,13 @@
test "X$arg" = "X-lc" && continue
;;
esac
+ elif test "$arg" = "-lc_r"; then
@ -12,12 +12,12 @@ $OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06 shell Exp $
+ continue
+ ;;
+ esac
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -3567,40 +3574,6 @@
fi
deplibs="$deplibs $arg"
continue
@@ -4412,40 +4419,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
@ -27,7 +27,7 @@ $OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06 shell Exp $
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"

18
lang/clisp/patches/patch-libiconv-Makefile_in Normal file
View File

@ -0,0 +1,18 @@
--- libiconv/Makefile.in.orig Wed Jul 18 20:09:49 2001
+++ libiconv/Makefile.in Wed Jul 18 20:10:21 2001
@@ -18,9 +18,12 @@
@SET_MAKE@
# Programs used by "make install":
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
+#INSTALL = @INSTALL@
+#INSTALL_PROGRAM = @INSTALL_PROGRAM@
+#INSTALL_DATA = @INSTALL_DATA@
+INSTALL=install -c
+INSTALL_PROGRAM=install -c -s -m 555
+INSTALL_DATA=install -c -m 644
#### End of system configuration section. ####

18
lang/clisp/patches/patch-libiconv-lib-Makefile_in Normal file
View File

@ -0,0 +1,18 @@
--- libiconv/lib/Makefile.in.orig Wed Jul 18 20:18:49 2001
+++ libiconv/lib/Makefile.in Wed Jul 18 20:19:17 2001
@@ -29,9 +29,12 @@
RM = rm -f
# Programs used by "make install":
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
+#INSTALL = @INSTALL@
+#INSTALL_PROGRAM = @INSTALL_PROGRAM@
+#INSTALL_DATA = @INSTALL_DATA@
+INSTALL=install -c
+INSTALL_PROGRAM=install -c -s -m 555
+INSTALL_DATA=install -c -m 644
#### End of system configuration section. ####

16
lang/clisp/patches/patch-libiconv-libcharset-Makefile_in Normal file
View File

@ -0,0 +1,16 @@
--- libiconv/libcharset/Makefile.in.orig Wed Jul 18 20:14:51 2001
+++ libiconv/libcharset/Makefile.in Wed Jul 18 20:15:12 2001
@@ -20,8 +20,11 @@
@SET_MAKE@
# Programs used by "make install":
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
+#INSTALL = @INSTALL@
+#INSTALL_DATA = @INSTALL_DATA@
+INSTALL=install -c
+INSTALL_PROGRAM=install -c -s -m 555
+INSTALL_DATA=install -c -m 644
MKINSTALLDIRS = $(SHELL) $(srcdir)/autoconf/mkinstalldirs
#### End of system configuration section. ####

16
lang/clisp/patches/patch-libiconv-libcharset-lib-Makefile_in Normal file
View File

@ -0,0 +1,16 @@
--- libiconv/libcharset/lib/Makefile.in.orig Wed Jul 18 20:22:02 2001
+++ libiconv/libcharset/lib/Makefile.in Wed Jul 18 20:22:43 2001
@@ -25,8 +25,11 @@
RM = rm -f
# Programs used by "make install":
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
+#INSTALL = @INSTALL@
+#INSTALL_DATA = @INSTALL_DATA@
+INSTALL=install -c
+INSTALL_PROGRAM=install -c -s -m 555
+INSTALL_DATA=install -c -m 644
MKINSTALLDIRS = $(SHELL) $(srcdir)/../autoconf/mkinstalldirs
#### End of system configuration section. ####

46
lang/clisp/patches/patch-libiconv_autoconf_ltmain_sh
View File

@ -1,48 +1,46 @@
$OpenBSD: patch-libiconv_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06 shell Exp $
--- libiconv/autoconf/ltmain.sh.orig Sat May 26 01:03:04 2001
+++ libiconv/autoconf/ltmain.sh Sat May 26 01:05:22 2001
@@ -1079,7 +1079,17 @@
# These systems don't actually have c library (as such)
continue
$OpenBSD: patch-libiconv_autoconf_ltmain_sh,v 1.3 2001/07/18 13:56:29 shell Exp $
--- libiconv/autoconf/ltmain.sh.orig Wed Jul 18 19:41:30 2001
+++ libiconv/autoconf/ltmain.sh Wed Jul 18 19:43:42 2001
@@ -1031,6 +1031,16 @@
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
+ *-*-openbsd*)
+ continue
+ ;;
esac
+ esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -1091,6 +1101,10 @@
esac
fi
deplibs="$deplibs $arg"
@@ -1078,6 +1088,10 @@
continue
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
-R)
prev=xrpath
continue
@@ -1799,6 +1813,9 @@
# rhapsody is a little odd...
@@ -2405,7 +2419,7 @@
# Rhapsody C library is in the System framework
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ ;;
- *-*-netbsd*)
+ *-*-netbsd* | *-*-openbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3567,40 +3584,6 @@
@@ -4412,40 +4426,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
@ -52,7 +50,7 @@ $OpenBSD: patch-libiconv_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06 shell Exp
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"

52
lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltconfig
View File

@ -1,52 +0,0 @@
$OpenBSD: patch-libiconv_libcharset_autoconf_ltconfig,v 1.2 2001/05/25 19:40:06 shell Exp $
--- libiconv/libcharset/autoconf/ltconfig.orig Sat May 26 01:07:07 2001
+++ libiconv/libcharset/autoconf/ltconfig Sat May 26 01:08:10 2001
@@ -1105,6 +1105,9 @@
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1402,10 +1405,21 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2021,13 +2035,10 @@
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

46
lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltmain_sh
View File

@ -1,13 +1,11 @@
$OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06 shell Exp $
--- libiconv/libcharset/autoconf/ltmain.sh.orig Wed Feb 21 22:13:49 2001
+++ libiconv/libcharset/autoconf/ltmain.sh Sat May 26 02:17:25 2001
@@ -1079,7 +1079,18 @@
# These systems don't actually have c library (as such)
continue
$OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.3 2001/07/18 13:56:29 shell Exp $
--- libiconv/libcharset/autoconf/ltmain.sh.orig Sat Jun 9 06:24:39 2001
+++ libiconv/libcharset/autoconf/ltmain.sh Wed Jul 18 19:44:47 2001
@@ -1031,6 +1031,16 @@
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
- esac
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ esac
@ -17,34 +15,32 @@ $OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -1091,6 +1102,10 @@
esac
fi
deplibs="$deplibs $arg"
@@ -1078,6 +1088,10 @@
continue
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
-R)
prev=xrpath
continue
@@ -1799,6 +1814,9 @@
# rhapsody is a little odd...
@@ -2405,7 +2419,7 @@
# Rhapsody C library is in the System framework
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ ;;
- *-*-netbsd*)
+ *-*-netbsd* | *-*-openbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3567,40 +3585,6 @@
@@ -4412,40 +4426,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
@ -54,7 +50,7 @@ $OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:06
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"

27
lang/clisp/patches/patch-sigsegv_autoconf_ltconfig
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-sigsegv_autoconf_ltconfig,v 1.2 2001/05/25 19:40:06 shell Exp $
--- sigsegv/autoconf/ltconfig.orig Sat May 26 01:10:53 2001
+++ sigsegv/autoconf/ltconfig Sat May 26 01:12:20 2001
@@ -1396,10 +1396,21 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib$libobjs'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib$libobjs'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)

51
lang/clisp/patches/patch-sigsegv_autoconf_ltmain_sh
View File

@ -1,53 +1,46 @@
$OpenBSD: patch-sigsegv_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:07 shell Exp $
--- sigsegv/autoconf/ltmain.sh.orig Tue Mar 20 04:52:26 2001
+++ sigsegv/autoconf/ltmain.sh Sat May 26 03:24:13 2001
@@ -1079,7 +1079,18 @@
# These systems don't actually have c library (as such)
continue
$OpenBSD: patch-sigsegv_autoconf_ltmain_sh,v 1.3 2001/07/18 13:56:29 shell Exp $
--- sigsegv/autoconf/ltmain.sh.orig Sat Jun 9 06:24:43 2001
+++ sigsegv/autoconf/ltmain.sh Wed Jul 18 19:46:17 2001
@@ -1031,6 +1031,16 @@
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
esac
+ esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -1091,6 +1102,10 @@
esac
fi
deplibs="$deplibs $arg"
@@ -1078,6 +1088,10 @@
continue
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
-R)
prev=xrpath
continue
@@ -1799,9 +1814,12 @@
# rhapsody is a little odd...
@@ -2405,7 +2419,7 @@
# Rhapsody C library is in the System framework
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
- deplibs="$deplibs -lc"
+ deplibs="$deplibs -lc"
- *-*-netbsd*)
+ *-*-netbsd* | *-*-openbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
esac
fi
@@ -3567,40 +3585,6 @@
*)
@@ -4412,40 +4426,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
@ -57,7 +50,7 @@ $OpenBSD: patch-sigsegv_autoconf_ltmain_sh,v 1.2 2001/05/25 19:40:07 shell Exp $
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"