From 40a64497a95ad44ddd502bc9985c2305e87f5120 Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Tue, 22 Jun 1999 17:51:59 +0000
Subject: Compensate for not having a generic.h on -current boxes.

---
 math/kaskade/Makefile       |  9 +++++++--
 math/kaskade/files/patch-aa | 12 ++++++++----
 math/kaskade/files/patch-ac | 14 ++++++++++++++
 3 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 math/kaskade/files/patch-ac

(limited to 'math')

diff --git a/math/kaskade/Makefile b/math/kaskade/Makefile
index 15a482bd96f2..47182e4ece88 100644
--- a/math/kaskade/Makefile
+++ b/math/kaskade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 Sept. 1997
 # Whom:			Pedro Giffuni
 #
-# $Id: Makefile,v 1.5 1998/09/27 08:12:54 steve Exp $
+# $Id: Makefile,v 1.6 1998/12/09 00:19:05 steve Exp $
 #
 
 DISTNAME=	3.1.1
@@ -14,6 +14,11 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	giffunip@asme.org
 
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 400004
+MAKE_ENV+=	HAVE_G2C=yes
+.endif
+
 DIST_SUBDIR=	kaskade
 WRKSRC=         ${WRKDIR}/3.1
 MAKEFILE=	makefile
@@ -31,4 +36,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/*.mat ${PREFIX}/share/examples/kaskade
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/kaskade/files/patch-aa b/math/kaskade/files/patch-aa
index f7e380b7e147..35714afb0d37 100644
--- a/math/kaskade/files/patch-aa
+++ b/math/kaskade/files/patch-aa
@@ -1,5 +1,5 @@
 --- makefile.orig	Wed Sep 25 09:32:22 1996
-+++ makefile	Fri Sep 25 15:22:12 1998
++++ makefile	Sun Jun 20 13:35:05 1999
 @@ -1,6 +1,6 @@
  PURIFY   = #purify
  PURELINK = #purelink
@@ -8,7 +8,7 @@
  LD     = $(PURELINK) g++
  
  #C++    = $(PURIFY) g++ -w  -I/sgisoft/gnu/lib/g++-include 	# !!! SGI GNU 2.7.1
-@@ -18,25 +18,29 @@
+@@ -18,25 +18,33 @@
  #FORFLAGS = -O -extend_source 				# SGI
  
  DEBFLAG  = -g
@@ -30,7 +30,11 @@
  # F77LIBS  =  -lxlf -lxlf90 -lxlfutil     			# IBM
  # F77LIBS  =  -lfor     			      		# DEC Alpha
 -# F77LIBS  =  -lf2c						# PC LINUX, XFree86 3.1.1
++.if $(HAVE_G2C)
++F77LIBS  =  -lg2c						# PC LINUX, XFree86 3.1.1
++.else
 +F77LIBS  =  -lf2c						# PC LINUX, XFree86 3.1.1
++.endif
  
 -CFLAGS   = -ansi 
 -CPPFLAGS =  
@@ -45,7 +49,7 @@
  
  default: k6
  
-@@ -77,18 +81,18 @@
+@@ -77,18 +85,18 @@
  FSources = ma28.f madc28.f
  
  # SUN / SGI:
@@ -71,7 +75,7 @@
  # IBM:
  #ma28.o: ma28.f  sysmat.h sysmatml.h sysmatsp.h 
  #	$(FOR)  -c -qextname  $(FORFLAGS) ma28.f
-@@ -224,12 +228,12 @@
+@@ -224,12 +232,12 @@
  k3: 	$(k3O) 
  	$(LD) $(LDFLAGS) -o  k3   $(k3O) $(LIBS)
  
diff --git a/math/kaskade/files/patch-ac b/math/kaskade/files/patch-ac
new file mode 100644
index 000000000000..1d7a5409a7bd
--- /dev/null
+++ b/math/kaskade/files/patch-ac
@@ -0,0 +1,14 @@
+--- fortran.h.orig	Tue Apr 23 02:45:02 1996
++++ fortran.h	Sun Jun 20 13:32:40 1999
+@@ -1,7 +1,11 @@
+ #ifndef FORTRAN_H
+ #define FORTRAN_H
+ 
++#if __FreeBSD__ < 4
+ #include <generic.h>
+ #define F77NAME(x) name2(x,_)
++#else
++#define F77NAME(x) x ## _
++#endif
+ 
+ #endif
-- 
cgit v1.2.3