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

- break jumbo patch down and rename.

Browse Source 
- sync with libtool.
This commit is contained in:
danh 2001-02-20 21:38:53 +00:00
parent 356947debc
commit 527171a23e
15 changed files with 192 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
graphics/aalib/patches/patch-aa
View File

@ -1,87 +0,0 @@
--- aaedit.c.orig Mon Mar 15 13:39:27 1999
+++ aaedit.c Mon Mar 15 13:39:36 1999
@@ -1,6 +1,5 @@
#include <string.h>
#include <ctype.h>
-#include <malloc.h>
#include "aalib.h"
static void aa_editdisplay(struct aa_edit *e)
{
--- aafire.c.orig Mon Mar 15 13:40:52 1999
+++ aafire.c Mon Mar 15 13:40:59 1999
@@ -1,6 +1,5 @@
#include <stdio.h>
#include <string.h>
-#include <malloc.h>
#include <stdlib.h>
#include "aalib.h"
--- aakbdreg.c.orig Mon Mar 15 13:43:05 1999
+++ aakbdreg.c Mon Mar 15 13:42:16 1999
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include "config.h"
#include "aalib.h"
struct aa_kbddriver *aa_kbddrivers[] =
--- aalib.c.orig Mon Mar 15 13:44:00 1999
+++ aalib.c Mon Mar 15 13:44:09 1999
@@ -1,6 +1,5 @@
#include <stdio.h>
#include <string.h>
-#include <malloc.h>
#include "aalib.h"
#include "aaint.h"
--- aalinux.c.orig Mon Mar 15 13:44:28 1999
+++ aalinux.c Mon Mar 15 13:44:41 1999
@@ -1,7 +1,6 @@
#include "config.h"
#ifdef LINUX_DRIVER
#include <sys/stat.h>
-#include <malloc.h>
#include <sys/ioctl.h>
#include <linux/kd.h>
#ifdef GPM_MOUSEDRIVER
--- aamoureg.c.orig Mon Mar 15 13:45:45 1999
+++ aamoureg.c Mon Mar 15 13:45:50 1999
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include "config.h"
#include "aalib.h"
struct aa_mousedriver *aa_mousedrivers[] =
--- aarec.c.orig Mon Mar 15 13:48:23 1999
+++ aarec.c Mon Mar 15 13:48:29 1999
@@ -1,5 +1,4 @@
#include <string.h>
-#include <malloc.h>
#include "aalib.h"
aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL,
*aa_displayrecommended = NULL;
--- aaregist.c.orig Mon Mar 15 13:50:40 1999
+++ aaregist.c Mon Mar 15 13:50:46 1999
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include "config.h"
#include "aalib.h"
struct aa_driver *aa_drivers[] =
--- aax.c.orig Mon Mar 15 13:52:00 1999
+++ aax.c Mon Mar 15 13:52:06 1999
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
--- aaxkbd.c.orig Mon Mar 15 13:52:24 1999
+++ aaxkbd.c Mon Mar 15 13:52:32 1999
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
--- aaxmouse.c.orig Mon Mar 15 13:52:53 1999
+++ aaxmouse.c Mon Mar 15 13:52:58 1999
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>

10
graphics/aalib/patches/patch-aaedit_c Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-aaedit_c,v 1.1 2001/02/20 21:38:53 danh Exp $
--- aaedit.c.orig Tue Aug 19 12:38:01 1997
+++ aaedit.c Tue Feb 20 16:26:26 2001
@@ -1,6 +1,5 @@
#include <string.h>
#include <ctype.h>
-#include <malloc.h>
#include "aalib.h"
static void aa_editdisplay(struct aa_edit *e)
{

10
graphics/aalib/patches/patch-aafire_c Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-aafire_c,v 1.1 2001/02/20 21:38:53 danh Exp $
--- aafire.c.orig Thu Oct 23 14:45:12 1997
+++ aafire.c Tue Feb 20 16:26:26 2001
@@ -1,6 +1,5 @@
#include <stdio.h>
#include <string.h>
-#include <malloc.h>
#include <stdlib.h>
#include "aalib.h"

8
graphics/aalib/patches/patch-aakbdreg_c Normal file
View File

@ -0,0 +1,8 @@
$OpenBSD: patch-aakbdreg_c,v 1.1 2001/02/20 21:38:53 danh Exp $
--- aakbdreg.c.orig Wed Aug 27 09:42:06 1997
+++ aakbdreg.c Tue Feb 20 16:26:26 2001
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include "config.h"
#include "aalib.h"
struct aa_kbddriver *aa_kbddrivers[] =

10
graphics/aalib/patches/patch-aalib_c Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-aalib_c,v 1.1 2001/02/20 21:38:53 danh Exp $
--- aalib.c.orig Thu Sep 25 08:52:00 1997
+++ aalib.c Tue Feb 20 16:26:26 2001
@@ -1,6 +1,5 @@
#include <stdio.h>
#include <string.h>
-#include <malloc.h>
#include "aalib.h"
#include "aaint.h"

11
graphics/aalib/patches/patch-aalinux_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-aalinux_c,v 1.1 2001/02/20 21:38:53 danh Exp $
--- aalinux.c.orig Mon Sep 15 10:59:26 1997
+++ aalinux.c Tue Feb 20 16:26:26 2001
@@ -1,7 +1,6 @@
#include "config.h"
#ifdef LINUX_DRIVER
#include <sys/stat.h>
-#include <malloc.h>
#include <sys/ioctl.h>
#include <linux/kd.h>
#ifdef GPM_MOUSEDRIVER

8
graphics/aalib/patches/patch-aamoureg_c Normal file
View File

@ -0,0 +1,8 @@
$OpenBSD: patch-aamoureg_c,v 1.1 2001/02/20 21:38:53 danh Exp $
--- aamoureg.c.orig Fri Aug 22 07:16:01 1997
+++ aamoureg.c Tue Feb 20 16:26:26 2001
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include "config.h"
#include "aalib.h"
struct aa_mousedriver *aa_mousedrivers[] =

9
graphics/aalib/patches/patch-aarec_c Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-aarec_c,v 1.1 2001/02/20 21:38:53 danh Exp $
--- aarec.c.orig Tue Aug 19 12:38:01 1997
+++ aarec.c Tue Feb 20 16:26:26 2001
@@ -1,5 +1,4 @@
#include <string.h>
-#include <malloc.h>
#include "aalib.h"
aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL,
*aa_displayrecommended = NULL;

8
graphics/aalib/patches/patch-aaregist_c Normal file
View File

@ -0,0 +1,8 @@
$OpenBSD: patch-aaregist_c,v 1.1 2001/02/20 21:38:53 danh Exp $
--- aaregist.c.orig Wed Jan 28 10:17:58 1998
+++ aaregist.c Tue Feb 20 16:26:27 2001
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include "config.h"
#include "aalib.h"
struct aa_driver *aa_drivers[] =

8
graphics/aalib/patches/patch-aax_c Normal file
View File

@ -0,0 +1,8 @@
$OpenBSD: patch-aax_c,v 1.1 2001/02/20 21:38:53 danh Exp $
--- aax.c.orig Sun Mar 8 17:29:10 1998
+++ aax.c Tue Feb 20 16:26:27 2001
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>

8
graphics/aalib/patches/patch-aaxkbd_c Normal file
View File

@ -0,0 +1,8 @@
$OpenBSD: patch-aaxkbd_c,v 1.1 2001/02/20 21:38:53 danh Exp $
--- aaxkbd.c.orig Sun Mar 8 17:19:24 1998
+++ aaxkbd.c Tue Feb 20 16:26:27 2001
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>

8
graphics/aalib/patches/patch-aaxmouse_c Normal file
View File

@ -0,0 +1,8 @@
$OpenBSD: patch-aaxmouse_c,v 1.1 2001/02/20 21:38:53 danh Exp $
--- aaxmouse.c.orig Mon Sep 15 11:35:07 1997
+++ aaxmouse.c Tue Feb 20 16:26:27 2001
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>

14
graphics/aalib/patches/patch-ab
View File

@ -1,14 +0,0 @@
--- ltmain.sh.orig Mon Mar 15 14:19:38 1999
+++ ltmain.sh Mon Mar 15 14:21:48 1999
@@ -1575,11 +1575,6 @@
done
fi
- echo "To link against installed libraries in LIBDIR, users may have to:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to their \`$shlibpath_var' environment variable"
- fi
- echo " - use the \`-LLIBDIR' linker flag"
exit 0
;;

34
graphics/aalib/patches/patch-ltconfig
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-ltconfig,v 1.3 2001/02/20 21:38:54 danh Exp $
--- ltconfig.orig Thu Sep 25 08:22:04 1997
+++ ltconfig Mon Dec 25 16:00:59 2000
@@ -451,12 +451,13 @@
+++ ltconfig Tue Feb 20 16:28:56 2001
@@ -451,12 +451,13 @@ else
esac
fi
@ -20,7 +21,7 @@
if test -n "$pic_flag"; then
echo $ac_t "$pic_flag" 1>&6
@@ -575,6 +576,12 @@
@@ -575,6 +576,12 @@ hardcode_runpath_var=no
hardcode_shlibpath_var=unsupported
runpath_var=
@ -33,7 +34,7 @@
ld_shlibs=yes
if test "$with_gnu_ld" = yes; then
# See if GNU ld supports shared libraries.
@@ -666,7 +673,7 @@
@@ -666,7 +673,7 @@ else
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
;;
@ -42,7 +43,7 @@
# Tested with NetBSD 1.2 ld
archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
hardcode_libdir_flag_spec='-R$libdir'
@@ -674,6 +681,21 @@
@@ -674,6 +681,24 @@ else
hardcode_shlibpath_var=no
;;
@ -50,13 +51,16 @@
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd2.[01234567])
+ archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
+ hardcode_libdir_flag_spec='-R$libdir'
+ 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'
+ hardcode_libdir_flag_spec='${wl}-rpath,$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
+ ;;
@ -64,7 +68,15 @@
osf3* | osf4*)
allow_undefined_flag=' -expect_unresolved'
archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring$libobjs -lc$deplibs'
@@ -946,6 +968,9 @@
@@ -827,6 +852,7 @@ netbsd* | openbsd*)
library_names_spec='$libname.so.$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
osf3* | osf4*)
@@ -946,6 +972,9 @@ host="$host"
# The archiver.
AR='$AR'

