--- .pkgextract
+++ .pkgextract	Tue Apr 27 18:48:07 2004
@@ -0,0 +1 @@
+bzcat ../gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
--- configure.in
+++ configure.in	Tue Apr 27 18:48:07 2004
@@ -209,7 +209,7 @@
     [AC_DEFINE(LINUXVGA,1,
                [ Define if this is a Linux system with SuperVGA library. ])
      LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot'
-     TERMLIBS="-lvga $TERMLIBS"],
+     TERMLIBS="/usr/${ARCHLIB:=lib}/libvga.a $TERMLIBS"],
     with_linux_vga=no)
 fi
 
--- demo/poldat.dem
+++ demo/poldat.dem	Tue Apr 27 18:48:07 2004
@@ -11,7 +11,7 @@
 unset polar
 set title "Primitive Smith Chart"
 unset key
-set xlabel "Impedance or Admittance Coordinates"
+set xlabel "Impedance or Admittance Coordinates" 12,-1
 set para
 set rrange [-0 : 10]
 set trange [-pi : pi]
--- demo/simple.dem
+++ demo/simple.dem	Tue Apr 27 18:48:07 2004
@@ -7,12 +7,11 @@
 # gnuplot> load 'simple.dem'
 #
 set key left box
-set samples 50
+set samples 400
 plot [-10:10] sin(x),atan(x),cos(atan(x))
 pause -1 "Hit return to continue"
 
 set key right nobox
-set samples 100
 plot [-pi/2:pi] cos(x),-(sin(x) > sin(x+1) ? sin(x) : sin(x+1))
 pause -1 "Hit return to continue"
 
--- demo/vector.dem
+++ demo/vector.dem	Tue Apr 27 18:48:07 2004
@@ -62,7 +62,7 @@
 pause -1 "Hit return to continue"
 set term push
 set term table
-set out "equipo2.dat"
+set out "/tmp/equipo2.dat"
 rep
 set out
 set term pop
@@ -74,7 +74,7 @@
 set isosam 31,31
 set term push
 set term table
-set out "field2xy.dat"
+set out "/tmp/field2xy.dat"
 splot vtot(x,y) w l
 set out
 set term pop
--- docs/Makefile.in
+++ docs/Makefile.in	Tue Apr 27 18:53:41 2004
@@ -34,7 +34,7 @@
 #
 
 # default is what is needed for interactive gnuplot
-all: gnuplot.gih gnuplot.info
+all: gnuplot.gih gnuplot-fr.gih gnuplot.info
 
 # this tells GNU make not to export variables into the environment
 # But other makes dont understand its significance, so it must
@@ -299,12 +299,16 @@
 	$(LINK) doc2hlp.o termdoc.o $(LIBS)
 
 ### gnuplot interactive help format
-gih: gnuplot.gih
+gih: gnuplot.gih gnuplot-fr.gih
 
 gnuplot.gih: doc2gih $(srcdir)/gnuplot.doc
 	@rm -f alldoc2gih
 	./doc2gih $(srcdir)/gnuplot.doc gnuplot.gih
 
+gnuplot-fr.gih: doc2gih $(srcdir)/gnuplot-fr.doc
+	@rm -f alldoc2gih
+	./doc2gih $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih
+
 doc2gih: doc2gih.o termdoc.o
 	$(LINK) doc2gih.o termdoc.o $(LIBS)
 
