ports/89795: biology/molden: update to new version and unbreak

[Johan van Selst]

>Number:         89795
>Category:       ports
>Synopsis:       biology/molden: update to new version and unbreak
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 01 13:10:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Johan van Selst
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 6.0-STABLE FreeBSD 6.0-STABLE #7: Fri Nov 4 18:39:17 CET 2005 root at mud.stack.nl:/usr/obj/usr/src/sys/mud i386


	
>Description:
	
	Update to version 4.4

>How-To-Repeat:
	
>Fix:

	

	Note: Renamed patch-aa to new style patch-makefile

diff -uNr molden/Makefile molden/Makefile
--- molden/Makefile	Thu Nov 24 04:01:37 2005
+++ molden/Makefile	Thu Dec  1 13:17:37 2005
@@ -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}
@@ -15,8 +15,6 @@
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Display molecular orbitals and electron densities in 2D and 3D
-
-BROKEN=		"Size mismatch"
 
 USE_XLIB=	yes
 
diff -uNr molden/distinfo molden/distinfo
--- molden/distinfo	Mon Jan 31 21:09:09 2005
+++ molden/distinfo	Thu Dec  1 13:17:43 2005
@@ -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 -uNr molden/files/patch-aa molden/files/patch-aa
--- molden/files/patch-aa	Sat Jul 19 06:17:06 2003
+++ molden/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,60 +0,0 @@
-
-$FreeBSD: ports/biology/molden/files/patch-aa,v 1.3 2003/07/19 04:17:06 maho Exp $
-
---- makefile.orig	Tue Nov  5 04:43:01 2002
-+++ makefile	Fri Jan 17 16:04:35 2003
-@@ -12,13 +12,31 @@
- #
- #	Disregard compiler warnings on rdmolf.f
- #
--CC = cc
--LIBS =  -lX11 -lm
-+#CC = cc
-+#LIBS =  -lX11 -lm
-+
-+###
-+# FreeBSD
-+#CC = gcc
-+CFLAGS += -c -DDOBACK -DHASTIMER -I/usr/X11R6/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
-+.endif
-+LIBS =  -L/usr/X11R6/lib -lX11 -lm
-+LDR = f77
-+###
- 
- # 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 )
- #
-@@ -160,7 +178,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
- #
- # on linux :
- #
-@@ -170,6 +188,8 @@
- #
- #LIBSG = -L/usr/X11R6/lib -lglut -lMesaGLU -lMesaGL -lXmu -lXi -lX11 -lm
- #
-+
-+all: molden moldenogl
- 
- molden:	$(OBJS) $(SOBJ) mpdum.o xwin.o 
- 	$(LDR) -o molden $(OBJS) $(SOBJ) mpdum.o xwin.o $(LIBS)
diff -uNr molden/files/patch-makefile molden/files/patch-makefile
--- molden/files/patch-makefile	Thu Jan  1 01:00:00 1970
+++ molden/files/patch-makefile	Thu Dec  1 13:35:04 2005
@@ -0,0 +1,55 @@
+--- makefile.orig	Wed Nov  2 16:35:57 2005
++++ makefile	Thu Dec  1 13:34:44 2005
+@@ -14,12 +14,30 @@
+ #
+ 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/usr/X11R6/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
++.endif
++LIBS =  -L${X11BASE}/lib -lX11 -lm
++LDR = f77
++###
+ 
+ # 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 )
+ #
+@@ -168,7 +186,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 :
+ #
+@@ -187,6 +205,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)
diff -uNr molden/pkg-plist molden/pkg-plist
--- molden/pkg-plist	Wed Oct 22 11:29:54 2003
+++ molden/pkg-plist	Thu Dec  1 13:57:54 2005
@@ -9,6 +9,7 @@
 %%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
>Release-Note:
>Audit-Trail:
>Unformatted: