Fixed PKGMANDIR and made the package build on NetBSD.

4 files changed, 29 insertions, 23 deletions

diff --git a/news/nn/Makefile b/news/nn/Makefile
index ec9528fa01d..a9f90f24ff6 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/10/15 16:43:37 schwarz Exp $
+# $NetBSD: Makefile,v 1.33 2006/11/12 01:28:03 rillig Exp $
 
 DISTNAME=	nn-6.7.3
 CATEGORIES=	news
@@ -40,6 +40,7 @@ post-patch:
 	@${SED} -e ' \
 	    s#@PREFIX@#${PREFIX}#; \
 	    s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#; \
+	    s#@PKGMANDIR@#${PKGMANDIR}#; \
 	    s#@BINOWN@#${BINOWN}#; \
 	    s#@BINGRP@#${BINGRP}#; \
 	    s#@MFILE@#${MFILE}#; \
diff --git a/news/nn/distinfo b/news/nn/distinfo
index 3527310579e..c1b3849d54f 100644
--- a/news/nn/distinfo
+++ b/news/nn/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2006/10/15 16:43:37 schwarz Exp $
+$NetBSD: distinfo,v 1.14 2006/11/12 01:28:03 rillig Exp $
 
 SHA1 (nn-6.7.3.tar.Z) = 1879aae59131e4b86e82021802918a0a39cea826
 RMD160 (nn-6.7.3.tar.Z) = 2617fe7dce42c36ae970579e27ebd00a60f23653
@@ -9,7 +9,7 @@ SHA1 (patch-ae) = 5d9968a29408cfc753b27cba6fc48076bb849317
 SHA1 (patch-af) = 446d8359228f5afd73d9d770b78cbe573e39fac0
 SHA1 (patch-ag) = 4857f66029c77e46e1506cb33a64ec098bdaeb39
 SHA1 (patch-ah) = d4d23e9072b473f3069218b43b8a54c9c4562c91
-SHA1 (patch-ai) = cf2c0b56772de4b630e6172a10f6f8ab69865c49
+SHA1 (patch-ai) = 03d4d5dbd0cc632acf23056dafc878fa7dced015
 SHA1 (patch-aj) = e7a6a94b242ae1ee652117799642b7711e049993
 SHA1 (patch-ak) = 005bf2286b0b988434d81b5c7cc5ab97e4909841
 SHA1 (patch-al) = 6bff7c2dd0739acf57db7d7694ed8cb68f1f3b3d
@@ -19,7 +19,7 @@ SHA1 (patch-ar) = 8c40f584182b734348d50489ffab1a03e791ef9c
 SHA1 (patch-at) = 11541ea36bbdacfbd84af6b3be4c4dbc983ef16d
 SHA1 (patch-au) = e247b3a62b24409a04a1f1604606d6e38474af67
 SHA1 (patch-av) = 4013cfa3d4dc9bba84593ce68310e7d9b75b0aa0
-SHA1 (patch-ax) = 43a0ca2f99c21ad0bcc047154d48d9ebf864fecf
+SHA1 (patch-ax) = bccf81e22dc530fce90b86b2f1c31ae72099e4b6
 SHA1 (patch-ay) = d707b74d2c6d2f39b8515531cf90d435784deaf1
 SHA1 (patch-az) = 206fcead17eb09c8c019eeb78335841ff9ce9c94
 SHA1 (patch-ba) = a9c5dd3af5901d08bef80de67402b4cf82be6380
diff --git a/news/nn/patches/patch-ai b/news/nn/patches/patch-ai
index 1fcfa181aaa..c8721cc929a 100644
--- a/news/nn/patches/patch-ai
+++ b/news/nn/patches/patch-ai
@@ -1,17 +1,18 @@
-$NetBSD: patch-ai,v 1.8 2006/10/14 19:33:45 schwarz Exp $
+$NetBSD: patch-ai,v 1.9 2006/11/12 01:28:03 rillig Exp $
 
 --- config.h-dist.orig	2005-04-01 22:44:22.000000000 +0200
-+++ config.h-dist	2006-10-14 20:03:22.000000000 +0200
-@@ -11,6 +11,8 @@
++++ config.h-dist	2006-11-12 02:24:05.000000000 +0100
+@@ -11,6 +11,9 @@
   *	(c) Copyright 1990, Kim F. Storm.  All rights reserved.
   */
  
 +#define PREFIX		"@PREFIX@"
 +#define PKG_SYSCONFDIR	"@PKG_SYSCONFDIR@"
++#define MANDIR		"@PREFIX@/@PKGMANDIR@"
  
  /*
   * The Good Net-Keeping Seal of Approval folks seem to think it necessary to
-@@ -68,7 +70,7 @@
+@@ -68,7 +71,7 @@
   *	LIB_DIRECTORY defined below.
   */
  
