update to 4.2.3

changes:
* NEW options front and back to "set colorbox"
* NEW character encoding support for emf and pdf terminals
* NEW "format" keyword for "set tics" and "set {x|y|...}tics"
* NEW allow user to set colorbar label rotatation if the bar is vertical
+bugfixes

6 files changed, 26 insertions, 28 deletions

diff --git a/graphics/gnuplot-nox11/Makefile b/graphics/gnuplot-nox11/Makefile
index 74c912f96ab..f4c97ccd208 100644
--- a/graphics/gnuplot-nox11/Makefile
+++ b/graphics/gnuplot-nox11/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2008/05/09 11:12:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/15 20:22:02 drochner Exp $
 #
 
 PKGNAME=		${DISTNAME:C/-/-nox11-/}
-PKGREVISION=		6
 SVR4_PKGNAME=		gplot
 
 CONFLICTS+=		gnuplot-[0-9]*
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index ff58d81aae4..332799762ad 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.41 2007/12/16 21:49:31 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2008/05/15 20:22:02 drochner Exp $
 
-PKGREVISION=		1
 SVR4_PKGNAME=		gplot
 CATEGORIES+=		x11
 
diff --git a/graphics/gnuplot/Makefile.common b/graphics/gnuplot/Makefile.common
index 45162b4e193..ec21854a0c0 100644
--- a/graphics/gnuplot/Makefile.common
+++ b/graphics/gnuplot/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.13 2008/01/19 09:16:24 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2008/05/15 20:22:02 drochner Exp $
 
 # used by ../../graphics/gnuplot-nox11
 
-DISTNAME=		gnuplot-4.2.2
+DISTNAME=		gnuplot-4.2.3
 CATEGORIES+=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnuplot/} \
 			ftp://ftp.ucc.ie/pub/gnuplot/ \
diff --git a/graphics/gnuplot/PLIST b/graphics/gnuplot/PLIST
index e80466b8bde..c250504f7ea 100644
--- a/graphics/gnuplot/PLIST
+++ b/graphics/gnuplot/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.10 2007/11/30 12:31:52 tron Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/05/15 20:22:02 drochner Exp $
 bin/gnuplot
 info/gnuplot.info
-lib/X11/app-defaults/Gnuplot.app-defaults
+lib/X11/app-defaults/Gnuplot
 libexec/gnuplot/4.2/gnuplot_x11
 man/man1/gnuplot.1
 share/gnuplot/4.2/PostScript/8859-1.ps
diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo
index 7358671e758..5d9974e6dce 100644
--- a/graphics/gnuplot/distinfo
+++ b/graphics/gnuplot/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2008/05/09 11:12:27 jmmv Exp $
+$NetBSD: distinfo,v 1.12 2008/05/15 20:22:02 drochner Exp $
 
-SHA1 (gnuplot-4.2.2.tar.gz) = 991db8024f04e8cad300804bc2661e358fdcf348
-RMD160 (gnuplot-4.2.2.tar.gz) = 7364d283718d89c05652d7c25a841154caa2efd8
-Size (gnuplot-4.2.2.tar.gz) = 2832174 bytes
+SHA1 (gnuplot-4.2.3.tar.gz) = 9f6239ef69ac5a6d68f40dc797f8a0b35b80f491
+RMD160 (gnuplot-4.2.3.tar.gz) = b4692db884c9da2f0d160f33f53c3d2aba65f36e
+Size (gnuplot-4.2.3.tar.gz) = 2840611 bytes
 SHA1 (patch-aa) = a6f67cc9ef3dc1cac2dc5bd9d0ecc634b9b70a92
-SHA1 (patch-ab) = f6a377947e2c59d97aacf2715e4477642861b9e8
+SHA1 (patch-ab) = 066d4c0282c8c36b66a823d3a2a1c578428bf029
diff --git a/graphics/gnuplot/patches/patch-ab b/graphics/gnuplot/patches/patch-ab
index 9e16039d3b7..b5ebc1ff31b 100644
--- a/graphics/gnuplot/patches/patch-ab
+++ b/graphics/gnuplot/patches/patch-ab
@@ -1,32 +1,32 @@
-$NetBSD: patch-ab,v 1.9 2008/05/09 11:12:27 jmmv Exp $
+$NetBSD: patch-ab,v 1.10 2008/05/15 20:22:02 drochner Exp $
 
---- share/Makefile.in.orig	2007-08-31 08:35:05.000000000 +0200
+--- share/Makefile.in.orig	2008-03-08 21:06:28.000000000 +0100
 +++ share/Makefile.in
 @@ -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
-@@ -227,13 +227,15 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++SUBDIRS =
+ appdefaultdir = $(libdir)/X11/app-defaults
+ APPDEFAULTFILES = Gnuplot
+ appdefault_DATA = $(APPDEFAULTFILES)
+@@ -229,13 +229,15 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  uninstall-info-am:
- install-xresourceDATA: $(xresource_DATA)
+ install-appdefaultDATA: $(appdefault_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(xresourcedir)" || $(mkdir_p) "$(DESTDIR)$(xresourcedir)"
--	@list='$(xresource_DATA)'; for p in $$list; do \
+-	test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
+-	@list='$(appdefault_DATA)'; for p in $$list; do \
 +	if test $${INSTALL_XRESOURCE_DATA:-yes} = yes; then \
-+	test -z "$(xresourcedir)" || $(mkdir_p) "$(DESTDIR)$(xresourcedir)"; \
-+	list='$(xresource_DATA)'; for p in $$list; do \
++	test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"; \
++	list='$(appdefault_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  	  f=$(am__strip_dir) \
- 	  echo " $(xresourceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xresourcedir)/$$f'"; \
- 	  $(xresourceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xresourcedir)/$$f"; \
+ 	  echo " $(appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
+ 	  $(appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
 -	done
 +	done; \
 +	fi
  
- uninstall-xresourceDATA:
+ uninstall-appdefaultDATA:
  	@$(NORMAL_UNINSTALL)