pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/pstoedit check for __NetBSD__, not just NetBSD.
details: https://anonhg.NetBSD.org/pkgsrc/rev/d60eddb76eb1
branches: trunk
changeset: 489729:d60eddb76eb1
user: drochner <drochner%pkgsrc.org@localhost>
date: Fri Feb 25 18:31:43 2005 +0000
description:
check for __NetBSD__, not just NetBSD.
fixes build on -current
(there is a newer version available, tbd later)
diffstat:
graphics/pstoedit/distinfo | 6 +++---
graphics/pstoedit/patches/patch-ad | 19 +++++++++++--------
graphics/pstoedit/patches/patch-ae | 10 ++++++----
3 files changed, 20 insertions(+), 15 deletions(-)
diffs (88 lines):
diff -r 928c55a5ff55 -r d60eddb76eb1 graphics/pstoedit/distinfo
--- a/graphics/pstoedit/distinfo Fri Feb 25 18:18:28 2005 +0000
+++ b/graphics/pstoedit/distinfo Fri Feb 25 18:31:43 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 08:45:12 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/02/25 18:31:43 drochner Exp $
SHA1 (pstoedit_3_31.zip) = 95e7a09385c3d9ce3dbe8ba5afcc9154021c83ce
RMD160 (pstoedit_3_31.zip) = 1d8304c89647f0d8b4d425b1320d81755e0ee672
@@ -6,5 +6,5 @@
SHA1 (patch-aa) = 25513e3452eed6eb464df1c0dbeeafa4d0f446bf
SHA1 (patch-ab) = c96f64f0bf26ebbd4b119bf1f6da426421b22537
SHA1 (patch-ac) = 614ba9036e1484755955b765e829227e64f10879
-SHA1 (patch-ad) = 3b01b11422db35a95b1a55a20c7a28dc3a251fa9
-SHA1 (patch-ae) = 7c9f4b0f6bdeec1c96986f4e8a321f6a195385ce
+SHA1 (patch-ad) = 794556f6c5afd37bcc40c5c319450011a437c2ff
+SHA1 (patch-ae) = 26ef548a105d0a2ff8b093a4f51fb6f66f95521e
diff -r 928c55a5ff55 -r d60eddb76eb1 graphics/pstoedit/patches/patch-ad
--- a/graphics/pstoedit/patches/patch-ad Fri Feb 25 18:18:28 2005 +0000
+++ b/graphics/pstoedit/patches/patch-ad Fri Feb 25 18:31:43 2005 +0000
@@ -1,10 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2002/05/07 13:18:27 itohy Exp $
+$NetBSD: patch-ad,v 1.3 2005/02/25 18:31:43 drochner Exp $
---- miscutil.cpp.orig Mon Dec 31 05:35:25 2001
-+++ miscutil.cpp Fri Mar 22 12:37:42 2002
-@@ -28,6 +28,10 @@
+--- miscutil.cpp.orig 2001-12-30 21:35:25.000000000 +0100
++++ miscutil.cpp
+@@ -26,8 +26,12 @@
+ // #ifdef _MSC_VER
+ // for getcwd ( at least for Visual C++)
- #if defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD)
+-#if defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD)
++#if defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (__NetBSD__)
#include <unistd.h>
+#include <sys/param.h>
+#if defined(BSD) && BSD >= 199306
@@ -13,7 +16,7 @@
#ifdef __hpux
// HP-UX does not define getcwd in unistd.h
-@@ -134,6 +138,17 @@
+@@ -134,6 +138,17 @@ char *tempnam(const char *, const char *
char *full_qualified_tempnam(const char *pref)
{
@@ -31,7 +34,7 @@
#if defined (__BCPLUSPLUS__) || defined (__TCPLUSPLUS__)
/* borland has a prototype that expects a char * as second arg */
char *filename = tempnam(0, (char *) pref);
-@@ -161,6 +176,7 @@
+@@ -161,6 +176,7 @@ char *full_qualified_tempnam(const char
return filename;
}
#endif
@@ -39,7 +42,7 @@
}
unsigned short hextoint(const char hexchar)
-@@ -374,7 +390,11 @@
+@@ -374,7 +390,11 @@ ostream & operator << (ostream & out, co
TempFile::TempFile()
{
diff -r 928c55a5ff55 -r d60eddb76eb1 graphics/pstoedit/patches/patch-ae
--- a/graphics/pstoedit/patches/patch-ae Fri Feb 25 18:18:28 2005 +0000
+++ b/graphics/pstoedit/patches/patch-ae Fri Feb 25 18:31:43 2005 +0000
@@ -1,12 +1,14 @@
-$NetBSD: patch-ae,v 1.3 2003/12/03 11:18:05 markd Exp $
+$NetBSD: patch-ae,v 1.4 2005/02/25 18:31:43 drochner Exp $
---- drvsk.cpp.orig 2003-11-18 23:30:30.000000000 +1300
+--- drvsk.cpp.orig 2001-11-03 21:18:20.000000000 +0100
+++ drvsk.cpp
-@@ -62,7 +62,7 @@ PERFORMANCE OF THIS SOFTWARE.
+@@ -61,8 +61,8 @@ PERFORMANCE OF THIS SOFTWARE.
+ #include <stdlib.h>
#include <ctype.h>
#include <iomanip.h>
- #if (defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD) ) && !defined(DJGPP)
+-#if (defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD) ) && !defined(DJGPP)
-#include <strstream.h>
++#if (defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (__NetBSD__) ) && !defined(DJGPP)
+#include <strstream>
#else
#include <strstrea.h>
Home |
Main Index |
Thread Index |
Old Index