From owner-freebsd-ports Mon Oct 26 23:10:06 1998
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Received: (from majordom@localhost)
by hub.freebsd.org (8.8.8/8.8.8) id XAA19839
for freebsd-ports-outgoing; Mon, 26 Oct 1998 23:10:06 -0800 (PST)
(envelope-from owner-freebsd-ports@FreeBSD.ORG)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id XAA19832
for <freebsd-ports@FreeBSD.org>; Mon, 26 Oct 1998 23:10:05 -0800 (PST)
(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.8.8/8.8.5) id XAA13956;
Mon, 26 Oct 1998 23:10:01 -0800 (PST)
Received: from freedom.ie.cycu.edu.tw (freedom.ie.cycu.edu.tw [140.135.138.6])
by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id XAA19493
for <FreeBSD-gnats-submit@freebsd.org>; Mon, 26 Oct 1998 23:02:13 -0800 (PST)
(envelope-from horance@freedom.ie.cycu.edu.tw)
Received: (from horance@localhost)
by freedom.ie.cycu.edu.tw (8.9.1/8.9.0) id PAA09348;
Tue, 27 Oct 1998 15:06:02 +0800 (CST)
Message-Id: <199810270706.PAA09348@freedom.ie.cycu.edu.tw>
Date: Tue, 27 Oct 1998 15:06:02 +0800 (CST)
From: Horance Chou <horance@freedom.ie.cycu.edu.tw>
Reply-To: horance@freedom.ie.cycu.edu.tw
To: FreeBSD-gnats-submit@FreeBSD.ORG
X-Send-Pr-Version: 3.2
Subject: ports/8463: ports updates for devel/libffi
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org
>Number: 8463
>Category: ports
>Synopsis: ports updates for devel/libffi
>Confidential: yes
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 26 23:10:01 PST 1998
>Last-Modified:
>Originator: Horance Chou
>Organization:
FreeBSD NETLAB Server
>Release: FreeBSD 2.2.7-19980904-SNAP i386
>Environment:
FreeBSD 2.2 aout
FreeBSD 3.0 aout
FreeBSD 3.0 ELF
>Description:
libffi upgrade from 1.18 to 1.20.
source patches for ELF are included.
>How-To-Repeat:
>Fix:
diff -uNr libffi.orig/Makefile libffi/Makefile
--- libffi.orig/Makefile Tue Oct 20 02:20:00 1998
+++ libffi/Makefile Thu Oct 22 20:56:59 1998
@@ -6,7 +6,7 @@
# $Id: Makefile,v 1.3 1998/10/20 01:35:24 steve Exp $
#
-DISTNAME= libffi-1.18
+DISTNAME= libffi-1.20
CATEGORIES= devel
MASTER_SITES= ftp://ftp.cygnus.com:/pub/green/
@@ -15,5 +15,8 @@
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PKGNAME}
ALL_TARGET= test
+
+pre-patch:
+ sh ./scripts/objformat_patch.sh
.include <bsd.port.mk>
diff -uNr libffi.orig/files/md5 libffi/files/md5
--- libffi.orig/files/md5 Sun Aug 9 16:08:00 1998
+++ libffi/files/md5 Thu Oct 22 19:50:47 1998
@@ -1 +1 @@
-MD5 (libffi-1.18.tar.gz) = e8d8fa118c52cae8eb8aec6b01090238
+MD5 (libffi-1.20.tar.gz) = e4c9c435ebdfcba6fa493fb1abce2ddc
diff -uNr libffi.orig/patches/patch-ad libffi/patches/patch-ad
--- libffi.orig/patches/patch-ad Thu Jan 1 08:00:00 1970
+++ libffi/patches/patch-ad Thu Oct 22 20:55:17 1998
@@ -0,0 +1,43 @@
+--- src/x86/sysv.S.orig Thu Oct 22 20:53:26 1998
++++ src/x86/sysv.S Thu Oct 22 20:54:15 1998
+@@ -30,14 +30,14 @@
+
+ .text
+
+-.globl ffi_prep_args
++.globl _ffi_prep_args
+
+ # This assumes we are using gas.
+ .align 4
+-.globl ffi_call_SYSV
+- .type ffi_call_SYSV,@function
++.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
+@@ -124,6 +124,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
+
diff -uNr libffi.orig/pkg/PLIST libffi/pkg/PLIST
--- libffi.orig/pkg/PLIST Tue Oct 20 02:20:00 1998
+++ libffi/pkg/PLIST Thu Oct 22 20:07:14 1998
@@ -4,6 +4,6 @@
lib/libffi.la
lib/libffi.a
lib/libffi.so
-lib/libffi.so.2.1
+lib/libffi.so.2.3
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff -uNr libffi.orig/scripts/objformat_patch.sh libffi/scripts/objformat_patch.sh
--- libffi.orig/scripts/objformat_patch.sh Thu Jan 1 08:00:00 1970
+++ libffi/scripts/objformat_patch.sh Thu Oct 22 21:01:42 1998
@@ -0,0 +1,13 @@
+#!/bin/sh
+VERSION=`uname -r`
+case "$VERSION" in
+ 2.2*)
+ mv -f patches/aout-patch patches/patch-ad
+ ;;
+ 3.0*)
+ if test `objformat` = "aout" ; then
+ mv -f patches/aout-patch patches/patch-ad
+ fi
+ ;;
+esac
+
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message