- prevent extra -O from being added to optimizer flags

- added patches for IRIX and for SGI ido cc

5 files changed, 54 insertions, 8 deletions

diff --git a/mail/cue/Makefile b/mail/cue/Makefile
index 81534dcaba1..3a1c0b517b6 100644
--- a/mail/cue/Makefile
+++ b/mail/cue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/10/07 08:19:08 obache Exp $
+# $NetBSD: Makefile,v 1.52 2006/10/22 20:59:00 schwarz Exp $
 
 DISTNAME=	cue-snap-20060417
 PKGNAME=	${DISTNAME:S/snap-//}
@@ -12,6 +12,10 @@ GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${PKGSRC_COMPILER} == "ido"
+CPPFLAGS+=	-DNO_ATTRIBUTE
+.endif
+
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cue
 PKG_SUPPORTED_OPTIONS=	canna idea inet6
 
diff --git a/mail/cue/distinfo b/mail/cue/distinfo
index 982d2098344..70aba7485a0 100644
--- a/mail/cue/distinfo
+++ b/mail/cue/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.26 2006/10/07 08:19:08 obache Exp $
+$NetBSD: distinfo,v 1.27 2006/10/22 20:59:00 schwarz Exp $
 
 SHA1 (cue-snap-20060417.tar.gz) = 2153fb2710da44d74a3a03dc8b1234e9ce7c774f
 RMD160 (cue-snap-20060417.tar.gz) = c9db1f0404de6636d382e5d461144d14b3ff8c3e
 Size (cue-snap-20060417.tar.gz) = 176883 bytes
-SHA1 (patch-aa) = e6d38430c0ae6146c60db43597bc4c523cb292ae
+SHA1 (patch-aa) = c1ed53b1333b58dd8f794b2f028ed4c71a294c04
 SHA1 (patch-ab) = a94ec3a565bbde8e8ca064821867f7a978450687
+SHA1 (patch-ac) = 105da5dc78a6a493d3863de74ba91891653cc936
+SHA1 (patch-ad) = 0d3ce51529e2b0d7fcc051719bbd4ad008bd1b65
diff --git a/mail/cue/patches/patch-aa b/mail/cue/patches/patch-aa
index a8d83255278..b7437bab496 100644
--- a/mail/cue/patches/patch-aa
+++ b/mail/cue/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2006/10/07 08:19:08 obache Exp $
+$NetBSD: patch-aa,v 1.5 2006/10/22 20:59:01 schwarz Exp $
 
---- configure.orig	2005-04-27 20:54:13.000000000 +0900
-+++ configure
-@@ -1127,7 +1127,7 @@ fi
+--- configure.orig	2005-04-27 13:54:13.000000000 +0200
++++ configure	2006-10-22 22:53:47.000000000 +0200
+@@ -675,7 +675,7 @@
+ 	;;
+ esac
+ 
+-OPTS="-O"
++OPTS=""
+ 
+ 
+ 
+@@ -1127,7 +1127,7 @@
  rm -fr conftest*
  fi
  
@@ -11,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 2006/10/07 08:19:08 obache Exp $
  if test "$buggygetaddrinfo" = "yes"; then
  	if test "$ipv6" = "yes"; then
  		echo 'Fatal: You must get working getaddrinfo() function.'
-@@ -1135,6 +1135,7 @@ if test "$buggygetaddrinfo" = "yes"; the
+@@ -1135,6 +1135,7 @@
  		exit 1
  	fi
  fi
diff --git a/mail/cue/patches/patch-ac b/mail/cue/patches/patch-ac
new file mode 100644
index 00000000000..fd8b3f248be
--- /dev/null
+++ b/mail/cue/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2006/10/22 20:59:01 schwarz Exp $
+
+--- proc.c.orig	2006-10-22 22:37:56.000000000 +0200
++++ proc.c	2006-10-22 22:39:04.000000000 +0200
+@@ -41,6 +41,10 @@
+ 
+ #include "cue.h"
+ 
++#ifdef __sgi
++#define vfork() fork()
++#endif
++
+ struct procs {
+ 	struct procs *pr_next;
+ 	int pr_pid;
diff --git a/mail/cue/patches/patch-ad b/mail/cue/patches/patch-ad
new file mode 100644
index 00000000000..ac9553e42b6
--- /dev/null
+++ b/mail/cue/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2006/10/22 20:59:01 schwarz Exp $
+
+--- zip.h.orig	2006-10-22 22:42:35.000000000 +0200
++++ zip.h	2006-10-22 22:43:58.000000000 +0200
+@@ -30,6 +30,11 @@
+ #ifndef _ZIP_H
+ #define	_ZIP_H
+ 
++#ifdef NO_ATTRIBUTE
++/* some compilers don't like it */
++#define __attribute__(x)
++#endif
++
+ /*
+  * Definition of ZIP
+  */