pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/news/nntpcache Convert to options framework.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1fe15856b8d0
branches:  trunk
changeset: 503913:1fe15856b8d0
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Dec 01 20:10:41 2005 +0000

description:
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:

 news/nntpcache/Makefile   |  17 +++--------------
 news/nntpcache/options.mk |  22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 14 deletions(-)

diffs (60 lines):

diff -r d9e06d90d972 -r 1fe15856b8d0 news/nntpcache/Makefile
--- a/news/nntpcache/Makefile   Thu Dec 01 19:59:49 2005 +0000
+++ b/news/nntpcache/Makefile   Thu Dec 01 20:10:41 2005 +0000
@@ -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 @@
 
 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 -r d9e06d90d972 -r 1fe15856b8d0 news/nntpcache/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/news/nntpcache/options.mk Thu Dec 01 20:10:41 2005 +0000
@@ -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



Home | Main Index | Thread Index | Old Index