From 1e1dd8e98ac2af4b0da968e53d801602e2f4bc85 Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Sun, 30 Jan 2005 22:42:12 +0000 Subject: Add missing files. PR: ports/75342 Submitted by: maintainer. --- science/vmd/Makefile | 29 ++++++++++++++++++++++------- science/vmd/distinfo | 4 ++++ science/vmd/files/patch-Makefile | 4 ++-- science/vmd/files/patch-configure | 11 +++++++++++ science/vmd/files/patch-stride.c | 11 +++++++++++ science/vmd/files/patch-stride.h | 11 +++++++++++ science/vmd/pkg-plist | 3 +++ 7 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 science/vmd/files/patch-stride.c create mode 100644 science/vmd/files/patch-stride.h (limited to 'science/vmd') diff --git a/science/vmd/Makefile b/science/vmd/Makefile index 79aa4fdcd010..a72abdc9ab3c 100644 --- a/science/vmd/Makefile +++ b/science/vmd/Makefile @@ -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,16 +28,19 @@ USE_GL= yes 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 # Check for VMD sources -.if !exists(${DISTDIR}/${DISTFILES}) # && !defined(PACKAGE_BUILDING) -ECHO_MSG= /usr/bin/printf +.if !exists(${DISTDIR}/${VMD_DIST}) # && !defined(PACKAGE_BUILDING) +ECHO_MSG= ${PRINTF} IGNORE= :\n\ Because of licensing restrictions, you must fetch the source distribution\n\ manually. Please access\n\ @@ -44,9 +48,16 @@ http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD\n\ 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 @@ post-patch: ${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 diff --git a/science/vmd/distinfo b/science/vmd/distinfo index e94e8ceeffd7..24df7f7013f8 100644 --- a/science/vmd/distinfo +++ b/science/vmd/distinfo @@ -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 --git a/science/vmd/files/patch-Makefile b/science/vmd/files/patch-Makefile index 7469e127512a..4dc20558ffb5 100644 --- a/science/vmd/files/patch-Makefile +++ b/science/vmd/files/patch-Makefile @@ -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 --git a/science/vmd/files/patch-configure b/science/vmd/files/patch-configure index 19f2bb9934d1..2e0afa6efc63 100644 --- a/science/vmd/files/patch-configure +++ b/science/vmd/files/patch-configure @@ -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 --git a/science/vmd/files/patch-stride.c b/science/vmd/files/patch-stride.c new file mode 100644 index 000000000000..35ea92916d30 --- /dev/null +++ b/science/vmd/files/patch-stride.c @@ -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