- do not explicitly pass CC to MAKE_ENV as pkgsrc already does so

- added fixes for IRIX

4 files changed, 33 insertions, 9 deletions

diff --git a/news/nn/Makefile b/news/nn/Makefile
index 7ced06bdb83..ec9528fa01d 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/10/15 10:27:53 schwarz Exp $
+# $NetBSD: Makefile,v 1.32 2006/10/15 16:43:37 schwarz Exp $
 
 DISTNAME=	nn-6.7.3
 CATEGORIES=	news
@@ -32,7 +32,9 @@ MFILE=		m-${LOWER_ARCH}.h
 CPP+=		-traditional
 .endif
 
-MAKE_ENV+=	CC=${CC:Q}
+.if ${OPSYS} == "IRIX"
+CPPFLAGS+=	-DHAVE_TERMIO_H
+.endif
 
 post-patch:
 	@${SED} -e ' \
diff --git a/news/nn/distinfo b/news/nn/distinfo
index 10c685d45ec..3527310579e 100644
--- a/news/nn/distinfo
+++ b/news/nn/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2006/10/14 19:33:45 schwarz Exp $
+$NetBSD: distinfo,v 1.13 2006/10/15 16:43:37 schwarz Exp $
 
 SHA1 (nn-6.7.3.tar.Z) = 1879aae59131e4b86e82021802918a0a39cea826
 RMD160 (nn-6.7.3.tar.Z) = 2617fe7dce42c36ae970579e27ebd00a60f23653
@@ -19,10 +19,10 @@ SHA1 (patch-ar) = 8c40f584182b734348d50489ffab1a03e791ef9c
 SHA1 (patch-at) = 11541ea36bbdacfbd84af6b3be4c4dbc983ef16d
 SHA1 (patch-au) = e247b3a62b24409a04a1f1604606d6e38474af67
 SHA1 (patch-av) = 4013cfa3d4dc9bba84593ce68310e7d9b75b0aa0
-SHA1 (patch-ax) = 8c8599991d71d4b72d56258bdaf474e4ddd13bd6
+SHA1 (patch-ax) = 43a0ca2f99c21ad0bcc047154d48d9ebf864fecf
 SHA1 (patch-ay) = d707b74d2c6d2f39b8515531cf90d435784deaf1
 SHA1 (patch-az) = 206fcead17eb09c8c019eeb78335841ff9ce9c94
-SHA1 (patch-ba) = d021b28f813aa39189b863cff3c5be059b904a54
+SHA1 (patch-ba) = a9c5dd3af5901d08bef80de67402b4cf82be6380
 SHA1 (patch-bb) = af094b78b3f2fc0cdb77dea834d74a35fbb170a4
 SHA1 (patch-bc) = 981b2abf745d41f82e1dd4b77981457a5f19591c
 SHA1 (patch-be) = 61eaadbf56104d484055ebf3b05eeaac045e4450
diff --git a/news/nn/patches/patch-ax b/news/nn/patches/patch-ax
index 9687055b166..48768757e39 100644
--- a/news/nn/patches/patch-ax
+++ b/news/nn/patches/patch-ax
@@ -1,8 +1,19 @@
-$NetBSD: patch-ax,v 1.6 2006/10/14 19:33:45 schwarz Exp $
+$NetBSD: patch-ax,v 1.7 2006/10/15 16:43:37 schwarz Exp $
 
 --- nntp.c.orig	2005-04-20 01:06:51.000000000 +0200
-+++ nntp.c	2006-10-14 20:33:45.000000000 +0200
-@@ -915,7 +915,11 @@
++++ nntp.c	2006-10-15 15:20:58.000000000 +0200
+@@ -57,8 +57,9 @@
+ #endif
+ 
+ /* This is necessary due to the definitions in m-XXX.h */
++/* IRIX needs it for struct sockaddr_in */
+ 
+-#if !defined(NETWORK_DATABASE) || defined(NETWORK_BYTE_ORDER)
++#if !defined(NETWORK_DATABASE) || defined(NETWORK_BYTE_ORDER) || defined(__sgi)
+ #include <netinet/in.h>
+ #endif
+ 
+@@ -915,7 +916,11 @@
  	server_real_name = hp->h_name;
      else
  	nn_exitmsg(1, "NNTPSERVER is invalid");
diff --git a/news/nn/patches/patch-ba b/news/nn/patches/patch-ba
index 560f1514ec0..5c1279a4318 100644
--- a/news/nn/patches/patch-ba
+++ b/news/nn/patches/patch-ba
@@ -1,5 +1,7 @@
+$NetBSD: patch-ba,v 1.5 2006/10/15 16:43:37 schwarz Exp $
+
 --- term.c.orig	2005-06-29 23:40:27.000000000 +0200
-+++ term.c	2006-10-14 21:03:30.000000000 +0200
++++ term.c	2006-10-15 15:22:58.000000000 +0200
 @@ -25,7 +25,7 @@
  #include "regexp.h"
  #include "nn_term.h"
@@ -9,6 +11,15 @@
  #include <stropts.h>
  #else
  #include <sys/ioctl.h>
+@@ -60,7 +60,7 @@
+ #else
+ #define USE_TERMCAP
+ 
+-#if !defined(SUNOS4) && !defined(NeXT)
++#if !defined(SUNOS4) && !defined(NeXT) && !defined(__sgi)
+ #include <termcap.h>
+ #endif				/* SUNOS4 */
+ 
 @@ -74,9 +74,9 @@
  
  #else