Unbreak: molden has been updated on Aug 17, with the same DISTNAME.

Changelog at <http://www.cmbi.ru.nl/molden/HISTORY>.

4 files changed, 35 insertions, 23 deletions

diff --git a/biology/molden/Makefile b/biology/molden/Makefile
index 1d31d8faf454..d80c67234a6f 100644
--- a/biology/molden/Makefile
+++ b/biology/molden/Makefile
@@ -7,29 +7,31 @@
 
 PORTNAME=	molden
 PORTVERSION=	4.4
-PORTREVISION=	1
+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
 
-BROKEN=		Size mismatch
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
 LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 
 USE_XLIB=	yes
 
-RESTRICTED=	"free for academic, non profit usage; do not re-distribute source and executable."
+RESTRICTED=	free for academic, non profit usage; do not re-distribute source and executable.
 MAKEFILE=	${WRKSRC}/makefile
+MAKE_ENV=	FC=${F77}
 
 .include <bsd.port.pre.mk>
 
+.if !${OSVERSION} < 500039
+F77?=		f77
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' ${WRKSRC}/xwin.c
 
diff --git a/biology/molden/distinfo b/biology/molden/distinfo
index 0296e487a013..9ce0774521cc 100644
--- a/biology/molden/distinfo
+++ b/biology/molden/distinfo
@@ -1,3 +1,3 @@
-MD5 (molden4.4.tar.Z) = 5f982a82af2b21cfbc4be85dfca3b9fa
-SHA256 (molden4.4.tar.Z) = ccd07510c8632e30bb3dadb574d7eeebbd765ddfe3aeb6c3692650ccd7823474
-SIZE (molden4.4.tar.Z) = 3428228
+MD5 (molden-4.4_2/molden4.4.tar.Z) = c50e5b4baf9cc453702fbc63649cfe44
+SHA256 (molden-4.4_2/molden4.4.tar.Z) = 0eadbe629485d408440586aed81f7761c354636a2a36ae996e1f21a2c59db23a
+SIZE (molden-4.4_2/molden4.4.tar.Z) = 3556861
diff --git a/biology/molden/files/patch-aa b/biology/molden/files/patch-aa
index 7cc7b140f3fe..7eba32a343a5 100644
--- a/biology/molden/files/patch-aa
+++ b/biology/molden/files/patch-aa
@@ -1,6 +1,6 @@
---- makefile.orig	Wed Nov  2 16:35:57 2005
-+++ makefile	Thu Dec  1 15:11:18 2005
-@@ -12,14 +12,32 @@
+--- 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
  #
@@ -25,20 +25,29 @@
 +FFLAGS += -Wno-globals -fno-globals
 +.endif
 +LIBS =  -L${X11BASE}/lib -lX11 -lm
-+LDR = f77
++LDR = ${FC}
 +###
  
  # Silicon Graphics
--CFLAGS = -c -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
--FFLAGS =   
--LDR = f77 
-+#CFLAGS = -c -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
-+#FFLAGS =   
-+#LDR = f77 
- 
- # Ultrix, Dec Alpha, Linux ( and best start for Unix other than below )
+ #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
  #
-@@ -168,7 +186,7 @@
+@@ -176,7 +194,7 @@
  # For The OpenGL Graphics library molden helper 'moldenogl'
  # (make moldenogl)
  #
@@ -47,7 +56,7 @@
  #
  # on linux :
  #
-@@ -187,6 +205,8 @@
+@@ -195,6 +213,8 @@
  #
  #LIBSG = -L/usr/X11R6/lib -framework GLUT -framework OpenGL -framework Cocoa
  #
diff --git a/biology/molden/pkg-plist b/biology/molden/pkg-plist
index 5034b27aadef..a3cc3029413a 100644
--- a/biology/molden/pkg-plist
+++ b/biology/molden/pkg-plist
@@ -29,6 +29,7 @@ bin/moldenogl
 %%PORTDOCS%%share/molden/test/mopac.freq
 %%PORTDOCS%%share/molden/test/mopac.test
 %%PORTDOCS%%share/molden/test/pdb.test
+%%PORTDOCS%%share/molden/test/qchem.test
 %%PORTDOCS%%share/molden/test/reacpth.xyz
 %%PORTDOCS%%share/molden/test/shelx.ins
 %%PORTDOCS%%share/molden/test/surface.molf