Attachment 27931 Details for Bug 47177 – molden.update

molden.update

molden.update (text/plain), 3.83 KB, created by gjohnson on 2003-01-17 23:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gjohnson

Created: 2003-01-17 23:10:07 UTC

Size: 3.83 KB

patch

obsolete

>diff -ruN molden.orig/Makefile molden/Makefile
>--- molden.orig/Makefile	Fri Jan 17 15:49:55 2003
>+++ molden/Makefile	Fri Jan 17 16:11:01 2003
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	molden
> PORTVERSION=	3.8
>+PORTREVISION=	1
> CATEGORIES=	biology
> MASTER_SITES=	ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/
> DISTNAME=	${PORTNAME}${PORTVERSION}
>@@ -39,7 +40,7 @@
> 	(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 -ruN molden.orig/files/patch-aa molden/files/patch-aa
>--- molden.orig/files/patch-aa	Fri Jan 17 15:49:55 2003
>+++ molden/files/patch-aa	Fri Jan 17 16:07:19 2003
>@@ -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 -ruN molden.orig/pkg-plist molden/pkg-plist
>--- molden.orig/pkg-plist	Fri Jan 17 15:49:55 2003
>+++ molden/pkg-plist	Fri Jan 17 16:08:35 2003
>@@ -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

Actions: View

Attachments on bug 47177: 27931