--- makefile.orig	Wed Sep 25 09:32:22 1996
+++ makefile	Fri Sep 25 15:22:12 1998
@@ -1,6 +1,6 @@
 PURIFY   = #purify
 PURELINK = #purelink
-C++    = $(PURIFY) g++  
+C++    = $(PURIFY) g++  -w -I$(X11BASE)/include
 LD     = $(PURELINK) g++
 
 #C++    = $(PURIFY) g++ -w  -I/sgisoft/gnu/lib/g++-include 	# !!! SGI GNU 2.7.1
@@ -18,25 +18,29 @@
 #FORFLAGS = -O -extend_source 				# SGI
 
 DEBFLAG  = -g
-OPTFLAG  = -Wall -O -g
+#OPTFLAG  = -Wall -O -g
 
 LIBS     = -lX11 -lm $(F77LIBS) 
-#LIBDIR  = /usr/X11/lib						# PC LINUX, XFree86 3.1.1
+.if ${PORTOBJFORMAT} == "elf"
+LIBS+=-Wl,-rpath,$(X11BASE)/lib
+.endif
 
-F77LIBS  = -L/opt/SUNWspro/SC4.0/lib -lF77 -lM77 -lsunmath -lsocket -lnsl # SUN
+LIBDIR  = $(X11BASE)/lib						# PC LINUX, XFree86 3.1.1
+
+#F77LIBS  = -L/opt/SUNWspro/SC4.0/lib -lF77 -lM77 -lsunmath -lsocket -lnsl # SUN
 #F77LIBS  = -lftn						# SGI
 #F77LIBS  = -L/opt/SUNWspro/SC3.0/lib -lF77 -lM77 -lcomplex -lsunmath  -lnsl -lsocket # SUN SC3.0
 # F77LIBS  =  -lxlf -lxlf90 -lxlfutil     			# IBM
 # F77LIBS  =  -lfor     			      		# DEC Alpha
-# F77LIBS  =  -lf2c						# PC LINUX, XFree86 3.1.1
+F77LIBS  =  -lf2c						# PC LINUX, XFree86 3.1.1
 
-CFLAGS   = -ansi 
-CPPFLAGS =  
+#CFLAGS   = -ansi 
+CPPFLAGS =  $(CFLAGS)
 LDFLAGS  = $(DEBFLAG)
 
 # -------------------------------------------------------------------------
 
-TargetDirectory = /temp		# used for command 'copy'
+TargetDirectory = /tmp		# used for command 'copy'
 
 default: k6
 
@@ -77,18 +81,18 @@
 FSources = ma28.f madc28.f
 
 # SUN / SGI:
-ma28.o: ma28.f sysmat.h sysmatml.h sysmatsp.h 
-	$(FOR) -c $(FORFLAGS) ma28.f
-madc28.o: madc28.f sysmat.h sysmatml.h sysmatsp.h 
-	$(FOR) -c $(FORFLAGS) madc28.f
-
-
-# SUN and PC LINUX:
 #ma28.o: ma28.f sysmat.h sysmatml.h sysmatsp.h 
 #	$(FOR) -c $(FORFLAGS) ma28.f
 #madc28.o: madc28.f sysmat.h sysmatml.h sysmatsp.h 
 #	$(FOR) -c $(FORFLAGS) madc28.f
 
+
+# SUN and PC LINUX:
+ma28.o: ma28.f sysmat.h sysmatml.h sysmatsp.h 
+	$(FOR) -c $(FORFLAGS) ma28.f
+madc28.o: madc28.f sysmat.h sysmatml.h sysmatsp.h 
+	$(FOR) -c $(FORFLAGS) madc28.f
+
 # IBM:
 #ma28.o: ma28.f  sysmat.h sysmatml.h sysmatsp.h 
 #	$(FOR)  -c -qextname  $(FORFLAGS) ma28.f
@@ -224,12 +228,12 @@
 k3: 	$(k3O) 
 	$(LD) $(LDFLAGS) -o  k3   $(k3O) $(LIBS)
 
-k6: 	$(k6O) 
-	$(LD) $(LDFLAGS) -o  k6   $(k6O) $(LIBS)
+#k6: 	$(k6O) 
+#	$(LD) $(LDFLAGS) -o  k6   $(k6O) $(LIBS)
 
 #	under PC Linux add "-L$(LIBDIR)"
-#k6: 	$(k6O) 
-#	$(LD) $(LDFLAGS) -o  k6   $(k6O) $(LIBS) -L$(LIBDIR)
+k6: 	$(k6O) 
+	$(LD) $(LDFLAGS) -o  k6   $(k6O) $(LIBS) -L$(LIBDIR)