Index: head/biology/molden/Makefile
===================================================================
--- head/biology/molden/Makefile	(revision 181821)
+++ head/biology/molden/Makefile	(revision 181822)
@@ -1,57 +1,54 @@
 # New ports collection makefile for:	molden
 # Date created:		1998-11-14
 # Whom:			rmiya
 #
 # $FreeBSD$
 #
 
 PORTNAME=	molden
 PORTVERSION=	4.4
 PORTREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 DIST_SUBDIR=	${PKGNAME}
 EXTRACT_ONLY=	${PORTNAME}${PORTVERSION}.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display molecular orbitals and electron densities in 2D and 3D
 
 LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 
 USE_XLIB=	yes
 
 RESTRICTED=	free for academic, non profit usage; do not re-distribute source and executable.
 MAKEFILE=	${WRKSRC}/makefile
-MAKE_ENV=	FC=${F77}
+WANT_FORTRAN=	yes #dummy
+USE_GCC=	4.2+
 
 .include <bsd.port.pre.mk>
-
-.if !${OSVERSION} < 500039
-F77?=		f77
-.endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' ${WRKSRC}/xwin.c
 
 post-configure:
 	@${ECHO_MSG} "********************"
 	@${ECHO_MSG} "**  If you want to use a larger MOLDEN,"
 	@${ECHO_MSG} "**  edit change_parameter.sh and run it,"
 	@${ECHO_MSG} "**  before \'make build\'."
 	@${ECHO_MSG} "********************"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/molden ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/moldenogl ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/molden
 	${MKDIR} ${PREFIX}/share/molden/test
 	${MKDIR} ${PREFIX}/share/molden/utils
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/molden
 	${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/molden/test
 	${INSTALL_DATA} ${WRKSRC}/utils/* ${PREFIX}/share/molden/utils
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/biology/molden/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.28
\ No newline at end of property
+1.29
\ No newline at end of property
Index: head/biology/molden/files/patch-aa
===================================================================
--- head/biology/molden/files/patch-aa	(revision 181821)
+++ head/biology/molden/files/patch-aa	(revision 181822)
@@ -1,67 +1,67 @@
 --- makefile.orig	Mon Jul 10 13:48:03 2006
 +++ makefile	Sun Sep 17 14:53:34 2006
 @@ -12,9 +12,27 @@
  #
  #	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${X11BASE}/lib -lGLU -lGL -lXmu -lX11 -lm
 +
 +###
 +# FreeBSD
 +#CC = gcc
 +CFLAGS += -c -DDOBACK -DHASTIMER -I${X11BASE}/include
 +#FC = f77
 +.if ${MACHINE_ARCH} == i386
 +FFLAGS += -malign-double
 +CFLAGS += -malign-double
 +.endif
 +.if ${OSVERSION} < 400005
 +FFLAGS += -Nn802 -Nx400
 +.else
-+FFLAGS += -Wno-globals -fno-globals
++FFLAGS += #-Wno-globals -fno-globals
 +.endif
 +LIBS =  -L${X11BASE}/lib -lX11 -lm
 +LDR = ${FC}
 +###
  
  # Silicon Graphics
  #CFLAGS = -c -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
 @@ -46,11 +64,11 @@
  # when using gfortran, replace g77 with gfortran and comment out the line
  # 'external iargc' in molden.f
  #
 -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
  #
 @@ -176,7 +194,7 @@
  # For The OpenGL Graphics library molden helper 'moldenogl'
  # (make moldenogl)
  #
 -LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm
 +LIBSOGL = -L${X11BASE}/lib -lglut -lGLU -lGL -lXmu -lX11 -lm
  #
  # on linux :
  #
 @@ -195,6 +213,8 @@
  #
  #LIBSG = -L/usr/X11R6/lib -framework GLUT -framework OpenGL -framework Cocoa
  #
 +
 +all: molden moldenogl
  
  molden:	$(OBJS) mpdum.o xwin.o 
  	$(LDR) -o molden $(OBJS) $(SOBJ) mpdum.o xwin.o $(LIBS)

Property changes on: head/biology/molden/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/biology/molden/files/patch-molden.f
===================================================================
--- head/biology/molden/files/patch-molden.f	(nonexistent)
+++ head/biology/molden/files/patch-molden.f	(revision 181822)
@@ -0,0 +1,10 @@
+--- molden.f~	Mon Jul 10 20:46:06 2006
++++ molden.f	Tue Jan  9 10:43:24 2007
+@@ -255,7 +255,6 @@
+       common /vrmlhl/ spcdfil
+       common /pmflvl/ ipmfm,ipmfh,pmflev(mxpmfl),levcol(mxpmfl)
+       common /comsrf/ vo(3), rt(3),v1t(3),v2t(3),v3t(3)
+-      external iargc
+       dimension fcnt(mxcntr)
+       character title*80, keywrd*160, keyhlp*80, keyori*160
+       character tmpstr*80,movfil*80,vrmlfil*80,povfil*80,oglfil*80

Property changes on: head/biology/molden/files/patch-molden.f
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property