cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Roll the SQLite support for Dovecot into the main package. From Brad,

Browse Source 
I added a REVISION bump, and a @conflict marker because this is moving from
a subpackage to a package rather than rolling a FLAVOR into another.
This commit is contained in:
sthen 2012-05-17 07:48:15 +00:00
parent 07a378960e
commit 83705fdbd4
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mail/dovecot/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.186 2012/04/28 10:52:08 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.187 2012/05/17 07:48:15 sthen Exp $
SHARED_ONLY= Yes
@ -6,8 +6,7 @@ COMMENT-server= compact IMAP/POP3 server
COMMENT-ldap= LDAP authentication support for Dovecot
COMMENT-mysql= MySQL authentication / dictionary support for Dovecot
COMMENT-postgresql= PostgreSQL authentication / dictionary support for Dovecot
COMMENT-sqlite= SQLite authentication / dictionary support for Dovecot
REVISION-sqlite = 0
REVISION-server= 0
# Bump dovecot-pigeonhole every time you update to a new Dovecot version.
V_MAJOR= 2.0
@ -19,7 +18,6 @@ PKGNAME-server= dovecot-${V_DOVECOT}
PKGNAME-ldap= dovecot-ldap-${V_DOVECOT}
PKGNAME-mysql= dovecot-mysql-${V_DOVECOT}
PKGNAME-postgresql= dovecot-postgresql-${V_DOVECOT}
PKGNAME-sqlite= dovecot-sqlite-${V_DOVECOT}
CATEGORIES= mail
MASTER_SITES= ${HOMEPAGE}releases/${V_MAJOR}/
@ -39,11 +37,11 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB-server= asn1 bz2 c crypto gssapi krb5 ssl z ${MODLIBICONV_WANTLIB}
WANTLIB-server= asn1 bz2 c crypto gssapi krb5 sqlite3 ssl z \
${MODLIBICONV_WANTLIB}
WANTLIB-ldap= asn1 com_err crypto gssapi krb5 lber-2.4 ldap-2.4 sasl2 ssl
WANTLIB-mysql= crypto m lib/mysql/mysqlclient>=10 ssl z
WANTLIB-postgresql= com_err crypto pq>=4 ssl
WANTLIB-sqlite= sqlite3 z
MODULES= converters/libiconv
LIB_DEPENDS+= archivers/bzip2
@ -53,13 +51,13 @@ LIB_DEPENDS-mysql= databases/mysql
RUN_DEPENDS-mysql= ${BASE_PKGPATH}=${V_DOVECOT}
LIB_DEPENDS-postgresql= databases/postgresql
RUN_DEPENDS-postgresql= ${BASE_PKGPATH}=${V_DOVECOT}
RUN_DEPENDS-sqlite= ${BASE_PKGPATH}=${V_DOVECOT}
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-gssapi \
--with-rundir=/var/dovecot \
--with-sql=plugin \
--with-sqlite \
--with-statedir=/var/dovecot \
--without-pam \
--without-shadow \
@ -67,10 +65,10 @@ CONFIGURE_ARGS= --with-gssapi \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
PSEUDO_FLAVORS= no_db no_ldap no_mysql no_postgresql no_sqlite
PSEUDO_FLAVORS= no_db no_ldap no_mysql no_postgresql
FLAVOR?=
.if ${FLAVOR:Mno_db}
FLAVOR+= no_ldap no_mysql no_postgresql no_sqlite
FLAVOR+= no_ldap no_mysql no_postgresql
.endif
MULTI_PACKAGES= -server
@ -88,10 +86,6 @@ MULTI_PACKAGES+=-mysql
MULTI_PACKAGES+=-postgresql
.endif
.if !${FLAVOR:L:Mno_sqlite}
MULTI_PACKAGES+=-sqlite
.endif
.include <bsd.port.arch.mk>
.if ${BUILD_PACKAGES:M-ldap}
@ -106,10 +100,6 @@ CONFIGURE_ARGS+=--with-mysql
CONFIGURE_ARGS+=--with-pgsql
.endif
.if ${BUILD_PACKAGES:M-sqlite}
CONFIGURE_ARGS+=--with-sqlite
.endif
post-extract:
@${INSTALL} -m 555 ${FILESDIR}/krb5-config ${WRKDIR}/bin

7
mail/dovecot/pkg/PLIST-server
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.29 2012/04/10 22:39:08 sthen Exp $
@comment $OpenBSD: PLIST-server,v 1.30 2012/05/17 07:48:15 sthen Exp $
@pkgpath mail/dovecot
@pkgpath mail/dovecot,-server,bdb
@pkgpath mail/dovecot,-server,bdb,ldap,mysql,postgresql,sqlite
@ -11,6 +11,8 @@
@pkgpath mail/dovecot,mysql
@pkgpath mail/dovecot,postgresql
@pkgpath mail/dovecot,sqlite
@pkgpath mail/dovecot,-sqlite
@conflict dovecot-sqlite-*
@ask-update dovecot-<2.0 You will need to change your conf
@newgroup _dovecot:518
@newgroup _dovenull:666
@ -343,7 +345,9 @@ include/dovecot/wildcard-match.h
include/dovecot/write-full.h
lib/dovecot/
lib/dovecot/auth/
lib/dovecot/auth/libdriver_sqlite.so
lib/dovecot/dict/
lib/dovecot/dict/libdriver_sqlite.so
lib/dovecot/doveadm/
lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so
lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so
@ -372,6 +376,7 @@ lib/dovecot/lib30_imap_zlib_plugin.so
@lib lib/dovecot/libdovecot-sql.so.${LIBdovecot-sql_VERSION}
@lib lib/dovecot/libdovecot-storage.so.${LIBdovecot-storage_VERSION}
@lib lib/dovecot/libdovecot.so.${LIBdovecot_VERSION}
lib/dovecot/libdriver_sqlite.so
libexec/dovecot/
@bin libexec/dovecot/anvil
@bin libexec/dovecot/auth