Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
graphics/gnuplot/Makefile
View File

@@ -1,21 +1,20 @@
# $NetBSD: Makefile,v 1.86 2014/02/12 23:18:00 tron Exp $
# $NetBSD: Makefile,v 1.96 2015/03/03 15:22:20 mef Exp $
DISTNAME= gnuplot-4.6.4
PKGREVISION= 1
DISTNAME= gnuplot-5.0.0
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]*
PATCHDIR= ${.CURDIR}/../../graphics/gnuplot/patches
DISTINFO_FILE= ${.CURDIR}/../../graphics/gnuplot/distinfo
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c
USE_TOOLS+= makeinfo pkg-config gmake
GNU_CONFIGURE= yes
@@ -27,10 +26,15 @@ CONFIGURE_ARGS+= --without-tutorial
CONFIGURE_ARGS+= ac_cv_prog_EMACS=
INFO_FILES= yes
# to build doc/gnuplot.pdf
BUILD_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
BUILD_DEPENDS+= tex-ucs-[0-9]*:../../print/tex-ucs
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.
@@ -40,6 +44,13 @@ SUBST_MESSAGE.fontpath= Fixing font path.
SUBST_FILES.fontpath= src/variable.c
SUBST_SED.fontpath= -e 's,@PKGSRC_PREFIX@,"${PREFIX}",'
post-build:
(cd ${WRKSRC}/docs; ${GMAKE} gnuplot.pdf)
post-install:
(cd ${WRKSRC}/docs; \
${INSTALL_DATA} gnuplot.pdf ${DESTDIR}${PREFIX}/share/gnuplot/${API_VERSION})
.include "options.mk"
.include "../../converters/libiconv/buildlink3.mk"

83
graphics/gnuplot/PLIST
View File

@@ -1,42 +1,45 @@
@comment $NetBSD: PLIST,v 1.17 2012/11/18 01:56:20 joerg Exp $
@comment $NetBSD: PLIST,v 1.19 2015/03/03 15:22:20 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
man/man1/gnuplot-ja.1
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/cp1252.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/return.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

13
graphics/gnuplot/distinfo
View File

@@ -1,13 +1,12 @@
$NetBSD: distinfo,v 1.25 2014/03/25 23:19:19 asau Exp $
$NetBSD: distinfo,v 1.29 2015/03/03 15:22:20 mef Exp $
SHA1 (gnuplot-4.6.4.tar.gz) = 54ee5ce9a0a2698b046064bd275e772673350013
RMD160 (gnuplot-4.6.4.tar.gz) = a2dcc9d7768b9fbd12fa0993c6d40d059f57215e
Size (gnuplot-4.6.4.tar.gz) = 4974176 bytes
SHA1 (gnuplot-5.0.0.tar.gz) = ca5163e3cb466b4aeb878f1173b0fe624367f08a
RMD160 (gnuplot-5.0.0.tar.gz) = e91ae15d1b50110d323450be451db5d180917f4d
Size (gnuplot-5.0.0.tar.gz) = 4955900 bytes
SHA1 (patch-aa) = fa5981422c83d1467b0df8a7c36ce7b2439855f2
SHA1 (patch-ac) = ba7d48926faca78399fe10f44020364a244f87e0
SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413
SHA1 (patch-ae) = ce2a89ebcdcae1b1945563b48e6ebb6974d3a048
SHA1 (patch-af) = e5672a05f88d0ba3c1471b379dd47cd1b274f8b1
SHA1 (patch-ag) = 8a27282ee0e9add193e3437e2f88dac149e40068
SHA1 (patch-ah) = e4024ebbc039d7b5e741aa109259de6269b03765
SHA1 (patch-docs_gnuplot.texi) = fd9e1eccf64198336e9ba80997b022612101ac77
SHA1 (patch-ag) = 92a5d18f47f44e799e5f7e24bb232024f2f8d928
SHA1 (patch-ah) = f768abaddc7b326648e36f82b3edd2c9bead8b11

12
graphics/gnuplot/options.mk
View File

@@ -1,11 +1,7 @@
# $NetBSD: options.mk,v 1.7 2013/05/16 14:17:04 adam Exp $
# $NetBSD: options.mk,v 1.8 2014/05/08 20:48:55 bad Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gnuplot
PKG_SUPPORTED_OPTIONS= gd lua pdf x11 qt4
.if ${OPSYS} != "NetBSD"
# wxterminal is broken on NetBSD c.f. pkg/47177
PKG_SUPPORTED_OPTIONS+= wxwidgets
.endif
PKG_SUPPORTED_OPTIONS= gd lua pdf x11 qt4 wxwidgets
PKG_SUGGESTED_OPTIONS= gd x11
.include "../../mk/bsd.options.mk"
@@ -46,7 +42,9 @@ CONFIGURE_ARGS+= --disable-qt
.if !empty(PKG_OPTIONS:Mwxwidgets)
USE_LANGUAGES+= c++
CONFIGURE_ARGS+= --enable-wxwidgets
# force wxt terminal into single threaded mode to avoid crashes
# c.f. http://sourceforge.net/p/gnuplot/mailman/message/31928881/
CONFIGURE_ARGS+= --enable-wxwidgets --with-wx-single-threaded
.include "../../x11/wxGTK28/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-wxwidgets

