summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--news/trn/Makefile10
-rw-r--r--news/trn/options.mk16
2 files changed, 18 insertions, 8 deletions
diff --git a/news/trn/Makefile b/news/trn/Makefile
index 3049bb7824c..8ac042ff7dc 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/09/28 20:52:25 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/01 19:29:26 wiz Exp $
DISTNAME= trn-4.0-test76
PKGNAME= trn-4.76
@@ -15,13 +15,7 @@ LICENSE= trn-license
PKG_SYSCONFSUBDIR= nntp
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_INN) && ${USE_INN} == YES
-DEPENDS= inn>=2.2:../../news/inn
-.else
-DEPENDS= nntpclnt>=1.6.1:../../news/nntpclnt
-.endif
+.include "options.mk"
# TRN_HOSTBITS determines the number of "name segments" (x.y.z.com), counting
# from right to left, that TRN will match to allow cancels, with 0 requiring
diff --git a/news/trn/options.mk b/news/trn/options.mk
new file mode 100644
index 00000000000..fa5653cc52c
--- /dev/null
+++ b/news/trn/options.mk
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2005/12/01 19:29:26 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.trn
+PKG_OPTIONS_REQUIRED_GROUPS= nntpclient
+PKG_OPTIONS_GROUP.nntpclient= trn-inn trn-nntpclnt
+PKG_SUGGESTED_OPTIONS+= trn-nntpclnt
+# remove after 2005Q4
+PKG_OPTIONS_LEGACY_VARS+= USE_INN:trn-inn
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minn)
+DEPENDS= inn>=2.2:../../news/inn
+.else
+DEPENDS= nntpclnt>=1.6.1:../../news/nntpclnt
+.endif