71
graphics/aalib/patches/patch-ltmain_sh Normal file
View File

@ -0,0 +1,71 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2001/02/20 21:38:54 danh Exp $
--- ltmain.sh.orig Thu Sep 25 08:22:11 1997
+++ ltmain.sh Tue Feb 20 16:33:47 2001
@@ -365,7 +365,28 @@ if test -z "$show_help"; then
deplibs="$deplibs $arg"
;;
- -l*) deplibs="$deplibs $arg" ;;
+ -l*)
+ if test "$arg" = "-lc"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
+ fi
+ deplibs="$deplibs $arg"
+ ;;
+
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
-o) prev=output ;;
@@ -737,6 +758,25 @@ if test -z "$show_help"; then
allow_undefined_flag=
fi
+ dependency_libs="$deplibs"
+ case "$host" in
+ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
+ # these systems don't actually have a c library (as such)!
+ ;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
+ *-*-rhapsody*)
+ # rhapsody is a little odd...
+ deplibs="$deplibs -framework System"
+ ;;
+ *)
+ # Add libc to deplibs on all other systems.
+ deplibs="$deplibs -lc"
+ ;;
+ esac
+
+
if test "$build_libtool_libs" = yes; then
# Get the real and link names of the library.
library_names=`eval echo \"$library_names_spec\"`
@@ -1575,11 +1615,6 @@ EOF
done
fi
- echo "To link against installed libraries in LIBDIR, users may have to:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to their \`$shlibpath_var' environment variable"
- fi
- echo " - use the \`-LLIBDIR' linker flag"
exit 0
;;