From bcd1250517094f988d7e1e37f0f27cc2d7eb6e6c Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Wed, 28 Mar 2007 16:50:58 +0000
Subject: [PATCH] update to gnuplot 4.2.0

maintainer timeout
---
 math/gnuplot/Makefile                        | 28 ++++++++++----------
 math/gnuplot/distinfo                        |  9 ++++---
 math/gnuplot/patches/patch-share_Makefile_in | 12 +++++++++
 math/gnuplot/pkg/PFRAG.no-no_x11             |  7 ++---
 math/gnuplot/pkg/PLIST                       | 19 ++++++++++---
 5 files changed, 50 insertions(+), 25 deletions(-)
 create mode 100644 math/gnuplot/patches/patch-share_Makefile_in

diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 1dcdf50d627..0d6ad89453f 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -1,47 +1,47 @@
-# $OpenBSD: Makefile,v 1.29 2006/08/25 10:08:33 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2007/03/28 16:50:58 steven Exp $
 
 COMMENT=	"command-driven interactive function plotting program"
 
-DISTNAME=	gnuplot-4.0.0
-PKGNAME=	${DISTNAME}p0
+V=		4.2
+PATCHLEVEL=	0
+DISTNAME=	gnuplot-${V}.${PATCHLEVEL}
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 
 HOMEPAGE=	http://www.gnuplot.info/
 
-LIB_DEPENDS=	png.>=2::graphics/png
-
 MAINTAINER=	Dan Harnett <danh@openbsd.org>
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=	c m z
+WANTLIB=	c m ncurses readline stdc++ z
 
 FLAVORS=	no_x11
 FLAVOR?=
 
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	--without-linux-vga --without-gd --without-pdf \
-		--with-png --with-readline --with-lasergnu \
-		--without-lisp-files
+CONFIGURE_ARGS=	--without-linux-vga --without-pdf \
+		--without-tutorial --with-readline \
+		--with-lasergnu --disable-wxwidgets --without-lisp-files
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 NO_REGRESS=	Yes
 
+SUBST_VARS=	V
+
 .if ${FLAVOR:L:Mno_x11}
-CONFIGURE_ARGS+= --without-x
+CONFIGURE_ARGS+= --without-x --without-gd
 .else
+LIB_DEPENDS=	gd.>=20::graphics/gd
 USE_X11=	Yes
-WANTLIB+=	X11
+WANTLIB+=	X11 fontconfig freetype iconv jpeg png
 CONFIGURE_ARGS+= --with-x
 .endif
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin/lasergnu
-	-cat ${PATCHDIR}/patch-* >${PREFIX}/share/gnuplot/4.0/patches
-
-post-build:
+	-cat ${PATCHDIR}/patch-* >${PREFIX}/share/gnuplot/${V}/patches
 
 .include <bsd.port.mk>
diff --git a/math/gnuplot/distinfo b/math/gnuplot/distinfo
index 57104df7290..86f5fb0bb7f 100644
--- a/math/gnuplot/distinfo
+++ b/math/gnuplot/distinfo
@@ -1,4 +1,5 @@
-MD5 (gnuplot-4.0.0.tar.gz) = 66258443d9f93cc4f46b147dac33e63a
-RMD160 (gnuplot-4.0.0.tar.gz) = 7b1fc84c161c132c776269b6e9a49abd29251a18
-SHA1 (gnuplot-4.0.0.tar.gz) = a862bc311724c263aa1ef1c646291d73dc37c978
-SIZE (gnuplot-4.0.0.tar.gz) = 2160918
+MD5 (gnuplot-4.2.0.tar.gz) = f688a578ddb4c376fd7d91ce444a0745
+RMD160 (gnuplot-4.2.0.tar.gz) = 1d31a40796f5c2474473afbe5c6d667d7d97c91c
+SHA1 (gnuplot-4.2.0.tar.gz) = 867e010ba23346d472e0afdf997edeb6e5ddd585
+SHA256 (gnuplot-4.2.0.tar.gz) = ede70fb18f05935f0186ae7514e5f77e09d7eab94a4f9cff82ddb48dbcbe20e9
+SIZE (gnuplot-4.2.0.tar.gz) = 2836649
diff --git a/math/gnuplot/patches/patch-share_Makefile_in b/math/gnuplot/patches/patch-share_Makefile_in
new file mode 100644
index 00000000000..66a12b0974c
--- /dev/null
+++ b/math/gnuplot/patches/patch-share_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-share_Makefile_in,v 1.1 2007/03/28 16:50:58 steven Exp $
+--- share/Makefile.in.orig	Fri Mar 16 17:09:09 2007
++++ share/Makefile.in	Fri Mar 16 17:09:19 2007
+@@ -189,7 +189,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign 1.2h
+ EXTRA_DIST = Gnuplot.app-defaults
+-SUBDIRS = LaTeX
++SUBDIRS = 
+ xresourcedir = $(libdir)/X11/app-defaults
+ xresource_DATA = Gnuplot.app-defaults
+ all: all-recursive
diff --git a/math/gnuplot/pkg/PFRAG.no-no_x11 b/math/gnuplot/pkg/PFRAG.no-no_x11
index 53afbc0276d..5840ce00053 100644
--- a/math/gnuplot/pkg/PFRAG.no-no_x11
+++ b/math/gnuplot/pkg/PFRAG.no-no_x11
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.no-no_x11,v 1.2 2004/12/21 16:56:59 danh Exp $
+@comment $OpenBSD: PFRAG.no-no_x11,v 1.3 2007/03/28 16:50:58 steven Exp $
+lib/X11/app-defaults/Gnuplot.app-defaults
 libexec/gnuplot/
-libexec/gnuplot/4.0/
-libexec/gnuplot/4.0/gnuplot_x11
+libexec/gnuplot/${V}/
+libexec/gnuplot/${V}/gnuplot_x11
diff --git a/math/gnuplot/pkg/PLIST b/math/gnuplot/pkg/PLIST
index 239da8c5460..7b3d180cc9a 100644
--- a/math/gnuplot/pkg/PLIST
+++ b/math/gnuplot/pkg/PLIST
@@ -1,11 +1,22 @@
-@comment $OpenBSD: PLIST,v 1.12 2006/08/25 10:08:33 espie Exp $
+@comment $OpenBSD: PLIST,v 1.13 2007/03/28 16:50:58 steven Exp $
 bin/gnuplot
 bin/lasergnu
 @info info/gnuplot.info
 @man man/man1/gnuplot.1
 @man man/man1/lasergnu.1
 share/gnuplot/
-share/gnuplot/4.0/
-share/gnuplot/4.0/gnuplot.gih
-share/gnuplot/4.0/patches
+share/gnuplot/${V}/
+share/gnuplot/${V}/PostScript/
+share/gnuplot/${V}/PostScript/8859-1.ps
+share/gnuplot/${V}/PostScript/8859-15.ps
+share/gnuplot/${V}/PostScript/8859-2.ps
+share/gnuplot/${V}/PostScript/cp1250.ps
+share/gnuplot/${V}/PostScript/cp437.ps
+share/gnuplot/${V}/PostScript/cp850.ps
+share/gnuplot/${V}/PostScript/cp852.ps
+share/gnuplot/${V}/PostScript/koi8r.ps
+share/gnuplot/${V}/PostScript/koi8u.ps
+share/gnuplot/${V}/PostScript/prologue.ps
+share/gnuplot/${V}/gnuplot.gih
+share/gnuplot/${V}/patches
 !%%no_x11%%