@@ -395,6 +399,7 @@
 install-gih: gnuplot.gih
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
 	$(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih
+	$(INSTALL_DATA) gnuplot-fr.gih $(DESTDIR)$(GIHDIR)/gnuplot-fr.gih
 
 install-info: gnuplot.info
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
@@ -412,6 +417,7 @@
 
 uninstall-gih:
 	rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih
+	rm -f $(DESTDIR)$(GIHDIR)/gnuplot-fr.gih
 
 uninstall-info:
 	$(PRE_UNINSTALL)
--- docs/gnuplot-fr.doc
+++ docs/gnuplot-fr.doc	Tue Apr 27 18:48:41 2004
@@ -436,8 +436,8 @@
 #Home      & same as \verb~^A~. \\
 #Ctrl Home & same as \verb~^E~. \\
 #Esc       & same as \verb~^U~. \\
-#Help      & `{\bf help}' plus Entrée. \\
-#Ctrl Help & `{\bf help }'. \\
+#Help      & `{\bf help}` plus Entrée. \\
+#Ctrl Help & `{\bf help }`. \\
 %c l .
 %Touche fléchée@Fonction
 %_
--- src/command.c
+++ src/command.c	Tue Apr 27 18:48:07 2004
@@ -966,14 +966,24 @@
 		(void) fgets(buf, strlen(buf), stdin);
 	    }
 	} else if (strcmp(term->name, "atari") == 0) {
-	    char *line = readline("");
+	    char *line;
+#if 0
+	    if (term->waitforinput)
+		term->waitforinput();
+#endif
+	    line = readline("");
 	    if (line)
 		free(line);
 	} else
 	    (void) fgets(buf, strlen(buf), stdin);
 #elif defined(ATARI)
 	if (strcmp(term->name, "atari") == 0) {
-	    char *line = readline("");
+	    char *line;
+#if 0
+	    if (term->waitforinput)
+		term->waitforinput();
+#endif
+	    line = readline("");
 	    if (line)
 		free(line);
 	} else
