diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index b4510019bdc8..a030e5069156 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -1,19 +1,22 @@
 # New ports collection makefile for:    gnuplot
-# Version required:     3.5
-# Date created:         6 October 1994
-# Whom:                 jmz
+# Version required:     3.6
+# Date created:         11 January 1997
+# Whom:                 cbr
 #
-# $Id: Makefile,v 1.6 1996/11/18 10:24:43 asami Exp $
+# $Id: Makefile,v 1.7 1996/11/18 14:05:16 asami Exp $
 #
 
 DISTNAME=	gnuplot
-PKGNAME=	gnuplot-3.5
+PKGNAME=	gnuplot-beta325
 CATEGORIES=	math graphics
-MASTER_SITES=	ftp://ftp.dartmouth.edu/pub/gnuplot/ \
-		${MASTER_SITE_GNU}
-DISTFILES=	gnuplot3.5.tar.Z
+#MASTER_SITES=	http://www.ipc.chiba-u.ac.jp/~yamaga/gnuplot%2B/3.6base/gnuplot-beta325.tar.gz
+MASTER_SITES=	http://www.ipc.chiba-u.ac.jp/~yamaga/gnuplot%2B/3.6base/
+DISTFILES=	gnuplot-beta325.tar.gz
 
-MAINTAINER=	jmz@FreeBSD.org
+MAINTAINER=	cbr@FreeBSD.org
+
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} --exec-prefix=${PREFIX} --with-x --without-linux-vga --with-gnu-readline --with-lasergnu
 
 MAN1=		gnuplot.1 lasergnu.1
 
diff --git a/math/gnuplot/distinfo b/math/gnuplot/distinfo
index 99240d06b5de..cbf6e05c5ed5 100644
--- a/math/gnuplot/distinfo
+++ b/math/gnuplot/distinfo
@@ -1 +1 @@
-MD5 (gnuplot3.5.tar.Z) = 0fd379fcb9b31ba8ffef29827eae7395
+MD5 (gnuplot-beta325.tar.gz) = 7fb33edf4907f0f3788ce1050982006b
diff --git a/math/gnuplot/files/patch-aa b/math/gnuplot/files/patch-aa
index 4366a1f9a7d4..b322d85284d0 100644
--- a/math/gnuplot/files/patch-aa
+++ b/math/gnuplot/files/patch-aa
@@ -1,95 +1,10 @@
-*** term/post.trm.orig	Thu Sep 16 07:00:13 1993
---- term/post.trm	Wed Oct  5 02:54:47 1994
-***************
-*** 115,120 ****
---- 115,185 ----
-  NULL
-  };
-  
-+ static char *psaccents=
-+ "% Define the array ISOLatin1Encoding (which specifies how characters are\n\
-+ % encoded for ISO-8859-1 fonts), if it isn't already present (Postscript\n\
-+ % level 2 is supposed to define it, but level 1 doesn't).\n\
-+ \n\
-+ systemdict /ISOLatin1Encoding known not {\n\
-+     /ISOLatin1Encoding [\n\
-+ 	/space /space /space /space /space /space /space /space\n\
-+ 	/space /space /space /space /space /space /space /space\n\
-+ 	/space /space /space /space /space /space /space /space\n\
-+ 	/space /space /space /space /space /space /space /space\n\
-+ 	/space /exclam /quotedbl /numbersign /dollar /percent /ampersand\n\
-+ 	    /quoteright\n\
-+ 	/parenleft /parenright /asterisk /plus /comma /minus /period /slash\n\
-+ 	/zero /one /two /three /four /five /six /seven\n\
-+ 	/eight /nine /colon /semicolon /less /equal /greater /question\n\
-+ 	/at /A /B /C /D /E /F /G\n\
-+ 	/H /I /J /K /L /M /N /O\n\
-+ 	/P /Q /R /S /T /U /V /W\n\
-+ 	/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore\n\
-+ 	/quoteleft /a /b /c /d /e /f /g\n\
-+ 	/h /i /j /k /l /m /n /o\n\
-+ 	/p /q /r /s /t /u /v /w\n\
-+ 	/x /y /z /braceleft /bar /braceright /asciitilde /space\n\
-+ 	/space /space /space /space /space /space /space /space\n\
-+ 	/space /space /space /space /space /space /space /space\n\
-+ 	/dotlessi /grave /acute /circumflex /tilde /macron /breve /dotaccent\n\
-+ 	/dieresis /space /ring /cedilla /space /hungarumlaut /ogonek /caron\n\
-+ 	/space /exclamdown /cent /sterling /currency /yen /brokenbar /section\n\
-+ 	/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /hyphen\n\
-+ 	    /registered /macron\n\
-+ 	/degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph\n\
-+ 	    /periodcentered\n\
-+ 	/cedillar /onesuperior /ordmasculine /guillemotright /onequarter\n\
-+ 	    /onehalf /threequarters /questiondown\n\
-+ 	/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla\n\
-+ 	/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex\n\
-+ 	    /Idieresis\n\
-+ 	/Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply\n\
-+ 	/Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn\n\
-+ 	    /germandbls\n\
-+ 	/agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla\n\
-+ 	/egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex\n\
-+ 	    /idieresis\n\
-+ 	/eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide\n\
-+ 	/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn\n\
-+ 	    /ydieresis\n\
-+     ] def\n\
-+ } if\n\
-+ \n\
-+ % Override the setfont procedure with a new procedure that re-encodes\n\
-+ % the font to use the ISO Latin-1 style.  The body of this procedure\n\
-+ % comes from Section 5.6.1 of the Postscript book.\n\
-+ \n\
-+ /realsetfont /setfont load def\n\
-+ /setfont {\n\
-+     dup length dict begin\n\
-+ 	{1 index /FID ne {def} {pop pop} ifelse} forall\n\
-+ 	/Encoding ISOLatin1Encoding def\n\
-+ 	currentdict\n\
-+     end\n\
-+     /Temporary exch definefont\n\
-+     realsetfont\n\
-+ } bind def\n";
-+ 
-  #define PS_XOFF	50	/* page offset in pts */
-  #define PS_YOFF	50
-  
-***************
-*** 258,264 ****
-  
-  	for ( i=0; PS_header[i] != NULL; i++)
-  		fprintf(outfile,"%s",PS_header[i]);
-! 	fprintf(outfile,"end\n%%%%EndProlog\n");
-  }
-  
-  
---- 323,331 ----
-  
-  	for ( i=0; PS_header[i] != NULL; i++)
-  		fprintf(outfile,"%s",PS_header[i]);
-! 	fprintf(outfile,"end\n"); 
-! 	fprintf (outfile, "%s", psaccents); 
-! 	fprintf (outfile, "%%%%EndProlog\n");
-  }
-  
-  
+--- configure.orig	Sun Jan 12 13:16:51 1997
++++ configure	Sun Jan 12 13:24:04 1997
+@@ -922,6 +922,7 @@
+   LASERGNU=lasergnu_noinstall
+ fi
+ 
++LASERGNU=lasergnu_install
+ 
+ maybe_linuxdriver=
+ # Check whether --with-linux-vga or --without-linux-vga was given.