37
graphics/gnuplot/patches/patch-ag
View File

@@ -1,13 +1,22 @@
$NetBSD: patch-ag,v 1.6 2012/11/07 19:22:05 he Exp $
$NetBSD: patch-ag,v 1.7 2015/03/03 15:22:20 mef Exp $
NetBSD editline keeps header files in "readline", not "editline".
Same applies to DragonFly.
Also get rid of a non-portable "test ... ==" instance.
--- configure.orig 2012-09-26 23:06:30.000000000 +0000
+++ configure
@@ -9197,9 +9197,9 @@ fi
--- configure.orig 2015-01-02 04:27:52.000000000 +0900
+++ configure 2015-03-01 21:42:48.000000000 +0900
@@ -8861,7 +8861,7 @@ $as_echo "yes" >&6; }
# Check whether --with-aquaterm was given.
if test "${with_aquaterm+set}" = set; then :
- withval=$with_aquaterm; if test "$withval" == yes; then
+ withval=$with_aquaterm; if test "$withval" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Aquaterm framework presence" >&5
$as_echo_n "checking for Aquaterm framework presence... " >&6; }
@@ -10164,9 +10164,9 @@ fi
$as_echo "#define HAVE_LIBEDITLINE 1" >>confdefs.h
@@ -19,7 +28,7 @@ Also get rid of a non-portable "test ... ==" instance.
if test "x$ac_cv_header_editline_readline_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_EDITLINE_READLINE_H 1
@@ -15340,7 +15340,7 @@ $as_echo " tek40xx, tek410x, texdraw,
@@ -16239,7 +16241,7 @@ $as_echo " tek40xx, tek410x, texdraw,
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
$as_echo "" >&6; }
@@ -28,3 +37,21 @@ Also get rid of a non-portable "test ... ==" instance.
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: dot-matrix terminals: yes ( --without-bitmap-terminals to disable)" >&5
$as_echo " dot-matrix terminals: yes ( --without-bitmap-terminals to disable)" >&6; }
else
@@ -16327,7 +16329,7 @@ else
$as_echo " ggi terminal: no (use --with-ggi to enable, requires libggi)" >&6; }
fi
-if test "$with_gpic" == yes; then
+if test "$with_gpic" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gpic terminal: yes" >&5
$as_echo " gpic terminal: yes" >&6; }
else
@@ -16335,7 +16337,7 @@ else
$as_echo " gpic terminal: no (use --with-gpic to enable)" >&6; }
fi
-if test "$with_mif" == yes; then
+if test "$with_mif" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: mif terminal: yes" >&5
$as_echo " mif terminal: yes" >&6; }
else

9
graphics/gnuplot/patches/patch-ah
View File

@@ -1,17 +1,20 @@
$NetBSD: patch-ah,v 1.2 2011/02/08 13:13:41 adam Exp $
$NetBSD: patch-ah,v 1.3 2014/06/01 16:58:21 wiz Exp $
Add NetBSD native X and pkgsrc modular X directories to the candidate
font path list.
--- src/variable.c.orig 2008-12-15 04:18:36.000000000 +0000
--- src/variable.c.orig 2013-07-03 16:31:53.000000000 +0000
+++ src/variable.c
@@ -275,6 +275,12 @@ static const struct path_table fontpath_
@@ -281,6 +281,15 @@ static const struct path_table fontpath_
{ "$`kpsexpand '$TEXMFMAIN'`/fonts/type1!" },
{ "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
#endif
+ /* NetBSD pkgsrc X.org */
+ { @PKGSRC_PREFIX@ "/lib/X11/fonts/Type1" },
+ { @PKGSRC_PREFIX@ "/lib/X11/fonts/truetype" },
+ /* NetBSD pkgsrc default font path */
+ { @PKGSRC_PREFIX@ "/share/fonts/X11/Type1" },
+ { @PKGSRC_PREFIX@ "/share/fonts/X11/TTF" },
+ /* NetBSD native X.org */
+ { "/usr/X11R7/lib/X11/fonts/Type1" },
+ { "/usr/X11R7/lib/X11/fonts/truetype" },

19
graphics/gnuplot/patches/patch-docs_gnuplot.texi
View File

@@ -1,19 +0,0 @@
$NetBSD: patch-docs_gnuplot.texi,v 1.1 2013/07/09 08:50:34 wiz Exp $
Fix
> ./gnuplot.texi:17653: raising the section level of @subsubsection which is too low
seen with texinfo-5.1.
More complete fix in
http://sourceforge.net/p/gnuplot/bugs/1226/
--- docs/gnuplot.texi.orig 2013-04-12 17:26:15.000000000 +0000
+++ docs/gnuplot.texi
@@ -17564,6 +17564,7 @@ if/else statements. See `if`.
@node complete_list_of_terminals, , Terminal_types, Terminal_types
@section complete list of terminals
+@subsection output formats
@c ?complete list of terminals
@cindex terminal