summaryrefslogtreecommitdiff
path: root/news
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2005-12-01 20:10:41 +0000
committerwiz <wiz@pkgsrc.org>2005-12-01 20:10:41 +0000
commit4c538e27bc38ac29c1e7628554f82b65b84303ec (patch)
treebfb2824df9da26dab25199eb0ae2286f523a6ae1 /news
parent5a22c2238de561e03cabcd5a9d080a382f21554a (diff)
downloadpkgsrc-4c538e27bc38ac29c1e7628554f82b65b84303ec.tar.gz
Convert to options framework.
Fix a pkglint quoting warning while here. XXX: openldap option disabled, since package does not compile with it. XXX: package should use PKG_SYSCONFDIR and rc.d script frameworks.
Diffstat (limited to 'news')
-rw-r--r--news/nntpcache/Makefile17
-rw-r--r--news/nntpcache/options.mk22
2 files changed, 25 insertions, 14 deletions
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 6c609383123..f62c11c023a 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:26 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/01 20:10:41 wiz Exp $
DISTNAME= nntpcache-3.0.1
CATEGORIES= news
@@ -11,22 +11,11 @@ COMMENT= NNTP multi-server caching daemon
LICENSE= fee-based-commercial-use
-# enable pgp signed nocem support?
-NNTP_USE_PGP?= no
-
-.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
-DEPENDS+= openldap-[0-9]*:../../databases/openldap
-.endif
-
-.if ${NNTP_USE_PGP} == yes
-DEPENDS+= pgp-2.*:../../security/pgp2
-.endif
-
-BUILD_DEFS+= USE_OPENLDAP NNTP_USE_PGP
+.include "options.mk"
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${VARBASE}/spool
-CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
USE_TOOLS+= gmake
INSTALL_TARGET= SUBDIRS="cf src filters http doc pgp contrib/newshound contrib/perlnewshound innreport scripts unixauth" \
diff --git a/news/nntpcache/options.mk b/news/nntpcache/options.mk
new file mode 100644
index 00000000000..396409fba43
--- /dev/null
+++ b/news/nntpcache/options.mk
@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1 2005/12/01 20:10:41 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.nntpcache
+PKG_SUPPORTED_OPTIONS= nntpcache-pgp
+# compile error:
+# authinfo_ldap.c: In function `ldap_got_pass':
+# authinfo_ldap.c:81: error: dereferencing pointer to incomplete type
+# authinfo_ldap.c:47: warning: unused variable `dom'
+# PKG_SUPPORTED_OPTIONS+= openldap
+# remove after 2005Q4
+PKG_OPTIONS_LEGACY_VARS+= NNTP_USE_PGP:nntpcache-pgp
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mnntpcache-pgp)
+DEPENDS+= pgp-2.*:../../security/pgp2
+.endif
+
+.if !empty(PKG_OPTIONS:Mopenldap)
+CONFIGURE_ARGS+= --with-authinfo-ldap
+.include "../../databases/openldap/buildlink3.mk"
+.endif