Convert Fixed Version (Major+Minor) in PLIST into API_VERSION. No logic, binary change.

2 files changed, 44 insertions, 41 deletions

diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index 19cbf3d1dac..966e6a35598 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.94 2014/11/18 22:19:47 adam Exp $
+# $NetBSD: Makefile,v 1.95 2015/03/01 12:58:10 mef Exp $
 
 DISTNAME=	gnuplot-4.6.6
+API_VERSION=	${PKGVERSION:C/([0-9])\.([0-9])\.([0-9])/\1.\2/}
 CATEGORIES+=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gnuplot.sourceforge.net/
 COMMENT=	Portable interactive, function plotting utility
+#LICENSE=	gnuplot + BSD
 
 CONFLICTS+=		gnuplot-nox11-[0-9]*
 
@@ -28,6 +30,7 @@ CONFIGURE_ARGS+=	--with-readline=bsd
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 
+PLIST_SUBST=		API_VERSION=${API_VERSION}
 LDFLAGS.SunOS+=		-liconv
 
 # Make this available to patch-ah so the font path can include pkgsrc fonts.
diff --git a/graphics/gnuplot/PLIST b/graphics/gnuplot/PLIST
index d414580da65..9ac4ba7bffc 100644
--- a/graphics/gnuplot/PLIST
+++ b/graphics/gnuplot/PLIST
@@ -1,42 +1,42 @@
-@comment $NetBSD: PLIST,v 1.17 2012/11/18 01:56:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.18 2015/03/01 12:58:10 mef Exp $
 bin/gnuplot
-${PLIST.qt4}libexec/gnuplot/4.6/gnuplot_qt
-${PLIST.x11}libexec/gnuplot/4.6/gnuplot_x11
+${PLIST.qt4}libexec/gnuplot/${API_VERSION}/gnuplot_qt
+${PLIST.x11}libexec/gnuplot/${API_VERSION}/gnuplot_x11
 man/man1/gnuplot.1
-share/gnuplot/4.6/PostScript/8859-1.ps
-share/gnuplot/4.6/PostScript/8859-15.ps
-share/gnuplot/4.6/PostScript/8859-2.ps
-share/gnuplot/4.6/PostScript/8859-9.ps
-share/gnuplot/4.6/PostScript/aglfn.txt
-share/gnuplot/4.6/PostScript/cp1250.ps
-share/gnuplot/4.6/PostScript/cp1251.ps
-share/gnuplot/4.6/PostScript/cp437.ps
-share/gnuplot/4.6/PostScript/cp850.ps
-share/gnuplot/4.6/PostScript/cp852.ps
-share/gnuplot/4.6/PostScript/koi8r.ps
-share/gnuplot/4.6/PostScript/koi8u.ps
-share/gnuplot/4.6/PostScript/prologue.ps
-share/gnuplot/4.6/PostScript/utf-8.ps
-${PLIST.x11}share/gnuplot/4.6/app-defaults/Gnuplot
-share/gnuplot/4.6/colors_default.gp
-share/gnuplot/4.6/colors_mono.gp
-share/gnuplot/4.6/colors_podo.gp
-share/gnuplot/4.6/gnuplot.gih
-share/gnuplot/4.6/gnuplot.pdf
-share/gnuplot/4.6/gnuplotrc
-share/gnuplot/4.6/js/README
-share/gnuplot/4.6/js/canvasmath.js
-share/gnuplot/4.6/js/canvastext.js
-share/gnuplot/4.6/js/gnuplot_common.js
-share/gnuplot/4.6/js/gnuplot_dashedlines.js
-share/gnuplot/4.6/js/gnuplot_mouse.css
-share/gnuplot/4.6/js/gnuplot_mouse.js
-share/gnuplot/4.6/js/gnuplot_svg.js
-share/gnuplot/4.6/js/grid.png
-share/gnuplot/4.6/js/help.png
-share/gnuplot/4.6/js/nextzoom.png
-share/gnuplot/4.6/js/previouszoom.png
-share/gnuplot/4.6/js/textzoom.png
-share/gnuplot/4.6/lua/gnuplot-tikz.lua
-${PLIST.qt4}share/gnuplot/4.6/qt/qtgnuplot_fr.qm
-${PLIST.qt4}share/gnuplot/4.6/qt/qtgnuplot_ja.qm
+share/gnuplot/${API_VERSION}/PostScript/8859-1.ps
+share/gnuplot/${API_VERSION}/PostScript/8859-15.ps
+share/gnuplot/${API_VERSION}/PostScript/8859-2.ps
+share/gnuplot/${API_VERSION}/PostScript/8859-9.ps
+share/gnuplot/${API_VERSION}/PostScript/aglfn.txt
+share/gnuplot/${API_VERSION}/PostScript/cp1250.ps
+share/gnuplot/${API_VERSION}/PostScript/cp1251.ps
+share/gnuplot/${API_VERSION}/PostScript/cp437.ps
+share/gnuplot/${API_VERSION}/PostScript/cp850.ps
+share/gnuplot/${API_VERSION}/PostScript/cp852.ps
+share/gnuplot/${API_VERSION}/PostScript/koi8r.ps
+share/gnuplot/${API_VERSION}/PostScript/koi8u.ps
+share/gnuplot/${API_VERSION}/PostScript/prologue.ps
+share/gnuplot/${API_VERSION}/PostScript/utf-8.ps
+${PLIST.x11}share/gnuplot/${API_VERSION}/app-defaults/Gnuplot
+share/gnuplot/${API_VERSION}/colors_default.gp
+share/gnuplot/${API_VERSION}/colors_mono.gp
+share/gnuplot/${API_VERSION}/colors_podo.gp
+share/gnuplot/${API_VERSION}/gnuplot.gih
+share/gnuplot/${API_VERSION}/gnuplot.pdf
+share/gnuplot/${API_VERSION}/gnuplotrc
+share/gnuplot/${API_VERSION}/js/README
+share/gnuplot/${API_VERSION}/js/canvasmath.js
+share/gnuplot/${API_VERSION}/js/canvastext.js
+share/gnuplot/${API_VERSION}/js/gnuplot_common.js
+share/gnuplot/${API_VERSION}/js/gnuplot_dashedlines.js
+share/gnuplot/${API_VERSION}/js/gnuplot_mouse.css
+share/gnuplot/${API_VERSION}/js/gnuplot_mouse.js
+share/gnuplot/${API_VERSION}/js/gnuplot_svg.js
+share/gnuplot/${API_VERSION}/js/grid.png
+share/gnuplot/${API_VERSION}/js/help.png
+share/gnuplot/${API_VERSION}/js/nextzoom.png
+share/gnuplot/${API_VERSION}/js/previouszoom.png
+share/gnuplot/${API_VERSION}/js/textzoom.png
+share/gnuplot/${API_VERSION}/lua/gnuplot-tikz.lua
+${PLIST.qt4}share/gnuplot/${API_VERSION}/qt/qtgnuplot_fr.qm
+${PLIST.qt4}share/gnuplot/${API_VERSION}/qt/qtgnuplot_ja.qm