Added a patch for plplot-5.9.9, thanks Jan Kohnert, bug #396723

(Portage version: 2.1.10.41/cvs/Linux x86_64)

6 files changed, 791 insertions, 474 deletions

diff --git a/sci-astronomy/scamp/ChangeLog b/sci-astronomy/scamp/ChangeLog
index 9bee49fc258f..c1724fd47729 100644
--- a/sci-astronomy/scamp/ChangeLog
+++ b/sci-astronomy/scamp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-astronomy/scamp
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/ChangeLog,v 1.7 2011/08/04 18:32:22 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/ChangeLog,v 1.8 2012/01/03 02:43:12 bicatali Exp $
+
+*scamp-1.7.0-r1 (03 Jan 2012)
+
+  03 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/scamp-1.4.6-autotools.patch, -files/scamp-1.5.5-autotools.patch,
+  -scamp-1.6.2.ebuild, -scamp-1.7.0.ebuild, +scamp-1.7.0-r1.ebuild,
+  +files/scamp-1.7.0-plplot599.patch:
+  Added a patch for plplot-5.9.9, thanks Jan Kohnert, bug #396723
 
   04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   Switched herd to sci-astronomy
diff --git a/sci-astronomy/scamp/files/scamp-1.4.6-autotools.patch b/sci-astronomy/scamp/files/scamp-1.4.6-autotools.patch
deleted file mode 100644
index 6ab1329aa2d3..000000000000
--- a/sci-astronomy/scamp/files/scamp-1.4.6-autotools.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-diff -Nur scamp-1.4.6.orig/acx_atlas.m4 scamp-1.4.6/acx_atlas.m4
---- scamp-1.4.6.orig/acx_atlas.m4	2009-02-26 16:50:10.382847729 +0000
-+++ scamp-1.4.6/acx_atlas.m4	2009-02-26 16:51:08.414884885 +0000
-@@ -194,6 +194,7 @@
- 	[$ATLAS_LIBPATH -lcblas -latlas -lm])
-     if test x$acx_atlas_ok = xyes; then
-       ATLAS_LIB="$ATLAS_LIBPATH -llapack -lptcblas -lcblas -latlas"
-+      LIBS="$OLIBS"
-       AC_SUBST(ATLAS_LIB)
-       AC_DEFINE(HAVE_ATLAS_MP,1,
- 	[Define if you have the parallel ATLAS libraries.])
-@@ -205,6 +206,7 @@
-     fi
-   else
-     ATLAS_LIB="$ATLAS_LIBPATH -llapack -lcblas -latlas"
-+    LIBS="$OLIBS"
-     AC_SUBST(ATLAS_LIB)
-     $4
-   fi
-diff -Nur scamp-1.4.6.orig/acx_fftw.m4 scamp-1.4.6/acx_fftw.m4
---- scamp-1.4.6.orig/acx_fftw.m4	2009-02-26 16:50:10.382847729 +0000
-+++ scamp-1.4.6/acx_fftw.m4	2009-02-26 16:51:08.414884885 +0000
-@@ -89,7 +89,7 @@
-     if test x$acx_fftw_ok = xyes && test x$3 = xyes; then
-       if test x$4 = xyes; then
-         AC_CHECK_LIB(fftw3f_threads, fftwf_init_threads,
--		[acx_fftw_ok=yes], [acx_fftw_ok=no], [-lfftw3f -lm])
-+		[acx_fftw_ok=yes], [acx_fftw_ok=no], [-lfftw3f -lm -lpthread])
-         if test x$acx_fftw_ok = xyes; then
-           AC_DEFINE(HAVE_FFTWFT,1,
-     [Define if you have the FFTW single precision multithreaded libraries and header files.])
-@@ -99,7 +99,7 @@
-         fi
-       else
-         AC_CHECK_LIB(fftw3_threads, fftw_init_threads,
--		[acx_fftw_ok=yes], [acx_fftw_ok=no], [-lfftw3 -lm])
-+		[acx_fftw_ok=yes], [acx_fftw_ok=no], [-lfftw3 -lm -lpthread])
-         if test x$acx_fftw_ok = xyes; then
-           AC_DEFINE(HAVE_FFTWT,1,
-     [Define if you have the FFTW double precision multithreaded libraries and header files.])
-@@ -115,7 +115,7 @@
- dnl -------------------------
-     if test x$4 = xyes; then
-       AC_CHECK_LIB(fftw3f, fftwf_execute, [acx_fftw_ok=yes],
--		[acx_fftw_ok=no], [-lm])
-+		[acx_fftw_ok=no], [-L$1 -lm])
-       if test x$acx_fftw_ok = xyes; then
-         AC_DEFINE(HAVE_FFTWF,1,
-     [Define if you have the FFTW single precision libraries and header files.])
-@@ -125,7 +125,7 @@
-       fi
-     else
-       AC_CHECK_LIB(fftw3, fftw_execute, [acx_fftw_ok=yes],
--		[acx_fftw_ok=no], [-lm])
-+		[acx_fftw_ok=no], [-L$1 -lm])
-       if test x$acx_fftw_ok = xyes; then
-         AC_DEFINE(HAVE_FFTW,1,
-     [Define if you have the FFTW double precision libraries and header files.])
-@@ -136,8 +136,8 @@
-     fi
-     if test x$acx_fftw_ok = xyes && test x$3 = xyes; then
-       if test x$4 = xyes; then
--        AC_CHECK_LIB(fftw3f_threads, fftwf_init_threads,
--		[acx_fftw_ok=yes], [acx_fftw_ok=no], [-lfftw3f -lm])
-+        AC_CHECK_LIB(fftw3f_threads, fftwf_init_threads, [acx_fftw_ok=yes],
-+		[acx_fftw_ok=no], [-L$1 -lfftw3f -lm -lpthread])
-         if test x$acx_fftw_ok = xyes; then
-           AC_DEFINE(HAVE_FFTWFT,1,
-     [Define if you have the FFTW single precision multithreaded libraries and header files.])
-@@ -146,8 +146,8 @@
-           FFTW_ERROR="FFTW single precision library in $1 was compiled without multithreading support!"
-         fi
-       else
--        AC_CHECK_LIB(fftw3_threads, fftw_init_threads,
--		[acx_fftw_ok=yes], [acx_fftw_ok=no], [-lfftw3 -lm])
-+        AC_CHECK_LIB(fftw3_threads, fftw_init_threads, [acx_fftw_ok=yes],
-+		[acx_fftw_ok=no], [-L$1 -lfftw3 -lm -lpthread])
-         if test x$acx_fftw_ok = xyes; then
-           AC_DEFINE(HAVE_FFTWT,1,
-     [Define if you have the FFTW double precision multithreaded libraries and header files.])
-diff -Nur scamp-1.4.6.orig/acx_plplot.m4 scamp-1.4.6/acx_plplot.m4
---- scamp-1.4.6.orig/acx_plplot.m4	2009-02-26 16:50:10.382847729 +0000
-+++ scamp-1.4.6/acx_plplot.m4	2009-02-26 16:51:08.414884885 +0000
-@@ -1,4 +1,5 @@
--dnl @synopsis ACX_PLPLOT([PLPLOT_DIR,[ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
-+dnl @synopsis ACX_PLPLOT([PLPLOT_LIBDIR, PLPLOT_INCDIR,
-+dnl                      [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
- dnl This macro figures out if the PlPlot library and header files
- dnl are installed.
- dnl You may wish to use these variables in your default LIBS and CFLAGS:
-@@ -16,28 +17,71 @@
- AC_DEFUN([ACX_PLPLOT], [
- AC_REQUIRE([AC_CANONICAL_HOST])
- 
--AC_CHECK_PROG(acx_plplot_ok, plplot-config, [yes], [no])
--plpath=`plplot-config --prefix`
--if test x$acx_plplot_ok = xyes; then
--AC_CHECK_HEADER([${plpath}/include/plplot/plplot.h],[acx_plplot_ok=yes])
-+PLPLOT_LIBS=""
-+OLIBS="$LIBS"
-+LIBS=""
-+
-+acx_plplot_ok=yes
-+acx_plplotpkg_ok=no
-+if test x$2 = x && test x$1 = x; then
-+  AC_MSG_CHECKING([for PLPlot pkg-config info])
-+  if pkg-config --exists plplotd; then
-+    AC_MSG_RESULT([yes])
-+    [PLPLOT_CFLAGS=`pkg-config --cflags plplotd`]
-+    [PLPLOT_LIBS=`pkg-config --libs plplotd`]
-+    AC_DEFINE(PLPLOT_H, "plplot.h", [PLPlot header filename.])
-+    AC_DEFINE(PLPLOTP_H, "plplotP.h", [PLPlot private header filename.])
-+    acx_plplotpkg_ok=yes
-+  else
-+    AC_MSG_RESULT([no])
- fi
--if test x$acx_plplot_ok = xyes; then
--    [PLPLOT_CFLAGS=`plplot-config --cflags`]
--    [PLPLOT_DIR="${plpath}"]
--    [PLPLOT_LIBPATH="-L${plpath}/lib"]
-+fi
-+if test x$acx_plplotpkg_ok = xno; then
-+  if test x$2 = x; then
-+    AC_CHECK_HEADER(plplot.h, [acx_plplothead_ok=yes], [acx_plplothead_ok=no])
-+    if test x$acx_plplothead_ok = xyes; then
-+      AC_DEFINE(PLPLOT_H, "plplot.h", [PLPlot header filename.])
-+      AC_DEFINE(PLPLOTP_H, "plplotP.h", [PLPlot private header filename.])
-+    else
-+      AC_CHECK_HEADER(plplot/plplot.h,
-+		[acx_plplothead_ok=yes], [acx_plplothead_ok=no])
-+      if test x$acx_plplothead_ok = xyes; then
-+        AC_DEFINE(PLPLOT_H, "plplot/plplot.h", [PLPlot header filename.])
-+        AC_DEFINE(PLPLOTP_H, "plplot/plplotP.h",
-+		[PLPlot private header filename.])
-+      else
-+        acx_plplot_ok=no
-+      fi
-+    fi
-+  else
-+    AC_CHECK_HEADER($2/plplot.h,
-+		[acx_plplothead_ok=yes], [acx_plplothead_ok=no])
-+    if test x$acx_plplothead_ok = xyes; then
-+      AC_DEFINE(PLPLOT_H, "plplot.h", [PLPlot header filename.])
-+      AC_DEFINE(PLPLOTP_H, "plplotP.h", [PLPlot private header filename.])
-+     [PLPLOT_CFLAGS="-I$2"]
-+    else
-+      acx_plplot_ok=no
-+    fi
-+  fi
-+  if test x$1 = x; then
-+    AC_CHECK_LIB(plplotd, c_plinit,, [acx_plplot_ok=no])
-     [PLPLOT_LIBS="-lplplotd"]
-+  else
-+    AC_CHECK_LIB(plplotd, c_plinit,, [acx_plplot_ok=no], [-L$1])
-+    [PLPLOT_LIBS="-L$1 -lplplotd"]
-+  fi
- fi
- 
--AC_SUBST(PLPLOT_LIBS)
-+LIBS="$OLIBS"
-+if test x$acx_plplot_ok = xyes; then
- AC_SUBST(PLPLOT_CFLAGS)
--
--# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
--if test x"$acx_plplot_ok" = xyes; then
-+  AC_SUBST(PLPLOT_LIBS)
-         AC_DEFINE(HAVE_PLPLOT,1,
-         [Define if you have the PLPlot libraries and header files.])
--        $2
--else
-         $3
-+else
-+  $4
- fi
- 
- ])dnl ACX_PLPLOT
-diff -Nur scamp-1.4.6.orig/configure.ac scamp-1.4.6/configure.ac
---- scamp-1.4.6.orig/configure.ac	2009-02-26 16:50:10.382847729 +0000
-+++ scamp-1.4.6/configure.ac	2009-02-26 16:51:08.310883768 +0000
-@@ -53,15 +53,13 @@
- # GCC is chosen last because it is likely to yield less optimized code
- AC_LANG(C)
- AC_PROG_CC([$cclist])
--# C Compiler: Check that it is ANSI C
-+# C Compiler: Check that it is ANSI C and POSIX-compliant
- AM_PROG_CC_STDC
--AC_DISABLE_STATIC
--AC_PROG_LIBTOOL
--
--# C Compiler: Check that it is POSIX-compliant
- AC_ISC_POSIX
- ACX_PROG_CC_OPTIM
-+AC_DISABLE_STATIC
- #AC_DISABLE_SHARED
-+AC_PROG_LIBTOOL
- AC_PROG_INSTALL
- 
- # Checks for libraries.
-@@ -89,21 +87,11 @@
- AC_CHECK_FUNC([isnan], AC_DEFINE_UNQUOTED([HAVE_ISNAN2], 1,
- 		[Second isnan check]))
- 
--datadir2=$(URBI_RESOLVE_DIR([$datadir]))
-+# Check support for large files
-+AC_SYS_LARGEFILE
-+AC_FUNC_FSEEKO
- 
--# Provide a special option for PlPLOT
--AC_ARG_WITH(plplot,
--    [AC_HELP_STRING([--with-plplot@<:@=<PLPlot dir>@:>@],
--    [Provide an alternative path to the PLPlot library])],
--    use_plplot="yes"
--    if "$withval" == "no"; then
--      use_plplot="no"
--    fi
--    if test "$withval" != "yes"; then
--      plplot_dir=$withval
--    fi,
--    use_plplot="yes"
--    )
-+datadir2=$(URBI_RESOLVE_DIR([$datadir]))
- 
- # Provide special option for debugging
- AC_MSG_CHECKING([for debugger mode])
-@@ -115,6 +103,27 @@
-         use_debug="no"
- 	AC_MSG_RESULT([no]))
- 
-+# Provide special options for PLPLOT
-+AC_ARG_WITH(plplot,
-+    [AC_HELP_STRING([--with-plplot@<:@=<PLPlot library dir>@:>@],
-+    [Activate PLPlot library (default = yes)])],
-+    if test "$withval" = "no"; then
-+      use_plplot="no"
-+    else
-+      use_plplot="yes"
-+      if test "$withval" != "yes"; then
-+        plplot_dir=$withval
-+      fi
-+    fi,
-+    use_plplot="yes"
-+    )
-+AC_ARG_WITH(plplot-incdir,
-+        [AC_HELP_STRING([--with-plplot-incdir=<PLPlot include dir>],
-+        [Provide an alternative path to the PLPlot include directory])],
-+    plplot_incdir=$withval,
-+    plplot_incdir=""
-+    )
-+
- # Provide special options for ATLAS
- AC_ARG_WITH(atlas,
-         [AC_HELP_STRING([--with-atlas=<ATLAS library path>],
-@@ -162,17 +171,19 @@
- AC_DEFINE_UNQUOTED([XSL_URL], "$xsl_url",[Default URL of the XSLT filter])
- 
- # Set flags for multithreading
-+n_pthreads=16
- AC_ARG_ENABLE(threads,
- 	[AC_HELP_STRING([--enable-threads@<:@=<max_number_of_threads>@:>@],
--		[Enable multhreading (off by default)])],
--    if test "$enableval" = "yes"; then
--      n_pthreads=16
-+	[Enable multhreading (on with up to $n_pthreads threads by default)])],
-+    if test "$enableval" = "no"; then
-+      use_pthreads="no"
-     else
-+      use_pthreads="yes"
-+      if test "$enableval" != "yes"; then
-       n_pthreads=$enableval
-     fi
--    use_pthreads=yes,
--    n_pthreads=1
--    use_pthreads=no
-+    fi,
-+    use_pthreads=yes
-     )
- 
- # Provide special option for profiling
-@@ -239,34 +250,35 @@
- fi
- 
- ################# handle the PLPlot library (graphic plots) ##################
-+AC_MSG_CHECKING([for PLPlot configure option])
- if test "$use_plplot" = "yes"; then
--  ACX_PLPLOT(,,[use_plplot=no])
--  if test "$use_plplot" = "no"; then
--    AC_MSG_WARN(PLPlot library not found! Plotting deactivated.)
--  fi
--fi
--
-+  AC_MSG_RESULT([yes])
-+  ACX_PLPLOT($plplot_dir,$plplot_incdir,,[use_plplot=no])
- if test "$use_plplot" = "yes"; then
--  AC_SUBST(PLPLOT_CFLAGS)
-   [CFLAGS="$CFLAGS $PLPLOT_CFLAGS"]
--  [LIBS="$PLPLOT_LIBS $PTHREAD_LIBS $LIBS"]
-+    [LIBS="$PLPLOT_LIBS $LIBS"]
-+  else
-+    AC_MSG_WARN(PLPlot library not found/incomplete! Plotting deactivated.)
-   fi
--AM_CONDITIONAL(USE_PLPLOT, test $use_plplot = "yes")
--
--# Special optimization options for the INTEL C compiler
--if test $use_icc = "yes" && test $CC = "icc"; then
--  CFLAGS="$CFLAGS -O3 -axPW -ip -unroll"
--  LDFLAGS="$LDFLAGS -static-intel"
-+else
-+  AC_MSG_RESULT([no])
-+  AC_MSG_WARN(Plotting deactivated.)
- fi
-+AM_CONDITIONAL(USE_PLPLOT, test $use_plplot = "yes")
- 
- # Debugging
- if test "$use_debug" = "yes"; then
-   CFLAGS="-g $CFLAGS"
- fi
- 
--# Profiling
--if test "$use_prof" = "yes"; then
--  CFLAGS="-pg -O3 -Wall $CFLAGS"
-+# Link with gprof option
-+if test "$use_gprof" = "yes"; then
-+  if test "$use_icc" = "yes"; then
-+    CFLAGS="$CFLAGS -pq"
-+  else
-+    CFLAGS="$CFLAGS -pg"
-+  fi
-+  use_static="no"
- fi
- 
- # Static linking option
---- scamp-1.4.6.orig/src/Makefile.am	2008-01-14 21:28:32.000000000 +0000
-+++ scamp-1.4.6/src/Makefile.am	2009-03-05 23:24:44.000000000 +0000
-@@ -15,6 +15,8 @@
- 		  define.h fft.h fgroup.h field.h fitswcs.h globals.h header.h \
- 		  key.h match.h misc.h mosaic.h photsolve.h preflist.h prefs.h \
- 		  proper.h samples.h threads.h types.h wcscelsys.h xml.h
-+scamp_CPPFLAGS  = @PLPLOT_CFLAGS@
- scamp_LDADD	= $(top_builddir)/src/fits/libfits.a \
--		  $(top_builddir)/src/wcs/libwcs_c.a
-+		  $(top_builddir)/src/wcs/libwcs_c.a \
-+		  @PLPLOT_LIBS@
- DATE=`date +"%Y-%m-%d"`
diff --git a/sci-astronomy/scamp/files/scamp-1.5.5-autotools.patch b/sci-astronomy/scamp/files/scamp-1.5.5-autotools.patch
deleted file mode 100644
index f58dca7b50f9..000000000000
--- a/sci-astronomy/scamp/files/scamp-1.5.5-autotools.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- configure.ac.orig	2009-04-10 20:22:36.000000000 +0100
-+++ configure.ac	2009-07-28 17:50:01.000000000 +0100
-@@ -24,39 +24,19 @@
- sinclude(acx_cdsclient.m4)
- sinclude(acx_fftw.m4)
- sinclude(acx_plplot.m4)
--sinclude(acx_prog_cc_optim.m4)
- sinclude(acx_pthread.m4)
- sinclude(acx_urbi_resolve_dir.m4)
- 
- # Display pakage and version number
- AC_MSG_RESULT([******** Configuring:  $PACKAGE_NAME $VERSION ($date) ********])
- 
--# Initialize the list of compilers to consider
--cclist="cc gcc"
--# Backup and reset the input CFLAGS
--mycflags="$CFLAGS"
--CFLAGS=""
--
--# Provide special option for the Linux Intel C compiler
--AC_MSG_CHECKING([for Linux Intel C compiler mode])
--AC_ARG_ENABLE(icc,
--	[AC_HELP_STRING([--enable-icc],
--	[Enable special mode for compilation with the Intel compiler \
--(off by default)])],
--        use_icc="yes"
--        cclist="icc $cclist"
--	AC_MSG_RESULT([yes]),
--        use_icc="no"
--	AC_MSG_RESULT([no]))
--
- # Checks for programs.
- # GCC is chosen last because it is likely to yield less optimized code
- AC_LANG(C)
--AC_PROG_CC([$cclist])
-+AC_PROG_CC
- # C Compiler: Check that it is ANSI C and POSIX-compliant
- AM_PROG_CC_STDC
- AC_ISC_POSIX
--ACX_PROG_CC_OPTIM
- AC_DISABLE_STATIC
- #AC_DISABLE_SHARED
- AC_PROG_LIBTOOL
-@@ -273,11 +253,6 @@
- 
- # Link with gprof option
- if test "$use_gprof" = "yes"; then
--  if test "$use_icc" = "yes"; then
--    CFLAGS="$CFLAGS -pq"
--  else
--    CFLAGS="$CFLAGS -pg"
--  fi
-   use_static="no"
- fi
- 
---- src/Makefile.am.orig	2009-04-09 10:00:38.000000000 +0100
-+++ src/Makefile.am	2009-07-28 17:54:16.000000000 +0100
-@@ -15,6 +15,8 @@
- 		  define.h fft.h fgroup.h field.h fitswcs.h globals.h header.h \
- 		  key.h match.h misc.h mosaic.h photsolve.h preflist.h prefs.h \
- 		  proper.h samples.h threads.h types.h wcscelsys.h xml.h
-+scamp_CPPFLAGS  = @PLPLOT_CFLAGS@
- scamp_LDADD	= $(top_builddir)/src/fits/libfits.a \
--		  $(top_builddir)/src/wcs/libwcs_c.a
-+		  $(top_builddir)/src/wcs/libwcs_c.a \
-+		  @PLPLOT_LIBS@
- DATE=`date +"%Y-%m-%d"`
diff --git a/sci-astronomy/scamp/files/scamp-1.7.0-plplot599.patch b/sci-astronomy/scamp/files/scamp-1.7.0-plplot599.patch
new file mode 100644
index 000000000000..687b1140693d
--- /dev/null
+++ b/sci-astronomy/scamp/files/scamp-1.7.0-plplot599.patch
@@ -0,0 +1,769 @@
+diff -U 3 -H -d -r -N -x '*.kdev4' -- scamp-1.7.0/src/astrcplot.c scamp-1.7.0-r2/src/astrcplot.c
+--- scamp-1.7.0/src/astrcplot.c	2009-09-10 15:10:02.000000000 +0200
++++ scamp-1.7.0-r2/src/astrcplot.c	2012-01-01 20:23:46.809506421 +0100
+@@ -87,7 +87,7 @@
+   plfont(2);
+   plschr(0.0, 0.3);
+   plwid(0);
+-  plcol(7);
++  plcol0(7);
+   mark[0] = 500;
+   space[0] = 500;
+   for (wcspos[0] = -180.0; wcspos[0]<=180.0; wcspos[0]+=14.999)
+@@ -138,7 +138,7 @@
+     {
+     field = fgroups[g]->field;
+     nfield = fgroups[g]->nfield;
+-    plcol(15);
++    plcol0(15);
+     for (f=0; f<nfield; f++)
+       {
+       set = field[f]->set;
+@@ -172,7 +172,7 @@
+       x[i] = rawpos2[0];
+       y[i] = rawpos2[1];
+       }
+-    plcol(3);
++    plcol0(3);
+     plline(37, x,y);
+     }
+ 
+@@ -814,7 +814,7 @@
+     psize = 1.0;
+ 
+   plfont(2);
+-  plcol(15);
++  plcol0(15);
+   plschr(0.0, 0.67);
+   lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
+   plwid(lwid);
+@@ -851,9 +851,9 @@
+     }
+   plssym(0.0, psize);
+   plwid(lsize);
+-  plcol(3);
++  plcol0(3);
+   plpoin((PLINT)npoint, x,y, 11);
+-  plcol(1);
++  plcol0(1);
+   plpoin((PLINT)(nsamp-npoint), x2,y2, 0);
+   free(x);
+   free(y);
+@@ -888,12 +888,12 @@
+             *(yt++) = (PLFLT)samp->projpos[lat];
+             }
+         plwid(lsize);
+-        plcol(8);
++        plcol0(8);
+         if (lsize)
+           plpoin((PLINT)(xt-x), x,y, 17);
+         else
+           plpoin((PLINT)(xt-x), x,y, 1);
+-        plcol(4);
++        plcol0(4);
+         plpoin((PLINT)(x+nsamp-x2t), x2t,y2t, 2);
+         free(x);
+         free(y);
+@@ -901,7 +901,7 @@
+       plwid(2*lwid);
+       if (field->cplot_colour==15)
+         {
+-        plcol(15);
++        plcol0(15);
+         cplot_drawbounds(set->wcs, wcs);
+         }
+       }
+@@ -914,7 +914,7 @@
+     if (field->cplot_colour!=15)
+       {
+       plwid(3*lwid);
+-      plcol(field->cplot_colour);
++      plcol0(field->cplot_colour);
+       for (s=0; s<field->nset; s++)
+         {
+         set = field->set[s];
+@@ -923,7 +923,7 @@
+       }
+     }
+ 
+-  plcol(7);
++  plcol0(7);
+   plwid(lwid);
+   cplot_drawcoordgrid(wcs, xmin, xmax, ymin, ymax);
+   plflush();
+@@ -1025,16 +1025,16 @@
+   lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
+   plwid(lwid);
+   plfont(2);
+-  plcol(15);
++  plcol0(15);
+   plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
+   sprintf(str, "#uInstrument A%d: distortion map", field->astromlabel+1);
+   pllab("","", str);
+   plwid(0);
+-  plcol(7);
++  plcol0(7);
+   cplot_drawloccoordgrid(wcs, xmin, xmax, ymin, ymax);
+ 
+   pllsty(1);
+-  plcol(15);
++  plcol0(15);
+   plscmap1n(256);
+ 
+   scalemin = BIG;
+@@ -1104,7 +1104,7 @@
+ 
+     wcsptr[0] = set->wcs;
+     wcsptr[1] = wcs;
+-    plshades(scale, CPLOT_NDISTGRID, CPLOT_NDISTGRID, NULL,
++    plshades((const PLFLT **)scale, CPLOT_NDISTGRID, CPLOT_NDISTGRID, NULL,
+ 	     xstep/2.0+0.5, set->wcs->naxisn[lng]-xstep/2.0+0.5,
+              ystep/2.0+0.5, set->wcs->naxisn[lat]-ystep/2.0+0.5,
+ 	     clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, distort_map, wcsptr);
+@@ -1112,7 +1112,7 @@
+     plwid(0);
+     cplot_drawfgrids(set->wcs, wcs);
+ */
+-    plcol(7);
++    plcol0(7);
+     plwid(lwid);
+     cplot_drawbounds(set->wcs, wcs);
+     }
+@@ -1126,10 +1126,10 @@
+ 
+   plvpor(0.91,0.935,0.115,0.885);
+   plwind(0.0,1.0,scalemin*DEG/ARCSEC,scalemax*DEG/ARCSEC);
+-  plshades(scale, 2, CPLOT_NSHADES, NULL, 0.0, 1.0,
++  plshades((const PLFLT **)scale, 2, CPLOT_NSHADES, NULL, 0.0, 1.0,
+ 	   scalemin*DEG/ARCSEC,scalemax*DEG/ARCSEC, clevel,
+ 	   CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
+-  plcol(15);
++  plcol0(15);
+   plschr(0.0, 0.5);
+   plbox("bc", 0.0, 0, "bnstv", 0.0, 0);
+   sprintf(str, "%s", mscale < 0.09*ARCSEC/DEG?
+@@ -1304,19 +1304,19 @@
+   lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
+   plwid(lwid);
+   plfont(2);
+-  plcol(15);
++  plcol0(15);
+   plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
+   sprintf(str, "#uInstrument A%d: map of astrometric systematics (internal)", 
+ 	field0->astromlabel+1);
+   pllab("","", str);
+   plwid(0);
+-  plcol(7);
++  plcol0(7);
+   cplot_drawloccoordgrid(wcs0, xmin, xmax, ymin, ymax);
+   y[0] = y[1] = 3.0;
+   x[0] = 7.0;
+   x[1] = x[0] + scalel;
+   pllsty(1);
+-  plcol(15);
++  plcol0(15);
+   plwid(lwid*3);
+   plline(2,x,y);
+   plwid(lwid);
+@@ -1333,7 +1333,7 @@
+   for (s=0; s<nset; s++)
+     {
+     set0 = field0->set[s];
+-    plcol(7);
++    plcol0(7);
+     cplot_drawbounds(set0->wcs, wcs0);
+     lng = set0->lng;
+     lat = set0->lat;
+@@ -1455,9 +1455,9 @@
+           y[0] = vecpos[lat];
+           y[1] = vecpos2[lat] + minscale*(vecpos2[lat] - vecpos[lat]);
+           plwid(lwid*2);
+-          plcol(3);
++          plcol0(3);
+           plline(2, x,y);
+-          plcol(15);
++          plcol0(15);
+           plpoin(1,x,y,1);
+           plwid(lwid);
+           }
+@@ -1618,20 +1618,20 @@
+   lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
+   plwid(lwid);
+   plfont(2);
+-  plcol(15);
++  plcol0(15);
+   plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
+   plschr(0.0, 0.8);
+   sprintf(str, "#uInstrument A%d: map of astrometric systematics (reference)",
+ 	field0->astromlabel+1);
+   pllab("","", str);
+   plwid(0);
+-  plcol(7);
++  plcol0(7);
+   cplot_drawloccoordgrid(wcs0, xmin, xmax, ymin, ymax);
+   y[0] = y[1] = 3.0;
+   x[0] = 7.0;
+   x[1] = x[0] + scalel;
+   pllsty(1);
+-  plcol(15);
++  plcol0(15);
+   plwid(lwid*3);
+   plline(2,x,y);
+   plwid(lwid);
+@@ -1648,7 +1648,7 @@
+   for (s=0; s<nset; s++)
+     {
+     set0 = field0->set[s];
+-    plcol(7);
++    plcol0(7);
+     cplot_drawbounds(set0->wcs, wcs0);
+     lng = set0->lng;
+     lat = set0->lat;
+@@ -1759,9 +1759,9 @@
+           y[0] = vecpos[lat];
+           y[1] = vecpos2[lat] + minscale*(vecpos2[lat] - vecpos[lat]);
+           plwid(lwid*2);
+-          plcol(1);
++          plcol0(1);
+           plline(2, x,y);
+-          plcol(15);
++          plcol0(15);
+           plpoin(1,x,y,1);
+           plwid(lwid);
+           }
+@@ -1833,7 +1833,7 @@
+ 
+ /*-- Now plot! */
+ /* Internal chi2/d.o.f. first */
+-  plcol(15);
++  plcol0(15);
+   plschr(0.0,0.5);
+   lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
+   plwid(lwid);
+@@ -1971,7 +1971,7 @@
+ 
+ /*-- Now plot! */
+ /* Internal chi2/d.o.f. first */
+-  plcol(15);
++  plcol0(15);
+   plschr(0.0,0.5);
+   lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
+   plwid(lwid);
+@@ -2217,13 +2217,13 @@
+         r[0] = 0.96; g[0] = 1.0; b[0] = 0.96;
+         r[1] = 0.2; g[1] = 0.3; b[1] = 0.2;
+         plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-        plshades(histo[d3], CPLOT_ADERR1DNX, CPLOT_ADERR1DNY, NULL,
+-		fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim,
+-		clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
++        plshades((const PLFLT **)histo[d3], CPLOT_ADERR1DNX, CPLOT_ADERR1DNY,
++		NULL, fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim,
++		maxlim, clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
+         }
+       else
+         {
+-        plcol(1);
++        plcol0(1);
+         plptex((fgroup->projposmin[d2] - margin + fgroup->projposmax[d2])/2.0,
+ 		maxlim/2.0, 1.0, 0.0, 0.5, "No overlapping detections!");
+         }
+@@ -2232,23 +2232,24 @@
+         r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
+         r[1] = 0.7; g[1] = 0.7; b[1] = 0.7;
+         plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-        plimage(histo_hsn[d3], CPLOT_ADERR1DNX_HSN, CPLOT_ADERR1DNY_HSN,
+-		fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim,
+-		0.5, zmax_hsn[d3],
+-		fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim);
++        plimage((const PLFLT **)histo_hsn[d3], CPLOT_ADERR1DNX_HSN,
++		CPLOT_ADERR1DNY_HSN, fgroup->projposmin[d2],
++		fgroup->projposmax[d2], -maxlim, maxlim, 
++		0.5, zmax_hsn[d3], fgroup->projposmin[d2], 
++		fgroup->projposmax[d2], -maxlim, maxlim);
+         }
+       sprintf(xlabel, "AXIS%d [pixels]", d2+1);
+       sprintf(ylabel, "#gDAXIS%d [\"]", d+1);
+       plscolbg(255,255,255);	/* Force the background colour to white */
+       plscol0(15, 0,0,0);	/* Force the foreground colour to black */
+ /* 1D histograms */
+-      plcol(3);
++      plcol0(3);
+       plwid(2*lwid);
+       plline(CPLOT_NADERRHISTBIN, cuty[d3], cutbin);
+-      plcol(7);
++      plcol0(7);
+       plline(CPLOT_NADERRHISTBIN, cuty_hsn[d3], cutbin);
+       plwid(lwid);
+-      plcol(15);
++      plcol0(15);
+       plwid(lwid);
+       xl[0] = fgroup->projposmin[d2] - margin;
+       xl[1] = fgroup->projposmax[d2];
+@@ -2459,13 +2460,13 @@
+     r[0] = 0.96; g[0] = 1.0; b[0] = 0.96;
+     r[1] = 0.2; g[1] = 0.3; b[1] = 0.2;
+     plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-    plshades(histo, CPLOT_ADERR2DN, CPLOT_ADERR2DN, NULL,
++    plshades((const PLFLT **)histo, CPLOT_ADERR2DN, CPLOT_ADERR2DN, NULL,
+ 	-maxlim,maxlim, -maxlim,maxlim,
+ 	clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
+     }
+   else
+     {
+-    plcol(1);
++    plcol0(1);
+     plptex(0.0, maxlim/2.0, 1.0, 0.0, 0.5, "No overlapping detections!");
+     }
+ 
+@@ -2474,7 +2475,7 @@
+     r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
+     r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
+     plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-    plimage(histo_hsn, CPLOT_ADERR2DN_HSN, CPLOT_ADERR2DN_HSN,
++    plimage((const PLFLT **)histo_hsn, CPLOT_ADERR2DN_HSN, CPLOT_ADERR2DN_HSN,
+ 	-maxlim,maxlim, -maxlim, maxlim,
+ 	0.5, zmax_hsn,
+ 	-maxlim, maxlim, -maxlim, maxlim);
+@@ -2484,7 +2485,7 @@
+   plscol0(15, 0,0,0);		/* Force the foreground colour to black */
+   plschr(0.0,0.5);
+ /* Pixel footprint */
+-  plcol(15);
++  plcol0(15);
+   pllsty(3);
+   xl[0] = xl[1] = xl[4] = pixscale[0]/2.0;
+   yl[0] = yl[3] = yl[4] = pixscale[1]/2.0;
+@@ -2493,15 +2494,15 @@
+   plline(5, xl, yl);
+   pllsty(1);
+ /* 1D histograms */
+-  plcol(3);
++  plcol0(3);
+   plwid(2*lwid);
+   plline(CPLOT_NADERRHISTBIN, cutbin, cutx);
+   plline(CPLOT_NADERRHISTBIN, cuty, cutbin);
+-  plcol(7);
++  plcol0(7);
+   plline(CPLOT_NADERRHISTBIN, cutbin, cutx_hsn);
+   plline(CPLOT_NADERRHISTBIN, cuty_hsn, cutbin);
+   plwid(lwid);
+-  plcol(15);
++  plcol0(15);
+   plbox("bcnst", 0.0, 0.0, "bcnst", 0.0, 0.0);
+   sprintf(str, "Group ##%d: 2D internal astrometric errors", fgroup->no);
+   pllab( "#gDAXIS1 [\"]", "#gDAXIS2 [\"]", str);
+@@ -2725,13 +2726,13 @@
+         r[0] = 1.0; g[0] = 0.98; b[0] = 0.98;
+         r[1] = 0.6; g[1] = 0.1; b[1] = 0.1;
+         plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-        plshades(histo[d3], CPLOT_ADERR1DNX, CPLOT_ADERR1DNY, NULL,
+-		fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim,
+-		clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
++        plshades((const PLFLT **)histo[d3], CPLOT_ADERR1DNX, CPLOT_ADERR1DNY,
++		NULL, fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim,
++		maxlim,	clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
+         }
+       else
+         {
+-        plcol(1);
++        plcol0(1);
+         plptex((fgroup->projposmin[d2] - margin + fgroup->projposmax[d2])/2.0,
+ 		maxlim/2.0, 1.0, 0.0, 0.5, "No match with a reference!");
+         }
+@@ -2740,23 +2741,24 @@
+         r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
+         r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
+         plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-        plimage(histo_hsn[d3], CPLOT_ADERR1DNX_HSN, CPLOT_ADERR1DNY_HSN,
+-		fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim,
+-		0.5, zmax_hsn[d3],
+-		fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim);
++        plimage((const PLFLT **)histo_hsn[d3], CPLOT_ADERR1DNX_HSN, 
++		CPLOT_ADERR1DNY_HSN, fgroup->projposmin[d2], 
++		fgroup->projposmax[d2], -maxlim, maxlim, 
++		0.5, zmax_hsn[d3], fgroup->projposmin[d2], 
++		fgroup->projposmax[d2], -maxlim, maxlim);
+         }
+       plscolbg(255,255,255);	/* Force the background colour to white */
+       plscol0(15, 0,0,0);	/* Force the foreground colour to black */
+       sprintf(xlabel, "AXIS%d [pixels]", d2+1);
+       sprintf(ylabel, "#gDAXIS%d [\"]", d+1);
+ /*---- 1D histograms */
+-      plcol(1);
++      plcol0(1);
+       plwid(2*lwid);
+       plline(CPLOT_NREFERRHISTBIN, cuty[d3], cutbin);
+-      plcol(7);
++      plcol0(7);
+       plline(CPLOT_NREFERRHISTBIN, cuty_hsn[d3], cutbin);
+       plwid(lwid);
+-      plcol(15);
++      plcol0(15);
+       plwid(lwid);
+       xl[0] = fgroup->projposmin[d2] - margin;
+       xl[1] = fgroup->projposmax[d2];
+@@ -2964,13 +2966,13 @@
+     r[0] = 1.0; g[0] = 0.98; b[0] = 0.98;
+     r[1] = 0.6; g[1] = 0.1; b[1] = 0.1;
+     plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-    plshades(histo, CPLOT_REFERR2DN, CPLOT_REFERR2DN, NULL,
++    plshades((const PLFLT **)histo, CPLOT_REFERR2DN, CPLOT_REFERR2DN, NULL,
+ 	-maxlim,maxlim, -maxlim,maxlim,
+ 	clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
+     }
+   else
+     {
+-    plcol(1);
++    plcol0(1);
+     plptex(0.0, maxlim/2.0, 1.0, 0.0, 0.5, "No match with a reference!");
+     }
+   if (zmax_hsn>=1.0)
+@@ -2978,16 +2980,15 @@
+     r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
+     r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
+     plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-    plimage(histo_hsn, CPLOT_REFERR2DN_HSN, CPLOT_REFERR2DN_HSN,
+-	-maxlim,maxlim, -maxlim, maxlim,
+-	0.5, zmax_hsn,
+-	-maxlim, maxlim, -maxlim, maxlim);
++    plimage((const PLFLT **)histo_hsn, CPLOT_REFERR2DN_HSN, 
++	CPLOT_REFERR2DN_HSN, -maxlim,maxlim, -maxlim, maxlim,
++	0.5, zmax_hsn, -maxlim, maxlim, -maxlim, maxlim);
+     }
+   plscolbg(255,255,255);	/* Force the background colour to white */
+   plscol0(15, 0,0,0);		/* Force the foreground colour to black */
+   plschr(0.0,0.5);
+ /* Pixel footprint */
+-  plcol(15);
++  plcol0(15);
+   pllsty(3);
+   xl[0] = xl[1] = xl[4] = pixscale[0]/2.0;
+   yl[0] = yl[3] = yl[4] = pixscale[1]/2.0;
+@@ -2996,15 +2997,15 @@
+   plline(5, xl, yl);
+   pllsty(1);
+ /* 1D histograms */
+-  plcol(1);
++  plcol0(1);
+   plwid(2*lwid);
+   plline(CPLOT_NREFERRHISTBIN, cutbin, cutx);
+   plline(CPLOT_NREFERRHISTBIN, cuty, cutbin);
+-  plcol(7);
++  plcol0(7);
+   plline(CPLOT_NREFERRHISTBIN, cutbin, cutx_hsn);
+   plline(CPLOT_NREFERRHISTBIN, cuty_hsn, cutbin);
+   plwid(lwid);
+-  plcol(15);
++  plcol0(15);
+   plbox("bcnst", 0.0, 0.0, "bcnst", 0.0, 0.0);
+   sprintf(str, "Group ##%d: 2D reference astrometric errors", fgroup->no);
+   pllab( "#gDAXIS1 [\"]", "#gDAXIS2 [\"]", str);
+@@ -3317,7 +3318,7 @@
+         }
+       else
+         {
+-        plcol(1);
++        plcol0(1);
+         plptex(-margin/2.0, maxlim/2.0, 1.0, 0.0, 0.5,
+ 		"No overlapping detections!");
+         }
+@@ -3326,36 +3327,35 @@
+         r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
+         r[1] = 0.7; g[1] = 0.7; b[1] = 0.7;
+         plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-        plimage(histo_hsn[d3], CPLOT_PIXERR1DNX_HSN, CPLOT_PIXERR1DNY_HSN,
+-		0.5, maxwidth, -maxlim, maxlim,
+-		0.5, zmax_hsn[d3],
+-		0.5, maxwidth, -maxlim, maxlim);
++        plimage((const PLFLT **)histo_hsn[d3], CPLOT_PIXERR1DNX_HSN, 
++		CPLOT_PIXERR1DNY_HSN, 0.5, maxwidth, -maxlim, maxlim,
++		0.5, zmax_hsn[d3], 0.5, maxwidth, -maxlim, maxlim);
+         }
+       sprintf(xlabel, "AXIS%d [pixels]", d2+1);
+       sprintf(ylabel, "#gDAXIS%d [pixels]", d+1);
+       plscolbg(255,255,255);	/* Force the background colour to white */
+       plscol0(15, 0,0,0);	/* Force the foreground colour to black */
+ /* 1D histograms */
+-      plcol(3);
++      plcol0(3);
+       plwid(2*lwid);
+       plline(CPLOT_NPIXERRHISTBIN, cuty[d3], cutbin);
+-      plcol(7);
++      plcol0(7);
+       plline(CPLOT_NPIXERRHISTBIN, cuty_hsn[d3], cutbin);
+       if (zmax[d3]>=1.0)
+         {
+-        plcol(15);
++        plcol0(15);
+         for (i=0; i<CPLOT_PIXERR1DNX+1; i++)
+           if (weight[d3][i]>0.0)
+             line[d3][i] /= weight[d3][i];
+         plwid(6*lwid);
+-        plcol(15);
++        plcol0(15);
+         plline(CPLOT_PIXERR1DNX+1, cutx, line[d3]);
+         plwid(3*lwid);
+-        plcol(3);
++        plcol0(3);
+         plline(CPLOT_PIXERR1DNX+1, cutx, line[d3]);
+         }
+       plwid(lwid);
+-      plcol(15);
++      plcol0(15);
+       plwid(lwid);
+       xl[0] = 0.5 - margin;
+       xl[1] = maxwidth;
+@@ -3659,7 +3659,7 @@
+         }
+       else
+         {
+-        plcol(1);
++        plcol0(1);
+         plptex(-margin/2.0, maxlim/2.0, 1.0, 0.0, 0.5,
+ 		"No overlapping detections!");
+         }
+@@ -3668,7 +3668,7 @@
+         r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
+         r[1] = 0.7; g[1] = 0.7; b[1] = 0.7;
+         plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-        plimage(histo_hsn[d3], CPLOT_SUBPIXERR1DNX_HSN,
++        plimage((const PLFLT **)histo_hsn[d3], CPLOT_SUBPIXERR1DNX_HSN,
+ 		CPLOT_SUBPIXERR1DNY_HSN,
+ 		-0.5, 0.5, -maxlim, maxlim,
+ 		0.5, zmax_hsn[d3],
+@@ -3679,27 +3679,27 @@
+       plscolbg(255,255,255);	/* Force the background colour to white */
+       plscol0(15, 0,0,0);	/* Force the foreground colour to black */
+ /* 1D histograms */
+-      plcol(3);
++      plcol0(3);
+       plwid(2*lwid);
+       plline(CPLOT_NSUBPIXERRHISTBIN, cuty[d3], cutbin);
+-      plcol(7);
++      plcol0(7);
+       plline(CPLOT_NSUBPIXERRHISTBIN, cuty_hsn[d3], cutbin);
+       if (zmax[d3]>=1.0)
+         {
+-        plcol(15);
++        plcol0(15);
+         for (i=0; i<CPLOT_SUBPIXERR1DNX; i++)
+           if (weight[d3][i]>0.0)
+             line[d3][i] /= weight[d3][i];
+         line[d3][CPLOT_SUBPIXERR1DNX] = line[d3][0];
+         plwid(6*lwid);
+-        plcol(15);
++        plcol0(15);
+         plline(CPLOT_SUBPIXERR1DNX+1, cutx, line[d3]);
+         plwid(3*lwid);
+-        plcol(3);
++        plcol0(3);
+         plline(CPLOT_SUBPIXERR1DNX+1, cutx, line[d3]);
+         }
+       plwid(lwid);
+-      plcol(15);
++      plcol0(15);
+       plwid(lwid);
+       xl[0] = -0.5 - margin;
+       xl[1] = 0.5;
+@@ -4012,13 +4012,14 @@
+           r[0] = 1.0; g[0] = 0.96; b[0] = 1.0;
+           r[1] = 0.3; g[1] = 0.2; b[1] = 0.3;
+           plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-          plshades(histo[d], CPLOT_ASTRCOLSHIFT1DNX, CPLOT_ASTRCOLSHIFT1DNY,
+-		NULL, dmagmin, dmagmax, -maxlim, maxlim,
+-		clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
++          plshades((const PLFLT **)histo[d], CPLOT_ASTRCOLSHIFT1DNX, 
++		CPLOT_ASTRCOLSHIFT1DNY,	NULL, dmagmin, dmagmax, -maxlim,
++		maxlim,	clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1,
++		NULL, NULL);
+           }
+         else
+           {
+-          plcol(1);
++          plcol0(1);
+           plptex((PLFLT)mdmag, maxlim/2.0, 1.0, 0.0, 0.5,
+ 		"No overlapping detections!");
+           }
+@@ -4027,7 +4028,7 @@
+           r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
+           r[1] = 0.7; g[1] = 0.7; b[1] = 0.7;
+           plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-          plimage(histo_hsn[d], CPLOT_ASTRCOLSHIFT1DNX_HSN,
++          plimage((const PLFLT **)histo_hsn[d], CPLOT_ASTRCOLSHIFT1DNX_HSN,
+ 		CPLOT_ASTRCOLSHIFT1DNY_HSN,
+ 		dmagmin, dmagmax, -maxlim, maxlim, 0.5, zmax_hsn[d],
+ 		dmagmin, dmagmax, -maxlim, maxlim);
+@@ -4037,13 +4038,13 @@
+         plscolbg(255,255,255);	/* Force the background colour to white */
+         plscol0(15, 0,0,0);	/* Force the foreground colour to black */
+ /*------ 1D histograms */
+-        plcol(13);
++        plcol0(13);
+         plwid(2*lwid);
+         plline(CPLOT_NADERRHISTBIN, cuty[d], cutbin);
+-        plcol(7);
++        plcol0(7);
+         plline(CPLOT_NADERRHISTBIN, cuty_hsn[d], cutbin);
+         plwid(lwid);
+-        plcol(15);
++        plcol0(15);
+         plwid(lwid);
+         xl[0] = dmagmin;
+         xl[1] = dmagmax;
+@@ -4250,13 +4251,13 @@
+       r[0] = 1.0; g[0] = 0.96; b[0] = 1.0;
+       r[1] = 0.3; g[1] = 0.2; b[1] = 0.3;
+       plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-      plshades(histo[d], CPLOT_REFPROPN, CPLOT_REFPROPN, NULL,
++      plshades((const PLFLT **)histo[d], CPLOT_REFPROPN, CPLOT_REFPROPN, NULL,
+ 	-maxlim,maxlim, -maxlim,maxlim,
+ 	clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
+       }
+     else
+       {
+-      plcol(1);
++      plcol0(1);
+       plptex(0.0, maxlim/2.0, 1.0, 0.0, 0.5, "No match with a reference!");
+       }
+     if (zmax_hsn[d]>=1.0)
+@@ -4264,14 +4265,13 @@
+       r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
+       r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
+       plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-      plimage(histo_hsn[d], CPLOT_REFERR2DN_HSN, CPLOT_REFERR2DN_HSN,
+-	-maxlim,maxlim, -maxlim, maxlim,
+-	0.5, zmax_hsn[d],
+-	-maxlim, maxlim, -maxlim, maxlim);
++      plimage((const PLFLT **)histo_hsn[d], CPLOT_REFERR2DN_HSN, 
++	CPLOT_REFERR2DN_HSN, -maxlim,maxlim, -maxlim, maxlim,
++	0.5, zmax_hsn[d], -maxlim, maxlim, -maxlim, maxlim);
+       }
+     plscolbg(255,255,255);	/* Force the background colour to white */
+     plscol0(15, 0,0,0);		/* Force the foreground colour to black */
+-    plcol(15);
++    plcol0(15);
+     plbox("bcnst", 0.0, 0.0, "bcnst", 0.0, 0.0);
+     pllab(d?"#gm#d#gd#u(ref) [mas/yr]":"#gm#d#ga#u(ref) [mas/yr]",
+ 	d?"#gm#d#gd#u(SCAMP) [mas/yr]":"#gm#d#ga#u(SCAMP) [mas/yr]", "");
+diff -U 3 -H -d -r -N -x '*.kdev4' -- scamp-1.7.0/src/photcplot.c scamp-1.7.0-r2/src/photcplot.c
+--- scamp-1.7.0/src/photcplot.c	2009-09-10 15:11:14.000000000 +0200
++++ scamp-1.7.0-r2/src/photcplot.c	2012-01-01 20:55:00.358169400 +0100
+@@ -182,7 +182,7 @@
+ /*-- Now plot! */
+     firstflag = 1;
+     yl[0] = yl[1] = 0.0;
+-    plcol(15);
++    plcol0(15);
+     plschr(0.0,0.5);
+     lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
+     plwid(lwid);
+@@ -204,9 +204,9 @@
+       if (fields[f]->photomlabel == instru)
+         {
+         if (fields[f]->photomflag==1)
+- 	  plcol(9);
++ 	  plcol0(9);
+         else
+- 	  plcol(8);
++ 	  plcol0(8);
+         plpoin((PLINT)1, x+n,y+n, 5);
+         plptex(x[n],y[n], 0.0, -1.0, -0.1, fields[f]->rfilename);
+         n++;
+@@ -214,7 +214,7 @@
+     xl[0] = 0.0;
+     xl[1] = npointmax+1.0;
+     pllsty(2);
+-    plcol(15);
++    plcol0(15);
+     plline(2, xl, yl);
+     pllsty(1);
+     firstflag = 0;
+@@ -443,13 +443,14 @@
+         r[0] = 0.98; g[0] = 0.98; b[0] = 1.0;
+         r[1] = 0.3; g[1] = 0.3; b[1] = 0.4;
+         plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-        plshades(histo[d], CPLOT_PHOTERRNX, CPLOT_PHOTERRNY, NULL,
+-		fgroup->projposmin[d], fgroup->projposmax[d], -maxlim, maxlim,
+-		clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
++        plshades((const PLFLT **)histo[d], CPLOT_PHOTERRNX, CPLOT_PHOTERRNY, 
++		NULL, fgroup->projposmin[d], fgroup->projposmax[d], -maxlim,
++		maxlim, clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1,
++		NULL, NULL);
+         }
+       else
+         {
+-        plcol(1);
++        plcol0(1);
+         plptex((fgroup->projposmin[d] - margin + fgroup->projposmax[d])/2.0,
+ 		maxlim/2.0, 1.0, 0.0, 0.5, "No overlapping detections!");
+         }
+@@ -458,20 +459,20 @@
+         r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
+         r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
+         plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-       plimage(histo_hsn[d], CPLOT_PHOTERRNX_HSN, CPLOT_PHOTERRNY_HSN,
+-		fgroup->projposmin[d], fgroup->projposmax[d], -maxlim, maxlim,
+-		0.5, zmax_hsn[d],
++       plimage((const PLFLT **)histo_hsn[d], CPLOT_PHOTERRNX_HSN, 
++		CPLOT_PHOTERRNY_HSN, fgroup->projposmin[d], 
++		fgroup->projposmax[d], -maxlim, maxlim, 0.5, zmax_hsn[d],
+ 		fgroup->projposmin[d], fgroup->projposmax[d], -maxlim, maxlim);
+         }
+       plscolbg(255,255,255);	/* Force the background colour to white */
+       plscol0(15, 0,0,0);	/* Force the foreground colour to black */
+-      plcol(9);
++      plcol0(9);
+       plwid(2*lwid);
+       plline(CPLOT_NADERRHISTBIN, cuty[d], cutbin);
+-      plcol(7);
++      plcol0(7);
+       plline(CPLOT_NADERRHISTBIN, cuty_hsn[d], cutbin);
+       plwid(lwid);
+-      plcol(15);
++      plcol0(15);
+       xl[0] = fgroup->projposmin[d] - margin;
+       xl[1] = fgroup->projposmax[d];
+       pllsty(2);
+@@ -728,13 +729,13 @@
+       r[0] = 0.98; g[0] = 0.98; b[0] = 1.0;
+       r[1] = 0.3; g[1] = 0.3; b[1] = 0.4;
+       plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-      plshades(histo, CPLOT_PHOTERRNX, CPLOT_PHOTERRNY, NULL,
++      plshades((const PLFLT **)histo, CPLOT_PHOTERRNX, CPLOT_PHOTERRNY, NULL,
+ 		xoffset, magmax, -maxlim, maxlim,
+ 		clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
+       }
+     else
+       {
+-      plcol(1);
++      plcol0(1);
+       plptex((xoffset - margin + magmax)/2.0,
+ 		maxlim/2.0, 1.0, 0.0, 0.5, "No overlapping detections!");
+       }
+@@ -743,20 +744,19 @@
+       r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
+       r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
+       plscmap1l(1, 2, cpoint, r, g, b, NULL);
+-     plimage(histo_hsn, CPLOT_PHOTERRNX_HSN, CPLOT_PHOTERRNY_HSN,
+-		xoffset, magmax, -maxlim, maxlim,
+-		0.5, zmax_hsn,
+-		xoffset, magmax, -maxlim, maxlim);
++     plimage((const PLFLT **)histo_hsn, CPLOT_PHOTERRNX_HSN,
++		CPLOT_PHOTERRNY_HSN, xoffset, magmax, -maxlim, maxlim,
++		0.5, zmax_hsn, xoffset, magmax, -maxlim, maxlim);
+       }
+     plscolbg(255,255,255);	/* Force the background colour to white */
+     plscol0(15, 0,0,0);	/* Force the foreground colour to black */
+-    plcol(9);
++    plcol0(9);
+     plwid(2*lwid);
+     plline(CPLOT_NADERRHISTBIN, cuty, cutbin);
+-    plcol(7);
++    plcol0(7);
+     plline(CPLOT_NADERRHISTBIN, cuty_hsn, cutbin);
+     plwid(lwid);
+-    plcol(15);
++    plcol0(15);
+     xl[0] = xoffset - margin;
+     xl[1] = magmax;
+     pllsty(2);
diff --git a/sci-astronomy/scamp/scamp-1.6.2.ebuild b/sci-astronomy/scamp/scamp-1.6.2.ebuild
deleted file mode 100644
index f8d4c04daa5e..000000000000
--- a/sci-astronomy/scamp/scamp-1.6.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/scamp-1.6.2.ebuild,v 1.1 2009/11/04 00:45:32 bicatali Exp $
-
-EAPI=2
-inherit eutils autotools
-
-DESCRIPTION="Computes astrometric and photometric solutions for astronomical images"
-HOMEPAGE="http://astromatic.iap.fr/software/scamp"
-SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc threads plplot"
-
-RDEPEND="sci-astronomy/cdsclient
-	virtual/cblas
-	>=sci-libs/lapack-atlas-3.8.0
-	sci-libs/fftw:3.0
-	plplot? ( >=sci-libs/plplot-5.9 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	#epatch "${FILESDIR}"/${P}-autotools.patch
-	# gentoo uses cblas instead of ptcblas (linked to threaded with eselect)
-	sed -i \
-		-e 's/ptcblas/cblas/g' \
-		acx_atlas.m4 || die "sed acx_atlas.m4 failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-atlas="/usr/$(get_libdir)/lapack/atlas" \
-		$(use_with plplot) \
-		$(use_enable threads)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog HISTORY README THANKS BUGS
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*.pdf || die "pdf doc install failed"
-	fi
-}
diff --git a/sci-astronomy/scamp/scamp-1.7.0.ebuild b/sci-astronomy/scamp/scamp-1.7.0-r1.ebuild
index d559a540e7ba..585d5825ae02 100644
--- a/sci-astronomy/scamp/scamp-1.7.0.ebuild
+++ b/sci-astronomy/scamp/scamp-1.7.0-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/scamp-1.7.0.ebuild,v 1.1 2010/05/03 21:44:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/scamp-1.7.0-r1.ebuild,v 1.1 2012/01/03 02:43:12 bicatali Exp $
 
-EAPI=2
+EAPI=4
+inherit eutils
 
-DESCRIPTION="Computes astrometric and photometric solutions for astronomical images"
-HOMEPAGE="http://astromatic.iap.fr/software/scamp"
-SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
+DESCRIPTION="Astrometric and photometric solutions for astronomical images"
+HOMEPAGE="http://www.astromatic.net/software/scamp"
+SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
 
 LICENSE="CeCILL-2"
 SLOT="0"
@@ -17,7 +18,7 @@ RDEPEND=">=sci-astronomy/cdsclient-3.4
 	virtual/cblas
 	>=sci-libs/lapack-atlas-3.8.0
 	sci-libs/fftw:3.0
-	plplot? ( >=sci-libs/plplot-5.9 )"
+	plplot? ( sci-libs/plplot )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -26,20 +27,17 @@ src_prepare() {
 	sed -i \
 		-e 's/ptcblas/cblas/g' \
 		configure || die "sed failed"
+	epatch "${FILESDIR}"/${P}-plplot599.patch
 }
 
 src_configure() {
 	econf \
-		--with-atlas="/usr/$(get_libdir)/lapack/atlas" \
+		--with-atlas-incdir="${EROOT}/usr/include/atlas" \
 		$(use_with plplot) \
 		$(use_enable threads)
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog HISTORY README THANKS BUGS
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*.pdf || die "pdf doc install failed"
-	fi
+	default
+	use doc && dodoc doc/*,pdf
 }