Date: Mon, 20 Dec 2004 19:46:07 -0600 (CST) From: Stephen Montgomery-Smith <stephen@math.missouri.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75342: Upgrade of port science/vmd Message-ID: <200412210146.iBL1k7Fv052472@cauchy.math.missouri.edu> Resent-Message-ID: <200412210150.iBL1oIp5062399@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75342
>Category: ports
>Synopsis: Upgrade of port science/vmd
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 21 01:50:17 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Stephen Montgomery-Smith
>Release: FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD cauchy 4.10-STABLE FreeBSD 4.10-STABLE #0: Mon Dec 6 11:15:59 CST 2004 stephen@cauchy:/usr/src-copy/sys/compile/gx270 i386
>Description:
The vmd port was incomplete.
>How-To-Repeat:
>Fix:
Note that there are a couple of extra files
vmd/files/patch-stride.h and vmd/files/patch-stride.c
diff -urP /usr/ports/science/vmd/Makefile vmd/Makefile
--- /usr/ports/science/vmd/Makefile Mon Oct 11 22:57:44 2004
+++ vmd/Makefile Fri Dec 17 18:38:01 2004
@@ -7,10 +7,11 @@
PORTNAME= vmd
PORTVERSION= 1.8.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science graphics python tcl84 tk84
-MASTER_SITES= #
-DISTFILES= ${PORTNAME}-${PORTVERSION}.src.tar.gz
+MASTER_SITES= http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.96/ \
+ ftp://ftp.ebi.ac.uk/pub/software/unix/stride/src/
+DISTFILES= ${VMD_DIST} ${TACHYON_DIST} ${STRIDE_DIST}
MAINTAINER= stephen@math.missouri.edu
COMMENT= A molecular visualization program
@@ -27,15 +28,18 @@
USE_PYTHON= yes
USE_REINPLACE= yes
-# I.A.N.A.L. so this may be overly restrictive.
NO_PACKAGE= "License has restrictions"
NO_CDROM= "License has restrictions"
RESTRICTED= "License has restrictions"
+VMD_DIST= ${PORTNAME}-${PORTVERSION}.src.tar.gz
+TACHYON_DIST= tachyon-0.96.tar.gz
+STRIDE_DIST= stride.tar.gz
+
.include <bsd.port.pre.mk>
# Check for VMD sources
-.if !exists(${DISTDIR}/${DISTFILES}) # && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${VMD_DIST}) # && !defined(PACKAGE_BUILDING)
ECHO_MSG= /usr/bin/printf
IGNORE= :\n\
Because of licensing restrictions, you must fetch the source distribution\n\
@@ -44,9 +48,16 @@
with a web browser. You will be required to log in and register,\n\
but you can create an account on this page. After registration and\n\
accepting the University of Illinois agreement, download the source file,\n\
-${DISTFILES}. Please place this file in ${DISTDIR}.\n
+${VMD_DIST}. Please place this file in ${DISTDIR}.\n
.endif
+do-extract:
+ ${MKDIR} ${WRKDIR}
+ cd ${WRKDIR} && ${TAR} xfz ${DISTDIR}/${VMD_DIST}
+ cd ${WRKSRC}/lib/surf && ${TAR} xfz surf.tar.Z
+ cd ${WRKSRC}/lib && ${TAR} xfz ${DISTDIR}/${TACHYON_DIST}
+ cd ${WRKSRC}/lib/stride && ${TAR} xfz ${DISTDIR}/${STRIDE_DIST}
+
post-patch:
${REINPLACE_CMD} "s/-lpthread/${PTHREAD_LIBS}/" ${WRKSRC}/configure
${REINPLACE_CMD} "s/-ltk8.4/-ltk84/" ${WRKSRC}/configure
@@ -55,11 +66,15 @@
${REINPLACE_CMD} "s/python2.2/${PYTHON_VERSION}/" ${WRKSRC}/configure
do-build:
+ cd ${WRKSRC}/lib/tachyon/unix && ${SETENV} ${MAKE_ENV} ${GMAKE} bsd && ${MV} ../compile/bsd/tachyon ../tachyon_FREEBSD
cd ${WRKDIR}/plugins && ${SETENV} ${MAKE_ENV} PLUGINDIR=${WRKSRC}/plugins ${GMAKE} FREEBSD distrib
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} TCL_INCLUDE_DIR=${PREFIX}/include/tcl8.4 TK_INCLUDE_DIR=${PREFIX}/include/tk8.4 ${GMAKE} freebsd.opengl
cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} all
+ cd ${WRKSRC}/lib/surf && ${SETENV} ${MAKE_ENV} ${GMAKE} depend && ${SETENV} ${MAKE_ENV} ${GMAKE} surf && ${MV} surf surf_FREEBSD
+ cd ${WRKSRC}/lib/stride && ${SETENV} ${MAKE_ENV} ${GMAKE} && ${MV} stride stride_FREEBSD
do-install:
cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install
+# cd ${WRKSRC}/lib/surf && ${INSTALL_PROGRAM} surf_FREEBSD ${PREFIX}/lib/vmd
.include <bsd.port.post.mk>
diff -urP /usr/ports/science/vmd/distinfo vmd/distinfo
--- /usr/ports/science/vmd/distinfo Mon Oct 11 22:55:52 2004
+++ vmd/distinfo Fri Dec 17 18:12:22 2004
@@ -1,2 +1,6 @@
MD5 (vmd-1.8.2.src.tar.gz) = 8ad9cb90d954740f3b54be585526698d
SIZE (vmd-1.8.2.src.tar.gz) = 7192878
+MD5 (tachyon-0.96.tar.gz) = db695196231a304b8102c1d6a0f6f6f2
+SIZE (tachyon-0.96.tar.gz) = 2419955
+MD5 (stride.tar.gz) = bdef3a3e1af8cbdf8fbfefacfa9a929f
+SIZE (stride.tar.gz) = 56441
diff -urP /usr/ports/science/vmd/files/patch-Makefile vmd/files/patch-Makefile
--- /usr/ports/science/vmd/files/patch-Makefile Mon Oct 11 22:55:52 2004
+++ vmd/files/patch-Makefile Fri Dec 17 17:42:39 2004
@@ -5,12 +5,12 @@
## FreeBSD builds
freebsd.mesa:
- ./configure FREEBSD MESA FLTK TK TCL IMD VRPN PYTHON PTHREADS LIBTACHYON NUMPY SILENT
-+ ./configure FREEBSD MESA FLTK TK TCL IMD PYTHON PTHREADS NUMPY SILENT
++ ./configure FREEBSD MESA FLTK TK TCL IMD PYTHON PTHREADS LIBTACHYON NUMPY SILENT
# FreeBSD doesn't have hardware good accelleration support
freebsd.opengl:
- ./configure FREEBSD OPENGL FLTK TK IMD VRPN SILENT SPACEBALL TCL PTHREADS ACTC LIBTACHYON PYTHON NUMPY
-+ ./configure FREEBSD OPENGL FLTK TK IMD SILENT TCL PTHREADS PYTHON NUMPY
++ ./configure FREEBSD OPENGL FLTK TK IMD SILENT TCL PTHREADS LIBTACHYON PYTHON NUMPY
diff -urP /usr/ports/science/vmd/files/patch-configure vmd/files/patch-configure
--- /usr/ports/science/vmd/files/patch-configure Mon Oct 11 22:57:44 2004
+++ vmd/files/patch-configure Fri Dec 17 17:54:32 2004
@@ -1,5 +1,16 @@
--- configure-xxx Fri Dec 5 13:20:58 2003
+++ configure Thu Aug 12 00:22:30 2004
+@@ -624,8 +624,8 @@
+ # This may be commented out if not required.
+ $libtachyon_defines = "-DVMDLIBTACHYON";
+ $libtachyon_dir = "$vmd_library_dir/tachyon";
+-$libtachyon_include = "-I$libtachyon_dir/include";
+-$libtachyon_library = "-L$libtachyon_dir/lib_$config_arch";
++$libtachyon_include = "-I$libtachyon_dir/src";
++$libtachyon_library = "-L$libtachyon_dir/compile/bsd";
+ $libtachyon_libs = "-ltachyon";
+ @libtachyon_cc = ();
+ @libtachyon_ccpp = ('LibTachyonDisplayDevice.C'
@@ -1174,8 +1174,10 @@
# XFree 4.0 Direct Rendering Interface and GLX
diff -urP /usr/ports/science/vmd/files/patch-stride.c vmd/files/patch-stride.c
--- /usr/ports/science/vmd/files/patch-stride.c Wed Dec 31 18:00:00 1969
+++ vmd/files/patch-stride.c Fri Dec 17 18:21:04 2004
@@ -0,0 +1,11 @@
+--- lib/stride/stride.c-xxx Fri Dec 17 18:18:42 2004
++++ lib/stride/stride.c Fri Dec 17 18:19:21 2004
+@@ -93,7 +93,7 @@
+ for( i=0; i<NHBond; i++ ) free(HBond[i]);
+ free(Cmd);
+
+- return(SUCCESS);
++ return(0);
+ }
+
+ void ProcessStrideOptions(char **List, int ListLength, COMMAND *Cmd)
diff -urP /usr/ports/science/vmd/files/patch-stride.h vmd/files/patch-stride.h
--- /usr/ports/science/vmd/files/patch-stride.h Wed Dec 31 18:00:00 1969
+++ vmd/files/patch-stride.h Fri Dec 17 18:20:39 2004
@@ -0,0 +1,11 @@
+--- lib/stride/stride.h-xxx Fri Dec 17 18:18:07 2004
++++ lib/stride/stride.h Fri Dec 17 18:18:30 2004
+@@ -40,7 +40,7 @@
+ #define MAX_BOND 100
+ #define MAX_ASSIGN 300
+ #define MAX_INFO 1000
+-#define MAX_AT_IN_RES 50
++#define MAX_AT_IN_RES 75
+ #define MAX_AT_IN_HETERORES 200
+ #define MAXRESDNR 6
+ #define MAXRESACC 6
diff -urP /usr/ports/science/vmd/pkg-plist vmd/pkg-plist
--- /usr/ports/science/vmd/pkg-plist Mon Oct 11 22:55:52 2004
+++ vmd/pkg-plist Fri Dec 17 18:26:38 2004
@@ -4,6 +4,9 @@
lib/vmd/README
lib/vmd/LICENSE
lib/vmd/vmd_FREEBSD
+lib/vmd/surf_FREEBSD
+lib/vmd/stride_FREEBSD
+lib/vmd/tachyon_FREEBSD
lib/vmd/scripts/CVS/Root
lib/vmd/scripts/CVS/Repository
lib/vmd/scripts/CVS/Entries
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412210146.iBL1k7Fv052472>