From a88a209e4145fd0ab7b0743d1436e97e1d722d28 Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill>
Date: Mon, 17 Jun 2002 04:21:08 +0000
Subject: fix PLIST and build on mipsel machines where all code is PIC so we
 don't need to build a _pic lib.

fixed PR pkg/16302 submitted by
Daniel Senderowicz <daniel@mispibes.SynchroDS.COM>
---
 lang/f2c/Makefile         | 11 ++++++++++-
 lang/f2c/distinfo         |  4 ++--
 lang/f2c/patches/patch-aa |  6 ++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'lang/f2c')

diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index e172b9e71d5..283a564d12c 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/01/22 16:47:22 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.20 2002/06/17 04:21:08 dmcmahill Exp $
 
 DISTNAME=	f2c-20001205
 PKGREVISION=	5
@@ -29,6 +29,7 @@ F2CMAJOR=	0
 F2CMINOR=	0
 MAKE_ENV+=	F2CMAJOR=${F2CMAJOR} F2CMINOR=${F2CMINOR}
 PLIST_SUBST+=	F2CMAJOR=${F2CMAJOR} F2CMINOR=${F2CMINOR}
+PLIST_SRC=	${WRKDIR}/PLIST
 
 USE_BUILDLINK_ONLY=	# defined
 
@@ -53,6 +54,14 @@ post-patch:
 
 # for OBJECT_FMT
 .include "../../mk/bsd.prefs.mk"
+MAKE_ENV+=	MACHINE_ARCH=${MACHINE_ARCH}
+
+pre-install:
+.if (${MACHINE_ARCH} == "mipsel")
+	${SED} '/lib.*_pic/d' ${PKGDIR}/PLIST > ${PLIST_SRC}
+.else
+	${CP} ${PKGSRCDIR}/PLIST ${PLIST_SRC}
+.endif
 
 .if (${OBJECT_FMT} == "ELF")
 post-install:
diff --git a/lang/f2c/distinfo b/lang/f2c/distinfo
index 0e5f258f601..fe5d1d80aac 100644
--- a/lang/f2c/distinfo
+++ b/lang/f2c/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2002/03/14 22:09:35 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2002/06/17 04:21:08 dmcmahill Exp $
 
 SHA1 (f2c-20001205.tar.gz) = f3cc1653eb962fee45d850df50890fc53448a17f
 Size (f2c-20001205.tar.gz) = 988607 bytes
-SHA1 (patch-aa) = 488a5adc6bf30a28fa221351224fa16952d54537
+SHA1 (patch-aa) = af1e3e1e04d5ab5f06eed0e031a9939d1f41150d
 SHA1 (patch-ab) = 97c676fa452daa674e11348412ccb26d38a7baa4
 SHA1 (patch-ac) = 6fc52f9257cdecd3784e7f8897cce8b5656b73e4
 SHA1 (patch-ad) = 0144d0cdf55ce8117d179a56acc4db64fe67c8e0
diff --git a/lang/f2c/patches/patch-aa b/lang/f2c/patches/patch-aa
index f9c2db87b70..7ac8c5bab94 100644
--- a/lang/f2c/patches/patch-aa
+++ b/lang/f2c/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.10 2001/04/18 21:43:18 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.11 2002/06/17 04:21:09 dmcmahill Exp $
 
 Add a top level Makefile
 
 --- /dev/null	Thu Apr  5 17:09:09 2001
 +++ Makefile	Thu Apr  5 18:31:35 2001
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,64 @@
 +# Top level Makefile for f2c, libF77, and libI77
 +
 +all: f2c libf2c/libf2c.a f2c-f77 man
@@ -36,6 +36,8 @@ Add a top level Makefile
 +	if [ -f libF77/libF77_pic.a ]; then cd libf2c && ar cruv libf2c_pic.a *.so ; fi
 +	if [ -f libF77/libF77_pic.a ]; then cd libf2c && \
 +		ld -Bshareable -soname libf2c.so.${F2CMAJOR} -o libf2c.so.${F2CMAJOR}.${F2CMINOR} *.so ; fi
++	if [ "${MACHINE_ARCH}" = "mipsel" ]; then cd libf2c && \
++		ld -Bshareable -soname libf2c.so.${F2CMAJOR} -o libf2c.so.${F2CMAJOR}.${F2CMINOR} *.o ; fi
 +
 +man: f2c.0
 +
-- 
cgit v1.2.3