head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2008.11.11.02.21.28;	author wxs;	state dead;
branches;
next	1.1;

1.1
date	2008.11.04.21.55.39;	author wxs;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Roll back to 4.6 as 4.7 is the development version and is constantly being
  re-rolled.
- Move post-patch target into files/patch-xwin.c to remove sed invocation.
- Respect NOPORTDATA and DATADIR.
- Bring files/patch-aa back (to preserve history) and retire patch-makefile.
- Fixup files/patch-xwin.c so it applies cleanly to this version.
@
text
@--- makefile.orig	2008-08-25 19:55:57.000000000 +0200
+++ makefile	2008-11-01 21:48:37.000000000 +0100
@@@@ -12,9 +12,23 @@@@
 #
 #	Disregard compiler warnings on rdmolf.f
 #
-CC = cc
+#CC = cc
 LIBS =  -lX11 -lm
-LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
+LIBSG = -L${LOCALBASE}/lib -lGLU -lGL -lXmu -lX11 -lm
+
+###
+# FreeBSD
+#CC = gcc
+CFLAGS += -c -DDOBACK -DHASTIMER -I${LOCALBASE}/include
+#FC = f77
+.if ${OSVERSION} < 400005
+FFLAGS += -Nn802 -Nx400
+.else
+FFLAGS += #-Wno-globals -fno-globals
+.endif
+LIBS =  -L${LOCALBASE}/lib -lX11 -lm
+LDR = ${FC}
+###
 
 # Silicon Graphics
 #CFLAGS = -c -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
@@@@ -52,11 +66,11 @@@@
 # with GCC4.0 or higher replace the line with:
 # 'external gfortran_iargc'
 #
-CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
-FC = g77
-FFLAGS =
-LIBS =  -L/usr/X11R6/lib -lX11 -lm
-LDR = g77   
+#CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
+#FC = g77
+#FFLAGS =
+#LIBS =  -L/usr/X11R6/lib -lX11 -lm
+#LDR = g77   
 # 64 bit machines:
 #LIBS =  -L/usr/X11R6/lib64 -lX11 -lm
 #
@@@@ -191,7 +205,7 @@@@
 # and the full opengl version of molden 'gmolden', (does not need glut)
 # (make gmolden)
 #
-LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm
+LIBSOGL = -L${LOCALBASE}/lib -lglut -lGLU -lGL -lXmu -lX11 -lm
 #
 # on linux :
 #
@@@@ -227,7 +241,7 @@@@
 	$(MAKE) -C ambfor
 
 surf/surf:	surf/*.h surf/*.c
-	$(MAKE) -C surf depend
+#	$(MAKE) -C surf depend
 	$(MAKE) -C surf
 
 # noxwin will not work as long as the old ocglbck calls arent in dummys
@


1.1
log
@Update to 4.7

PR:		ports/128476
Submitted by:	fulvio ciriaco <oivulf@@gmail.com>
@
text
@@

