diff options
Diffstat (limited to 'math/grace/files')
-rw-r--r-- | math/grace/files/patch-aa | 75 | ||||
-rw-r--r-- | math/grace/files/patch-ab | 36 | ||||
-rw-r--r-- | math/grace/files/patch-ac | 10 | ||||
-rw-r--r-- | math/grace/files/patch-ad | 24 | ||||
-rw-r--r-- | math/grace/files/patch-ae | 16 |
5 files changed, 82 insertions, 79 deletions
diff --git a/math/grace/files/patch-aa b/math/grace/files/patch-aa index 4e26813042c1..b8b15fb95109 100644 --- a/math/grace/files/patch-aa +++ b/math/grace/files/patch-aa @@ -1,53 +1,40 @@ -*** configure.orig Tue Sep 15 14:51:57 1998 ---- configure Wed Dec 23 16:46:57 1998 +*** configure.orig Sun Aug 22 12:11:35 1999 +--- configure Fri Sep 10 16:22:17 1999 *************** -*** 660,665 **** ---- 660,666 ---- - case "${host}" in - i?86-*-linux-*) CONF_FILE="ix86-linux";; - *-*-linux-*) CONF_FILE="linux";; -+ *-*-freebsd*) CONF_FILE="freebsd";; - i?86-*-sco-*) CONF_FILE="ix86-sco";; - i?86-*-cygwin32) CONF_FILE="ix86-cygwin32";; - alpha*-dec-osf4.*) CONF_FILE="alpha-osf4";; -*************** -*** 4729,4735 **** - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-ldf $LIBS" - cat > conftest.$ac_ext <<EOF - #line 4735 "configure" - #include "confdefs.h" ---- 4730,4736 ---- - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lmfhdf -ldf -lz $LIBS" - cat > conftest.$ac_ext <<EOF - #line 4735 "configure" - #include "confdefs.h" +*** 1096,1106 **** + + if test "x${GCC}" = "xyes" + then +- case "${host}" in +- i?86-*-linux-*) CFLAGS="-m486 -malign-double $CFLAGS";; +- i?86-*) CFLAGS="-m486 $CFLAGS";; +- esac +- + echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6 + echo "configure:1106: checking "for gcc strength-reduce bug"" >&5 + if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then +--- 1096,1101 ---- *************** -*** 4753,4759 **** - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -! NETCDF_LIBS="$NETCDF_LIBS -ldf"; cat >> confdefs.h <<\EOF - #define HAVE_MFHDF 1 - EOF +*** 1832,1838 **** + # It thinks the first close brace ends the variable substitution. + test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +--- 1827,1833 ---- + # It thinks the first close brace ends the variable substitution. + test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555' ---- 4754,4760 ---- - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -! NETCDF_LIBS="$NETCDF_LIBS -lmfhdf -ldf -lz"; cat >> confdefs.h <<\EOF - #define HAVE_MFHDF 1 - EOF + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' *************** -*** 6858,6861 **** +*** 8939,8942 **** chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - ---- 6859,6861 ---- +--- 8934,8936 ---- diff --git a/math/grace/files/patch-ab b/math/grace/files/patch-ab index f27b3ec5b1bb..acae2878785d 100644 --- a/math/grace/files/patch-ab +++ b/math/grace/files/patch-ab @@ -1,19 +1,19 @@ -*** src/pdfdrv.c.org Wed Dec 23 12:55:06 1998 ---- src/pdfdrv.c Wed Dec 23 12:55:20 1998 +*** conf/Make.conf.in.org Fri Sep 10 09:32:03 1999 +--- conf/Make.conf.in Fri Sep 10 09:32:27 1999 *************** -*** 52,58 **** - #include "protos.h" - - /* uncomment this if the PDFlib was compiled w/ support for TIFF images */ -! /* #define USE_TIFF */ - #include <pdf.h> - - #ifndef NONE_GUI ---- 52,58 ---- - #include "protos.h" - - /* uncomment this if the PDFlib was compiled w/ support for TIFF images */ -! #define USE_TIFF - #include <pdf.h> - - #ifndef NONE_GUI +*** 93,98 **** +--- 93,99 ---- + # BSD install + INSTALL=@INSTALL@ + INSTALL_PROGRAM=@INSTALL_PROGRAM@ ++ INSTALL_SCRIPT=@INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + MKINSTALLDIRS=@MKINSTALLDIRS@ + +*************** +*** 119,122 **** + + # HTML help viewer command + HELPVIEWER=@HELPVIEWER@ +- +--- 120,122 ---- diff --git a/math/grace/files/patch-ac b/math/grace/files/patch-ac index 4f7d88dedfc8..c15e4275b611 100644 --- a/math/grace/files/patch-ac +++ b/math/grace/files/patch-ac @@ -1,7 +1,7 @@ -*** examples/Makefile.orig Wed Dec 23 18:30:25 1998 ---- examples/Makefile Wed Dec 23 18:31:38 1998 +*** examples/Makefile.org Fri Sep 10 09:25:47 1999 +--- examples/Makefile Fri Sep 10 09:25:57 1999 *************** -*** 32,38 **** +*** 31,37 **** install : $(EXAMPLES) $(DOTEST) $(MKINSTALLDIRS) $(GRACE_HOME)/examples for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/examples; done @@ -9,11 +9,11 @@ links : dummy ---- 32,38 ---- +--- 31,37 ---- install : $(EXAMPLES) $(DOTEST) $(MKINSTALLDIRS) $(GRACE_HOME)/examples for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/examples; done -! $(INSTALL) -c -o root -g wheel -m 555 $(DOTEST) $(GRACE_HOME)/examples/$(DOTEST) +! $(INSTALL_SCRIPT) $(DOTEST) $(GRACE_HOME)/examples/$(DOTEST) links : dummy diff --git a/math/grace/files/patch-ad b/math/grace/files/patch-ad index 38d8e848533c..d1dcada7354c 100644 --- a/math/grace/files/patch-ad +++ b/math/grace/files/patch-ad @@ -1,19 +1,19 @@ -*** auxiliary/Makefile.org Mon Jul 20 23:51:55 1998 ---- auxiliary/Makefile Wed Dec 23 19:12:15 1998 +*** doc/Makefile.orig Fri Aug 20 00:31:44 1999 +--- doc/Makefile Fri Sep 10 11:06:06 1999 *************** -*** 22,28 **** - install : $(AUXILIARIES) fdf2fit - $(MKINSTALLDIRS) $(GRACE_HOME)/auxiliary - for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/auxiliary; done -! $(INSTALL_PROGRAM) fdf2fit $(GRACE_HOME)/auxiliary +*** 66,72 **** + $(MKINSTALLDIRS) $(PREFIX)/man + $(MKINSTALLDIRS) $(PREFIX)/man/man1 + cd $(PREFIX)/man/man1; \ +! for i in $? $(MANLINKS); do $(RM) $$i; $(LN_S) $(GRACE_HOME)/doc/$$i $$i; done tests : dummy ---- 22,28 ---- - install : $(AUXILIARIES) fdf2fit - $(MKINSTALLDIRS) $(GRACE_HOME)/auxiliary - for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/auxiliary; done -! $(INSTALL) -c -o root -g wheel -m 555 fdf2fit $(GRACE_HOME)/auxiliary +--- 66,72 ---- + $(MKINSTALLDIRS) $(PREFIX)/man + $(MKINSTALLDIRS) $(PREFIX)/man/man1 + cd $(PREFIX)/man/man1; \ +! for i in $? $(MANLINKS); do $(RM) $$i; $(INSTALL_DATA) $(GRACE_HOME)/doc/$$i $$i; done tests : dummy diff --git a/math/grace/files/patch-ae b/math/grace/files/patch-ae new file mode 100644 index 000000000000..dd55885be908 --- /dev/null +++ b/math/grace/files/patch-ae @@ -0,0 +1,16 @@ +--- conf/generic.orig Mon Mar 29 01:02:41 1999 ++++ conf/generic Fri Sep 10 16:10:36 1999 +@@ -17,11 +17,11 @@ + ############################### + # Misc optimization flags + # +-OPTIMIZE="-O" ++#OPTIMIZE="-O" + ############################### + + ############################### + # Flags used for debugging + # +-DEBUG="-g" ++#DEBUG="-g" + ############################### |