[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/namd/files/
commit: da9b45c43b4bb7413154c9c8e10641750e6e5b2d Author: Justin Lecher gentoo org> AuthorDate: Mon Dec 18 14:02:04 2017 + Commit: Justin Lecher gentoo org> CommitDate: Mon Dec 18 14:03:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da9b45c4 sci-chemistry/namd: Drop old patches Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.19, Repoman-2.3.6 sci-chemistry/namd/files/namd-2.9-gentoo.patch | 151 - 1 file changed, 151 deletions(-) diff --git a/sci-chemistry/namd/files/namd-2.9-gentoo.patch b/sci-chemistry/namd/files/namd-2.9-gentoo.patch deleted file mode 100644 index 583cc52645d..000 --- a/sci-chemistry/namd/files/namd-2.9-gentoo.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff -Naur NAMD_2.9_Source.original/Make.charm NAMD_2.9_Source/Make.charm NAMD_2.9_Source.original/Make.charm2012-02-29 19:12:11.0 -0700 -+++ NAMD_2.9_Source/Make.charm 2013-09-13 21:23:26.0 -0600 -@@ -2,5 +2,5 @@ - # The config script will override this setting if there is a directory - # called charm-6.4.0 or charm in the NAMD base directory. - --CHARMBASE = /Projects/namd2/charm-6.4.0 -+CHARMBASE = /usr/include/charm-6.4.0 - -diff -Naur NAMD_2.9_Source.original/Makefile NAMD_2.9_Source/Makefile NAMD_2.9_Source.original/Makefile 2012-04-27 09:53:24.0 -0600 -+++ NAMD_2.9_Source/Makefile 2013-09-13 21:30:15.0 -0600 -@@ -344,10 +344,10 @@ - $(DSTDIR)/stringhash.o - - # definitions for Charm routines --CHARMC = $(CHARM)/bin/charmc --CHARMXI = $(CHARM)/bin/charmc --CHARMINC = $(CHARM)/include $(COPTD)CMK_OPTIMIZE=1 --CHARMLIB = $(CHARM)/lib -+CHARMC = /usr/bin/charmc -+CHARMXI = /usr/bin/charmc -+CHARMINC = /usr/include/gentoo-charm $(COPTD)CMK_OPTIMIZE=1 -+CHARMLIB = /usr/gentoo-libdir - CHARM_MODULES = -module NeighborLB -module HybridLB -module RefineLB -module GreedyLB - #CHARM_MODULES = -module msa -module NeighborLB -module HybridLB -module RefineLB -module GreedyLB - #MSA = -DCHARM_HAS_MSA -@@ -370,7 +370,7 @@ - - # Add new executables here. - --BINARIES = namd2 psfgen sortreplicas charmrun flipdcd flipbinpdb -+BINARIES = namd2 psfgen sortreplicas flipdcd flipbinpdb - - # This should be rebuilt at every compile, but not on Win32. - BUILDINFO = $(DSTDIR)/buildinfo -@@ -386,7 +386,7 @@ - - namd2:$(MKINCDIR) $(MKDSTDIR) $(OBJS) $(LIBS) - $(MAKEBUILDINFO) -- $(CHARMC) -verbose -ld++-option \ -+ $(CHARMC) $(LDFLAGS) -verbose -ld++-option \ - "$(COPTI)$(CHARMINC) $(COPTI)$(INCDIR) $(COPTI)$(SRCDIR) $(CXXOPTS)" \ - "$(CHARM_MODULES)" -language charm++ \ - $(BUILDINFO).o \ -@@ -402,16 +402,9 @@ - $(EXTRALINKLIBS) \ - -lm -o namd2 - --charmrun: $(CHARM)/bin/charmrun # XXX -- $(COPY) $(CHARM)/bin/charmrun $@ -- - $(LIBCUDARTSO): - $(COPY) $(CUDASODIR)/$(LIBCUDARTSO) $@; - --WINDOWSBINARIES = namd2.exe psfgen.exe sortreplicas.exe --# WINDOWSBINARIES = namd2.exe psfgen.exe charmd.exe charmd_faceless.exe charmrun.exe --windowsbinaries: $(WINDOWSBINARIES) -- - namd2.exe: $(MKINCDIR) $(MKDSTDIR) $(OBJS) $(LIBS) $(TCLDLL) - $(MAKEBUILDINFO) - $(CHARMC) -verbose \ -@@ -434,11 +427,8 @@ - charmd_faceless.exe: - $(COPY) $(CHARM)/bin/charmd_faceless.exe charmd_faceless.exe - --charmrun.exe: -- $(COPY) $(CHARM)/bin/charmrun.exe charmrun.exe -- - psfgen: $(MKDSTDIR) $(SBOBJS) $(PLUGINOBJS) -- $(CC) $(SBCFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm -+ $(CC) $(SBCFLAGS) $(LDFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm - - psfgen.exe: $(MKDSTDIR) $(SBOBJS) $(PLUGINOBJS) $(TCLDLL) - $(CC) $(SBCFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm -@@ -456,7 +446,7 @@ - $(CC) $(CFLAGS) -o diffbinpdb $(SRCDIR)/diffbinpdb.c -lm - - flipdcd: $(SRCDIR)/flipdcd.c -- $(CC) $(CFLAGS) -o $@ $(SRCDIR)/flipdcd.c || \ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SRCDIR)/flipdcd.c || \ - echo "#!/bin/sh\necho unavailable on this platform" > $@; \ - chmod +x $@ - -@@ -466,7 +456,7 @@ - chmod +x $@ - - fixdcd: $(SRCDIR)/fixdcd.c -- $(CC) $(CFLAGS) -o fixdcd $(SRCDIR)/fixdcd.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o fixdcd $(SRCDIR)/fixdcd.c - - dumpdcd: $(SRCDIR)/dumpdcd.c - $(CC) $(CFLAGS) -o dumpdcd $(SRCDIR)/dumpdcd.c -@@ -665,9 +655,7 @@ - - DOC_FILES = README.txt announce.txt license.txt notes.txt - --RELEASE_FILES = $(LIBCUDARTSO) flipdcd flipbinpdb sortreplicas psfgen charmrun namd2 -- --WINDOWS_RELEASE_FILES = $(LIBCUDARTSO) $(WINDOWSBINARIES) $(TCLDLL) -+RELEASE_FILES = $(LIBCUDARTSO) flipdcd flipbinpdb sortreplicas psfgen namd2 - - release: all - $(ECHO) Creating release $(RELEASE_DIR_NAME) -@@ -678,17 +666,9 @@ - for f in `find $(RELEASE_DIR_NAME)/lib -name CVS`; do \ - /bin/rm -rf $$f; \ - done -- if [ -r
[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/namd/files/
commit: a3f27ec55f4a824d1e083154df1514fa7987b63c Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Mon Jan 30 17:51:30 2017 + Commit: David Seifert gentoo org> CommitDate: Tue Jan 31 08:41:21 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3f27ec5 sci-chemistry/namd: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3730 sci-chemistry/namd/files/namd-2.6-gentoo.patch | 107 - sci-chemistry/namd/files/namd-2.7-gentoo.patch | 117 --- sci-chemistry/namd/files/namd-2.7-ldflags.patch| 41 --- .../namd/files/namd-2.7_beta2-gentoo.patch | 126 - .../namd/files/namd-barrier-fix-gentoo.patch | 61 -- .../namd/files/namd-fftw-lib-gentoo.patch | 15 --- .../namd/files/namd-makefile-gentoo.patch | 88 -- sci-chemistry/namd/files/namd-tcl-lib-gentoo.patch | 16 --- 8 files changed, 571 deletions(-) diff --git a/sci-chemistry/namd/files/namd-2.6-gentoo.patch b/sci-chemistry/namd/files/namd-2.6-gentoo.patch deleted file mode 100644 index 9a71de8.. --- a/sci-chemistry/namd/files/namd-2.6-gentoo.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -Naur NAMD_2.6_Source/Makefile NAMD_2.6_Source.new/Makefile NAMD_2.6_Source/Makefile 2006-08-30 00:19:25.0 -0400 -+++ NAMD_2.6_Source.new/Makefile 2006-09-19 15:56:17.0 -0400 -@@ -232,10 +232,10 @@ - $(DSTDIR)/stringhash.o - - # definitions for Charm routines --CHARMC = $(CHARM)/bin/charmc --CHARMXI = $(CHARM)/bin/charmc --CHARMINC = $(CHARM)/include $(COPTD)CMK_OPTIMIZE=1 --CHARMLIB = $(CHARM)/lib -+CHARMC = /usr/bin/charmc -+CHARMXI = /usr/bin/charmc -+CHARMINC = /usr/include/charm-5.9 $(COPTD)CMK_OPTIMIZE=1 -+CHARMLIB = /usr/lib - - # Libraries we may have changed - LIBS = $(PLUGINLIB) $(DPMTALIBS) $(DPMELIBS) $(TCLDLL) -@@ -255,7 +255,7 @@ - - # Add new executables here. - --BINARIES = namd2 psfgen charmrun flipdcd flipbinpdb -+BINARIES = namd2 psfgen flipdcd flipbinpdb - - # This should be rebuilt at every compile, but not on Win32. - BUILDINFO = $(DSTDIR)/buildinfo -@@ -284,11 +284,6 @@ - $(CHARMOPTS) \ - -lm -o namd2 - --charmrun: $(CHARM)/bin/charmrun # XXX -- $(COPY) $(CHARM)/bin/charmrun $@ -- --windowsbinaries: namd2.exe psfgen.exe charmd.exe charmd_faceless.exe charmrun.exe -- - namd2.exe: $(INCDIR) $(DSTDIR) $(OBJS) $(LIBS) - $(MAKEBUILDINFO) - $(CHARMC) -verbose \ -@@ -309,9 +304,6 @@ - charmd_faceless.exe: - $(COPY) $(CHARM)/bin/charmd_faceless.exe charmd_faceless.exe - --charmrun.exe: -- $(COPY) $(CHARM)/bin/charmrun.exe charmrun.exe -- - psfgen: $(DSTDIR) $(SBOBJS) - $(CC) $(SBCFLAGS) -o psfgen $(SBOBJS) $(TCLLIB) $(TCLAPPLIB) -lm - -@@ -571,9 +563,7 @@ - - DOC_FILES = README.txt announce.txt license.txt notes.txt - --RELEASE_FILES = flipdcd flipbinpdb psfgen charmrun namd2 -- --WIN32_RELEASE_FILES = namd2.exe psfgen.exe charmrun.exe charmd.exe charmd_faceless.exe $(TCLDLL) -+RELEASE_FILES = flipdcd flipbinpdb psfgen namd2 - - release: all - $(ECHO) Creating release $(RELEASE_DIR_NAME) -@@ -582,17 +572,9 @@ - for f in $(DOC_FILES); do cp .rootdir/$$f $(RELEASE_DIR_NAME); done - cp -r .rootdir/lib $(RELEASE_DIR_NAME) - /bin/rm -rf $(RELEASE_DIR_NAME)/lib/CVS $(RELEASE_DIR_NAME)/lib/*/CVS -- if [ -r $(CHARM)/bin/charmd ]; then \ --$(COPY) $(CHARM)/bin/charmd $(RELEASE_DIR_NAME); \ -- fi -- if [ -r $(CHARM)/bin/charmd_faceless ]; then \ --$(COPY) $(CHARM)/bin/charmd_faceless $(RELEASE_DIR_NAME); \ -- fi - chmod -R a+rX $(RELEASE_DIR_NAME) - tar cf $(RELEASE_DIR_NAME).tar $(RELEASE_DIR_NAME) - gzip $(RELEASE_DIR_NAME).tar -- echo $(CHARM) -- ls -l $(CHARM)/lib - -for f in $(RELEASE_FILES); do echo $$f; $(LDD) $$f; done - - winrelease: winall -diff -Naur NAMD_2.6_Source/arch/Linux-i686.fftw NAMD_2.6_Source.new/arch/Linux-i686.fftw NAMD_2.6_Source/arch/Linux-i686.fftw 2004-02-20 17:38:36.0 -0500 -+++ NAMD_2.6_Source.new/arch/Linux-i686.fftw 2006-09-19 15:52:32.0 -0400 -@@ -1,7 +1,7 @@ - --FFTDIR=/Projects/namd2/fftw/linux --FFTINCL=-I$(FFTDIR)/include -I$(HOME)/fftw/include --FFTLIB=-L$(FFTDIR)/lib -L$(HOME)/fftw/lib -lsrfftw -lsfftw -+#FFTDIR=/Projects/namd2/fftw/linux -+FFTINCL=-I/usr/include -+FFTLIB=-L/usr/lib -lsrfftw -lsfftw - FFTFLAGS=-DNAMD_FFTW - FFT=$(FFTINCL) $(FFTFLAGS) - -diff -Naur NAMD_2.6_Source/arch/Linux-i686.tcl NAMD_2.6_Source.new/arch/Linux-i686.tcl NAMD_2.6_Source/arch/Linux-i686.tcl2004-10-27 17:40:55.0 -0400 -+++ NAMD_2.6_Source.new/arch/Linux-i686.tcl2006-09-19 15:56:45.0 -0400 -@@ -1,8 +1,8 @@ - --TCLDIR=/Projects/namd2/tcl/linux -+#TCLDIR=/Projects/namd2/tcl/linux - #TCLDIR=$(HOME)/tcl/cray-xt3 --TCLINCL=-I$(TCLDIR)/include -I$(HOME)/tcl/include
