diff options
author | David Naylor <dbn@FreeBSD.org> | 2017-06-18 06:03:29 +0000 |
---|---|---|
committer | David Naylor <dbn@FreeBSD.org> | 2017-06-18 06:03:29 +0000 |
commit | bb547a6642203987cc169cdc8844b2ee2276b70f (patch) | |
tree | 1864b5146042a3cfa5ee896fcc6394b473de24ba /science/vmd/files/patch-configure | |
parent | Update to 10.3.3 (diff) |
science/vmd: various fixes
- fix spelling of VMD license [1]
- use USES=tcl,tk instead of direct dependency
- patch vmd to support (tcl|tk)86
- fix shebang for tcl [1]
- fix detection of netcdf
- add sqlite as a dependency (for dmsplugin) [1]
- add expact as a dependency (for hoomdplugin)
- rework configuration:
- explicitly list required components (CONFIGURE_ARGS)
- call configure directly (instead of via gmake(1))
- patch configure to accept TCLLDFLAGS and TKLDFLAGS
- pass PREFIX as an environment variable instead of using sed(1)
- patch Make-arch to accept environment TCLLDFLAGS and NETCDFLDFLAGS
- add support for parallel building (except for building plugins)
- bump PORTREVISION
PR: 219642
Reported by: Yuri Victorovich <yuri@rawbw.com>
Notes
Notes:
svn path=/head/; revision=443820
Diffstat (limited to 'science/vmd/files/patch-configure')
-rw-r--r-- | science/vmd/files/patch-configure | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/science/vmd/files/patch-configure b/science/vmd/files/patch-configure index 6db1b98b3627..33ca9e23ce8f 100644 --- a/science/vmd/files/patch-configure +++ b/science/vmd/files/patch-configure @@ -5,14 +5,25 @@ # Directory where VMD startup script is installed, should be in users' paths. -$install_bin_dir="/usr/local/bin"; -+$install_bin_dir="\${DESTDIR}%%PREFIX%%/bin"; ++$install_bin_dir="\${DESTDIR}\${PREFIX}/bin"; # Directory where VMD files and executables are installed -$install_library_dir="/usr/local/lib/$install_name"; -+$install_library_dir="\${DESTDIR}%%PREFIX%%/lib/$install_name"; ++$install_library_dir="\${DESTDIR}\${PREFIX}/lib/$install_name"; # optionally override hard-coded defaults above with environment variables +@@ -729,8 +729,8 @@ $tcl_include = "-I$stock_tcl_includ + if ($config_tk) { $tcl_include .= " -I$stock_tk_include_dir"; } + $tcl_library = "-L$stock_tcl_library_dir"; + if ($config_tk) { $tcl_library .= " -L$stock_tk_library_dir"; } +-$tcl_libs = "-ltcl8.5"; +-if ($config_tk) { $tcl_libs = "-ltk8.5 -lX11 " . $tcl_libs; } ++$tcl_libs = "\${TCLLDFLAGS}"; ++if ($config_tk) { $tcl_libs = "\${TKLDFLAGS} " . $tcl_libs; } + + @tcl_cc = (); + @tcl_cu = (); @@ -1105,8 +1105,8 @@ if ($config_liboptix) { # This may be commented out if not required. $libtachyon_defines = "-DVMDLIBTACHYON"; |