summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--news/tin/Makefile16
-rw-r--r--news/tin/distinfo8
-rw-r--r--news/tin/options.mk7
3 files changed, 18 insertions, 13 deletions
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 503c5456e0c..4be576680ee 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2006/06/20 22:20:49 minskim Exp $
+# $NetBSD: Makefile,v 1.29 2006/07/17 15:48:47 rillig Exp $
#
-DISTNAME= tin-1.8.1
+DISTNAME= tin-1.8.2
CATEGORIES= news
MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/current/ \
ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/current/ \
@@ -16,6 +16,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.tin.org/
COMMENT= TIN newsreader (termcap based)
+# See src/nntplib.c, vms/vms.c
LICENSE= no-profit
RESTRICTED= Profit from use, sale, trade, or reproduction disallowed
@@ -23,7 +24,7 @@ GNU_CONFIGURE= yes
USE_PKGLOCALEDIR=yes
# for tinews.pl
USE_TOOLS+= perl:run yacc
-REPLACE_PERL= tools/tinews.pl
+REPLACE_PERL= tools/*.pl
BUILD_TARGET= build
.include "options.mk"
@@ -41,10 +42,11 @@ CONFIGURE_ARGS+= --with-defaults-dir=${PREFIX}/etc
CONFIGURE_ARGS+= --enable-mh-mail-handling
CONFIGURE_ARGS+= --with-coffee
-post-patch:
- @${MV} ${WRKSRC}/doc/tin.1 ${WRKSRC}/doc/tin.1.dist
- @${SED} -e 's:/etc/nntpserver:${PREFIX}/etc/nntp/server:' \
- <${WRKSRC}/doc/tin.1.dist >${WRKSRC}/doc/tin.1
+SUBST_CLASSES+= tin
+SUBST_STAGE.tin= pre-configure
+SUBST_MESSAGE.tin= Adjusting path to the configuration directory.
+SUBST_FILES.tin= doc/tin.1
+SUBST_SED.tin= -e 's:/etc/nntpserver:${PREFIX}/etc/nntp/server:'
post-configure:
${ECHO} '#define NNTP_SERVER_FILE "${PREFIX}/etc/nntp/server"' >>${WRKSRC}/include/autoconf.h
diff --git a/news/tin/distinfo b/news/tin/distinfo
index 4f20208fbb3..63e29a1e032 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2006/02/16 18:01:05 wiz Exp $
+$NetBSD: distinfo,v 1.12 2006/07/17 15:48:47 rillig Exp $
-SHA1 (tin-1.8.1.tar.bz2) = 39253fe626f97295203f5ded3f6bb935e5ad6f63
-RMD160 (tin-1.8.1.tar.bz2) = 145ebf7ca4f94402f39124ec505126cb0ac22a73
-Size (tin-1.8.1.tar.bz2) = 1435271 bytes
+SHA1 (tin-1.8.2.tar.bz2) = 59f13c9eeda414c42f61c408cbac6a59efdc4134
+RMD160 (tin-1.8.2.tar.bz2) = 2af922eb2fdc10fd6b305d6a3d033fd116db25ae
+Size (tin-1.8.2.tar.bz2) = 1436706 bytes
SHA1 (patch-aa) = a3d40ff4e38230bcf8a3814c92ec2a75f85bf44e
diff --git a/news/tin/options.mk b/news/tin/options.mk
index 659ed994e90..b96517981c1 100644
--- a/news/tin/options.mk
+++ b/news/tin/options.mk
@@ -1,4 +1,6 @@
-# $NetBSD: options.mk,v 1.4 2006/01/03 00:06:49 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2006/07/17 15:48:47 rillig Exp $
+
+.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS_VAR= PKG_OPTIONS.tin
PKG_SUPPORTED_OPTIONS= curses icu inet6 tin-use-inn-spool
@@ -22,7 +24,8 @@ CONFIGURE_ARGS+= --enable-ipv6
.endif
.if !empty(PKG_OPTIONS:Mtin-use-inn-spool)
-INN_DATA_DIR?= /var/news
+BUILD_DEFS+= INN_DATA_DIR VARBASE
+INN_DATA_DIR?= ${VARBASE}/news
CONFIGURE_ARGS+= --with-inews-dir=${PREFIX}/inn/bin \
--with-libdir=${INN_DATA_DIR}/db \
--with-spooldir=${INN_DATA_DIR}/spool/articles \