Attachment 146439 Details for Bug 193090 – vmd.diff

[patch] vmd.diff

vmd.diff (text/plain), 5.75 KB, created by TsurutaniNaoki on 2014-08-28 10:00:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TsurutaniNaoki

Created: 2014-08-28 10:00:20 UTC

Size: 5.75 KB

patch

obsolete

>diff -urN vmd.orig/Makefile vmd/Makefile
>--- vmd.orig/Makefile	2014-07-25 01:33:10.000000000 +0900
>+++ vmd/Makefile	2014-08-28 18:44:59.000000000 +0900
>@@ -40,7 +40,6 @@
> #STRIDE_DIST=		stride.tar.gz
> STRIDE_DIST=		Stride_src.tar.Z
> 
>-NO_STAGE=	yes
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == "amd64"
>@@ -86,7 +85,22 @@
> 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/lib/stride && ${MV} ${WRKSRC}/lib/stride/stride ${WRKSRC}/lib/stride/stride_${VMD_ARCH}
> 
> do-install:
>-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/src install
>-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/vmd
>+	${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} \
>+	    ${MAKE_CMD} -C ${WRKSRC}/src install
>+	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/vmd/*${VMD_ARCH} \
>+	    ${STAGEDIR}${LOCALBASE}/lib/vmd/plugins/${VMD_ARCH}/molfile/*.so
>+.for f in tcl/autopsf1.3/psfcheck.so tcl/hesstrans1.0/hesstrans.so \
>+	  tcl/mutator1.4/libalchemify.so tcl/pmepot1.0/libpmepot.so \
>+	  tcl/psfgen1.6/libpsfgen.so tcl/rnaview1.1/rnaview \
>+	  tcl/signalproc1.1/specden.so tcl/signalproc1.1/fftcmds.so \
>+	  tcl/signalproc1.1/sgsmooth.so tcl/volutil1.3/volutil \
>+	  tcl/clustalw1.1/clustalw tcl/libbiokit1.1/tcl_libbiokit.so \
>+	  tcl/libbiokit1.1/q tcl/libbiokit1.1/seqqr \
>+	  tcl/libbiokit1.1/structqr tcl/libbiokit1.1/qpair \
>+	  tcl/libbiokit1.1/rmsd tcl/libbiokit1.1/percid \
>+	  tcl/phylotree1.2/upgmaclu tcl/stamp1.2/stamp \
>+	  bin/catdcd4.0/catdcd bin/cionize1.0/cionize
>+	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/vmd/plugins/${VMD_ARCH}/${f}
>+.endfor
> 
> .include <bsd.port.post.mk>
>diff -urN vmd.orig/files/patch-configure vmd/files/patch-configure
>--- vmd.orig/files/patch-configure	2014-01-23 02:40:44.000000000 +0900
>+++ vmd/files/patch-configure	2014-08-28 18:13:18.000000000 +0900
>@@ -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!"
>--- vmd.diff ends here ---

Actions: View | Diff

Attachments on bug 193090: 146439