From efc116207eb088b65e3f4783ecfe77f71ba034e1 Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Sat, 19 Jul 2003 04:17:06 +0000
Subject: enhancement, build and install the opengl viewer, moldenogl. update
 to 3.9, not 3.8, which is newer :)

Committed by maintainer timeout:
> Sat Apr  5 17:46:57 EST 2003 - edwin - informed maintainer

PR:		47177
Submitted by:	Glenn Johnson <gjohnson@srrc.ars.usda.gov>
---
 biology/molden/Makefile       |   4 +-
 biology/molden/distinfo       |   2 +-
 biology/molden/files/patch-aa | 131 +++++++++++++++++++-----------------------
 biology/molden/pkg-plist      |   1 +
 4 files changed, 64 insertions(+), 74 deletions(-)

(limited to 'biology')

diff --git a/biology/molden/Makefile b/biology/molden/Makefile
index 3a5828334787..379eab60b1b7 100644
--- a/biology/molden/Makefile
+++ b/biology/molden/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	molden
-PORTVERSION=	3.8
+PORTVERSION=	3.9
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -40,7 +40,7 @@ do-build:
 	(cd ${WRKSRC} && ${MAKE})
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/molden ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/molden ${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 018561e9061d..9f9e5cbdd03f 100644
--- a/biology/molden/distinfo
+++ b/biology/molden/distinfo
@@ -1 +1 @@
-MD5 (molden3.8.tar.Z) = 1f4dfdbbf0b6620a06e62803d04d859e
+MD5 (molden3.9.tar.Z) = 66061c5187193b0a11be548d0da3e2bc
diff --git a/biology/molden/files/patch-aa b/biology/molden/files/patch-aa
index 6abea58e5ef3..bc8fa40497ab 100644
--- a/biology/molden/files/patch-aa
+++ b/biology/molden/files/patch-aa
@@ -1,71 +1,60 @@
-*** makefile.orig	Mon Jan 24 23:28:24 2000
---- makefile	Wed Jun  7 04:25:36 2000
-***************
-*** 12,19 ****
-  #
-  #	Disregard compiler warnings on rdmolf.f
-  #
-! CC = cc
-! LIBS =  -lX11 -lm
-  
-  # Ultrix, Dec Alpha, Linux ( and best start for Unix other than below )
-  #
---- 12,37 ----
-  #
-  #	Disregard compiler warnings on rdmolf.f
-  #
-! #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
-! ###
-  
-  # Ultrix, Dec Alpha, Linux ( and best start for Unix other than below )
-  #
-***************
-*** 49,57 ****
-  
-  
-  # Silicon Graphics
-! CFLAGS = -c -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
-! FFLAGS =   
-! LDR = f77 
-  
-  # AIX
-  #
---- 67,75 ----
-  
-  
-  # Silicon Graphics
-! #CFLAGS = -c -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
-! #FFLAGS =   
-! #LDR = f77 
-  
-  # AIX
-  #
-***************
-*** 138,143 ****
---- 156,163 ----
-  # on linux with older Mesa installations try:
-  #LIBSG = -L/usr/X11R6/lib -lglut -lMesaGLU -lMesaGL -lXmu -lXi -lX11 -lm
-  #
-+ 
-+ all: molden
-  
-  molden:	$(OBJS) $(SOBJ) mpdum.o xwin.o 
-  	$(LDR) -o molden $(OBJS) $(SOBJ) mpdum.o xwin.o $(LIBS)
+
+$FreeBSD$
+
+--- 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 --git a/biology/molden/pkg-plist b/biology/molden/pkg-plist
index e7d7ae2ac564..07995f6d4fe3 100644
--- a/biology/molden/pkg-plist
+++ b/biology/molden/pkg-plist
@@ -1,4 +1,5 @@
 bin/molden
+bin/moldenogl
 %%PORTDOCS%%share/doc/molden/figures.ps.Z
 %%PORTDOCS%%share/doc/molden/manual.ps.Z
 %%PORTDOCS%%share/doc/molden/manual.txt.Z
-- 
cgit v1.2.3