View | Details | Raw Unified | Return to bug 219642
Collapse All | Expand All

(-)b/science/vmd/Makefile (-31 / +38 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	vmd
4
PORTNAME=	vmd
5
DISTVERSION=	1.9.3
5
DISTVERSION=	1.9.3
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	science graphics python tcl tk
7
CATEGORIES=	science graphics python tcl tk
8
MASTER_SITES=	http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.99b6/:tachyon \
8
MASTER_SITES=	http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.99b6/:tachyon \
9
		http://www.photonlimited.com/~johns/tachyon/files/0.99b6/:tachyon \
9
		http://www.photonlimited.com/~johns/tachyon/files/0.99b6/:tachyon \
Lines 21-35 LICENSE_COMB= multi Link Here
21
21
22
BUILD_DEPENDS=	makedepend:devel/makedepend \
22
BUILD_DEPENDS=	makedepend:devel/makedepend \
23
		${PYNUMPY}
23
		${PYNUMPY}
24
LIB_DEPENDS=	libtcl85.so:lang/tcl85 \
24
LIB_DEPENDS=	libexpat.so:textproc/expat2 \
25
		libtk85.so:x11-toolkits/tk85 \
26
		libfltk.so:x11-toolkits/fltk \
25
		libfltk.so:x11-toolkits/fltk \
27
		libnetcdf.so:science/netcdf
26
		libnetcdf.so:science/netcdf
28
RUN_DEPENDS=	${PYNUMPY}
27
RUN_DEPENDS=	${PYNUMPY}
29
28
30
LICENSE_FILE_VMD=	${WRKSRC}/LICENSE
29
LICENSE_FILE_VMD=	${WRKSRC}/LICENSE
31
LICENSE_PERMS_VMD=	auto-accept
30
LICENSE_PERMS_VMD=	auto-accept
32
LICENSE_NAME_VMD=	Visaul Molecular Dynamics Software License Agreement
31
LICENSE_NAME_VMD=	Visual Molecular Dynamics Software License Agreement
33
LICENSE_DISTFILES_VMD=	${VMD_DIST}
32
LICENSE_DISTFILES_VMD=	${VMD_DIST}
34
33
35
LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/lib/tachyon/Copyright
34
LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/lib/tachyon/Copyright
Lines 40-46 LICENSE_PERMS_STRIDE= dist-mirror pkg-mirror auto-accept Link Here
40
LICENSE_NAME_STRIDE=	Stride Copyright Notice
39
LICENSE_NAME_STRIDE=	Stride Copyright Notice
41
LICENSE_DISTFILES_STRIDE=${STRIDE_DIST}
40
LICENSE_DISTFILES_STRIDE=${STRIDE_DIST}
42
41
43
USES=		gmake perl5 python
42
USES=		gmake perl5 python shebangfix sqlite tcl tk
43
44
SHEBANG_FILES=	${WRKDIR}/plugins/topotools/*.tcl
44
45
45
USE_PERL5=	build
46
USE_PERL5=	build
46
USE_GL=		gl glu
47
USE_GL=		gl glu
Lines 51-58 ONLY_FOR_ARCHS= i386 amd64 Link Here
51
CONFIGURE_ENV=	PYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \
52
CONFIGURE_ENV=	PYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \
52
		PYTHON_LIBRARY_DIR=${PYTHON_LIBDIR} \
53
		PYTHON_LIBRARY_DIR=${PYTHON_LIBDIR} \
53
		NUMPY_INCLUDE_DIR=${PYTHON_SITELIBDIR}/numpy/core/include \
54
		NUMPY_INCLUDE_DIR=${PYTHON_SITELIBDIR}/numpy/core/include \
54
		NUMPY_LIBRARY_DIR=${PYTHON_SITELIBDIR}
55
		NUMPY_LIBRARY_DIR=${PYTHON_SITELIBDIR} \
56
		TCL_INCLUDE_DIR=${TCL_INCLUDEDIR} \
57
		TCL_LIBRARY_DIR=${LOCALBASE}/lib \
58
		TK_INCLUDE_DIR=${TK_INCLUDEDIR} \
59
		TK_LIBRARY_DIR=${LOCALBASE}/lib
60
CONFIGURE_ARGS=	${VMD_ARCH} OPENGL FLTK TK IMD TCL PTHREADS LIBTACHYON NETCDF NUMPY PYTHON
55
INSTALL_WRKSRC=	${WRKSRC}/src
61
INSTALL_WRKSRC=	${WRKSRC}/src
62
MAKE_ENV=	EXPATINC=-I${LOCALBASE}/include \
63
		EXPATLIB=-L${LOCALBASE}/lib \
64
		EXPATLDFLAGS=-lexpat \
65
		EXPATDYNAMIC=1 \
66
		NETCDFINC=-I${LOCALBASE}/include \
67
		NETCDFLIB=-L${LOCALBASE}/lib \
68
		NETCDFLDFLAGS=-lnetcdf \
69
		SQLITEINC=-I${LOCALBASE}/include \
70
		SQLITELIB=-L${LOCALBASE}/lib \
71
		SQLITELDFLAGS=-lsqlite3 \
72
		SQLITEDYNAMIC=1 \
73
		TCLLIB=-L${LOCALBASE}/lib \
74
		TCLINC=-I${TCL_INCLUDEDIR} \
75
		TCLLDFLAGS=-ltcl${TCL_VER:S/.//} \
76
		TKLDFLAGS="-ltk${TK_VER:S/.//} -lX11"
56
77
57
VMD_DIST=	${PORTNAME}-${DISTVERSION}.src.tar.gz
78
VMD_DIST=	${PORTNAME}-${DISTVERSION}.src.tar.gz
58
TACHYON_DIST=	tachyon-0.99b6.tar.gz
79
TACHYON_DIST=	tachyon-0.99b6.tar.gz
Lines 63-72 STRIDE_DOC= stride.doc Link Here
63
84
64
.if ${ARCH} == "amd64"
85
.if ${ARCH} == "amd64"
65
VMD_ARCH=		FREEBSDAMD64
86
VMD_ARCH=		FREEBSDAMD64
66
VMD_TARGET=		freebsd.amd64.opengl
67
.else
87
.else
68
VMD_ARCH=		FREEBSD
88
VMD_ARCH=		FREEBSD
69
VMD_TARGET=		freebsd.opengl
70
.endif
89
.endif
71
90
72
PLIST_SUB+=		VMD_ARCH=${VMD_ARCH}
91
PLIST_SUB+=		VMD_ARCH=${VMD_ARCH}
Lines 89-102 do-extract: Link Here
89
108
90
post-patch:
109
post-patch:
91
	${REINPLACE_CMD} \
110
	${REINPLACE_CMD} \
92
		-e "s|-ltk8.5|-ltk85|" \
93
		-e "s|-ltcl8.5|-ltcl85|" \
94
		-e "s|-lpython2.5|-l${PYTHON_VERSION}${PYTHON_ABIVER}|" \
111
		-e "s|-lpython2.5|-l${PYTHON_VERSION}${PYTHON_ABIVER}|" \
95
		-e "s|%%PREFIX%%|${PREFIX}|g" \
96
		-e "s|/usr/local|${LOCALBASE}|g"  \
112
		-e "s|/usr/local|${LOCALBASE}|g"  \
97
		-e "s|-fno-for-scope||g" \
113
		-e "s|-fno-for-scope||g" \
98
		${WRKSRC}/configure
114
		-e "s/\"gcc\"/\"${CC}\"/;s/\"g++\"/\"${CXX}\"/" \
99
	${REINPLACE_CMD} "s/\"gcc\"/\"${CC}\"/;s/\"g++\"/\"${CXX}\"/" \
100
		${WRKSRC}/configure
115
		${WRKSRC}/configure
101
	${REINPLACE_CMD} -e "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/Makefile
116
	${REINPLACE_CMD} -e "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/Makefile
102
	${REINPLACE_CMD} "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/*/Makefile
117
	${REINPLACE_CMD} "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/*/Makefile
Lines 122-145 post-patch: Link Here
122
		${WRKSRC}/lib/surf/*.c
137
		${WRKSRC}/lib/surf/*.c
123
138
124
do-build:
139
do-build:
125
	${SETENV} ${MAKE_ENV} ${MAKE_CMD} bsd -C ${WRKSRC}/lib/tachyon/unix \
140
	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} bsd -C ${WRKSRC}/lib/tachyon/unix
126
		&& ${MV} ${WRKSRC}/lib/tachyon/compile/bsd/tachyon \
141
		${MV} ${WRKSRC}/lib/tachyon/compile/bsd/tachyon ${WRKSRC}/lib/tachyon/tachyon_${VMD_ARCH}
127
			${WRKSRC}/lib/tachyon/tachyon_${VMD_ARCH}
142
	${SETENV} ${MAKE_ENV} PLUGINDIR=${WRKSRC}/plugins ${MAKE_CMD} ${VMD_ARCH} distrib -C ${WRKDIR}/plugins
128
	${SETENV} ${MAKE_ENV} TCLLIB=-L${PREFIX}/lib/tcl8.5 \
143
	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
129
		TCLINC=-I${PREFIX}/include/tcl8.5 PLUGINDIR=${WRKSRC}/plugins \
144
	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} all -C ${WRKSRC}/src
130
		${MAKE_CMD} ${VMD_ARCH} distrib -C ${WRKDIR}/plugins
145
	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} depend -C ${WRKSRC}/lib/surf
131
	${SETENV} ${MAKE_ENV} TCL_INCLUDE_DIR=${PREFIX}/include/tcl8.5 \
146
	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} surf -C ${WRKSRC}/lib/surf
132
		TK_INCLUDE_DIR=${PREFIX}/include/tk8.5 ${MAKE_CMD} \
147
		${MV} ${WRKSRC}/lib/surf/surf ${WRKSRC}/lib/surf/surf_${VMD_ARCH}
133
		${VMD_TARGET} -C ${WRKSRC}
148
	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} -C ${WRKSRC}/lib/stride 
134
	${SETENV} ${MAKE_ENV} ${MAKE_CMD} all -C ${WRKSRC}/src
149
		${MV} ${WRKSRC}/lib/stride/stride ${WRKSRC}/lib/stride/stride_${VMD_ARCH}
135
	${SETENV} ${MAKE_ENV} ${MAKE_CMD} depend -C ${WRKSRC}/lib/surf \
136
		&& ${SETENV} ${MAKE_ENV} ${MAKE_CMD} surf -C \
137
			${WRKSRC}/lib/surf \
138
		&& ${MV} ${WRKSRC}/lib/surf/surf \
139
			${WRKSRC}/lib/surf/surf_${VMD_ARCH}
140
	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/lib/stride \
141
		&& ${MV} ${WRKSRC}/lib/stride/stride \
142
			${WRKSRC}/lib/stride/stride_${VMD_ARCH}
143
150
144
post-install:
151
post-install:
145
	${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||g' ${STAGEDIR}${PREFIX}/bin/vmd
152
	${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||g' ${STAGEDIR}${PREFIX}/bin/vmd
(-)b/science/vmd/files/patch-Make-arch (-12 / +16 lines)
Lines 1-17 Link Here
1
--- ../plugins/Make-arch.orig	2011-03-11 22:38:25.000000000 -0500
1
--- ../plugins/Make-arch.orig	2016-10-21 23:34:39.000000000 +0200
2
+++ ../plugins/Make-arch	2011-03-12 00:08:41.000000000 -0500
2
+++ ../plugins/Make-arch
3
@@ -277,8 +277,8 @@
3
@@ -272,10 +272,8 @@
4
 	"CC = gcc" \
4
 	"CC = gcc" \
5
 	"CXX = g++" \
5
 	"CXX = g++" \
6
 	"DEF = -D" \
6
 	"DEF = -D" \
7
-	"CCFLAGS = -O2 -Wall -I/usr/local/include/tcl8.5" \
7
-	"CCFLAGS = -O2 -Wall -I/usr/local/include/tcl8.5" \
8
-	"CXXFLAGS = -O2 -Wall" \
8
-	"CXXFLAGS = -O2 -Wall" \
9
+	"CCFLAGS = ${CFLAGS} -O2 -Wall -I/usr/local/include/tcl8.5" \
9
-	"TCLLDFLAGS = -L/usr/local/lib -ltcl85" \
10
+	"CXXFLAGS = ${CFLAGS} -O2 -Wall" \
10
-	"NETCDFLDFLAGS = -lnetcdf " \
11
 	"TCLLDFLAGS = -L/usr/local/lib -ltcl85" \
11
+	"CCFLAGS = ${CFLAGS} -Wall" \
12
 	"NETCDFLDFLAGS = -lnetcdf " \
12
+	"CXXFLAGS = ${CFLAGS} -Wall" \
13
 	"AR = ar" \
13
 	"AR = ar" \
14
@@ -288,14 +288,14 @@
14
 	"NM = nm -p" \
15
 	"RANLIB = touch" \
16
@@ -283,16 +281,14 @@
15
 
17
 
16
 FREEBSDAMD64:
18
 FREEBSDAMD64:
17
 	$(MAKE) dynlibs staticlibs bins \
19
 	$(MAKE) dynlibs staticlibs bins \
Lines 24-31 Link Here
24
 	"DEF = -D" \
26
 	"DEF = -D" \
25
-	"CCFLAGS = -m64 -O2 -Wall -I/usr/local/include/tcl8.5" \
27
-	"CCFLAGS = -m64 -O2 -Wall -I/usr/local/include/tcl8.5" \
26
-	"CXXFLAGS = -m64 -O2 -Wall" \
28
-	"CXXFLAGS = -m64 -O2 -Wall" \
27
+	"CCFLAGS = ${CFLAGS} -m64 -O2 -Wall -I/usr/local/include/tcl8.5" \
29
-	"TCLLDFLAGS = -L/usr/local/lib -ltcl85" \
28
+	"CXXFLAGS = ${CFLAGS} -m64 -O2 -Wall" \
30
-	"NETCDFLDFLAGS = -lnetcdf " \
29
 	"TCLLDFLAGS = -L/usr/local/lib -ltcl85" \
31
+	"CCFLAGS = ${CFLAGS} -Wall" \
30
 	"NETCDFLDFLAGS = -lnetcdf " \
32
+	"CXXFLAGS = ${CFLAGS} -Wall" \
31
 	"AR = ar" \
33
 	"AR = ar" \
34
 	"NM = nm -p" \
35
 	"RANLIB = touch" \
(-)b/science/vmd/files/patch-configure (-2 / +13 lines)
Lines 5-18 Link Here
5
 
5
 
6
 # Directory where VMD startup script is installed, should be in users' paths.
6
 # Directory where VMD startup script is installed, should be in users' paths.
7
-$install_bin_dir="/usr/local/bin";
7
-$install_bin_dir="/usr/local/bin";
8
+$install_bin_dir="\${DESTDIR}%%PREFIX%%/bin";
8
+$install_bin_dir="\${DESTDIR}\${PREFIX}/bin";
9
 
9
 
10
 # Directory where VMD files and executables are installed
10
 # Directory where VMD files and executables are installed
11
-$install_library_dir="/usr/local/lib/$install_name";
11
-$install_library_dir="/usr/local/lib/$install_name";
12
+$install_library_dir="\${DESTDIR}%%PREFIX%%/lib/$install_name";
12
+$install_library_dir="\${DESTDIR}\${PREFIX}/lib/$install_name";
13
 
13
 
14
 
14
 
15
 # optionally override hard-coded defaults above with environment variables
15
 # optionally override hard-coded defaults above with environment variables
16
@@ -729,8 +729,8 @@ $tcl_include      = "-I$stock_tcl_includ
17
 if ($config_tk) { $tcl_include .= " -I$stock_tk_include_dir"; }
18
 $tcl_library      = "-L$stock_tcl_library_dir";
19
 if ($config_tk) { $tcl_library .= " -L$stock_tk_library_dir"; }
20
-$tcl_libs         = "-ltcl8.5";  
21
-if ($config_tk) { $tcl_libs = "-ltk8.5 -lX11 " . $tcl_libs; }
22
+$tcl_libs         = "\${TCLLDFLAGS}";
23
+if ($config_tk) { $tcl_libs = "\${TKLDFLAGS} " . $tcl_libs; }
24
 
25
 @tcl_cc           = ();
26
 @tcl_cu           = ();
16
@@ -1105,8 +1105,8 @@ if ($config_liboptix) {
27
@@ -1105,8 +1105,8 @@ if ($config_liboptix) {
17
 # This may be commented out if not required.
28
 # This may be commented out if not required.
18
 $libtachyon_defines     = "-DVMDLIBTACHYON";
29
 $libtachyon_defines     = "-DVMDLIBTACHYON";
(-)b/science/vmd/pkg-plist (+3 lines)
Lines 23-28 lib/vmd/plugins/%%VMD_ARCH%%/molfile/crdplugin.so Link Here
23
lib/vmd/plugins/%%VMD_ARCH%%/molfile/cubeplugin.so
23
lib/vmd/plugins/%%VMD_ARCH%%/molfile/cubeplugin.so
24
lib/vmd/plugins/%%VMD_ARCH%%/molfile/dcdplugin.so
24
lib/vmd/plugins/%%VMD_ARCH%%/molfile/dcdplugin.so
25
lib/vmd/plugins/%%VMD_ARCH%%/molfile/dlpolyplugin.so
25
lib/vmd/plugins/%%VMD_ARCH%%/molfile/dlpolyplugin.so
26
lib/vmd/plugins/%%VMD_ARCH%%/molfile/dmsplugin.so
26
lib/vmd/plugins/%%VMD_ARCH%%/molfile/dsn6plugin.so
27
lib/vmd/plugins/%%VMD_ARCH%%/molfile/dsn6plugin.so
27
lib/vmd/plugins/%%VMD_ARCH%%/molfile/dtrplugin.so
28
lib/vmd/plugins/%%VMD_ARCH%%/molfile/dtrplugin.so
28
lib/vmd/plugins/%%VMD_ARCH%%/molfile/dxplugin.so
29
lib/vmd/plugins/%%VMD_ARCH%%/molfile/dxplugin.so
Lines 33-38 lib/vmd/plugins/%%VMD_ARCH%%/molfile/graspplugin.so Link Here
33
lib/vmd/plugins/%%VMD_ARCH%%/molfile/grdplugin.so
34
lib/vmd/plugins/%%VMD_ARCH%%/molfile/grdplugin.so
34
lib/vmd/plugins/%%VMD_ARCH%%/molfile/gridplugin.so
35
lib/vmd/plugins/%%VMD_ARCH%%/molfile/gridplugin.so
35
lib/vmd/plugins/%%VMD_ARCH%%/molfile/gromacsplugin.so
36
lib/vmd/plugins/%%VMD_ARCH%%/molfile/gromacsplugin.so
37
lib/vmd/plugins/%%VMD_ARCH%%/molfile/hoomdplugin.so
36
lib/vmd/plugins/%%VMD_ARCH%%/molfile/jsplugin.so
38
lib/vmd/plugins/%%VMD_ARCH%%/molfile/jsplugin.so
37
lib/vmd/plugins/%%VMD_ARCH%%/molfile/lammpsplugin.so
39
lib/vmd/plugins/%%VMD_ARCH%%/molfile/lammpsplugin.so
38
lib/vmd/plugins/%%VMD_ARCH%%/molfile/libmolfile_plugin.a
40
lib/vmd/plugins/%%VMD_ARCH%%/molfile/libmolfile_plugin.a
Lines 45-50 lib/vmd/plugins/%%VMD_ARCH%%/molfile/moldenplugin.so Link Here
45
lib/vmd/plugins/%%VMD_ARCH%%/molfile/molemeshplugin.so
47
lib/vmd/plugins/%%VMD_ARCH%%/molfile/molemeshplugin.so
46
lib/vmd/plugins/%%VMD_ARCH%%/molfile/msmsplugin.so
48
lib/vmd/plugins/%%VMD_ARCH%%/molfile/msmsplugin.so
47
lib/vmd/plugins/%%VMD_ARCH%%/molfile/namdbinplugin.so
49
lib/vmd/plugins/%%VMD_ARCH%%/molfile/namdbinplugin.so
50
lib/vmd/plugins/%%VMD_ARCH%%/molfile/netcdfplugin.so
48
lib/vmd/plugins/%%VMD_ARCH%%/molfile/offplugin.so
51
lib/vmd/plugins/%%VMD_ARCH%%/molfile/offplugin.so
49
lib/vmd/plugins/%%VMD_ARCH%%/molfile/parm7plugin.so
52
lib/vmd/plugins/%%VMD_ARCH%%/molfile/parm7plugin.so
50
lib/vmd/plugins/%%VMD_ARCH%%/molfile/parmplugin.so
53
lib/vmd/plugins/%%VMD_ARCH%%/molfile/parmplugin.so

Return to bug 219642