Fri Apr 30 10:50:21 2010 UTC ()
Fix some pkglint nits.


(ghen)
diff -r1.25 -r1.26 pkgsrc/mail/dovecot/options.mk
cvs diff -r1.25 -r1.26 pkgsrc/mail/dovecot/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/dovecot/Attic/options.mk 2010/04/30 10:43:26 1.25
+++ pkgsrc/mail/dovecot/Attic/options.mk 2010/04/30 10:50:21 1.26
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: options.mk,v 1.25 2010/04/30 10:43:26 ghen Exp $ 1# $NetBSD: options.mk,v 1.26 2010/04/30 10:50:21 ghen Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot 3PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot
4PKG_SUPPORTED_OPTIONS= dovecot-sieve dovecot-managesieve gssapi 4PKG_SUPPORTED_OPTIONS= dovecot-sieve dovecot-managesieve gssapi
5PKG_SUPPORTED_OPTIONS+= kqueue ldap mysql pam pgsql sqlite 5PKG_SUPPORTED_OPTIONS+= kqueue ldap mysql pam pgsql sqlite
6PKG_OPTIONS_OPTIONAL_GROUPS= ssl 6PKG_OPTIONS_OPTIONAL_GROUPS= ssl
7PKG_OPTIONS_GROUP.ssl= gnutls ssl 7PKG_OPTIONS_GROUP.ssl= gnutls ssl
8PKG_SUGGESTED_OPTIONS= ssl 8PKG_SUGGESTED_OPTIONS= ssl
9 9
10.if defined(PKG_HAVE_KQUEUE) 10.if defined(PKG_HAVE_KQUEUE)
11PKG_SUGGESTED_OPTIONS+= kqueue 11PKG_SUGGESTED_OPTIONS+= kqueue
12.endif 12.endif
13 13
14.include "../../mk/bsd.options.mk" 14.include "../../mk/bsd.options.mk"
15 15
16### 16###
17### Build with OpenSSL or GNU TLS as the underlying crypto library. 17### Build with OpenSSL or GNU TLS as the underlying crypto library.
18### 18###
19.if !empty(PKG_OPTIONS:Mssl) 19.if !empty(PKG_OPTIONS:Mssl)
20CONFIGURE_ARGS+= --with-ssl=openssl 20CONFIGURE_ARGS+= --with-ssl=openssl
21CONFIGURE_ENV+= SSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include" 21CONFIGURE_ENV+= SSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
22CONFIGURE_ENV+= SSL_LIBS="-lssl -lcrypto" 22CONFIGURE_ENV+= SSL_LIBS="-lssl -lcrypto"
23BUILDLINK_API_DEPENDS.openssl=openssl>=0.9.8a 23BUILDLINK_API_DEPENDS.openssl+=openssl>=0.9.8a
24. include "../../security/openssl/buildlink3.mk" 24. include "../../security/openssl/buildlink3.mk"
25.elif !empty(PKG_OPTIONS:Mgnutls) 25.elif !empty(PKG_OPTIONS:Mgnutls)
26CONFIGURE_ARGS+= --with-ssl=gnutls 26CONFIGURE_ARGS+= --with-ssl=gnutls
27. include "../../security/gnutls/buildlink3.mk" 27. include "../../security/gnutls/buildlink3.mk"
28.else 28.else
29CONFIGURE_ARGS+= --without-ssl 29CONFIGURE_ARGS+= --without-ssl
30.endif 30.endif
31 31
32### 32###
33### MySQL support. 33### MySQL support.
34### 34###
35.if !empty(PKG_OPTIONS:Mmysql) 35.if !empty(PKG_OPTIONS:Mmysql)
36CONFIGURE_ARGS+= --with-mysql 36CONFIGURE_ARGS+= --with-mysql
@@ -94,45 +94,45 @@ CONFIGURE_ARGS+= --without-gssapi @@ -94,45 +94,45 @@ CONFIGURE_ARGS+= --without-gssapi
94 94
95### 95###
96### Sieve and the ManageSieve patch 96### Sieve and the ManageSieve patch
97### 97###
98.if !empty(PKG_OPTIONS:Mdovecot-sieve) 98.if !empty(PKG_OPTIONS:Mdovecot-sieve)
99# ManageSieve needs Sieve to build. 99# ManageSieve needs Sieve to build.
100# We can't simply use CONFIGURE_DIRS+= and BUILD_DIRS+= 100# We can't simply use CONFIGURE_DIRS+= and BUILD_DIRS+=
101# because dovecot must be built before sieve can be configured 101# because dovecot must be built before sieve can be configured
102# and sieve must be built before managesieve can be configured/built. 102# and sieve must be built before managesieve can be configured/built.
103# So use post-build in Makefile. Sigh. 103# So use post-build in Makefile. Sigh.
104# 104#
105# Default so we can use += below 105# Default so we can use += below
106DISTFILES= ${DEFAULT_DISTFILES} 106DISTFILES= ${DEFAULT_DISTFILES}
107PLIST_SRC= ${PLIST_SRC_DFLT} 107PLIST_SRC= ${PLIST_SRC_DFLT:Q}
108INSTALL_DIRS= ${WRKSRC} 108INSTALL_DIRS= ${WRKSRC}
109# sieve (must be built after dovecot, before managesieve) 109# sieve (must be built after dovecot, before managesieve)
110DISTFILES+= dovecot-${DOVECOT_VERSION}-sieve-${SIEVE_VERSION}.tar.gz 110DISTFILES+= dovecot-${DOVECOT_VERSION}-sieve-${SIEVE_VERSION}.tar.gz
111SITES.dovecot-${DOVECOT_VERSION}-sieve-${SIEVE_VERSION}.tar.gz=\ 111SITES.dovecot-${DOVECOT_VERSION}-sieve-${SIEVE_VERSION}.tar.gz=\
112 ${DOVECOT_SIEVE_SITES} 112 ${DOVECOT_SIEVE_SITES}
113WRKSRC.sieve= ${WRKDIR}/dovecot-${DOVECOT_VERSION}-sieve-${SIEVE_VERSION} 113WRKSRC.sieve= ${WRKDIR}/dovecot-${DOVECOT_VERSION}-sieve-${SIEVE_VERSION}
114CONFIGURE_ARGS.sieve= --with-dovecot=${WRKSRC} 114CONFIGURE_ARGS.sieve= --with-dovecot=${WRKSRC}
115CONFIGURE_ARGS.sieve+= --docdir=${PREFIX}/share/doc 115CONFIGURE_ARGS.sieve+= --docdir=${PREFIX}/share/doc
116INSTALL_DIRS+= ${WRKSRC.sieve} 116INSTALL_DIRS+= ${WRKSRC.sieve}
117# Augment PLIST for sieve 117# Augment PLIST for sieve
118PLIST_SRC+= ${PKGDIR}/PLIST.sieve 118PLIST_SRC+= ${PKGDIR}/PLIST.sieve
119 119
120.if !empty(PKG_OPTIONS:Mdovecot-managesieve) 120. if !empty(PKG_OPTIONS:Mdovecot-managesieve)
121# The managesieve patch to dovecot 121# The managesieve patch to dovecot
122PATCHFILES+= ${MANAGESIEVE_PATCH} 122PATCHFILES+= ${MANAGESIEVE_PATCH}
123# managesieve itself (built after both dovecot and sieve) 123# managesieve itself (built after both dovecot and sieve)
124DISTFILES+= dovecot-${DOVECOT_VERSION}-managesieve-${MANAGESIEVE_VERSION}.tar.gz 124DISTFILES+= dovecot-${DOVECOT_VERSION}-managesieve-${MANAGESIEVE_VERSION}.tar.gz
125SITES.dovecot-${DOVECOT_VERSION}-managesieve-${MANAGESIEVE_VERSION}.tar.gz=\ 125SITES.dovecot-${DOVECOT_VERSION}-managesieve-${MANAGESIEVE_VERSION}.tar.gz=\
126 ${DOVECOT_SIEVE_SITES} 126 ${DOVECOT_SIEVE_SITES}
127WRKSRC.managesieve= ${WRKDIR}/dovecot-${DOVECOT_VERSION}-managesieve-${MANAGESIEVE_VERSION} 127WRKSRC.managesieve= ${WRKDIR}/dovecot-${DOVECOT_VERSION}-managesieve-${MANAGESIEVE_VERSION}
128CONFIGURE_ARGS.managesieve=\ 128CONFIGURE_ARGS.managesieve=\
129 --with-dovecot=${WRKSRC} --with-dovecot-sieve=${WRKSRC.sieve} 129 --with-dovecot=${WRKSRC} --with-dovecot-sieve=${WRKSRC.sieve}
130INSTALL_DIRS+= ${WRKSRC.managesieve} 130INSTALL_DIRS+= ${WRKSRC.managesieve}
131# Augment PLIST for managesieve 131# Augment PLIST for managesieve
132PLIST_SRC+= ${PKGDIR}/PLIST.managesieve 132PLIST_SRC+= ${PKGDIR}/PLIST.managesieve
133.endif # dovecot-managesieve 133. endif # dovecot-managesieve
134.endif # dovecot-sieve 134.endif # dovecot-sieve
135 135
136.if !empty(PKG_OPTIONS:Mdovecot-managesieve) && empty(PKG_OPTIONS:Mdovecot-sieve) 136.if !empty(PKG_OPTIONS:Mdovecot-managesieve) && empty(PKG_OPTIONS:Mdovecot-sieve)
137PKG_FAIL_REASON= "You cannot enable dovecot-managesieve without dovecot-sieve." 137PKG_FAIL_REASON+= "You cannot enable dovecot-managesieve without dovecot-sieve."
138.endif 138.endif