Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv5515
Modified Files:
plotutils.info plotutils.patch
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
Index: plotutils.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci/plotutils.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- plotutils.info 11 Jul 2011 04:08:34 -0000 1.1
+++ plotutils.info 5 Nov 2011 23:12:28 -0000 1.2
@@ -1,35 +1,42 @@
Package: plotutils
-Version: 2.4.1
-Revision: 1010
+Version: 2.6
+Revision: 2
Description: Functions for exporting 2-D vector graphics
License: GPL
Homepage: http://www.gnu.org/software/plotutils
Maintainer: Monic Polynomial <[email protected]>
Source: mirror:gnu:%n/%n-%v.tar.gz
-Source-MD5: 8da2cc2ed5a837cad0753c7843ef18ee
+Source-MD5: c08a424bd2438c80a786a7f4b5bb6a40
PatchFile: %n.patch
-PatchFile-MD5: 1a85bf53e4c1708437a92e929a4b9d65
+PatchFile-MD5: 348e2e342685f309b17e8cff87d637ed
GCC: 4.0
-BuildDepends: x11-dev, libpng3, fink (>= 0.24.12-1)
-Depends: x11, libpng3-shlibs, %N-shlibs (= %v-%r)
+BuildDepends: <<
+ autoconf2.6,
+ automake1.11,
+ fink (>= 0.24.12-1),
+ fink-package-precedence,
+ libpng15,
+ libtool2,
+ x11-dev
+<<
+Depends: <<
+ %N-shlibs (= %v-%r),
+ libpng15-shlibs,
+ x11
+<<
-UpdateConfigGuess: true
-UpdateLibtool: true
-ConfigureParams: --enable-libplotter --mandir='${prefix}/share/man'
--infodir='${prefix}/share/info' --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib
+ConfigureParams: --enable-libplotter --disable-static
--enable-dependency-tracking
CompileScript: <<
- #!/bin/bash -ev
- if [ "%m" = "x86_64" ]
- then
- perl -pi -e 's/file_magic Mach-O dynamically linked shared
library/file_magic Mach-O 64-bit dynamically linked shared library x86_64/'
ltconfig
- fi
- ac_cv_exeext='' ./configure %c
- perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' libtool
- make
+ autoreconf -fi
+ ./configure %c
+ make
+ fink-package-precedence --prohibit-bdep=%N-dev .
<<
+InstallScript: make install DESTDIR=%d
DocFiles: README INSTALL.pkg COPYING KNOWN_BUGS PROBLEMS NEWS
InfoDocs: plotutils.info
@@ -37,7 +44,7 @@
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 2.4.1-1)
- Depends: x11-shlibs, libpng3-shlibs
+ Depends: x11-shlibs, libpng15-shlibs
Files: lib/libplot.*.dylib lib/libplotter.*.dylib
Shlibs: <<
%p/lib/libplotter.2.dylib 5.0.0 %n (>= 2.4.1-5)
@@ -58,9 +65,14 @@
DescDetail: Also contains command-line programs for plotting scientific data.
DescPort: <<
- Explicit cast of (unsigned char *) and (unsigned const char *) to
- (const char *) for ostream::write. Should really not be using
- "unsigned" at all, but easier to recast at the lowest level instead
- of actually fixing the type and then propagating back to all
- callers...
+ Included autotools are very old and do not know about recent
+ darwin and other modern tricks.
+
+ Make really *really* sure not to supercede fink's -I flags
+
+ Upgrade long-deprecated libpng jmpbuf. See:
+ http://lists.gnu.org/archive/html/bug-plotutils/2011-01/msg00000.html
+ http://llvm.org/bugs/show_bug.cgi?id=10338#c1
+
+ Regenerating autotools needs AC_PROG_CXX b/c have c++ sources
<<
Index: plotutils.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci/plotutils.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- plotutils.patch 11 Jul 2011 04:08:34 -0000 1.1
+++ plotutils.patch 5 Nov 2011 23:12:28 -0000 1.2
@@ -1,117 +1,72 @@
-diff -Nurd -x'*~' plotutils-2.4.1.orig/libplot/Makefile.in
plotutils-2.4.1/libplot/Makefile.in
---- plotutils-2.4.1.orig/libplot/Makefile.in 2000-07-04 03:37:10.000000000
-0400
-+++ plotutils-2.4.1/libplot/Makefile.in 2007-06-26 02:38:54.000000000
-0400
-@@ -88,7 +88,7 @@
+diff -Nurd -x'*~' plotutils-2.6.orig/configure.ac plotutils-2.6/configure.ac
+--- plotutils-2.6.orig/configure.ac 2009-07-29 23:14:09.000000000 -0400
++++ plotutils-2.6/configure.ac 2011-07-10 12:39:00.000000000 -0400
+@@ -331,7 +331,7 @@
+ fi])
- libplot_la_LDFLAGS = -version-info 4:1:2
+ # Do we build libplotter, the C++ library, and other C++ software?
+-AC_ARG_ENABLE(libplotter, [ --enable-libplotter build the C++ Plotter
class library and C++ software], echo enabling construction of the C++ class
library; no_libplotter="no", no_libplotter="yes"; extralib="")
++AC_ARG_ENABLE(libplotter, [ --enable-libplotter build the C++ Plotter
class library and C++ software], echo enabling construction of the C++ class
library; [AC_PROG_CXX] no_libplotter="no", no_libplotter="yes"; extralib="")
+ AM_CONDITIONAL(NO_LIBPLOTTER, test "x$no_libplotter" = "xyes")
--INCLUDES = $(X_CFLAGS) -I$(srcdir)/../include -DLIBPLOT
-+INCLUDES = -I$(srcdir)/../include $(X_CFLAGS) -DLIBPLOT
+ # Do we build and install a standalone version of the libxmi
+diff -Nurd -x'*~' plotutils-2.6.orig/libplot/Makefile.am
plotutils-2.6/libplot/Makefile.am
+--- plotutils-2.6.orig/libplot/Makefile.am 2009-07-28 22:16:02.000000000
-0400
++++ plotutils-2.6/libplot/Makefile.am 2011-07-10 10:43:38.000000000 -0400
+@@ -6,7 +6,7 @@
- MISRC = mi_alloc.c mi_api.c mi_arc.c mi_canvas.c mi_fllarc.c mi_fllrct.c
mi_fplycon.c mi_gc.c mi_ply.c mi_plycon.c mi_plygen.c mi_plypnt.c
mi_plyutil.c mi_spans.c mi_widelin.c mi_zerarc.c mi_zerolin.c mi_version.c
+ libplot_la_LDFLAGS = -version-info 4:4:2
-diff -Nurd -x'*~' plotutils-2.4.1.orig/libplot/g_write.c
plotutils-2.4.1/libplot/g_write.c
---- plotutils-2.4.1.orig/libplot/g_write.c 2000-05-19 12:10:01.000000000
-0400
-+++ plotutils-2.4.1/libplot/g_write.c 2006-03-28 16:55:12.000000000 -0500
-@@ -40,7 +40,7 @@
+-INCLUDES = $(X_CFLAGS) -I$(srcdir)/../include -DLIBPLOT
++INCLUDES = -I$(srcdir)/../include $(CPPFLAGS) $(X_CFLAGS) -DLIBPLOT
+
+ MISRC = mi_alloc.c mi_api.c mi_arc.c mi_canvas.c mi_fllarc.c mi_fllrct.c \
+ mi_fplycon.c mi_gc.c mi_ply.c mi_plycon.c mi_plygen.c mi_plypnt.c \
+diff -Nurd -x'*~' plotutils-2.6.orig/libplot/z_write.c
plotutils-2.6/libplot/z_write.c
+--- plotutils-2.6.orig/libplot/z_write.c 2008-07-15 20:54:10.000000000
-0400
++++ plotutils-2.6/libplot/z_write.c 2011-07-10 12:03:45.000000000 -0400
+@@ -164,7 +164,7 @@
}
- #ifdef LIBPLOTTER
- else if (data->outstream)
-- data->outstream->write(c, n);
-+ data->outstream->write((const char *)c, n);
- #endif
- }
-diff -Nurd -x'*~' plotutils-2.4.1.orig/libplot/i_rle.c
plotutils-2.4.1/libplot/i_rle.c
---- plotutils-2.4.1.orig/libplot/i_rle.c 1999-06-27 12:58:10.000000000
-0400
-+++ plotutils-2.4.1/libplot/i_rle.c 2006-03-28 16:47:04.000000000 -0500
-@@ -78,7 +78,7 @@
- else if (rle->outstream)
+ /* cleanup after libpng errors (error handler does a longjmp) */
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp ((*png_set_longjmp_fn((png_ptr), (png_longjmp_ptr)longjmp,
sizeof(jmp_buf)))))
{
- rle->outstream->put ((unsigned char)(rle->oblen));
-- rle->outstream->write (&(rle->oblock[0]), rle->oblen);
-+ rle->outstream->write ((const char *)&(rle->oblock[0]), rle->oblen);
+ png_destroy_write_struct (&png_ptr, (png_info **)NULL);
+ return -1;
+@@ -444,7 +444,11 @@
+ #endif
}
- #endif
-diff -Nurd -x'*~' plotutils-2.4.1.orig/libplot/n_write.c
plotutils-2.4.1/libplot/n_write.c
---- plotutils-2.4.1.orig/libplot/n_write.c 2000-06-16 01:42:13.000000000
-0400
-+++ plotutils-2.4.1/libplot/n_write.c 2006-03-28 17:06:20.000000000 -0500
-@@ -208,7 +208,7 @@
- linebuf[pos++] = '0';
- if (pos >= MAX_PBM_PIXELS_PER_LINE || i == (width - 1))
- {
-- stream->write (linebuf, pos);
-+ stream->write ((const char *)linebuf, pos);
- stream->put ('\n');
-
- pos = 0;
-@@ -253,7 +253,7 @@
- rowbuf[bytecount++] = outbyte;
- }
- /* emit row of bytes */
-- stream->write (rowbuf, bytecount);
-+ stream->write ((const char *)rowbuf, bytecount);
- }
-
- free (rowbuf);
-@@ -366,7 +366,7 @@
- num_pixels++;
- if (num_pixels >= MAX_PGM_PIXELS_PER_LINE || i == (width - 1))
- {
-- stream->write (linebuf, pos);
-+ stream->write ((const char *)linebuf, pos);
- stream->put ('\n');
-
- num_pixels = 0;
-@@ -392,7 +392,7 @@
- {
- for (i = 0; i < width; i++)
- rowbuf[i] = pixmap[j][i].u.rgb[0];
-- stream->write (rowbuf, width);
-+ stream->write ((const char *)rowbuf, width);
- }
- free (rowbuf);
- }
-@@ -514,7 +514,7 @@
- num_pixels++;
- if (num_pixels >= MAX_PPM_PIXELS_PER_LINE || i == (width - 1))
- {
-- stream->write (linebuf, pos);
-+ stream->write ((const char *)linebuf, pos);
- stream->put ('\n');
++#if (PNG_LIBPNG_VER < 10500)
+ longjmp (png_ptr->jmpbuf, 1);
++#else
++ png_longjmp (png_ptr, 1);
++#endif
+ }
- num_pixels = 0;
-@@ -542,7 +542,7 @@
- for (i = 0; i < width; i++)
- for (component = 0; component < 3; component++)
- rowbuf[3 * i + component] = pixmap[j][i].u.rgb[component];
-- stream->write (rowbuf, 3 * width);
-+ stream->write ((const char *)rowbuf, 3 * width);
- }
- free (rowbuf);
- }
-diff -Nurd -x'*~' plotutils-2.4.1.orig/libplot/z_write.c
plotutils-2.4.1/libplot/z_write.c
---- plotutils-2.4.1.orig/libplot/z_write.c 2000-06-20 00:34:42.000000000
-0400
-+++ plotutils-2.4.1/libplot/z_write.c 2006-03-28 17:15:48.000000000 -0500
-@@ -484,7 +484,7 @@
- ostream *stream;
+ static void
+@@ -515,7 +519,11 @@
+ #endif
+ }
- stream = (ostream *)png_get_io_ptr (png_ptr);
-- stream->write (data, length);
-+ stream->write ((const char *)data, length);
++#if (PNG_LIBPNG_VER < 10500)
+ longjmp (png_ptr->jmpbuf, 1);
++#else
++ png_longjmp (png_ptr, 1);
++#endif
}
static void
-diff -Nurd -x'*~' plotutils-2.4.1.orig/libplotter/Makefile.in
plotutils-2.4.1/libplotter/Makefile.in
---- plotutils-2.4.1.orig/libplotter/Makefile.in 2000-07-04
03:41:22.000000000 -0400
-+++ plotutils-2.4.1/libplotter/Makefile.in 2007-06-26 02:38:33.000000000
-0400
-@@ -86,7 +86,7 @@
+diff -Nurd -x'*~' plotutils-2.6.orig/libplotter/Makefile.am
plotutils-2.6/libplotter/Makefile.am
+--- plotutils-2.6.orig/libplotter/Makefile.am 2009-07-28 22:16:18.000000000
-0400
++++ plotutils-2.6/libplotter/Makefile.am 2011-07-10 10:48:44.000000000
-0400
+@@ -4,7 +4,7 @@
- libplotter_la_LDFLAGS = -version-info 4:0:2
+ libplotter_la_LDFLAGS = -version-info 4:4:2
-INCLUDES = $(X_CFLAGS) -I$(srcdir)/../include -DLIBPLOT -DLIBPLOTTER
-+INCLUDES = -I$(srcdir)/../include $(X_CFLAGS) -DLIBPLOT -DLIBPLOTTER
-
- MISRC = mi_alloc.cc mi_api.cc mi_arc.cc mi_canvas.cc mi_fllarc.cc
mi_fllrct.cc mi_fplycon.cc mi_gc.cc mi_ply.cc mi_plycon.cc mi_plygen.cc
mi_plypnt.cc mi_plyutil.cc mi_spans.cc mi_widelin.cc mi_zerarc.cc
mi_zerolin.cc mi_version.cc
++INCLUDES = -I$(srcdir)/../include $(CPPFLAGS) $(X_CFLAGS) -DLIBPLOT
-DLIBPLOTTER
+ MISRC = mi_alloc.cc mi_api.cc mi_arc.cc mi_canvas.cc mi_fllarc.cc \
+ mi_fllrct.cc mi_fplycon.cc mi_gc.cc mi_ply.cc mi_plycon.cc mi_plygen.cc
\
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
