summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron>1999-07-26 19:47:37 +0000
committertron <tron>1999-07-26 19:47:37 +0000
commit2ff0920cb9702f4f4ddcb402304b3562aa24e0bf (patch)
tree31ce46bb3a9ded6b7247ef7dcac16e37e08c7623
parentb5bd5191bf49da1314d1fcf8fb60bde42a709047 (diff)
downloadpkgsrc-2ff0920cb9702f4f4ddcb402304b3562aa24e0bf.tar.gz
New variable "USE_INN" to use "inn" instead of "nntclnt" to provide
"inews" binary for newsreaders.
-rw-r--r--mk/mk.conf.example8
-rw-r--r--news/nn/Makefile10
-rw-r--r--news/trn/Makefile8
3 files changed, 21 insertions, 5 deletions
diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index f9b500236f2..d4294420dd7 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.63 1999/07/19 00:14:34 tron Exp $
+# $NetBSD: mk.conf.example,v 1.64 1999/07/26 19:47:37 tron Exp $
#
# Sample /etc/mk.conf file, which can be used to set specific values
@@ -317,6 +317,12 @@ PAPERSIZE= A4 # Default paper size for packages.
# Possible: defined, not defined
# Default: not defined
+#USE_INN= # Used in many packages to specify use of
+ # "inn" instead of "nntpclnt" package to
+ # provide "inews" binary.
+ # Possible: not defined, YES
+ # Default: not defined
+
#USE_MENUS= # Used in xvile package to build in support for
# menus.
# Possible: defined, not defined
diff --git a/news/nn/Makefile b/news/nn/Makefile
index b8584fc57c3..4ac9025ea6c 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/06/22 13:00:14 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/07/26 19:47:37 tron Exp $
# $FreeBSD Id: Makefile,v 1.14 1997/07/30 18:17:48 adam Exp
#
@@ -10,7 +10,13 @@ MASTER_SITES= ftp://uniwa.uwa.edu.au/pub/nn/old/beta/ \
MAINTAINER= tron@netbsd.org
-DEPENDS= nntpclnt-1.6.1:../../news/nntpclnt
+.include <../../mk/bsd.prefs.mk>
+
+.if defined(USE_INN) && ${USE_INN} == YES
+DEPENDS= inn-2.2:../inn
+.else
+DEPENDS= nntpclnt-1.6.1:../nntpclnt
+.endif
post-extract:
@${MV} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h
diff --git a/news/trn/Makefile b/news/trn/Makefile
index 62c354baa47..33d8155c14e 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/02/22 16:12:07 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/07/26 19:47:37 tron Exp $
#
DISTNAME= trn-3.6
@@ -7,7 +7,11 @@ MASTER_SITES= ftp://ftp.wustl.edu/packages/news/readers/trn/
MAINTAINER= packages@netbsd.org
-DEPENDS= nntpclnt-1.6.1:../../news/nntpclnt
+.if defined(USE_INN) && ${USE_INN} == YES
+DEPENDS= inn-2.2:../inn
+.else
+DEPENDS= nntpclnt-1.6.1:../nntpclnt
+.endif
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure