Index: print/poppler/distinfo =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/print/poppler/distinfo,v retrieving revision 1.65 diff -u -r1.65 distinfo --- print/poppler/distinfo 13 Jan 2011 17:01:35 -0000 1.65 +++ print/poppler/distinfo 26 Jan 2011 08:10:44 -0000 @@ -10,7 +10,7 @@ SHA1 (patch-ag) = 4b914e85bb08ce83305d20de9c0a3e74d3cabdd2 SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53 SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74 -SHA1 (patch-aq) = 01e115ca868e0bbd398bade92485d83edbe98d66 +SHA1 (patch-aq) = 8476aeb7f200c743f5235f038615beae571f52a6 SHA1 (patch-ar) = 0c77eb223d27545942f2b2d6081f07c3d796bb2d SHA1 (patch-as) = 9ce48a302cdb83f4dcb811d36a3b23cfb6652bbb SHA1 (patch-bc) = 456af841d297ce365878c9756d2c6327f9d7658e Index: print/poppler/patches/patch-aq =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/print/poppler/patches/patch-aq,v retrieving revision 1.4 diff -u -r1.4 patch-aq --- print/poppler/patches/patch-aq 17 Jul 2010 19:29:25 -0000 1.4 +++ print/poppler/patches/patch-aq 26 Jan 2011 08:10:16 -0000 @@ -8,7 +8,7 @@ +#if defined(__DragonFly__) || defined(__NetBSD__) +#include -+#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100 || (__NetBSD_Version__ >= 501000000 && __NetBSD_Version__ < 599000000))) ++#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100 || (__NetBSD_Version__ >= 500000001 && __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