[pkgsrc/trunk]: pkgsrc/print/poppler Improve horrible version check to unbrea...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ca91ff70c13
branches:  trunk
changeset: 577702:8ca91ff70c13
user:      tron <tron%pkgsrc.org@localhost>
date:      Sat Jul 17 19:29:25 2010 +0000

description:
Improve horrible version check to unbreak build under NetBSD 5.1* which
provides both fmin(3) and fmax(3). The build is still broke under
NetBSD 5.0_STABLE built from sources after 2010-03-12. A possible fix
for this case is to upgrade to NetBSD 5.1*.

diffstat:

 print/poppler/Makefile.common  |  3 ++-
 print/poppler/distinfo         |  4 ++--
 print/poppler/patches/patch-aq |  4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r 9b474bd48a04 -r 8ca91ff70c13 print/poppler/Makefile.common
--- a/print/poppler/Makefile.common     Sat Jul 17 18:13:08 2010 +0000
+++ b/print/poppler/Makefile.common     Sat Jul 17 19:29:25 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2010/07/14 17:04:22 drochner Exp $
+# $NetBSD: Makefile.common,v 1.37 2010/07/17 19:29:25 tron Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-glib/Makefile
@@ -13,6 +13,7 @@
 MASTER_SITES=          http://poppler.freedesktop.org/
 
 HOMEPAGE=              http://poppler.freedesktop.org/
+LICENSE=               gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
diff -r 9b474bd48a04 -r 8ca91ff70c13 print/poppler/distinfo
--- a/print/poppler/distinfo    Sat Jul 17 18:13:08 2010 +0000
+++ b/print/poppler/distinfo    Sat Jul 17 19:29:25 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2010/07/15 12:24:19 obache Exp $
+$NetBSD: distinfo,v 1.59 2010/07/17 19:29:25 tron Exp $
 
 SHA1 (poppler-0.14.1.tar.gz) = 28229f897451feba5682d74defe7d67361eeee11
 RMD160 (poppler-0.14.1.tar.gz) = 7b8d084b05ccc374e9add9771b781a88948907a7
@@ -10,4 +10,4 @@
 SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53
 SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74
 SHA1 (patch-ap) = fc985510d4ebabe097e55bc4cbb0477267e95a7d
-SHA1 (patch-aq) = 2a1f413d65147f9c3a64466db8b85ff8f9717954
+SHA1 (patch-aq) = 01e115ca868e0bbd398bade92485d83edbe98d66
diff -r 9b474bd48a04 -r 8ca91ff70c13 print/poppler/patches/patch-aq
--- a/print/poppler/patches/patch-aq    Sat Jul 17 18:13:08 2010 +0000
+++ b/print/poppler/patches/patch-aq    Sat Jul 17 19:29:25 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.3 2010/07/15 12:24:19 obache Exp $
+$NetBSD: patch-aq,v 1.4 2010/07/17 19:29:25 tron Exp $
 
 --- poppler/TextOutputDev.cc.orig      2010-06-08 20:06:31.000000000 +0000
 +++ poppler/TextOutputDev.cc
@@ -8,7 +8,7 @@
  
 +#if defined(__DragonFly__) || defined(__NetBSD__)
 +#include <sys/param.h>
-+#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && __NetBSD_Version__ >= 599002100)
++#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100 || (__NetBSD_Version__ >= 501000000 && __NetBSD_Version__ < 599000000)))
 +static double fmax(double x, double y) { if (isnan(x)) return y; if (isnan(y)) return x; return (x > y ? x : y);}
 +static double fmin(double x, double y) { if (isnan(x)) return y; if (isnan(y)) return x; return (x < y ? x : y);}
 +#endif