Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv17877
Modified Files:
pgplot.info pgplot.patch wip.info
Log Message:
modernize libpng and gcc (tested that pgplot and wip demos work)
Index: wip.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/wip.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- wip.info 11 Apr 2011 14:06:16 -0000 1.2
+++ wip.info 20 Oct 2011 05:37:22 -0000 1.3
@@ -1,18 +1,23 @@
Package: wip
Version: 2p3
-Revision: 1011
+Revision: 1012
Description: Interactive graphics software package
License: OSI-Approved
Maintainer: None <[email protected]>
BuildDepends: <<
- fink (>= 0.24.12),
- gcc44 | gcc45, libpng3, libncurses5, aquaterm-dev (>= 1.0.0-1002),
- readline5 (>= 5.0-1004)
+ aquaterm-dev (>= 1.0.0-1002),
+ gcc46,
+ libpng15,
+ readline5 (>= 5.0-1004),
+ x11-dev
<<
Depends: <<
- pgplot (>= 5.2-1029), libncurses5-shlibs, libpng3-shlibs,
- aquaterm-shlibs (>= 1.0.0-1002), readline5-shlibs (>= 5.0-1004),
- gcc44-shlibs | gcc45-shlibs
+ aquaterm-shlibs (>= 1.0.0-1002),
+ gcc46-shlibs,
+ libpng15-shlibs,
+ pgplot (>= 5.2.2-2),
+ readline5-shlibs (>= 5.0-1004),
+ x11
<<
Source: ftp://ftp.astro.umd.edu/progs/morgan/%n%v.tar.gz
SourceDirectory: wip
Index: pgplot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/pgplot.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pgplot.info 20 Oct 2011 05:02:36 -0000 1.1
+++ pgplot.info 20 Oct 2011 05:37:22 -0000 1.2
@@ -1,25 +1,25 @@
Package: pgplot
Version: 5.2.2
-Revision: 1
+Revision: 2
Depends: <<
aquaterm (>= 1.0.0-1002),
aquaterm-shlibs (>= 1.0.0-1002),
- gcc44-shlibs,
- libpng14-shlibs,
+ gcc46-shlibs,
+ libpng15-shlibs,
x11
<<
BuildDepends: <<
aquaterm-dev (>= 1.0.0-1002),
fink (>= 0.24.12),
- gcc44,
- libpng14,
+ gcc46,
+ libpng15,
x11-dev
<<
Source: ftp://ftp.astro.caltech.edu/pub/pgplot/%n522.tar.gz
Source-MD5: e8a6e8d0d5ef9d1709dfb567724525ae
SourceDirectory: pgplot
PatchFile: %n.patch
-PatchFile-MD5: 321a6c734a3dd54b253c63fdd06605b8
+PatchFile-MD5: 0ea96aa1c1859f3d66c600738a25b7c2
PatchScript: <<
#!/bin/bash -efv
mkdir sys_macosx
Index: pgplot.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/pgplot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pgplot.patch 20 Oct 2011 05:02:36 -0000 1.1
+++ pgplot.patch 20 Oct 2011 05:37:22 -0000 1.2
@@ -1,5 +1,58 @@
---- pgplot/makemake Tue May 4 16:35:43 1999
-+++ pgplot/makemake Thu May 9 05:53:33 2002
+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.
@@ -39,45 +92,6 @@
x2driv.o figdisp_comm.o: $(DRVDIR)/commands.h
---- pgplot/drivers.list Mon May 3 23:02:15 1999
-+++ pgplot-new/drivers.list Thu May 9 05:52:49 2002
-@@ -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
--- 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 @@
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Ciosco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