@@ -2442,6 +2452,13 @@
 # endif				/* no READLINE */
 
     do {
+# if 0
+# ifdef USE_MOUSE
+	/* wait for input from graphic device, mainly x11 */
+	if (term->waitforinput)
+	    term->waitforinput();
+# endif
+# endif
 	/* grab some input */
 # if defined(READLINE) || defined(HAVE_LIBREADLINE)
 	if (((interactive)
--- src/gplt_x11.c
+++ src/gplt_x11.c	Tue Apr 27 18:48:07 2004
@@ -2033,8 +2033,11 @@
 	}
     }
     /*   X11_justify_text(mode) - set text justification mode  */
-    else if (*buffer == 'J')
-	sscanf(buffer, "J%4d", (int *) &plot->jmode);
+    else if (*buffer == 'J') {
+	int jmode;
+	sscanf(buffer, "J%4d", &jmode);
+	plot->jmode = jmode;
+    }
 
     else if (*buffer == 'A')
 	sscanf(buffer + 1, "%d", (int *) &plot->angle);
--- src/plot.c
+++ src/plot.c	Tue Apr 27 18:51:49 2004
@@ -226,6 +226,7 @@
 void
 drop_privilege()
 {
+#ifndef SVGA_IS_SECURE
     if (!asked_privi) {
 	euid = geteuid();
 	egid = getegid();
@@ -239,11 +240,13 @@
     if (seteuid(ruid) == -1)
 	(void) fprintf(stderr, "seteuid(%d): %s\n",
 		       (int) ruid, strerror(errno));
+#endif
 }
 
 void
 take_privilege()
 {
+#ifndef SVGA_IS_SECURE
     if (!asked_privi) {
 	euid = geteuid();
 	egid = getegid();
@@ -257,6 +260,7 @@
     if (seteuid(euid) == -1)
 	(void) fprintf(stderr, "seteuid(%d): %s\n",
 		       (int) euid, strerror(errno));
+#endif
 }
 
 #endif /* LINUXVGA */
@@ -283,8 +287,8 @@
 {
     int i;
 #ifdef LINUXVGA
-    LINUX_setup();		/* setup VGA before dropping privilege DBT 4/5/99 */
     drop_privilege();
+    LINUX_setup();
 #endif
 /* make sure that we really have revoked root access, this might happen if
    gnuplot is compiled without vga support but is installed suid by mistake */
@@ -343,6 +347,24 @@
 
 #ifdef VMS
     unsigned int status[2] = { 1, 0 };
+#endif
+
+#ifdef __linux__
+    if (!getenv("GNUHELP")) {
+	char* lang = getenv ("LANG");
+	if (lang) {
+	    char hfile[64];
+	    struct stat buf;
+
+	    if (strlen(lang) > 2)
+		lang[2] = '\0';
+	    strcpy(hfile, "/usr/share/gnuplot/4.0/gnuplot-");
+	    strcat(hfile, lang);
+	    strcat(hfile, ".gih");
+	    if (stat(hfile, &buf) == 0)
+		setenv("GNUHELP", strdup(hfile), 0);
+	}
+    }
 #endif
 
 #ifdef HAVE_LIBREADLINE
--- src/term.h
+++ src/term.h	Tue Apr 27 18:48:07 2004
@@ -299,9 +299,9 @@
 #include "emf.trm"
 
 /* Roland DXY800A plotter */
-/* #include "dxy.trm" */
+#include "dxy.trm"
 /* QMS/EXCL laserprinter (Talaris 1590 and others) */
-/* #include "excl.trm" */
+#include "excl.trm"
 
 /* fig graphics */
 #include "fig.trm"
@@ -337,7 +337,7 @@
 #include "imagen.trm"
 
 /* Kyocera Prescribe printer */
-/* #include "kyo.trm" */
+#include "kyo.trm"
 
 /* Frame Maker MIF 3.00 format driver */
 #include "mif.trm"
@@ -384,7 +384,7 @@
 #include "tkcanvas.trm"
 
 /* Vectrix 384 printer, also Tandy colour */
-/* #include "v384.trm" */
+#include "v384.trm"
 
 /* wire printers */
 /* Epson LX-800, Star NL-10, NX-1000 and lots of others */
--- src/time.c
+++ src/time.c	Tue Apr 27 18:48:07 2004
@@ -297,11 +297,12 @@
 	case 's':
 #if 0 /* HBB 20040213: comment this out, but keep it around for now */
 	    {
-		/* time_t when; */
-		int when;
+		time_t when;
+		int iwhen;
 		struct tm *tmwhen;
-		s = read_int(s, 10, &when);
-		tmwhen = gmtime((time_t*)&when);
+		s = read_int(s, 10, &iwhen);
+		when = iwhen;
+		tmwhen = gmtime(&when);
 		tmwhen->tm_year += 1900;
 		*tm = *tmwhen;
 		break;
--- term/grass.trm
+++ term/grass.trm	Tue Apr 27 18:48:07 2004
@@ -471,7 +471,7 @@
 
 static void
 draw_points_fitriangle(x, y)
-nt x, y;
+int x, y;
 {
   int R_polygon_abs();
 
--- term/linux.trm
+++ term/linux.trm	Tue Apr 27 18:48:07 2004
@@ -80,7 +80,7 @@
 TERM_PUBLIC void LINUX_move __PROTO((unsigned int x, unsigned int y));
 TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y));
 TERM_PUBLIC int LINUX_text_angle __PROTO((int ang));
-TERM_PUBLIC void LINUX_put_text __PROTO((unsigned int x, unsigned int y, const char *str));
+TERM_PUBLIC void LINUX_put_text __PROTO((unsigned int x, unsigned int y, char *str));
 TERM_PUBLIC void LINUX_suspend __PROTO((void));
 TERM_PUBLIC void LINUX_resume __PROTO((void));
 
@@ -298,7 +298,7 @@
 TERM_PUBLIC void
 LINUX_put_text(x, y, str)
 unsigned int x, y;
-const char *str;
+char *str;
 {
     int i;
     switch (linux_angle) {
--- term/png.trm
+++ term/png.trm	Tue Apr 27 18:48:07 2004
@@ -97,6 +97,16 @@
 #ifdef TERM_BODY
 
 #include "png.h"
+#if PNG_LIBPNG_VER < 89
+typedef png_struct* png_structp;
+typedef png_info*   png_infop;
+typedef png_byte*   png_bytep;
+typedef png_info**  png_infopp;
+#undef  PNG_LIBPNG_VER_STRING
+#define PNG_LIBPNG_VER_STRING ("1.0.2")
+#undef  PNG_LIBPNG_VER
+#define PNG_LIBPNG_VER 10002
+#endif
 
 /* I'm not sure exactly which is the first version we work with,
  * but I know that some older ones don't define all the symbols