4 files changed, 22 insertions, 25 deletions

diff --git a/biology/molden/Makefile b/biology/molden/Makefile
index cf604180f5ed..c72ec9d9657f 100644
--- a/biology/molden/Makefile
+++ b/biology/molden/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	molden
-PORTVERSION=	4.3
+PORTVERSION=	4.4
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -16,9 +16,8 @@ EXTRACT_ONLY=	${PORTNAME}${PORTVERSION}.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display molecular orbitals and electron densities in 2D and 3D
 
-BROKEN=		"Size mismatch"
-
 USE_XLIB=	yes
+USE_MESA=	yes
 
 RESTRICTED=	"free for academic, non profit usage;"
 NO_CDROM=	"Do not re-distribute source and executable."
@@ -38,11 +37,9 @@ post-configure:
 	@${ECHO_MSG} "**  before \'make build\'."
 	@${ECHO_MSG} "********************"
 
-do-build:
-	(cd ${WRKSRC} && ${MAKE})
-
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/molden ${WRKSRC}/moldenogl ${PREFIX}/bin
+	${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
diff --git a/biology/molden/distinfo b/biology/molden/distinfo
index a1456099f3e7..0296e487a013 100644
--- a/biology/molden/distinfo
+++ b/biology/molden/distinfo
@@ -1,2 +1,3 @@
-MD5 (molden4.3.tar.Z) = 43b7fc1c0dc683be7e9f692468ca46fa
-SIZE (molden4.3.tar.Z) = 3311689
+MD5 (molden4.4.tar.Z) = 5f982a82af2b21cfbc4be85dfca3b9fa
+SHA256 (molden4.4.tar.Z) = ccd07510c8632e30bb3dadb574d7eeebbd765ddfe3aeb6c3692650ccd7823474
+SIZE (molden4.4.tar.Z) = 3428228
diff --git a/biology/molden/files/patch-aa b/biology/molden/files/patch-aa
index bc8fa40497ab..7cc7b140f3fe 100644
--- a/biology/molden/files/patch-aa
+++ b/biology/molden/files/patch-aa
@@ -1,21 +1,19 @@
-
-$FreeBSD$
-
---- makefile.orig	Tue Nov  5 04:43:01 2002
-+++ makefile	Fri Jan 17 16:04:35 2003
-@@ -12,13 +12,31 @@
+--- makefile.orig	Wed Nov  2 16:35:57 2005
++++ makefile	Thu Dec  1 15:11:18 2005
+@@ -12,14 +12,32 @@
  #
  #	Disregard compiler warnings on rdmolf.f
  #
 -CC = cc
--LIBS =  -lX11 -lm
 +#CC = cc
-+#LIBS =  -lX11 -lm
+ 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/usr/X11R6/include
++CFLAGS += -c -DDOBACK -DHASTIMER -I${X11BASE}/include
 +#FC = f77
 +.if ${MACHINE_ARCH} == i386
 +FFLAGS += -malign-double
@@ -26,7 +24,7 @@ $FreeBSD$
 +.else
 +FFLAGS += -Wno-globals -fno-globals
 +.endif
-+LIBS =  -L/usr/X11R6/lib -lX11 -lm
++LIBS =  -L${X11BASE}/lib -lX11 -lm
 +LDR = f77
 +###
  
@@ -40,21 +38,21 @@ $FreeBSD$
  
  # Ultrix, Dec Alpha, Linux ( and best start for Unix other than below )
  #
-@@ -160,7 +178,7 @@
+@@ -168,7 +186,7 @@
  # For The OpenGL Graphics library molden helper 'moldenogl'
  # (make moldenogl)
  #
--LIBSG = -lglut -lGLU -lGL -lXmu -lX11 -lm
-+LIBSG = -L${X11BASE}/lib -lglut -lGLU -lGL -lXmu -lX11 -lm
+-LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm
++LIBSOGL = -L${X11BASE}/lib -lglut -lGLU -lGL -lXmu -lX11 -lm
  #
  # on linux :
  #
-@@ -170,6 +188,8 @@
+@@ -187,6 +205,8 @@
  #
- #LIBSG = -L/usr/X11R6/lib -lglut -lMesaGLU -lMesaGL -lXmu -lXi -lX11 -lm
+ #LIBSG = -L/usr/X11R6/lib -framework GLUT -framework OpenGL -framework Cocoa
  #
 +
 +all: molden moldenogl
  
- molden:	$(OBJS) $(SOBJ) mpdum.o xwin.o 
+ molden:	$(OBJS) mpdum.o xwin.o 
  	$(LDR) -o molden $(OBJS) $(SOBJ) mpdum.o xwin.o $(LIBS)
diff --git a/biology/molden/pkg-plist b/biology/molden/pkg-plist
index 7979ba25abc2..5034b27aadef 100644
--- a/biology/molden/pkg-plist
+++ b/biology/molden/pkg-plist
@@ -9,6 +9,7 @@ bin/moldenogl
 %%PORTDOCS%%share/molden/test/bucky.xyz
 %%PORTDOCS%%share/molden/test/chemx.test
 %%PORTDOCS%%share/molden/test/complex2.out
+%%PORTDOCS%%share/molden/test/cpeptide.gro
 %%PORTDOCS%%share/molden/test/esp.test
 %%PORTDOCS%%share/molden/test/esp.txt
 %%PORTDOCS%%share/molden/test/esp.xyz