diff options
| author | John Marino <marino@FreeBSD.org> | 2014-08-30 14:17:53 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-08-30 14:17:53 +0000 |
| commit | e49ea6bbb67fc6a520c219c6c31c1c252715c888 (patch) | |
| tree | c3a49ff7c823553b1519f454dfad7f8315466a56 /science/vmd/files/patch-configure | |
| parent | Stage japanese/waeijiro-fpw (diff) | |
Stage science/vmd
I clobbered the Makefile diff (sorry danfe@). The entire makefile was
tabbed over 3 times. There was also no respect for 80 columns so a good
part of the clobber came from line wrapping. I also made $TAR use
real switches (e.g. -xzf) rather than undocumented by supported (zxf)
This is another manual package / obtain restricted data files/ only port
so I can't test much of it.
PR: 193090
Submitted by: turutani (Kyoto)
Notes
Notes:
svn path=/head/; revision=366620
Diffstat (limited to 'science/vmd/files/patch-configure')
| -rw-r--r-- | science/vmd/files/patch-configure | 73 |
1 files changed, 71 insertions, 2 deletions
diff --git a/science/vmd/files/patch-configure b/science/vmd/files/patch-configure index 7f1d31386128..0ce4ed2e20d9 100644 --- a/science/vmd/files/patch-configure +++ b/science/vmd/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig 2009-08-01 03:19:34.000000000 -0400 -+++ configure 2010-01-08 22:01:38.000000000 -0500 +--- configure.orig 2012-02-02 16:53:54.000000000 +0900 ++++ configure 2014-08-28 16:42:38.000000000 +0900 @@ -13,10 +13,10 @@ $install_name = "vmd"; @@ -37,3 +37,72 @@ NVCC = $arch_nvcc NVCCFLAGS = $arch_nvccflags -DARCH_$config_arch \$(DEFINES) \$(INCDIRS) +@@ -2997,38 +2997,38 @@ + \$(COMPILERC) \$(RCFLAGS) + + install: +- if [ ! -d "$install_library_dir" ]; then \\ +- \$(MAKEDIR) "$install_library_dir" ; \\ ++ if [ ! -d "\${DESTDIR}$install_library_dir" ]; then \\ ++ \$(MAKEDIR) "\${DESTDIR}$install_library_dir" ; \\ + fi ; \\ +- if [ ! -d "$install_bin_dir" ]; then \\ +- \$(MAKEDIR) "$install_bin_dir" ; \\ ++ if [ ! -d "\${DESTDIR}$install_bin_dir" ]; then \\ ++ \$(MAKEDIR) "\${DESTDIR}$install_bin_dir" ; \\ + fi ; \\ +- if [ ! -d "$install_library_dir"/doc ]; then \\ +- \$(MAKEDIR) "$install_library_dir"/doc; \\ ++ if [ ! -d "\${DESTDIR}$install_library_dir"/doc ]; then \\ ++ \$(MAKEDIR) "\${DESTDIR}$install_library_dir"/doc; \\ + fi +- -\$(COPY) ../Announcement "$install_library_dir" +- -\$(COPY) ../README "$install_library_dir" +- -\$(COPY) ../LICENSE "$install_library_dir" +- -\$(COPY) $vmd_doc_dir/ug.pdf "$install_library_dir"/doc +- if [ -f $install_library_dir/$config_progname ]; then \\ +- \$(MOVE) "$install_library_dir/$config_progname" "$install_library_dir/OLD_$config_progname" ; \$(DELETE) "$install_library_dir/OLD_$config_progname" ; fi +- -\$(COPY) ../$config_arch/$config_progname "$install_library_dir" ++ -\$(COPY) ../Announcement "\${DESTDIR}$install_library_dir" ++ -\$(COPY) ../README "\${DESTDIR}$install_library_dir" ++ -\$(COPY) ../LICENSE "\${DESTDIR}$install_library_dir" ++ -\$(COPY) $vmd_doc_dir/ug.pdf "\${DESTDIR}$install_library_dir"/doc ++ if [ -f \${DESTDIR}$install_library_dir/$config_progname ]; then \\ ++ \$(MOVE) "\${DESTDIR}$install_library_dir/$config_progname" "\${DESTDIR}$install_library_dir/OLD_$config_progname" ; \$(DELETE) "\${DESTDIR}$install_library_dir/OLD_$config_progname" ; fi ++ -\$(COPY) ../$config_arch/$config_progname "\${DESTDIR}$install_library_dir" + if [ -d "../lib/redistrib/lib_$config_arch" ]; then \\ + \$(CD) ../lib/redistrib/lib_$config_arch; \$(TAR) -cf - ./* | \\ +- (cd "$install_library_dir" ; \$(TAR) -xf -) \\ ++ (cd "\${DESTDIR}$install_library_dir" ; \$(TAR) -xf -) \\ + fi ; +- -\$(COPY) @vmd_other_exe "$install_library_dir" ++ -\$(COPY) @vmd_other_exe "\${DESTDIR}$install_library_dir" + -\$(CD) ..; \$(TAR) -cf - scripts | \\ +- (cd "$install_library_dir" ; \$(TAR) -xf -) ++ (cd "\${DESTDIR}$install_library_dir" ; \$(TAR) -xf -) + -\$(CD) $vmd_library_dir; \$(TAR) -cf - scripts | \\ +- (cd "$install_library_dir" ; \$(TAR) -xf -) ++ (cd "\${DESTDIR}$install_library_dir" ; \$(TAR) -xf -) + -\$(CD) ..; \$(TAR) -cf - python | \\ +- (cd "$install_library_dir"/scripts ; \$(TAR) -xf -) ++ (cd "\${DESTDIR}$install_library_dir"/scripts ; \$(TAR) -xf -) + -\$(CD) ..; \$(TAR) -cf - plugins | \\ +- (cd "$install_library_dir" ; \$(TAR) -xf -) ++ (cd "\${DESTDIR}$install_library_dir" ; \$(TAR) -xf -) + -\$(CD) ..; \$(TAR) -cf - shaders | \\ +- (cd "$install_library_dir" ; \$(TAR) -xf -) +- -\$(COPY) ../data/.vmdrc ../data/.vmdsensors ../data/vmd_completion.dat "$install_library_dir" ++ (cd "\${DESTDIR}$install_library_dir" ; \$(TAR) -xf -) ++ -\$(COPY) ../data/.vmdrc ../data/.vmdsensors ../data/vmd_completion.dat "\${DESTDIR}$install_library_dir" + \$(CD) $vmd_bin_dir ; \\ + if [ -f run_vmd_tmp ]; then \$(DELETE) run_vmd_tmp; fi ; \\ + if [ ! -x "/bin/csh" ]; then \\ +@@ -3044,7 +3044,7 @@ + cat $vmd_bin_csh >> run_vmd_tmp ; \\ + fi ; \\ + chmod +x run_vmd_tmp ; \\ +- \$(COPY) run_vmd_tmp "$install_bin_dir"/$install_name ; \\ ++ \$(COPY) run_vmd_tmp "\${DESTDIR}$install_bin_dir"/$install_name ; \\ + \$(DELETE) run_vmd_tmp + \$(ECHO) Make sure "$install_bin_dir"/$install_name is in your path. + \$(ECHO) "VMD installation complete. Enjoy!" |