Convert to ELF and remove leading underscores so this builds

again.

6 files changed, 18 insertions, 88 deletions

diff --git a/devel/libffi-devel/Makefile b/devel/libffi-devel/Makefile
index 157df50d9702..d6709ce9b5ac 100644
--- a/devel/libffi-devel/Makefile
+++ b/devel/libffi-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14, June, 1998
 # Whom:			Horance Chou <horance@freedom.ie.cycu.edu.tw>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/10 00:08:48 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/12 18:42:20 jseger Exp $
 #
 
 DISTNAME=       libffi-1.18
@@ -12,8 +12,6 @@ MASTER_SITES=   ftp://ftp.cygnus.com:/pub/green/
 
 MAINTAINER=     horance@freedom.ie.cycu.edu.tw
 
-BROKEN_ELF=	libffi.so
-
 GNU_CONFIGURE=  yes
 WRKSRC=         ${WRKDIR}/${PKGNAME}
 ALL_TARGET=     test
diff --git a/devel/libffi-devel/files/patch-ab b/devel/libffi-devel/files/patch-ab
index 01d32630e0f9..0b4f501cb19a 100644
--- a/devel/libffi-devel/files/patch-ab
+++ b/devel/libffi-devel/files/patch-ab
@@ -1,44 +1,11 @@
---- src/x86/sysv.S.orig	Sun Jun 14 14:43:22 1998
-+++ src/x86/sysv.S	Sun Jun 14 14:48:35 1998
-@@ -30,14 +30,14 @@
- 
- .text
- 
--.globl ffi_prep_args
-+.globl _ffi_prep_args
+--- src/x86/sysv.S.orig	Tue Feb 24 19:49:51 1998
++++ src/x86/sysv.S	Tue Oct 13 22:28:56 1998
+@@ -33,7 +33,7 @@
+ .globl ffi_prep_args
  
  	# This assumes we are using gas.
 -        .balign 16
--.globl ffi_call_SYSV
--        .type    ffi_call_SYSV,@function
 +        .align 4
-+.globl _ffi_call_SYSV
-+        .type    _ffi_call_SYSV,@function
- 
--ffi_call_SYSV:
-+_ffi_call_SYSV:
-         pushl %ebp
-         movl  %esp,%ebp
- 
-@@ -47,10 +47,10 @@
- 
- 	movl  %esp,%eax
- 
--	# Place all of the ffi_prep_args in position
-+	# Place all of the _ffi_prep_args in position
- 	pushl 12(%ebp)
- 	pushl %eax
--	call  ffi_prep_args
-+	call  _ffi_prep_args
- 
- 	# Return stack to previous state and call the function
- 	addl  $8,%esp	
-@@ -110,6 +110,6 @@
-         movl %ebp,%esp
-         popl %ebp
-         ret
--.ffi_call_SYSV_end:
--        .size    ffi_call_SYSV,.ffi_call_SYSV_end-ffi_call_SYSV
-+._ffi_call_SYSV_end:
-+        .size    _ffi_call_SYSV,._ffi_call_SYSV_end-_ffi_call_SYSV
+ .globl ffi_call_SYSV
+         .type    ffi_call_SYSV,@function
  
diff --git a/devel/libffi-devel/pkg-plist b/devel/libffi-devel/pkg-plist
index 3a8e0e277773..e5137d004f86 100644
--- a/devel/libffi-devel/pkg-plist
+++ b/devel/libffi-devel/pkg-plist
@@ -5,5 +5,5 @@ lib/libffi.la
 lib/libffi.a
 lib/libffi.so
 lib/libffi.so.2.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index 157df50d9702..d6709ce9b5ac 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14, June, 1998
 # Whom:			Horance Chou <horance@freedom.ie.cycu.edu.tw>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/10 00:08:48 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/12 18:42:20 jseger Exp $
 #
 
 DISTNAME=       libffi-1.18
@@ -12,8 +12,6 @@ MASTER_SITES=   ftp://ftp.cygnus.com:/pub/green/
 
 MAINTAINER=     horance@freedom.ie.cycu.edu.tw
 
-BROKEN_ELF=	libffi.so
-
 GNU_CONFIGURE=  yes
 WRKSRC=         ${WRKDIR}/${PKGNAME}
 ALL_TARGET=     test
diff --git a/devel/libffi/files/patch-ab b/devel/libffi/files/patch-ab
index 01d32630e0f9..0b4f501cb19a 100644
--- a/devel/libffi/files/patch-ab
+++ b/devel/libffi/files/patch-ab
@@ -1,44 +1,11 @@
---- src/x86/sysv.S.orig	Sun Jun 14 14:43:22 1998
-+++ src/x86/sysv.S	Sun Jun 14 14:48:35 1998
-@@ -30,14 +30,14 @@
- 
- .text
- 
--.globl ffi_prep_args
-+.globl _ffi_prep_args
+--- src/x86/sysv.S.orig	Tue Feb 24 19:49:51 1998
++++ src/x86/sysv.S	Tue Oct 13 22:28:56 1998
+@@ -33,7 +33,7 @@
+ .globl ffi_prep_args
  
  	# This assumes we are using gas.
 -        .balign 16
--.globl ffi_call_SYSV
--        .type    ffi_call_SYSV,@function
 +        .align 4
-+.globl _ffi_call_SYSV
-+        .type    _ffi_call_SYSV,@function
- 
--ffi_call_SYSV:
-+_ffi_call_SYSV:
-         pushl %ebp
-         movl  %esp,%ebp
- 
-@@ -47,10 +47,10 @@
- 
- 	movl  %esp,%eax
- 
--	# Place all of the ffi_prep_args in position
-+	# Place all of the _ffi_prep_args in position
- 	pushl 12(%ebp)
- 	pushl %eax
--	call  ffi_prep_args
-+	call  _ffi_prep_args
- 
- 	# Return stack to previous state and call the function
- 	addl  $8,%esp	
-@@ -110,6 +110,6 @@
-         movl %ebp,%esp
-         popl %ebp
-         ret
--.ffi_call_SYSV_end:
--        .size    ffi_call_SYSV,.ffi_call_SYSV_end-ffi_call_SYSV
-+._ffi_call_SYSV_end:
-+        .size    _ffi_call_SYSV,._ffi_call_SYSV_end-_ffi_call_SYSV
+ .globl ffi_call_SYSV
+         .type    ffi_call_SYSV,@function
  
diff --git a/devel/libffi/pkg-plist b/devel/libffi/pkg-plist
index 3a8e0e277773..e5137d004f86 100644
--- a/devel/libffi/pkg-plist
+++ b/devel/libffi/pkg-plist
@@ -5,5 +5,5 @@ lib/libffi.la
 lib/libffi.a
 lib/libffi.so
 lib/libffi.so.2.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R