diff options
Diffstat (limited to 'news/nn')
-rw-r--r-- | news/nn/Makefile | 8 | ||||
-rw-r--r-- | news/nn/distinfo | 4 | ||||
-rw-r--r-- | news/nn/patches/patch-ai | 27 |
3 files changed, 22 insertions, 17 deletions
diff --git a/news/nn/Makefile b/news/nn/Makefile index ace9bd17f2c..09bcce56d2d 100644 --- a/news/nn/Makefile +++ b/news/nn/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.21 2004/03/22 10:25:26 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2004/05/03 12:56:10 kim Exp $ # FreeBSD Id: Makefile,v 1.14 1997/07/30 18:17:48 adam Exp # DISTNAME= nn-6.6.4 +PKGREVISION= 1 CATEGORIES= news MASTER_SITES= ftp://ftp.gw.com/pub/unix/news/nn/nn-6.6/ \ ftp://ftp.nndev.org/pub/nn-6.6/ \ @@ -13,6 +14,8 @@ MASTER_SITES= ftp://ftp.gw.com/pub/unix/news/nn/nn-6.6/ \ MAINTAINER= tech-pkg@NetBSD.org COMMENT= NN newsreader +PKG_SYSCONFSUBDIR= nntp + BUILD_DEFS+= USE_INN .include "../../mk/bsd.prefs.mk" @@ -27,7 +30,7 @@ SFILE= s-netbsd.h .if ${LOWER_ARCH} == "i386" MFILE= m-i80386.h -.else if ${LOWER_ARCH} == "mipseb" +.elif ${LOWER_ARCH} == "mipseb" MFILE= m-mipsel.h .else MFILE= m-${LOWER_ARCH}.h @@ -38,6 +41,7 @@ MAKE_ENV+= CC="${CC}" post-patch: @${SED} -e ' \ s#@PREFIX@#${PREFIX}#; \ + s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#; \ s#@BINOWN@#${BINOWN}#; \ s#@BINGRP@#${BINGRP}#; \ s#@MFILE@#${MFILE}#; \ diff --git a/news/nn/distinfo b/news/nn/distinfo index 5ee46afdc4f..69530b4a433 100644 --- a/news/nn/distinfo +++ b/news/nn/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/07/08 02:21:18 kim Exp $ +$NetBSD: distinfo,v 1.4 2004/05/03 12:56:10 kim Exp $ SHA1 (nn-6.6.4.tar.gz) = 9e89a1b93b4315d3ed484bf87495f357bb9cc7b4 Size (nn-6.6.4.tar.gz) = 581672 bytes @@ -9,7 +9,7 @@ SHA1 (patch-ad) = 30f6a683b9d6f6b347822589b72baf8c00ac5c2d SHA1 (patch-af) = 2287796a2c6e7aaddd5e8b766309d3fa706982d1 SHA1 (patch-ag) = 7d5055a2ae040a5588634f7ac1a2136cce325dc7 SHA1 (patch-ah) = 25a7d447f425e177a1c0c0628bc7432defb449fe -SHA1 (patch-ai) = b2ed7995a5e67566dc60371a6f456c36f0b3e46f +SHA1 (patch-ai) = 56f6d55fe15e67009d40871cc23339490df78e67 SHA1 (patch-aj) = fac8d9a74a0f4d4cc2226511607c50e38fd8af7e SHA1 (patch-ak) = 45790b88eee03fa755b227c05d53664c41d3688f SHA1 (patch-al) = 86ef5d494eaf07b024640d3d1d2ae36fcff0cb87 diff --git a/news/nn/patches/patch-ai b/news/nn/patches/patch-ai index a618964fd4b..c812d3a676b 100644 --- a/news/nn/patches/patch-ai +++ b/news/nn/patches/patch-ai @@ -1,17 +1,18 @@ -$NetBSD: patch-ai,v 1.5 2002/07/08 02:21:19 kim Exp $ +$NetBSD: patch-ai,v 1.6 2004/05/03 12:56:10 kim Exp $ ---- config.h-dist.orig Thu Feb 7 22:39:03 2002 -+++ config.h-dist Sun Jul 7 21:44:08 2002 -@@ -11,6 +11,8 @@ +--- config.h-dist.orig 2002-02-07 22:39:03.000000000 -0500 ++++ config.h-dist 2004-05-03 08:51:32.000000000 -0400 +@@ -11,6 +11,9 @@ * (c) Copyright 1990, Kim F. Storm. All rights reserved. */ +#define PREFIX "@PREFIX@" ++#define PKG_SYSCONFDIR "@PKG_SYSCONFDIR@" + #include <stdio.h> #include <ctype.h> -@@ -66,7 +68,7 @@ +@@ -66,7 +69,7 @@ * ascii files. (Thank you Geoff!) */ @@ -20,16 +21,16 @@ $NetBSD: patch-ai,v 1.5 2002/07/08 02:21:19 kim Exp $ /********************************** NNTP ********************************* -@@ -100,7 +102,7 @@ +@@ -100,7 +103,7 @@ * LIB_DIRECTORY defined below. */ -#define NNTP_SERVER "/usr/local/lib/nntp_server" -+#define NNTP_SERVER PREFIX "/etc/nntp/server" ++#define NNTP_SERVER PKG_SYSCONFDIR "/server" /* * Define NNTP_PATH_HOSTNAME to force a specific hostname into the -@@ -138,7 +140,7 @@ +@@ -138,7 +141,7 @@ * conf/s-template.h as a starting point for writing you own. */ @@ -38,7 +39,7 @@ $NetBSD: patch-ai,v 1.5 2002/07/08 02:21:19 kim Exp $ /********************** MACHINE DEPENDENT DEFINITIONS ********************** -@@ -149,7 +151,7 @@ +@@ -149,7 +152,7 @@ * conf/m-template.h as a starting point for writing you own. */ @@ -47,7 +48,7 @@ $NetBSD: patch-ai,v 1.5 2002/07/08 02:21:19 kim Exp $ /**************************** LOCALIZATION **************************** -@@ -182,8 +184,12 @@ +@@ -182,8 +185,12 @@ * (= LIB_DIRECTORY/Log if undefined). */ @@ -62,7 +63,7 @@ $NetBSD: patch-ai,v 1.5 2002/07/08 02:21:19 kim Exp $ /*************************** NEWS TRANSPORT ************************** -@@ -258,7 +264,10 @@ +@@ -258,7 +265,10 @@ */ /* #define REC_MAIL "/usr/lib/news/recmail" */ /* non-sendmail */ @@ -74,7 +75,7 @@ $NetBSD: patch-ai,v 1.5 2002/07/08 02:21:19 kim Exp $ /* -@@ -307,13 +316,13 @@ +@@ -307,13 +317,13 @@ * DAEMON_MAN - nnmaster */ @@ -92,7 +93,7 @@ $NetBSD: patch-ai,v 1.5 2002/07/08 02:21:19 kim Exp $ #define DAEMON_MAN_SECTION "8" -@@ -383,8 +392,8 @@ +@@ -383,8 +393,8 @@ * Common choices are: (news, news) and (your uid, your gid) */ |