diff -Nurd -x'*~' pgplot/drivers/pndriv.c pgplot-new/drivers/pndriv.c --- pgplot/drivers/pndriv.c 1999-03-26 21:06:23.000000000 -0500 +++ pgplot-new/drivers/pndriv.c 2011-10-20 01:20:42.000000000 -0400 @@ -222,7 +222,7 @@ return; } - if (setjmp(png_ptr->jmpbuf)) { /* not really sure what I'm doing here... */ + if (setjmp(png_jmpbuf(png_ptr))) { /* not really sure what I'm doing here... */ fprintf(stderr,"%s: error in libpng while writing file %s, plotting disabled\n", png_ident, filename); png_destroy_write_struct(&png_ptr,&info_ptr); dev->error = true; diff -Nurd -x'*~' pgplot/drivers.list pgplot-new/drivers.list --- pgplot/drivers.list 1999-05-04 01:02:15.000000000 -0400 +++ pgplot-new/drivers.list 2011-10-20 01:17:24.000000000 -0400 @@ -37,14 +37,14 @@ ! NEDRIV 0 /NEXT Computers running NeXTstep operating system NUDRIV 0 /NULL Null device (no output) Std F77 ! PGDRIV 0 /PGMF PGPLOT metafile (new format, experimental) Std F77 -! PNDRIV 1 /PNG Portable Network Graphics file C -! PNDRIV 2 /TPNG Portable Network Graphics file - transparent background C + PNDRIV 1 /PNG Portable Network Graphics file C + PNDRIV 2 /TPNG Portable Network Graphics file - transparent background C ! PPDRIV 1 /PPM Portable Pixel Map file, landscape ! PPDRIV 2 /VPPM Portable PIxel Map file, portrait -! PSDRIV 1 /PS PostScript printers, monochrome, landscape Std F77 -! PSDRIV 2 /VPS Postscript printers, monochrome, portrait Std F77 -! PSDRIV 3 /CPS PostScript printers, color, landscape Std F77 -! PSDRIV 4 /VCPS PostScript printers, color, portrait Std F77 + PSDRIV 1 /PS PostScript printers, monochrome, landscape Std F77 + PSDRIV 2 /VPS Postscript printers, monochrome, portrait Std F77 + PSDRIV 3 /CPS PostScript printers, color, landscape Std F77 + PSDRIV 4 /VCPS PostScript printers, color, portrait Std F77 ! PXDRIV 0 /PRINTRONI Printronix P300 or P600 dot-matrix printer ! QMDRIV 1 /QMS QUIC devices (QMS and Talaris), landscape Std F77 ! QMDRIV 2 /VQMS QUIC devices (QMS and Talaris), portrait Std F77 @@ -68,8 +68,8 @@ ! WDDRIV 2 /VWD X Window dump file, portrait ! WSDRIV 0 /WS VAX workstations running VWS software VMS ! X2DRIV 0 /XDISP PGDISP or FIGDISP server for X workstations C -! XWDRIV 1 /XWINDOW Workstations running X Window System C -! XWDRIV 2 /XSERVE Persistent window on X Window System C + XWDRIV 1 /XWINDOW Workstations running X Window System C + XWDRIV 2 /XSERVE Persistent window on X Window System C ! ZEDRIV 0 /ZETA Zeta 8 Digital Plotter ! ! The following drivers can only be used in PGPLOT installations on MS-DOS @@ -112,3 +112,4 @@ ! The following driver is included solely for use by the aips++ team. ! ! RVDRIV 0 /XRV X-window Rivet/Tk programs with pgplot widgets. C + AQDRIV 0 /AQT AquaTerm.app MacOSX C diff -Nurd -x'*~' pgplot/makemake pgplot-new/makemake --- pgplot/makemake 1999-05-04 18:35:43.000000000 -0400 +++ pgplot-new/makemake 2011-10-20 01:17:24.000000000 -0400 @@ -68,8 +68,8 @@ # By default the PGPLOT library is initially placed in the current # The demos should be explicitly linked against this library. -PGPLOT_LIB="-L\`pwd\` -lpgplot" -CPGPLOT_LIB="-L\`pwd\` -lcpgplot -lpgplot" +PGPLOT_LIB="-L`pwd` -lpgplot" +CPGPLOT_LIB="-L`pwd` -lcpgplot -lpgplot" # List the default make targets. @@ -160,6 +160,7 @@ XADRIV="xadriv.o pgxwin.o" TKDRIV="tkdriv.o pgxwin.o" RVDRIV="rvdriv.o pgxwin.o" +AQDRIV="aqdriv.o" # We need a drivers.list file in the current directory, from which to # determine the drivers to be compiled. @@ -221,8 +222,8 @@ # PNDRIV requires extra libraries and include files if (echo $DRIV_LIST | grep -s pndriv 2>&1 1>/dev/null); then - PGPLOT_LIB="$PGPLOT_LIB -lpng -lz" - CPGPLOT_LIB="$CPGPLOT_LIB -lpng -lz" + PGPLOT_LIB="$PGPLOT_LIB -L/lib -lpng -lz" + CPGPLOT_LIB="$CPGPLOT_LIB -L/lib -lpng -lz" fi # Create a new grexec.f that calls the above drivers. @@ -1025,7 +1026,7 @@ grivas.o : $(DRVDIR)/gadef.h grtv00.o : $(DRVDIR)/imdef.h pgxwin.o : $(DRVDIR)/pgxwin.h -pndriv.o : ./png.h ./pngconf.h ./zlib.h ./zconf.h +pndriv.o : /include/png.h /include/pngconf.h x2driv.o figdisp_comm.o: $(DRVDIR)/commands.h --- pgplot/sys_macosx/g77_gcc_AQT.conf.orig Thu Apr 1 05:19:54 2004 +++ pgplot/sys_macosx/g77_gcc_AQT.conf Thu Apr 1 05:23:14 2004 @@ -5,7 +5,7 @@ # X2DRIV (/xdisp and /figdisp). # The arguments needed by the C compiler to locate X-window include files. - XINCL="-I/usr/X11R6/include" + XINCL="-I/include -I/include" # Optional: Needed by XMDRIV (/xmotif). # The arguments needed by the C compiler to locate Motif, Xt and @@ -74,7 +74,7 @@ # The library-specification flags to use when linking normal pgplot # demo programs. - LIBS="-L/usr/X11R6/lib -lX11 -Wl,-framework -Wl,AquaTerm -Wl,-framework -Wl,Foundation" + LIBS="-L/lib -lX11 -Wl,-F/Library/Frameworks,-framework,AquaTerm,-framework,Foundation" # Optional: Needed by XMDRIV (/xmotif). # The library-specification flags to use when linking motif @@ -103,12 +103,12 @@ # Optional: Needed on systems that support shared libraries. # The name to give the shared pgplot library. - SHARED_LIB="libpgplot.dylib" +# SHARED_LIB="libpgplot.dylib" # Optional: Needed if SHARED_LIB is set. # How to create a shared library from a trailing list of object files. - SHARED_LD="gcc -dynamiclib -single_module -o $SHARED_LIB -install_name /usr/local/lib/$SHARED_LIB" +# SHARED_LD="gcc -dynamiclib -single_module -o $SHARED_LIB -install_name /usr/local/lib/$SHARED_LIB" # Optional: # On systems such as Solaris 2.x, that allow specification of the @@ -117,7 +117,7 @@ # library-specification flags used to specify these libraries to # $SHARED_LD - SHARED_LIB_LIBS="$LIBS -lg2c -lSystem" +# SHARED_LIB_LIBS="$LIBS -lg2c -lSystem" # Optional: # Compiler name used on Next systems to compile objective-C files. diff -Nurd pgplot.orig/sys/grfileio.c pgplot/sys/grfileio.c --- pgplot.orig/sys/grfileio.c 1995-06-19 22:41:42.000000000 +0200 +++ pgplot/sys/grfileio.c 2017-10-10 16:29:09.980381220 +0200 @@ -20,6 +20,8 @@ #include #include #include +#include +#include #ifdef PG_PPU #define GROFIL grofil_ diff -Nurd pgplot.orig/sys/grtermio.c pgplot/sys/grtermio.c --- pgplot.orig/sys/grtermio.c 1994-12-29 21:00:33.000000000 +0100 +++ pgplot/sys/grtermio.c 2017-10-10 16:36:03.411715781 +0200 @@ -7,6 +7,9 @@ #include #include +#include +#include +#include #ifdef PG_PPU #define GROTER groter_