From 08a006d08a4c35d2c3ecc9a3d10cf7fd14661a84 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Tue, 29 Jul 2014 17:12:47 +0000 Subject: Rename all patches that contain '::' as a path separator, and use '__' instead. --- math/arpack++/files/patch-include::arlutil.h | 11 ------ math/arpack++/files/patch-include__arlutil.h | 11 ++++++ math/blocksolve95/files/patch-bmake::common | 19 ---------- .../files/patch-bmake::freebsd::freebsd | 37 ------------------- .../files/patch-bmake::freebsd::freebsd.O | 8 ----- .../files/patch-bmake::freebsd::freebsd.site | 35 ------------------ math/blocksolve95/files/patch-bmake__common | 19 ++++++++++ .../files/patch-bmake__freebsd__freebsd | 37 +++++++++++++++++++ .../files/patch-bmake__freebsd__freebsd.O | 8 +++++ .../files/patch-bmake__freebsd__freebsd.site | 35 ++++++++++++++++++ math/blocksolve95/files/patch-examples::makefile | 34 ------------------ math/blocksolve95/files/patch-examples__makefile | 34 ++++++++++++++++++ math/blocksolve95/files/patch-include::BSdepend.h | 14 -------- math/blocksolve95/files/patch-include__BSdepend.h | 14 ++++++++ math/emc2/files/patch-libI77::fio.h | 15 -------- math/emc2/files/patch-libI77__fio.h | 15 ++++++++ math/fftw/files/patch-doc::fftw.texi | 27 -------------- math/fftw/files/patch-doc__fftw.texi | 27 ++++++++++++++ math/gdcalc/files/patch-src::dcalc.c | 20 ----------- math/gdcalc/files/patch-src__dcalc.c | 20 +++++++++++ math/gretl/files/patch-gui2::Makefile.in | 29 --------------- math/gretl/files/patch-gui2__Makefile.in | 29 +++++++++++++++ math/gretl/files/patch-lib::Makefile.in | 11 ------ math/gretl/files/patch-lib__Makefile.in | 11 ++++++ math/gretl/files/patch-plugin::Makefile.in | 18 ---------- math/gretl/files/patch-plugin::workbook.c | 10 ------ math/gretl/files/patch-plugin__Makefile.in | 18 ++++++++++ math/gretl/files/patch-plugin__workbook.c | 10 ++++++ math/gretl/files/patch-share::Makefile.in | 41 ---------------------- math/gretl/files/patch-share::bcih::Makefile.in | 11 ------ math/gretl/files/patch-share__Makefile.in | 41 ++++++++++++++++++++++ math/gretl/files/patch-share__bcih__Makefile.in | 11 ++++++ .../files/patch-bmake::common::rules.shared.basic | 13 ------- .../files/patch-bmake__common__rules.shared.basic | 13 +++++++ .../patch-src::mat::impls::rowbs::mpi::mpirowbs.h | 13 ------- .../patch-src__mat__impls__rowbs__mpi__mpirowbs.h | 13 +++++++ math/ploticus/files/patch-src::reslimits.c | 10 ------ math/ploticus/files/patch-src__reslimits.c | 10 ++++++ math/qhull5/files/patch-eg::Makefile.in | 11 ------ math/qhull5/files/patch-eg__Makefile.in | 11 ++++++ math/qhull5/files/patch-src::Makefile.in | 11 ------ math/qhull5/files/patch-src__Makefile.in | 11 ++++++ math/spar/files/patch-calculator::Makefile.in | 11 ------ math/spar/files/patch-calculator__Makefile.in | 11 ++++++ math/spar/files/patch-lib::randist::rand.c | 10 ------ math/spar/files/patch-lib__randist__rand.c | 10 ++++++ 46 files changed, 419 insertions(+), 419 deletions(-) delete mode 100644 math/arpack++/files/patch-include::arlutil.h create mode 100644 math/arpack++/files/patch-include__arlutil.h delete mode 100644 math/blocksolve95/files/patch-bmake::common delete mode 100644 math/blocksolve95/files/patch-bmake::freebsd::freebsd delete mode 100644 math/blocksolve95/files/patch-bmake::freebsd::freebsd.O delete mode 100644 math/blocksolve95/files/patch-bmake::freebsd::freebsd.site create mode 100644 math/blocksolve95/files/patch-bmake__common create mode 100644 math/blocksolve95/files/patch-bmake__freebsd__freebsd create mode 100644 math/blocksolve95/files/patch-bmake__freebsd__freebsd.O create mode 100644 math/blocksolve95/files/patch-bmake__freebsd__freebsd.site delete mode 100644 math/blocksolve95/files/patch-examples::makefile create mode 100644 math/blocksolve95/files/patch-examples__makefile delete mode 100644 math/blocksolve95/files/patch-include::BSdepend.h create mode 100644 math/blocksolve95/files/patch-include__BSdepend.h delete mode 100644 math/emc2/files/patch-libI77::fio.h create mode 100644 math/emc2/files/patch-libI77__fio.h delete mode 100644 math/fftw/files/patch-doc::fftw.texi create mode 100644 math/fftw/files/patch-doc__fftw.texi delete mode 100644 math/gdcalc/files/patch-src::dcalc.c create mode 100644 math/gdcalc/files/patch-src__dcalc.c delete mode 100644 math/gretl/files/patch-gui2::Makefile.in create mode 100644 math/gretl/files/patch-gui2__Makefile.in delete mode 100644 math/gretl/files/patch-lib::Makefile.in create mode 100644 math/gretl/files/patch-lib__Makefile.in delete mode 100644 math/gretl/files/patch-plugin::Makefile.in delete mode 100644 math/gretl/files/patch-plugin::workbook.c create mode 100644 math/gretl/files/patch-plugin__Makefile.in create mode 100644 math/gretl/files/patch-plugin__workbook.c delete mode 100644 math/gretl/files/patch-share::Makefile.in delete mode 100644 math/gretl/files/patch-share::bcih::Makefile.in create mode 100644 math/gretl/files/patch-share__Makefile.in create mode 100644 math/gretl/files/patch-share__bcih__Makefile.in delete mode 100644 math/petsc/files/patch-bmake::common::rules.shared.basic create mode 100644 math/petsc/files/patch-bmake__common__rules.shared.basic delete mode 100644 math/petsc/files/patch-src::mat::impls::rowbs::mpi::mpirowbs.h create mode 100644 math/petsc/files/patch-src__mat__impls__rowbs__mpi__mpirowbs.h delete mode 100644 math/ploticus/files/patch-src::reslimits.c create mode 100644 math/ploticus/files/patch-src__reslimits.c delete mode 100644 math/qhull5/files/patch-eg::Makefile.in create mode 100644 math/qhull5/files/patch-eg__Makefile.in delete mode 100644 math/qhull5/files/patch-src::Makefile.in create mode 100644 math/qhull5/files/patch-src__Makefile.in delete mode 100644 math/spar/files/patch-calculator::Makefile.in create mode 100644 math/spar/files/patch-calculator__Makefile.in delete mode 100644 math/spar/files/patch-lib::randist::rand.c create mode 100644 math/spar/files/patch-lib__randist__rand.c (limited to 'math') diff --git a/math/arpack++/files/patch-include::arlutil.h b/math/arpack++/files/patch-include::arlutil.h deleted file mode 100644 index 40e7ac7f0b53..000000000000 --- a/math/arpack++/files/patch-include::arlutil.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/arlutil.h.orig Thu Jul 31 22:32:42 1997 -+++ include/arlutil.h Mon Oct 20 00:09:43 2003 -@@ -12,7 +12,7 @@ - #include - #include - #include --#include -+#include - #include - - /* Macros */ diff --git a/math/arpack++/files/patch-include__arlutil.h b/math/arpack++/files/patch-include__arlutil.h new file mode 100644 index 000000000000..40e7ac7f0b53 --- /dev/null +++ b/math/arpack++/files/patch-include__arlutil.h @@ -0,0 +1,11 @@ +--- include/arlutil.h.orig Thu Jul 31 22:32:42 1997 ++++ include/arlutil.h Mon Oct 20 00:09:43 2003 +@@ -12,7 +12,7 @@ + #include + #include + #include +-#include ++#include + #include + + /* Macros */ diff --git a/math/blocksolve95/files/patch-bmake::common b/math/blocksolve95/files/patch-bmake::common deleted file mode 100644 index 7c426bf835a8..000000000000 --- a/math/blocksolve95/files/patch-bmake::common +++ /dev/null @@ -1,19 +0,0 @@ ---- bmake/common.orig Tue Jan 9 16:35:45 1996 -+++ bmake/common Sun Oct 3 23:03:55 2004 -@@ -161,13 +161,13 @@ - # - # Builds library - fast version - libfast: chkpetsc_dir $(SOURCEC) $(SOURCEF) -- @-if [ "$(SOURCEC)" != "" ] ; then \ -+ -if [ "$(SOURCEC)" != "" ] ; then \ - $(CC) -c $(CFLAGS) $(BASEOPT) $(SOURCEC) ;\ - fi -- @-if [ "$(SOURCEF)" != "" ] ; then \ -+ -if [ "$(SOURCEF)" != "" ] ; then \ - $(FC) -c $(FFLAGS) $(BASEOPTF) $(SOURCEF) ;\ - fi -- @-if [ "$(OBJS)" != " " ] ; then \ -+ -if [ "$(OBJS)" != " " ] ; then \ - $(AR) cr $(LIBNAME) $(OBJS); \ - $(RM) -f $(OBJS); \ - fi diff --git a/math/blocksolve95/files/patch-bmake::freebsd::freebsd b/math/blocksolve95/files/patch-bmake::freebsd::freebsd deleted file mode 100644 index d3334f6431fc..000000000000 --- a/math/blocksolve95/files/patch-bmake::freebsd::freebsd +++ /dev/null @@ -1,37 +0,0 @@ ---- bmake/freebsd/freebsd.orig Tue Jan 9 16:40:08 1996 -+++ bmake/freebsd/freebsd Sun Oct 3 18:12:06 2004 -@@ -1,13 +1,13 @@ - --CC = gcc -DPARCH_freebsd --FC = f77 -+CC += -DPARCH_freebsd -+#FC = f77 - AR = ar - RM = rm -f *.c.* --OMAKE = gnumake --no-print-directory -+OMAKE = $(GMAKE) - RANLIB = ranlib - SHELL = /bin/sh --CLINKER = gcc $(BASEOPT) --FLINKER = f77 $(BASEOPTF) -+CLINKER = $(CC) $(BASEOPT) -+FLINKER = $(FC) $(BASEOPTF) - CONF = -DHAVE_PWD_H -DHAVE_MALLOC_H -DHAVE_STRING_H \ - -DHAVE_SWAPPED_BYTES -DHAVE_X11 - SYS_LIB = -@@ -33,13 +33,13 @@ - $(RM) $*.o - .F.o: - $(RM) $*.f -- cpp $(PETSC_INCLUDE) $*.F > $*.f -+ $(CPP) $(PETSC_INCLUDE) $*.F > $*.f - $(FC) -c $(FFLAGS) $(BASEOPTF) $*.f - $(RM) $*.f - - .F.a: - $(RM) $*.f -- cpp $(PETSC_INCLUDE) $*.F > $*.f -+ $(CPP) $(PETSC_INCLUDE) $*.F > $*.f - $(FC) -c $(FFLAGS) $(BASEOPTF) $*.f - $(RM) $*.f - $(AR) cr $(LIBNAME) $*.o diff --git a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.O b/math/blocksolve95/files/patch-bmake::freebsd::freebsd.O deleted file mode 100644 index 1829d187a1a5..000000000000 --- a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.O +++ /dev/null @@ -1,8 +0,0 @@ ---- bmake/freebsd/freebsd.O.orig Thu Dec 14 20:49:35 1995 -+++ bmake/freebsd/freebsd.O Sun Oct 3 23:08:37 2004 -@@ -1,3 +1,3 @@ --BASEOPT = -O -Wall -Wshadow -fomit-frame-pointer -DINLINE_FOR \ -+BASEOPT = $(CFLAGS) -fomit-frame-pointer -DINLINE_FOR \ - -DPETSC_LOG -DPETSC_DEBUG -Dlint -DPETSC_BOPT_O --BASEOPTF = -O4 -+BASEOPTF = $(FFLAGS) diff --git a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site b/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site deleted file mode 100644 index bab70597d456..000000000000 --- a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site +++ /dev/null @@ -1,35 +0,0 @@ ---- bmake/freebsd/freebsd.site.orig Thu Feb 15 22:53:34 1996 -+++ bmake/freebsd/freebsd.site Wed Jun 21 23:11:51 2006 -@@ -15,24 +15,24 @@ - # Location of BLAS and LAPACK. These libraries are available via Netlib, - # or see $(BS_DIR)/readme for information on retrieving a subset. - # --BLAS_LIB = /home/bsmith/lapack/blas_freebsd.a $(FC_LIB) --LAPACK_LIB = /home/bsmith/lapack/lapack_freebsd.a -+#BLAS_LIB = -lf77blas -lcblas -latlas -lg2c -lm -+#LAPACK_LIB = -L$(LOCALBASE)/lib -lalapack - # - # Location of X-windows software - # --X11_INCLUDE = -+X11_INCLUDE = -I$(LOCALBASE)/include - X11_LIB = -lX11 - # - # Location of MPI (Message Passing Interface) software - # --MPI_LIB = /usr/local/mpi/lib/freebsd/ch_p4/libmpi.a --MPI_INCLUDE = -I/usr/local/mpi/include --MPIRUN = /usr/local/mpi/bin/mpirun -+MPI_LIB = $(LOCALBASE)/mpich2/lib/libmpich.a -+MPI_INCLUDE = -I$(LOCALBASE)/mpich2/include -+MPIRUN = $(LOCALBASE)/mpich2/bin/mpirun - # - # Location of BlockSolve95 - # --BS_INCLUDE = --BS_LIB = -+BS_INCLUDE = $(PETSC_INCLUDE) -+BS_LIB = $(BS_DIR)/lib/lib$(BOPT)/$(PETSC_ARCH)/libBS95.a - # - # PCONF - indicates which external packages are available at your site - # diff --git a/math/blocksolve95/files/patch-bmake__common b/math/blocksolve95/files/patch-bmake__common new file mode 100644 index 000000000000..7c426bf835a8 --- /dev/null +++ b/math/blocksolve95/files/patch-bmake__common @@ -0,0 +1,19 @@ +--- bmake/common.orig Tue Jan 9 16:35:45 1996 ++++ bmake/common Sun Oct 3 23:03:55 2004 +@@ -161,13 +161,13 @@ + # + # Builds library - fast version + libfast: chkpetsc_dir $(SOURCEC) $(SOURCEF) +- @-if [ "$(SOURCEC)" != "" ] ; then \ ++ -if [ "$(SOURCEC)" != "" ] ; then \ + $(CC) -c $(CFLAGS) $(BASEOPT) $(SOURCEC) ;\ + fi +- @-if [ "$(SOURCEF)" != "" ] ; then \ ++ -if [ "$(SOURCEF)" != "" ] ; then \ + $(FC) -c $(FFLAGS) $(BASEOPTF) $(SOURCEF) ;\ + fi +- @-if [ "$(OBJS)" != " " ] ; then \ ++ -if [ "$(OBJS)" != " " ] ; then \ + $(AR) cr $(LIBNAME) $(OBJS); \ + $(RM) -f $(OBJS); \ + fi diff --git a/math/blocksolve95/files/patch-bmake__freebsd__freebsd b/math/blocksolve95/files/patch-bmake__freebsd__freebsd new file mode 100644 index 000000000000..d3334f6431fc --- /dev/null +++ b/math/blocksolve95/files/patch-bmake__freebsd__freebsd @@ -0,0 +1,37 @@ +--- bmake/freebsd/freebsd.orig Tue Jan 9 16:40:08 1996 ++++ bmake/freebsd/freebsd Sun Oct 3 18:12:06 2004 +@@ -1,13 +1,13 @@ + +-CC = gcc -DPARCH_freebsd +-FC = f77 ++CC += -DPARCH_freebsd ++#FC = f77 + AR = ar + RM = rm -f *.c.* +-OMAKE = gnumake --no-print-directory ++OMAKE = $(GMAKE) + RANLIB = ranlib + SHELL = /bin/sh +-CLINKER = gcc $(BASEOPT) +-FLINKER = f77 $(BASEOPTF) ++CLINKER = $(CC) $(BASEOPT) ++FLINKER = $(FC) $(BASEOPTF) + CONF = -DHAVE_PWD_H -DHAVE_MALLOC_H -DHAVE_STRING_H \ + -DHAVE_SWAPPED_BYTES -DHAVE_X11 + SYS_LIB = +@@ -33,13 +33,13 @@ + $(RM) $*.o + .F.o: + $(RM) $*.f +- cpp $(PETSC_INCLUDE) $*.F > $*.f ++ $(CPP) $(PETSC_INCLUDE) $*.F > $*.f + $(FC) -c $(FFLAGS) $(BASEOPTF) $*.f + $(RM) $*.f + + .F.a: + $(RM) $*.f +- cpp $(PETSC_INCLUDE) $*.F > $*.f ++ $(CPP) $(PETSC_INCLUDE) $*.F > $*.f + $(FC) -c $(FFLAGS) $(BASEOPTF) $*.f + $(RM) $*.f + $(AR) cr $(LIBNAME) $*.o diff --git a/math/blocksolve95/files/patch-bmake__freebsd__freebsd.O b/math/blocksolve95/files/patch-bmake__freebsd__freebsd.O new file mode 100644 index 000000000000..1829d187a1a5 --- /dev/null +++ b/math/blocksolve95/files/patch-bmake__freebsd__freebsd.O @@ -0,0 +1,8 @@ +--- bmake/freebsd/freebsd.O.orig Thu Dec 14 20:49:35 1995 ++++ bmake/freebsd/freebsd.O Sun Oct 3 23:08:37 2004 +@@ -1,3 +1,3 @@ +-BASEOPT = -O -Wall -Wshadow -fomit-frame-pointer -DINLINE_FOR \ ++BASEOPT = $(CFLAGS) -fomit-frame-pointer -DINLINE_FOR \ + -DPETSC_LOG -DPETSC_DEBUG -Dlint -DPETSC_BOPT_O +-BASEOPTF = -O4 ++BASEOPTF = $(FFLAGS) diff --git a/math/blocksolve95/files/patch-bmake__freebsd__freebsd.site b/math/blocksolve95/files/patch-bmake__freebsd__freebsd.site new file mode 100644 index 000000000000..bab70597d456 --- /dev/null +++ b/math/blocksolve95/files/patch-bmake__freebsd__freebsd.site @@ -0,0 +1,35 @@ +--- bmake/freebsd/freebsd.site.orig Thu Feb 15 22:53:34 1996 ++++ bmake/freebsd/freebsd.site Wed Jun 21 23:11:51 2006 +@@ -15,24 +15,24 @@ + # Location of BLAS and LAPACK. These libraries are available via Netlib, + # or see $(BS_DIR)/readme for information on retrieving a subset. + # +-BLAS_LIB = /home/bsmith/lapack/blas_freebsd.a $(FC_LIB) +-LAPACK_LIB = /home/bsmith/lapack/lapack_freebsd.a ++#BLAS_LIB = -lf77blas -lcblas -latlas -lg2c -lm ++#LAPACK_LIB = -L$(LOCALBASE)/lib -lalapack + # + # Location of X-windows software + # +-X11_INCLUDE = ++X11_INCLUDE = -I$(LOCALBASE)/include + X11_LIB = -lX11 + # + # Location of MPI (Message Passing Interface) software + # +-MPI_LIB = /usr/local/mpi/lib/freebsd/ch_p4/libmpi.a +-MPI_INCLUDE = -I/usr/local/mpi/include +-MPIRUN = /usr/local/mpi/bin/mpirun ++MPI_LIB = $(LOCALBASE)/mpich2/lib/libmpich.a ++MPI_INCLUDE = -I$(LOCALBASE)/mpich2/include ++MPIRUN = $(LOCALBASE)/mpich2/bin/mpirun + # + # Location of BlockSolve95 + # +-BS_INCLUDE = +-BS_LIB = ++BS_INCLUDE = $(PETSC_INCLUDE) ++BS_LIB = $(BS_DIR)/lib/lib$(BOPT)/$(PETSC_ARCH)/libBS95.a + # + # PCONF - indicates which external packages are available at your site + # diff --git a/math/blocksolve95/files/patch-examples::makefile b/math/blocksolve95/files/patch-examples::makefile deleted file mode 100644 index fab4c12b501b..000000000000 --- a/math/blocksolve95/files/patch-examples::makefile +++ /dev/null @@ -1,34 +0,0 @@ ---- examples/makefile.orig Thu Oct 17 22:15:08 1996 -+++ examples/makefile Sat Jul 22 16:50:24 2006 -@@ -19,19 +19,19 @@ - $(MPI_LIB) $(FC_LIB) $(SYS_LIB) -lm - LINCLUDE = $(SOURCEH) - --bsrunexamples: -+bsrunexamples: $(EXAMPLES_1) - -@echo ">>>>>> Running examples in example directory <<<<<<" -- -@$(MPIRUN) -np 4 grid0.$(PETSC_ARCH) 2 2 1 10 10 10 -- -@$(MPIRUN) -np 4 grid1.$(PETSC_ARCH) 2 2 1 10 10 10 -- -@$(MPIRUN) -np 4 grid2.$(PETSC_ARCH) 2 2 10 10 10 -- -@$(MPIRUN) -np 4 grid3.$(PETSC_ARCH) 10 9 -- -@$(MPIRUN) -np 4 grid4.$(PETSC_ARCH) 2 2 1 10 10 10 -- -@$(MPIRUN) -np 1 grid5.$(PETSC_ARCH) 1 1 1 10 10 10 1 3 1 1 1 1 2 -- -@$(MPIRUN) -np 1 grid5.$(PETSC_ARCH) 1 1 1 10 10 10 0 3 1 0 0 1 2 -- -@$(MPIRUN) -np 1 grid6.$(PETSC_ARCH) 1 1 1 10 10 10 1 1 3 -- -@$(MPIRUN) -np 1 grid6.$(PETSC_ARCH) 1 1 1 10 10 10 0 1 3 -- -@$(MPIRUN) -np 4 grid7.$(PETSC_ARCH) 2 2 1 8 8 8 0 1 3 1 0.01 -- -@$(MPIRUN) -np 4 grid8.$(PETSC_ARCH) 2 2 1 8 8 8 0 1 3 0.01 -+ -@$(MPIRUN) -np 4 ./grid0.$(PETSC_ARCH) 2 2 1 10 10 10 -+ #@$(MPIRUN) -np 4 ./grid1.$(PETSC_ARCH) 2 2 1 10 10 10 -+ #@$(MPIRUN) -np 4 ./grid2.$(PETSC_ARCH) 2 2 10 10 10 -+ -@$(MPIRUN) -np 4 ./grid3.$(PETSC_ARCH) 10 9 -+ -@$(MPIRUN) -np 4 ./grid4.$(PETSC_ARCH) 2 2 1 10 10 10 -+ -@$(MPIRUN) -np 1 ./grid5.$(PETSC_ARCH) 1 1 1 10 10 10 1 3 1 1 1 1 2 -+ -@$(MPIRUN) -np 1 ./grid5.$(PETSC_ARCH) 1 1 1 10 10 10 0 3 1 0 0 1 2 -+ -@$(MPIRUN) -np 1 ./grid6.$(PETSC_ARCH) 1 1 1 10 10 10 1 1 3 -+ -@$(MPIRUN) -np 1 ./grid6.$(PETSC_ARCH) 1 1 1 10 10 10 0 1 3 -+ -@$(MPIRUN) -np 4 ./grid7.$(PETSC_ARCH) 2 2 1 8 8 8 0 1 3 1 0.01 -+ -@$(MPIRUN) -np 4 ./grid8.$(PETSC_ARCH) 2 2 1 8 8 8 0 1 3 0.01 - - deletelibs: - diff --git a/math/blocksolve95/files/patch-examples__makefile b/math/blocksolve95/files/patch-examples__makefile new file mode 100644 index 000000000000..fab4c12b501b --- /dev/null +++ b/math/blocksolve95/files/patch-examples__makefile @@ -0,0 +1,34 @@ +--- examples/makefile.orig Thu Oct 17 22:15:08 1996 ++++ examples/makefile Sat Jul 22 16:50:24 2006 +@@ -19,19 +19,19 @@ + $(MPI_LIB) $(FC_LIB) $(SYS_LIB) -lm + LINCLUDE = $(SOURCEH) + +-bsrunexamples: ++bsrunexamples: $(EXAMPLES_1) + -@echo ">>>>>> Running examples in example directory <<<<<<" +- -@$(MPIRUN) -np 4 grid0.$(PETSC_ARCH) 2 2 1 10 10 10 +- -@$(MPIRUN) -np 4 grid1.$(PETSC_ARCH) 2 2 1 10 10 10 +- -@$(MPIRUN) -np 4 grid2.$(PETSC_ARCH) 2 2 10 10 10 +- -@$(MPIRUN) -np 4 grid3.$(PETSC_ARCH) 10 9 +- -@$(MPIRUN) -np 4 grid4.$(PETSC_ARCH) 2 2 1 10 10 10 +- -@$(MPIRUN) -np 1 grid5.$(PETSC_ARCH) 1 1 1 10 10 10 1 3 1 1 1 1 2 +- -@$(MPIRUN) -np 1 grid5.$(PETSC_ARCH) 1 1 1 10 10 10 0 3 1 0 0 1 2 +- -@$(MPIRUN) -np 1 grid6.$(PETSC_ARCH) 1 1 1 10 10 10 1 1 3 +- -@$(MPIRUN) -np 1 grid6.$(PETSC_ARCH) 1 1 1 10 10 10 0 1 3 +- -@$(MPIRUN) -np 4 grid7.$(PETSC_ARCH) 2 2 1 8 8 8 0 1 3 1 0.01 +- -@$(MPIRUN) -np 4 grid8.$(PETSC_ARCH) 2 2 1 8 8 8 0 1 3 0.01 ++ -@$(MPIRUN) -np 4 ./grid0.$(PETSC_ARCH) 2 2 1 10 10 10 ++ #@$(MPIRUN) -np 4 ./grid1.$(PETSC_ARCH) 2 2 1 10 10 10 ++ #@$(MPIRUN) -np 4 ./grid2.$(PETSC_ARCH) 2 2 10 10 10 ++ -@$(MPIRUN) -np 4 ./grid3.$(PETSC_ARCH) 10 9 ++ -@$(MPIRUN) -np 4 ./grid4.$(PETSC_ARCH) 2 2 1 10 10 10 ++ -@$(MPIRUN) -np 1 ./grid5.$(PETSC_ARCH) 1 1 1 10 10 10 1 3 1 1 1 1 2 ++ -@$(MPIRUN) -np 1 ./grid5.$(PETSC_ARCH) 1 1 1 10 10 10 0 3 1 0 0 1 2 ++ -@$(MPIRUN) -np 1 ./grid6.$(PETSC_ARCH) 1 1 1 10 10 10 1 1 3 ++ -@$(MPIRUN) -np 1 ./grid6.$(PETSC_ARCH) 1 1 1 10 10 10 0 1 3 ++ -@$(MPIRUN) -np 4 ./grid7.$(PETSC_ARCH) 2 2 1 8 8 8 0 1 3 1 0.01 ++ -@$(MPIRUN) -np 4 ./grid8.$(PETSC_ARCH) 2 2 1 8 8 8 0 1 3 0.01 + + deletelibs: + diff --git a/math/blocksolve95/files/patch-include::BSdepend.h b/math/blocksolve95/files/patch-include::BSdepend.h deleted file mode 100644 index a6868374dc19..000000000000 --- a/math/blocksolve95/files/patch-include::BSdepend.h +++ /dev/null @@ -1,14 +0,0 @@ ---- include/BSdepend.h.orig Tue Jul 8 21:10:10 1997 -+++ include/BSdepend.h Sun Oct 3 18:23:32 2004 -@@ -16,6 +16,11 @@ - #define MPI_Aint int - - #include -+ -+#if defined(PARCH_freebsd) -+#include -+#endif -+ - #if defined(PARCH_sun4) && !defined(__cplusplus) && defined(_Gnu_) - extern int fprintf(FILE*,const char*,...); - extern void sscanf(char *,...); diff --git a/math/blocksolve95/files/patch-include__BSdepend.h b/math/blocksolve95/files/patch-include__BSdepend.h new file mode 100644 index 000000000000..a6868374dc19 --- /dev/null +++ b/math/blocksolve95/files/patch-include__BSdepend.h @@ -0,0 +1,14 @@ +--- include/BSdepend.h.orig Tue Jul 8 21:10:10 1997 ++++ include/BSdepend.h Sun Oct 3 18:23:32 2004 +@@ -16,6 +16,11 @@ + #define MPI_Aint int + + #include ++ ++#if defined(PARCH_freebsd) ++#include ++#endif ++ + #if defined(PARCH_sun4) && !defined(__cplusplus) && defined(_Gnu_) + extern int fprintf(FILE*,const char*,...); + extern void sscanf(char *,...); diff --git a/math/emc2/files/patch-libI77::fio.h b/math/emc2/files/patch-libI77::fio.h deleted file mode 100644 index 1ebd63157a40..000000000000 --- a/math/emc2/files/patch-libI77::fio.h +++ /dev/null @@ -1,15 +0,0 @@ ---- libI77/fio.h.orig Tue Nov 9 15:58:43 1999 -+++ libI77/fio.h Tue Dec 16 23:53:43 2003 -@@ -17,6 +17,12 @@ - #endif - #endif - -+#ifdef __FreeBSD__ -+#ifndef NON_UNIX_STDIO -+#define NON_UNIX_STDIO -+#endif -+#endif -+ - #ifdef UIOLEN_int - typedef int uiolen; - #else diff --git a/math/emc2/files/patch-libI77__fio.h b/math/emc2/files/patch-libI77__fio.h new file mode 100644 index 000000000000..1ebd63157a40 --- /dev/null +++ b/math/emc2/files/patch-libI77__fio.h @@ -0,0 +1,15 @@ +--- libI77/fio.h.orig Tue Nov 9 15:58:43 1999 ++++ libI77/fio.h Tue Dec 16 23:53:43 2003 +@@ -17,6 +17,12 @@ + #endif + #endif + ++#ifdef __FreeBSD__ ++#ifndef NON_UNIX_STDIO ++#define NON_UNIX_STDIO ++#endif ++#endif ++ + #ifdef UIOLEN_int + typedef int uiolen; + #else diff --git a/math/fftw/files/patch-doc::fftw.texi b/math/fftw/files/patch-doc::fftw.texi deleted file mode 100644 index ff55063443d1..000000000000 --- a/math/fftw/files/patch-doc::fftw.texi +++ /dev/null @@ -1,27 +0,0 @@ ---- ./doc/fftw.texi.orig 2003-03-16 23:43:18.000000000 +0000 -+++ ./doc/fftw.texi 2014-06-26 19:46:33.000000000 +0000 -@@ -3,6 +3,10 @@ - @c %**start of header - @setfilename fftw.info - @settitle FFTW -+@dircategory Libraries -+@direntry -+* FFTW: (fftw). Fast fourier transform library -+@end direntry - @c %**end of header - - @include version.texi -@@ -46,10 +50,10 @@ - @titlepage - @sp 10 - @comment The title is printed in a large font. --@title{FFTW User's Manual} -+@title FFTW User's Manual - @subtitle For version @value{VERSION}, @value{UPDATED} --@author{Matteo Frigo} --@author{Steven G. Johnson} -+@author Matteo Frigo -+@author Steven G. Johnson - - @c The following two commands start the copyright page. - @page diff --git a/math/fftw/files/patch-doc__fftw.texi b/math/fftw/files/patch-doc__fftw.texi new file mode 100644 index 000000000000..ff55063443d1 --- /dev/null +++ b/math/fftw/files/patch-doc__fftw.texi @@ -0,0 +1,27 @@ +--- ./doc/fftw.texi.orig 2003-03-16 23:43:18.000000000 +0000 ++++ ./doc/fftw.texi 2014-06-26 19:46:33.000000000 +0000 +@@ -3,6 +3,10 @@ + @c %**start of header + @setfilename fftw.info + @settitle FFTW ++@dircategory Libraries ++@direntry ++* FFTW: (fftw). Fast fourier transform library ++@end direntry + @c %**end of header + + @include version.texi +@@ -46,10 +50,10 @@ + @titlepage + @sp 10 + @comment The title is printed in a large font. +-@title{FFTW User's Manual} ++@title FFTW User's Manual + @subtitle For version @value{VERSION}, @value{UPDATED} +-@author{Matteo Frigo} +-@author{Steven G. Johnson} ++@author Matteo Frigo ++@author Steven G. Johnson + + @c The following two commands start the copyright page. + @page diff --git a/math/gdcalc/files/patch-src::dcalc.c b/math/gdcalc/files/patch-src::dcalc.c deleted file mode 100644 index 1d6a2c591136..000000000000 --- a/math/gdcalc/files/patch-src::dcalc.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/dcalc.c.orig Fri Jul 12 15:26:18 2002 -+++ src/dcalc.c Fri Jul 12 15:26:06 2002 -@@ -3247,7 +3247,7 @@ - oldX = 1.0; - - sprintf(fromarg, "%f %s", oldX, from); -- argv[0] = "units"; -+ argv[0] = "gunits"; - argv[1] = "-o %.20g"; - argv[2] = fromarg; - argv[3] = to; -@@ -3296,7 +3296,7 @@ - does not use stderr! */ - msg("Bad units"); - else -- msg("Can't find the units program - please install it!"); -+ msg("Can't find the gunits program - please install it!"); - - fclose(p); /* no need to close fd[1] too */ - } diff --git a/math/gdcalc/files/patch-src__dcalc.c b/math/gdcalc/files/patch-src__dcalc.c new file mode 100644 index 000000000000..1d6a2c591136 --- /dev/null +++ b/math/gdcalc/files/patch-src__dcalc.c @@ -0,0 +1,20 @@ +--- src/dcalc.c.orig Fri Jul 12 15:26:18 2002 ++++ src/dcalc.c Fri Jul 12 15:26:06 2002 +@@ -3247,7 +3247,7 @@ + oldX = 1.0; + + sprintf(fromarg, "%f %s", oldX, from); +- argv[0] = "units"; ++ argv[0] = "gunits"; + argv[1] = "-o %.20g"; + argv[2] = fromarg; + argv[3] = to; +@@ -3296,7 +3296,7 @@ + does not use stderr! */ + msg("Bad units"); + else +- msg("Can't find the units program - please install it!"); ++ msg("Can't find the gunits program - please install it!"); + + fclose(p); /* no need to close fd[1] too */ + } diff --git a/math/gretl/files/patch-gui2::Makefile.in b/math/gretl/files/patch-gui2::Makefile.in deleted file mode 100644 index a69067182f13..000000000000 --- a/math/gretl/files/patch-gui2::Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ ---- gui2/Makefile.in.orig 2013-03-30 13:23:00.000000000 -0400 -+++ gui2/Makefile.in 2013-11-20 00:31:53.000000000 -0500 -@@ -122,7 +122,7 @@ - PROG = gretl - else - PROG = gretl_x11$(EXEEXT) -- INSTALL_SCRIPT = install-script -+ INSTALL_SCRIPT_TARGET = install-script - endif - - vpath %.c $(topsrc)/gui2 -@@ -215,7 +215,7 @@ - - .PHONY: - --install: install-exec install-ui $(INSTALL_SCRIPT) install-data install-lang -+install: install-exec install-ui $(INSTALL_SCRIPT_TARGET) install-data install-lang - - install-strip: $(PROG) install-data - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(bindir)/$(PROG) -@@ -229,7 +229,7 @@ - $(INSTALL_DATA) $(topsrc)/gui2/gretlmodel.xml $(DESTDIR)$(uidir) - - install-script: installdirs -- $(INSTALL_PROGRAM) ../gretl_sh $(DESTDIR)$(bindir)/gretl -+ $(INSTALL_SCRIPT) ../gretl_sh $(DESTDIR)$(bindir)/gretl - - install-exec: $(PROG) installdirs - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(PROG) diff --git a/math/gretl/files/patch-gui2__Makefile.in b/math/gretl/files/patch-gui2__Makefile.in new file mode 100644 index 000000000000..a69067182f13 --- /dev/null +++ b/math/gretl/files/patch-gui2__Makefile.in @@ -0,0 +1,29 @@ +--- gui2/Makefile.in.orig 2013-03-30 13:23:00.000000000 -0400 ++++ gui2/Makefile.in 2013-11-20 00:31:53.000000000 -0500 +@@ -122,7 +122,7 @@ + PROG = gretl + else + PROG = gretl_x11$(EXEEXT) +- INSTALL_SCRIPT = install-script ++ INSTALL_SCRIPT_TARGET = install-script + endif + + vpath %.c $(topsrc)/gui2 +@@ -215,7 +215,7 @@ + + .PHONY: + +-install: install-exec install-ui $(INSTALL_SCRIPT) install-data install-lang ++install: install-exec install-ui $(INSTALL_SCRIPT_TARGET) install-data install-lang + + install-strip: $(PROG) install-data + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(bindir)/$(PROG) +@@ -229,7 +229,7 @@ + $(INSTALL_DATA) $(topsrc)/gui2/gretlmodel.xml $(DESTDIR)$(uidir) + + install-script: installdirs +- $(INSTALL_PROGRAM) ../gretl_sh $(DESTDIR)$(bindir)/gretl ++ $(INSTALL_SCRIPT) ../gretl_sh $(DESTDIR)$(bindir)/gretl + + install-exec: $(PROG) installdirs + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(PROG) diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in deleted file mode 100644 index 3c88d3c6119c..000000000000 --- a/math/gretl/files/patch-lib::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Makefile.in.orig 2013-08-16 13:12:54.000000000 -0400 -+++ lib/Makefile.in 2013-11-18 21:43:54.000000000 -0500 -@@ -70,7 +70,7 @@ - - LIBGRETL = libgretl-1.0.la - --LIBS = $(LAPACK_LIBS) -lm -ldl -lz $(XML_LIBS) \ -+LIBS = $(LAPACK_LIBS) -lm -lz $(XML_LIBS) \ - $(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(GSF_LIBS) - - #### End of system configuration section. #### diff --git a/math/gretl/files/patch-lib__Makefile.in b/math/gretl/files/patch-lib__Makefile.in new file mode 100644 index 000000000000..3c88d3c6119c --- /dev/null +++ b/math/gretl/files/patch-lib__Makefile.in @@ -0,0 +1,11 @@ +--- lib/Makefile.in.orig 2013-08-16 13:12:54.000000000 -0400 ++++ lib/Makefile.in 2013-11-18 21:43:54.000000000 -0500 +@@ -70,7 +70,7 @@ + + LIBGRETL = libgretl-1.0.la + +-LIBS = $(LAPACK_LIBS) -lm -ldl -lz $(XML_LIBS) \ ++LIBS = $(LAPACK_LIBS) -lm -lz $(XML_LIBS) \ + $(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(GSF_LIBS) + + #### End of system configuration section. #### diff --git a/math/gretl/files/patch-plugin::Makefile.in b/math/gretl/files/patch-plugin::Makefile.in deleted file mode 100644 index c7d66c786d8f..000000000000 --- a/math/gretl/files/patch-plugin::Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- plugin/Makefile.in.orig 2013-02-19 10:08:31.000000000 -0500 -+++ plugin/Makefile.in 2013-04-20 18:20:25.000000000 -0400 -@@ -350,13 +350,13 @@ - .PHONY: - - install: $(GRETLLIB) $(PLUGINS) $(URCDATA) $(DWDATA) installdirs -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \ -+ $(LIBTOOL) --mode=install $(INSTALL_DATA) \ - $(PLUGINS) $(DESTDIR)$(plugindir) - $(INSTALL_DATA) $(URCDATA) $(DESTDIR)$(plugindir)/data - $(INSTALL_DATA) $(DWDATA) $(DESTDIR)$(plugindir)/data - - install-strip: $(GRETLLIB) $(PLUGINS) installdirs -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \ -+ $(LIBTOOL) --mode=install $(INSTALL_DATA) -s \ - $(PLUGINS) $(DESTDIR)$(plugindir) - - installdirs: diff --git a/math/gretl/files/patch-plugin::workbook.c b/math/gretl/files/patch-plugin::workbook.c deleted file mode 100644 index d91482092391..000000000000 --- a/math/gretl/files/patch-plugin::workbook.c +++ /dev/null @@ -1,10 +0,0 @@ ---- plugin/workbook.c.orig Fri May 31 22:22:42 2002 -+++ plugin/workbook.c Sat Jul 27 08:45:00 2002 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #ifdef G_OS_WIN32 - # include "../winconfig.h" diff --git a/math/gretl/files/patch-plugin__Makefile.in b/math/gretl/files/patch-plugin__Makefile.in new file mode 100644 index 000000000000..c7d66c786d8f --- /dev/null +++ b/math/gretl/files/patch-plugin__Makefile.in @@ -0,0 +1,18 @@ +--- plugin/Makefile.in.orig 2013-02-19 10:08:31.000000000 -0500 ++++ plugin/Makefile.in 2013-04-20 18:20:25.000000000 -0400 +@@ -350,13 +350,13 @@ + .PHONY: + + install: $(GRETLLIB) $(PLUGINS) $(URCDATA) $(DWDATA) installdirs +- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \ ++ $(LIBTOOL) --mode=install $(INSTALL_DATA) \ + $(PLUGINS) $(DESTDIR)$(plugindir) + $(INSTALL_DATA) $(URCDATA) $(DESTDIR)$(plugindir)/data + $(INSTALL_DATA) $(DWDATA) $(DESTDIR)$(plugindir)/data + + install-strip: $(GRETLLIB) $(PLUGINS) installdirs +- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \ ++ $(LIBTOOL) --mode=install $(INSTALL_DATA) -s \ + $(PLUGINS) $(DESTDIR)$(plugindir) + + installdirs: diff --git a/math/gretl/files/patch-plugin__workbook.c b/math/gretl/files/patch-plugin__workbook.c new file mode 100644 index 000000000000..d91482092391 --- /dev/null +++ b/math/gretl/files/patch-plugin__workbook.c @@ -0,0 +1,10 @@ +--- plugin/workbook.c.orig Fri May 31 22:22:42 2002 ++++ plugin/workbook.c Sat Jul 27 08:45:00 2002 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #ifdef G_OS_WIN32 + # include "../winconfig.h" diff --git a/math/gretl/files/patch-share::Makefile.in b/math/gretl/files/patch-share::Makefile.in deleted file mode 100644 index 147ec53b6811..000000000000 --- a/math/gretl/files/patch-share::Makefile.in +++ /dev/null @@ -1,41 +0,0 @@ ---- share/Makefile.in.orig 2011-02-10 16:40:30.000000000 -0500 -+++ share/Makefile.in 2011-03-02 07:43:03.000000000 -0500 -@@ -13,7 +13,7 @@ - sharesrc = $(topsrc)/share - pdfdir = ../doc/tex - --INSTALL_DATA = cp -fp -+INSTALL_DATA = @INSTALL_DATA@ - - AUTO_HELPFILES = \ - gretlgui.hlp \ -@@ -80,22 +80,22 @@ - $(INSTALL_DATA) $(sharesrc)/functions/criteria.gfn $(DESTDIR)$(gretldir)/functions - - install_man: gretl.1 -- $(tooldir)/mkinstalldirs $(DESTDIR)$(prefix)/share/man/man1 -- $(INSTALL_DATA) $(topsrc)/gretl.1 $(DESTDIR)$(prefix)/share/man/man1 -+ $(tooldir)/mkinstalldirs $(DESTDIR)$(prefix)/man/man1 -+ $(INSTALL_DATA) $(topsrc)/gretl.1 $(DESTDIR)$(prefix)/man/man1 - - install_help: $(query_make_help) - $(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir) -- $(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/doc -+# $(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/doc - $(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/helpfigs - for f in $(AUTO_HELPFILES) ; do \ - if test -f $(sharesrc)/$$f ; then \ - $(INSTALL_DATA) $(sharesrc)/$$f $(DESTDIR)$(gretldir) ; fi ; done - for f in $(sharesrc)/texfigs/*.png ; do \ - $(INSTALL_DATA) $$f $(DESTDIR)$(gretldir)/helpfigs ; done -- for f in $(pdfdir)/gretl-ref.pdf $(pdfdir)/gretl-guide.pdf ; do \ -- if test -f $$f ; then $(INSTALL_DATA) $$f $(DESTDIR)$(gretldir)/doc ; fi ; done -- for f in $(pdfdir)/gretl-ref-a4.pdf $(pdfdir)/gretl-guide-a4.pdf ; do \ -- if test -f $$f ; then $(INSTALL_DATA) $$f $(DESTDIR)$(gretldir)/doc ; fi ; done -+# for f in $(pdfdir)/gretl-ref.pdf $(pdfdir)/gretl-guide.pdf ; do \ -+# if test -f $$f ; then $(INSTALL_DATA) $$f $(DESTDIR)$(gretldir)/doc ; fi ; done -+# for f in $(pdfdir)/gretl-ref-a4.pdf $(pdfdir)/gretl-guide-a4.pdf ; do \ -+# if test -f $$f ; then $(INSTALL_DATA) $$f $(DESTDIR)$(gretldir)/doc ; fi ; done - - install_fonts: - for f in $(sharesrc)/fonts/*.ttf ; do \ diff --git a/math/gretl/files/patch-share::bcih::Makefile.in b/math/gretl/files/patch-share::bcih::Makefile.in deleted file mode 100644 index 188de04e97d5..000000000000 --- a/math/gretl/files/patch-share::bcih::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- share/bcih/Makefile.in.orig 2011-08-21 15:13:15.000000000 -0400 -+++ share/bcih/Makefile.in 2011-10-18 21:24:45.000000000 -0400 -@@ -2,7 +2,7 @@ - - CC = @CC@ - HOSTCC = @HOSTCC@ --INSTALL_DATA = cp -fp -+INSTALL_DATA = @INSTALL_DATA@ - swap_ends = @swap_ends@ - - ifeq ($(HOSTCC),) diff --git a/math/gretl/files/patch-share__Makefile.in b/math/gretl/files/patch-share__Makefile.in new file mode 100644 index 000000000000..147ec53b6811 --- /dev/null +++ b/math/gretl/files/patch-share__Makefile.in @@ -0,0 +1,41 @@ +--- share/Makefile.in.orig 2011-02-10 16:40:30.000000000 -0500 ++++ share/Makefile.in 2011-03-02 07:43:03.000000000 -0500 +@@ -13,7 +13,7 @@ + sharesrc = $(topsrc)/share + pdfdir = ../doc/tex + +-INSTALL_DATA = cp -fp ++INSTALL_DATA = @INSTALL_DATA@ + + AUTO_HELPFILES = \ + gretlgui.hlp \ +@@ -80,22 +80,22 @@ + $(INSTALL_DATA) $(sharesrc)/functions/criteria.gfn $(DESTDIR)$(gretldir)/functions + + install_man: gretl.1 +- $(tooldir)/mkinstalldirs $(DESTDIR)$(prefix)/share/man/man1 +- $(INSTALL_DATA) $(topsrc)/gretl.1 $(DESTDIR)$(prefix)/share/man/man1 ++ $(tooldir)/mkinstalldirs $(DESTDIR)$(prefix)/man/man1 ++ $(INSTALL_DATA) $(topsrc)/gretl.1 $(DESTDIR)$(prefix)/man/man1 + + install_help: $(query_make_help) + $(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir) +- $(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/doc ++# $(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/doc + $(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/helpfigs + for f in $(AUTO_HELPFILES) ; do \ + if test -f $(sharesrc)/$$f ; then \ + $(INSTALL_DATA) $(sharesrc)/$$f $(DESTDIR)$(gretldir) ; fi ; done + for f in $(sharesrc)/texfigs/*.png ; do \ + $(INSTALL_DATA) $$f $(DESTDIR)$(gretldir)/helpfigs ; done +- for f in $(pdfdir)/gretl-ref.pdf $(pdfdir)/gretl-guide.pdf ; do \ +- if test -f $$f ; then $(INSTALL_DATA) $$f $(DESTDIR)$(gretldir)/doc ; fi ; done +- for f in $(pdfdir)/gretl-ref-a4.pdf $(pdfdir)/gretl-guide-a4.pdf ; do \ +- if test -f $$f ; then $(INSTALL_DATA) $$f $(DESTDIR)$(gretldir)/doc ; fi ; done ++# for f in $(pdfdir)/gretl-ref.pdf $(pdfdir)/gretl-guide.pdf ; do \ ++# if test -f $$f ; then $(INSTALL_DATA) $$f $(DESTDIR)$(gretldir)/doc ; fi ; done ++# for f in $(pdfdir)/gretl-ref-a4.pdf $(pdfdir)/gretl-guide-a4.pdf ; do \ ++# if test -f $$f ; then $(INSTALL_DATA) $$f $(DESTDIR)$(gretldir)/doc ; fi ; done + + install_fonts: + for f in $(sharesrc)/fonts/*.ttf ; do \ diff --git a/math/gretl/files/patch-share__bcih__Makefile.in b/math/gretl/files/patch-share__bcih__Makefile.in new file mode 100644 index 000000000000..188de04e97d5 --- /dev/null +++ b/math/gretl/files/patch-share__bcih__Makefile.in @@ -0,0 +1,11 @@ +--- share/bcih/Makefile.in.orig 2011-08-21 15:13:15.000000000 -0400 ++++ share/bcih/Makefile.in 2011-10-18 21:24:45.000000000 -0400 +@@ -2,7 +2,7 @@ + + CC = @CC@ + HOSTCC = @HOSTCC@ +-INSTALL_DATA = cp -fp ++INSTALL_DATA = @INSTALL_DATA@ + swap_ends = @swap_ends@ + + ifeq ($(HOSTCC),) diff --git a/math/petsc/files/patch-bmake::common::rules.shared.basic b/math/petsc/files/patch-bmake::common::rules.shared.basic deleted file mode 100644 index f64f611487b7..000000000000 --- a/math/petsc/files/patch-bmake::common::rules.shared.basic +++ /dev/null @@ -1,13 +0,0 @@ ---- bmake/common/rules.shared.basic.orig 2007-05-23 19:30:02.000000000 -0400 -+++ bmake/common/rules.shared.basic 2012-06-15 00:43:31.000000000 -0400 -@@ -10,6 +10,10 @@ - shared_solaris2: shared_solaris - shared_solaris2_gnu: shared_solaris_gnu - -+shared_freebsd10: shared_freebsd -+shared_freebsd9: shared_freebsd -+shared_freebsd8: shared_freebsd -+shared_freebsd7: shared_freebsd - shared_freebsd6: shared_freebsd - shared_freebsd5: shared_freebsd - shared_freebsd4: shared_freebsd diff --git a/math/petsc/files/patch-bmake__common__rules.shared.basic b/math/petsc/files/patch-bmake__common__rules.shared.basic new file mode 100644 index 000000000000..f64f611487b7 --- /dev/null +++ b/math/petsc/files/patch-bmake__common__rules.shared.basic @@ -0,0 +1,13 @@ +--- bmake/common/rules.shared.basic.orig 2007-05-23 19:30:02.000000000 -0400 ++++ bmake/common/rules.shared.basic 2012-06-15 00:43:31.000000000 -0400 +@@ -10,6 +10,10 @@ + shared_solaris2: shared_solaris + shared_solaris2_gnu: shared_solaris_gnu + ++shared_freebsd10: shared_freebsd ++shared_freebsd9: shared_freebsd ++shared_freebsd8: shared_freebsd ++shared_freebsd7: shared_freebsd + shared_freebsd6: shared_freebsd + shared_freebsd5: shared_freebsd + shared_freebsd4: shared_freebsd diff --git a/math/petsc/files/patch-src::mat::impls::rowbs::mpi::mpirowbs.h b/math/petsc/files/patch-src::mat::impls::rowbs::mpi::mpirowbs.h deleted file mode 100644 index 4deb3db1d37b..000000000000 --- a/math/petsc/files/patch-src::mat::impls::rowbs::mpi::mpirowbs.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/mat/impls/rowbs/mpi/mpirowbs.h.orig Sat Oct 2 09:13:29 2004 -+++ src/mat/impls/rowbs/mpi/mpirowbs.h Tue Oct 5 21:58:07 2004 -@@ -5,8 +5,8 @@ - #include "src/mat/matimpl.h" - - EXTERN_C_BEGIN --#include "BSsparse.h" --#include "BSprivate.h" -+#include -+#include - EXTERN_C_END - - /* diff --git a/math/petsc/files/patch-src__mat__impls__rowbs__mpi__mpirowbs.h b/math/petsc/files/patch-src__mat__impls__rowbs__mpi__mpirowbs.h new file mode 100644 index 000000000000..4deb3db1d37b --- /dev/null +++ b/math/petsc/files/patch-src__mat__impls__rowbs__mpi__mpirowbs.h @@ -0,0 +1,13 @@ +--- src/mat/impls/rowbs/mpi/mpirowbs.h.orig Sat Oct 2 09:13:29 2004 ++++ src/mat/impls/rowbs/mpi/mpirowbs.h Tue Oct 5 21:58:07 2004 +@@ -5,8 +5,8 @@ + #include "src/mat/matimpl.h" + + EXTERN_C_BEGIN +-#include "BSsparse.h" +-#include "BSprivate.h" ++#include ++#include + EXTERN_C_END + + /* diff --git a/math/ploticus/files/patch-src::reslimits.c b/math/ploticus/files/patch-src::reslimits.c deleted file mode 100644 index 5083f4650bcd..000000000000 --- a/math/ploticus/files/patch-src::reslimits.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/reslimits.c.orig Sat May 24 15:07:41 2003 -+++ src/reslimits.c Sat May 24 15:08:01 2003 -@@ -9,6 +9,7 @@ - #ifndef NORLIMIT - - #include -+#include - #include - #include - diff --git a/math/ploticus/files/patch-src__reslimits.c b/math/ploticus/files/patch-src__reslimits.c new file mode 100644 index 000000000000..5083f4650bcd --- /dev/null +++ b/math/ploticus/files/patch-src__reslimits.c @@ -0,0 +1,10 @@ +--- src/reslimits.c.orig Sat May 24 15:07:41 2003 ++++ src/reslimits.c Sat May 24 15:08:01 2003 +@@ -9,6 +9,7 @@ + #ifndef NORLIMIT + + #include ++#include + #include + #include + diff --git a/math/qhull5/files/patch-eg::Makefile.in b/math/qhull5/files/patch-eg::Makefile.in deleted file mode 100644 index f9877a8061e3..000000000000 --- a/math/qhull5/files/patch-eg::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- eg/Makefile.in.orig Fri Feb 6 16:33:23 2004 -+++ eg/Makefile.in Wed Apr 28 23:06:27 2004 -@@ -138,7 +138,7 @@ - - # to: - docdir = $(prefix)/share/doc/$(PACKAGE) --examplesdir = $(docdir)/examples -+examplesdir = $(prefix)/share/examples/$(PACKAGE) - - # which: - examples_DATA = \ diff --git a/math/qhull5/files/patch-eg__Makefile.in b/math/qhull5/files/patch-eg__Makefile.in new file mode 100644 index 000000000000..f9877a8061e3 --- /dev/null +++ b/math/qhull5/files/patch-eg__Makefile.in @@ -0,0 +1,11 @@ +--- eg/Makefile.in.orig Fri Feb 6 16:33:23 2004 ++++ eg/Makefile.in Wed Apr 28 23:06:27 2004 +@@ -138,7 +138,7 @@ + + # to: + docdir = $(prefix)/share/doc/$(PACKAGE) +-examplesdir = $(docdir)/examples ++examplesdir = $(prefix)/share/examples/$(PACKAGE) + + # which: + examples_DATA = \ diff --git a/math/qhull5/files/patch-src::Makefile.in b/math/qhull5/files/patch-src::Makefile.in deleted file mode 100644 index 9623670c7d08..000000000000 --- a/math/qhull5/files/patch-src::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Fri Feb 6 16:33:23 2004 -+++ src/Makefile.in Wed Apr 28 23:37:31 2004 -@@ -198,7 +198,7 @@ - - # to: - docdir = $(prefix)/share/doc/$(PACKAGE) --examplesdir = $(docdir)/examples -+examplesdir = $(prefix)/share/examples/$(PACKAGE) - - # which: - examples_DATA = \ diff --git a/math/qhull5/files/patch-src__Makefile.in b/math/qhull5/files/patch-src__Makefile.in new file mode 100644 index 000000000000..9623670c7d08 --- /dev/null +++ b/math/qhull5/files/patch-src__Makefile.in @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig Fri Feb 6 16:33:23 2004 ++++ src/Makefile.in Wed Apr 28 23:37:31 2004 +@@ -198,7 +198,7 @@ + + # to: + docdir = $(prefix)/share/doc/$(PACKAGE) +-examplesdir = $(docdir)/examples ++examplesdir = $(prefix)/share/examples/$(PACKAGE) + + # which: + examples_DATA = \ diff --git a/math/spar/files/patch-calculator::Makefile.in b/math/spar/files/patch-calculator::Makefile.in deleted file mode 100644 index 725ba36e31f9..000000000000 --- a/math/spar/files/patch-calculator::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- calculator/Makefile.in.orig Sun Jul 1 02:55:42 2001 -+++ calculator/Makefile.in Sun Jul 1 02:55:56 2001 -@@ -91,7 +91,7 @@ - DEFS = @DEFS@ -I. -I$(srcdir) -I.. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lcompat - spar_OBJECTS = commands.o commands_table.o shell.o spar.o - spar_DEPENDENCIES = ../lib/.libs/libspar.so - spar_LDFLAGS = diff --git a/math/spar/files/patch-calculator__Makefile.in b/math/spar/files/patch-calculator__Makefile.in new file mode 100644 index 000000000000..725ba36e31f9 --- /dev/null +++ b/math/spar/files/patch-calculator__Makefile.in @@ -0,0 +1,11 @@ +--- calculator/Makefile.in.orig Sun Jul 1 02:55:42 2001 ++++ calculator/Makefile.in Sun Jul 1 02:55:56 2001 +@@ -91,7 +91,7 @@ + DEFS = @DEFS@ -I. -I$(srcdir) -I.. + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lcompat + spar_OBJECTS = commands.o commands_table.o shell.o spar.o + spar_DEPENDENCIES = ../lib/.libs/libspar.so + spar_LDFLAGS = diff --git a/math/spar/files/patch-lib::randist::rand.c b/math/spar/files/patch-lib::randist::rand.c deleted file mode 100644 index 792b9fa2ae9a..000000000000 --- a/math/spar/files/patch-lib::randist::rand.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/randist/rand.c.orig Sun Jul 1 02:45:44 2001 -+++ lib/randist/rand.c Sun Jul 1 02:46:03 2001 -@@ -64,6 +64,7 @@ - * struct timeb to be defined. They can be - * found in timeb.h. - */ -+#include - #include - void - sl_randomize (void) diff --git a/math/spar/files/patch-lib__randist__rand.c b/math/spar/files/patch-lib__randist__rand.c new file mode 100644 index 000000000000..792b9fa2ae9a --- /dev/null +++ b/math/spar/files/patch-lib__randist__rand.c @@ -0,0 +1,10 @@ +--- lib/randist/rand.c.orig Sun Jul 1 02:45:44 2001 ++++ lib/randist/rand.c Sun Jul 1 02:46:03 2001 +@@ -64,6 +64,7 @@ + * struct timeb to be defined. They can be + * found in timeb.h. + */ ++#include + #include + void + sl_randomize (void) -- cgit v1.2.3