diff options
| author | drochner <drochner@pkgsrc.org> | 2007-02-01 12:15:38 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2007-02-01 12:15:38 +0000 |
| commit | 3ab0974f897cc19fe1c606b6603f3609f713382b (patch) | |
| tree | 3d9df64d0a553e86bc75bdf605726116c6b4beb9 /graphics/gnuplot | |
| parent | ecc3f8fa4e3eacdde2689eba2ecfd63fe609616a (diff) | |
| download | pkgsrc-3ab0974f897cc19fe1c606b6603f3609f713382b.tar.gz | |
-don't use usleep() for the "pause" command, this does only work
for sleep times less than a second (see SUSv3)
fixes PR pkg/35533 by Matyas Janos
-share patches between gnuplot{,-nox11}
-bump PKGREVISION
Diffstat (limited to 'graphics/gnuplot')
| -rw-r--r-- | graphics/gnuplot/Makefile | 4 | ||||
| -rw-r--r-- | graphics/gnuplot/Makefile.common | 5 | ||||
| -rw-r--r-- | graphics/gnuplot/distinfo | 4 | ||||
| -rw-r--r-- | graphics/gnuplot/patches/patch-aa | 13 |
4 files changed, 19 insertions, 7 deletions
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile index 70594a257cb..a5909b9de5d 100644 --- a/graphics/gnuplot/Makefile +++ b/graphics/gnuplot/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2007/01/22 22:14:26 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2007/02/01 12:15:38 drochner Exp $ # -PKGREVISION= 6 +PKGREVISION= 7 SVR4_PKGNAME= gplot CATEGORIES+= x11 diff --git a/graphics/gnuplot/Makefile.common b/graphics/gnuplot/Makefile.common index e10ad11ad1d..00cdf13cd6e 100644 --- a/graphics/gnuplot/Makefile.common +++ b/graphics/gnuplot/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2006/04/04 14:45:44 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2007/02/01 12:15:38 drochner Exp $ # DISTNAME= gnuplot-4.0.0 @@ -11,6 +11,9 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://gnuplot.sourceforge.net/ COMMENT= Portable interactive, function plotting utility +PATCHDIR= ${.CURDIR}/../../graphics/gnuplot/patches +DISTINFO_FILE= ${.CURDIR}/../../graphics/gnuplot/distinfo + PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo index 833a53671ef..137ed20f38d 100644 --- a/graphics/gnuplot/distinfo +++ b/graphics/gnuplot/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2005/03/13 01:26:45 tv Exp $ +$NetBSD: distinfo,v 1.8 2007/02/01 12:15:38 drochner Exp $ SHA1 (gnuplot-4.0.0.tar.gz) = a862bc311724c263aa1ef1c646291d73dc37c978 RMD160 (gnuplot-4.0.0.tar.gz) = 7b1fc84c161c132c776269b6e9a49abd29251a18 Size (gnuplot-4.0.0.tar.gz) = 2160918 bytes -SHA1 (patch-aa) = ff4f1ca9d64d9d946948e736ea69411dc729e9b0 +SHA1 (patch-aa) = cb1cba419a22b9d0dabf5ec80422b62a278aee32 diff --git a/graphics/gnuplot/patches/patch-aa b/graphics/gnuplot/patches/patch-aa index 5673d48ab61..50c6e3cbd5e 100644 --- a/graphics/gnuplot/patches/patch-aa +++ b/graphics/gnuplot/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.7 2005/03/13 01:26:45 tv Exp $ +$NetBSD: patch-aa,v 1.8 2007/02/01 12:15:39 drochner Exp $ ---- src/stdfn.h.orig Tue Apr 13 13:24:01 2004 +--- src/stdfn.h.orig 2004-04-13 19:24:01.000000000 +0200 +++ src/stdfn.h @@ -258,6 +258,11 @@ extern char *sys_errlist[]; # include <time.h> @@ -14,3 +14,12 @@ $NetBSD: patch-aa,v 1.7 2005/03/13 01:26:45 tv Exp $ #ifndef HAVE_TIME_T_IN_TIME_H # define time_t long #endif +@@ -324,7 +329,7 @@ int gp_strnicmp __PROTO((const char *, c + #endif + + /* sleep delay time, where delay is a double value */ +-#if defined(HAVE_USLEEP) ++#if 0 /*defined(HAVE_USLEEP)*/ + # define GP_SLEEP(delay) usleep((unsigned int) ((delay)*1e6)) + # ifndef HAVE_SLEEP + # define HAVE_SLEEP |