@@ -20,7 +21,7 @@ $NetBSD: patch-ai,v 1.8 2006/10/14 19:33:45 schwarz Exp $
  
  /*
   *  Define your local domain name.  If you leave this undefined, nn will
-@@ -95,7 +97,7 @@
+@@ -95,7 +98,7 @@
   *	conf/s-template.h as a starting point for writing you own.
   */
  
@@ -29,7 +30,7 @@ $NetBSD: patch-ai,v 1.8 2006/10/14 19:33:45 schwarz Exp $
  
  /*
   *	Define DEFAULT_PAGER as the initial value of the 'pager' variable.
-@@ -122,7 +124,7 @@
+@@ -122,7 +125,7 @@
   *	conf/m-template.h as a starting point for writing you own.
   */
  
@@ -38,7 +39,7 @@ $NetBSD: patch-ai,v 1.8 2006/10/14 19:33:45 schwarz Exp $
  
  
  /***************************** OWNERSHIP ***************************
-@@ -139,8 +141,8 @@
+@@ -139,8 +142,8 @@
   *	Common choices are: (news, news) and (your uid, your gid)
   */
  
@@ -49,7 +50,7 @@ $NetBSD: patch-ai,v 1.8 2006/10/14 19:33:45 schwarz Exp $
  
  
  /**************************** LOCALIZATION ****************************
-@@ -173,8 +175,12 @@
+@@ -173,8 +176,12 @@
   *			   (= LIB_DIRECTORY/Log if undefined).
   */
  
@@ -64,7 +65,7 @@ $NetBSD: patch-ai,v 1.8 2006/10/14 19:33:45 schwarz Exp $
  
  
  /*************************** MAIL INTERFACE *************************
-@@ -189,7 +195,11 @@
+@@ -189,7 +196,11 @@
   */
  
  /* #define REC_MAIL	"/usr/lib/news/recmail"	*/	/* non-sendmail */
@@ -77,25 +78,29 @@ $NetBSD: patch-ai,v 1.8 2006/10/14 19:33:45 schwarz Exp $
  
  /*
   *	nn needs to know the name of your host.
-@@ -237,13 +247,13 @@
+@@ -237,13 +248,17 @@
   *	DAEMON_MAN	- nnmaster
   */
  
 -#define USER_MAN_DIR	"/usr/local/man/man1"
-+#define USER_MAN_DIR	PREFIX "/man/man1"
++#ifndef MANDIR
++#define MANDIR PREFIX "/man"
++#endif
++
++#define USER_MAN_DIR	MANDIR "/man1"
  #define USER_MAN_SECTION	"1"
  
 -#define SYS_MAN_DIR	"/usr/local/man/man1"
 -#define SYS_MAN_SECTION		"1m"
-+#define SYS_MAN_DIR	PREFIX "/man/man1"
++#define SYS_MAN_DIR	MANDIR "/man1"
 +#define SYS_MAN_SECTION		"1"
  
 -#define DAEMON_MAN_DIR	"/usr/local/man/man8"
-+#define DAEMON_MAN_DIR	PREFIX "/man/man8"
++#define DAEMON_MAN_DIR	MANDIR "/man8"
  #define DAEMON_MAN_SECTION	"8"
  
  
-@@ -374,7 +384,7 @@
+@@ -374,7 +389,7 @@
   *	performance (no data conversion is needed).
   */
  
diff --git a/news/nn/patches/patch-ax b/news/nn/patches/patch-ax
index 48768757e39..8d1dd664db2 100644
--- a/news/nn/patches/patch-ax
+++ b/news/nn/patches/patch-ax
@@ -1,19 +1,19 @@
-$NetBSD: patch-ax,v 1.7 2006/10/15 16:43:37 schwarz Exp $
+$NetBSD: patch-ax,v 1.8 2006/11/12 01:28:03 rillig Exp $
 
 --- nntp.c.orig	2005-04-20 01:06:51.000000000 +0200
-+++ nntp.c	2006-10-15 15:20:58.000000000 +0200
-@@ -57,8 +57,9 @@
++++ nntp.c	2006-11-12 02:14:49.000000000 +0100
+@@ -57,8 +58,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)
++#if !defined(NETWORK_DATABASE) || defined(NETWORK_BYTE_ORDER) || defined(__sgi) || defined(__NetBSD__)
  #include <netinet/in.h>
  #endif
  
-@@ -915,7 +916,11 @@
+@@ -915,7 +917,11 @@ nntp_check(void)
  	server_real_name = hp->h_name;
      else
  	nn_exitmsg(1, "NNTPSERVER is invalid");