Tue Nov 9 15:51:48 2010 UTC ()
Argh, missed the fact that adam imported the sieve plugin as a separate
dovecot2-pigonhole package.  Back out the changes related to this.


(ghen)
diff -r1.3 -r1.4 pkgsrc/mail/dovecot2/Makefile
diff -r1.3 -r1.4 pkgsrc/mail/dovecot2/distinfo
diff -r1.2 -r1.3 pkgsrc/mail/dovecot2/options.mk
diff -r1.2 -r1.3 pkgsrc/mail/dovecot2/patches/patch-aa
diff -r0 -r1.3 pkgsrc/mail/dovecot2/patches/patch-af
cvs diff -r1.3 -r1.4 pkgsrc/mail/dovecot2/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/dovecot2/Makefile 2010/11/09 15:35:47 1.3
+++ pkgsrc/mail/dovecot2/Makefile 2010/11/09 15:51:48 1.4
@@ -1,22 +1,18 @@ @@ -1,22 +1,18 @@
1# $NetBSD: Makefile,v 1.3 2010/11/09 15:35:47 ghen Exp $ 1# $NetBSD: Makefile,v 1.4 2010/11/09 15:51:48 ghen Exp $
2 2
3DOVECOT_VERSION= 2.0 3DISTNAME= dovecot-2.0.7
4DOVECOT_SUBVERSION= .7 
5SIEVE_VERSION= 0.2.1 
6DISTNAME= dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION} 
7CATEGORIES= mail 4CATEGORIES= mail
8MASTER_SITES= http://www.dovecot.org/releases/${DOVECOT_VERSION}/ 5MASTER_SITES= http://www.dovecot.org/releases/2.0/
9DOVECOT_SIEVE_SITES= http://www.rename-it.nl/dovecot/${DOVECOT_VERSION}/ 
10 6
11MAINTAINER= ghen@NetBSD.org 7MAINTAINER= ghen@NetBSD.org
12HOMEPAGE= http://www.dovecot.org/ 8HOMEPAGE= http://www.dovecot.org/
13COMMENT= Secure IMAP and POP3 server 9COMMENT= Secure IMAP and POP3 server
14LICENSE= mit AND gnu-lgpl-v2.1 AND modified-bsd 10LICENSE= mit AND gnu-lgpl-v2.1 AND modified-bsd
15 11
16PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
17PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
18 14
19USE_TOOLS+= pkg-config rpcgen 15USE_TOOLS+= pkg-config rpcgen
20USE_LIBTOOL= yes 16USE_LIBTOOL= yes
21GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
22CONFIGURE_ARGS+= --localstatedir=${VARBASE} 18CONFIGURE_ARGS+= --localstatedir=${VARBASE}
@@ -36,56 +32,38 @@ PKG_USERS= ${DOVECOT_USER}:${DOVECOT_GR @@ -36,56 +32,38 @@ PKG_USERS= ${DOVECOT_USER}:${DOVECOT_GR
36 ${DOVENULL_USER}:${DOVENULL_GROUP} 32 ${DOVENULL_USER}:${DOVENULL_GROUP}
37PKG_GROUPS_VARS= DOVECOT_GROUP DOVENULL_GROUP 33PKG_GROUPS_VARS= DOVECOT_GROUP DOVENULL_GROUP
38PKG_USERS_VARS= DOVECOT_USER DOVENULL_USER 34PKG_USERS_VARS= DOVECOT_USER DOVENULL_USER
39 35
40PKG_GECOS.${DOVECOT_USER}= Dovecot IMAP/POP3 user 36PKG_GECOS.${DOVECOT_USER}= Dovecot IMAP/POP3 user
41PKG_GECOS.${DOVENULL_USER}= Dovecot login user 37PKG_GECOS.${DOVENULL_USER}= Dovecot login user
42 38
43SUBST_CLASSES+= ssldir 39SUBST_CLASSES+= ssldir
44SUBST_MESSAGE.ssldir= Fixing SSLDIR 40SUBST_MESSAGE.ssldir= Fixing SSLDIR
45SUBST_FILES.ssldir= doc/example-config/conf.d/10-ssl.conf 41SUBST_FILES.ssldir= doc/example-config/conf.d/10-ssl.conf
46SUBST_STAGE.ssldir= pre-configure 42SUBST_STAGE.ssldir= pre-configure
47SUBST_SED.ssldir= -e 's,/etc/ssl,${SSLDIR},' 43SUBST_SED.ssldir= -e 's,/etc/ssl,${SSLDIR},'
48 44
49SUBST_CLASSES+= egdir 
50SUBST_MESSAGE.egdir= Fixing EGDIR 
51# sieve adds another file here (in options.mk) 
52SUBST_FILES.egdir= doc/example-config/Makefile.in 
53SUBST_FILES.egdir+= doc/example-config/conf.d/Makefile.in 
54SUBST_FILES.egdir+= src/config/Makefile.in 
55SUBST_STAGE.egdir= pre-configure 
56SUBST_SED.egdir= -e 's,^exampledir = .*/example-config,exampledir = ${PREFIX}/share/examples/dovecot,' 
57 
58EGDIR= ${PREFIX}/share/examples/dovecot 45EGDIR= ${PREFIX}/share/examples/dovecot
59 46
60CNFS_cmd= ${SED} -ne "s,^share/examples/dovecot/,,p" PLIST 47CNFS_cmd= ${SED} -ne "s,^share/examples/dovecot/,,p" PLIST
61CNFS= ${CNFS_cmd:sh} 48CNFS= ${CNFS_cmd:sh}
62CONF_FILES= ${EGDIR}/dovecot.conf ${PKG_SYSCONFDIR}/dovecot/dovecot-example.conf 49CONF_FILES= ${EGDIR}/dovecot.conf ${PKG_SYSCONFDIR}/dovecot/dovecot-example.conf
63.for file in ${CNFS} 50.for file in ${CNFS}
64CONF_FILES+= ${EGDIR}/${file:Q} ${PKG_SYSCONFDIR}/dovecot/${file:Q} 51CONF_FILES+= ${EGDIR}/${file:Q} ${PKG_SYSCONFDIR}/dovecot/${file:Q}
65.endfor 52.endfor
66 53
67INSTALLATION_DIRS= libexec/dovecot sbin share/doc/dovecot 54INSTALLATION_DIRS= libexec/dovecot sbin share/doc/dovecot
68INSTALLATION_DIRS+= share/examples/dovecot share/examples/dovecot/conf.d 55INSTALLATION_DIRS+= share/examples/dovecot share/examples/dovecot/conf.d
69OWN_DIRS= ${PKG_SYSCONFDIR}/dovecot/ 56OWN_DIRS= ${PKG_SYSCONFDIR}/dovecot/
70OWN_DIRS+= ${PKG_SYSCONFDIR}/dovecot/conf.d 57OWN_DIRS+= ${PKG_SYSCONFDIR}/dovecot/conf.d
71 58
72BUILD_DEFS+= VARBASE 59BUILD_DEFS+= VARBASE
73 60
74.include "options.mk" 
75 
76post-build: 
77.if !empty(PKG_OPTIONS:Mdovecot-sieve) 
78# We need dovecot built in order to be able to configure sieve. 
79 cd ${WRKSRC.sieve} \ 
80 && env ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} ${CONFIGURE_ARGS.sieve} 
81 cd ${WRKSRC.sieve} \ 
82 && env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET} 
83.endif 
84 
85post-install: 61post-install:
86 ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DESTDIR}${EGDIR} 62 ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DESTDIR}${EGDIR}
87 ${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DESTDIR}${EGDIR} 63 ${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DESTDIR}${EGDIR}
88 64
 65.include "options.mk"
 66
89.include "../../archivers/bzip2/buildlink3.mk" 67.include "../../archivers/bzip2/buildlink3.mk"
90.include "../../devel/zlib/buildlink3.mk" 68.include "../../devel/zlib/buildlink3.mk"
91.include "../../mk/bsd.pkg.mk" 69.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/mail/dovecot2/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/dovecot2/distinfo 2010/11/09 15:35:47 1.3
+++ pkgsrc/mail/dovecot2/distinfo 2010/11/09 15:51:48 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.3 2010/11/09 15:35:47 ghen Exp $ 1$NetBSD: distinfo,v 1.4 2010/11/09 15:51:48 ghen Exp $
2 2
3SHA1 (dovecot-2.0-pigeonhole-0.2.1.tar.gz) = ef06d157302576a9276c8f1181a3c5de018e2f36 3SHA1 (dovecot-2.0-pigeonhole-0.2.1.tar.gz) = ef06d157302576a9276c8f1181a3c5de018e2f36
4RMD160 (dovecot-2.0-pigeonhole-0.2.1.tar.gz) = a3cd58c13c3de33e6941c94633c580af4406ad85 4RMD160 (dovecot-2.0-pigeonhole-0.2.1.tar.gz) = a3cd58c13c3de33e6941c94633c580af4406ad85
5Size (dovecot-2.0-pigeonhole-0.2.1.tar.gz) = 1195090 bytes 5Size (dovecot-2.0-pigeonhole-0.2.1.tar.gz) = 1195090 bytes
6SHA1 (dovecot-2.0.7.tar.gz) = 3aab6cee878bd02e364aebcb70741bf1e4affc0d 6SHA1 (dovecot-2.0.7.tar.gz) = 3aab6cee878bd02e364aebcb70741bf1e4affc0d
7RMD160 (dovecot-2.0.7.tar.gz) = b284c99630935e87b124f48f132970a14737c985 7RMD160 (dovecot-2.0.7.tar.gz) = b284c99630935e87b124f48f132970a14737c985
8Size (dovecot-2.0.7.tar.gz) = 3174912 bytes 8Size (dovecot-2.0.7.tar.gz) = 3174912 bytes
9SHA1 (patch-aa) = 3f85e3858f451413e07e73916e654cfe81188551 9SHA1 (patch-aa) = b7e2923ead1ad1eacd3b8b1a37111325794135d2
10SHA1 (patch-ab) = 43361741cf68d1ad5d6e1073cfb9746acf497868 10SHA1 (patch-ab) = 43361741cf68d1ad5d6e1073cfb9746acf497868
11SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6 11SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6
12SHA1 (patch-ad) = 5a11ece1ea86ec775d73bd2d305fb927f8669ba5 12SHA1 (patch-ad) = 5a11ece1ea86ec775d73bd2d305fb927f8669ba5
13SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656 13SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
 14SHA1 (patch-af) = 691cb36fcd5d71e1dea1812da5ed3e93a9ca029a
14SHA1 (patch-ag) = 1f78984359bb6fcf939c540b54d1dc56317931b4 15SHA1 (patch-ag) = 1f78984359bb6fcf939c540b54d1dc56317931b4
15SHA1 (patch-ah) = 2c2ed68bbc475398a0247e08673be5a5db08d3c4 16SHA1 (patch-ah) = 2c2ed68bbc475398a0247e08673be5a5db08d3c4
16SHA1 (patch-ai) = 7ceb18222b47b496099f6634ca4cb4c3edcbf943 17SHA1 (patch-ai) = 7ceb18222b47b496099f6634ca4cb4c3edcbf943
17SHA1 (patch-aj) = 9e7970d29d11c097b9588ad16611f6d0e48235c2 18SHA1 (patch-aj) = 9e7970d29d11c097b9588ad16611f6d0e48235c2
cvs diff -r1.2 -r1.3 pkgsrc/mail/dovecot2/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/dovecot2/options.mk 2010/11/09 15:23:11 1.2
+++ pkgsrc/mail/dovecot2/options.mk 2010/11/09 15:51:48 1.3
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: options.mk,v 1.2 2010/11/09 15:23:11 ghen Exp $ 1# $NetBSD: options.mk,v 1.3 2010/11/09 15:51:48 ghen Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot 3PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot
4PKG_SUPPORTED_OPTIONS= dovecot-sieve gssapi 4PKG_SUPPORTED_OPTIONS= gssapi kqueue ldap mysql pam pgsql sqlite
5PKG_SUPPORTED_OPTIONS+= kqueue ldap mysql pam pgsql sqlite 
6PKG_OPTIONS_OPTIONAL_GROUPS= ssl 5PKG_OPTIONS_OPTIONAL_GROUPS= ssl
7PKG_OPTIONS_GROUP.ssl= gnutls ssl 6PKG_OPTIONS_GROUP.ssl= gnutls ssl
8PKG_SUGGESTED_OPTIONS= ssl 7PKG_SUGGESTED_OPTIONS= ssl
9 8
10.if defined(PKG_HAVE_KQUEUE) 9.if defined(PKG_HAVE_KQUEUE)
11PKG_SUGGESTED_OPTIONS+= kqueue 10PKG_SUGGESTED_OPTIONS+= kqueue
12.endif 11.endif
13 12
14.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
15 14
16### 15###
17### Build with OpenSSL or GNU TLS as the underlying crypto library 16### Build with OpenSSL or GNU TLS as the underlying crypto library
18### 17###
@@ -81,39 +80,13 @@ CONFIGURE_ARGS+= --with-notify=kqueue @@ -81,39 +80,13 @@ CONFIGURE_ARGS+= --with-notify=kqueue
81.else 80.else
82# use the defaults 81# use the defaults
83.endif 82.endif
84 83
85### 84###
86### GSSAPI support 85### GSSAPI support
87### 86###
88.if !empty(PKG_OPTIONS:Mgssapi) 87.if !empty(PKG_OPTIONS:Mgssapi)
89CONFIGURE_ARGS+= --with-gssapi 88CONFIGURE_ARGS+= --with-gssapi
90. include "../../mk/krb5.buildlink3.mk" 89. include "../../mk/krb5.buildlink3.mk"
91.else 90.else
92CONFIGURE_ARGS+= --without-gssapi 91CONFIGURE_ARGS+= --without-gssapi
93.endif 92.endif
94 
95### 
96### Pigeonhole Sieve plugin 
97### 
98.if !empty(PKG_OPTIONS:Mdovecot-sieve) || make(distinfo) || make(makesum) 
99# We can't simply use CONFIGURE_DIRS+= and BUILD_DIRS+= 
100# because dovecot must be built before sieve can be configured/built. 
101# So use post-build in Makefile. Sigh. 
102# 
103# Default so we can use += below 
104DISTFILES= ${DEFAULT_DISTFILES} 
105PLIST_SRC= ${PLIST_SRC_DFLT:Q} 
106INSTALL_DIRS= ${WRKSRC} 
107 
108DISTFILES+= dovecot-${DOVECOT_VERSION}-pigeonhole-${SIEVE_VERSION}.tar.gz 
109SITES.dovecot-${DOVECOT_VERSION}-pigeonhole-${SIEVE_VERSION}.tar.gz=\ 
110 ${DOVECOT_SIEVE_SITES} 
111WRKSRC.sieve= ${WRKDIR}/dovecot-${DOVECOT_VERSION}-pigeonhole-${SIEVE_VERSION} 
112CONFIGURE_ARGS.sieve= --with-dovecot=${WRKSRC} 
113CONFIGURE_ARGS.sieve+= --docdir=${PREFIX}/share/doc 
114INSTALL_DIRS+= ${WRKSRC.sieve} 
115SUBST_FILES.egdir+= ${WRKSRC.sieve}/doc/example-config/conf.d/Makefile.in 
116PLIST_SRC+= ${PKGDIR}/PLIST.sieve 
117CONF_FILES+= ${EGDIR}/conf.d/20-managesieve.conf ${PKG_SYSCONFDIR}/dovecot/conf.d/20-managesieve.conf 
118CONF_FILES+= ${EGDIR}/conf.d/90-sieve.conf ${PKG_SYSCONFDIR}/dovecot/conf.d/90-sieve.conf 
119.endif # dovecot-sieve 
cvs diff -r1.2 -r1.3 pkgsrc/mail/dovecot2/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/dovecot2/patches/patch-aa 2010/11/09 15:23:11 1.2
+++ pkgsrc/mail/dovecot2/patches/patch-aa 2010/11/09 15:51:48 1.3
@@ -1,14 +1,23 @@ @@ -1,14 +1,23 @@
1$NetBSD: patch-aa,v 1.2 2010/11/09 15:23:11 ghen Exp $ 1$NetBSD: patch-aa,v 1.3 2010/11/09 15:51:48 ghen Exp $
2 2
3--- doc/example-config/Makefile.in.orig 2010-10-21 17:37:01.000000000 +0000 3--- doc/example-config/Makefile.in.orig 2010-10-21 17:37:01.000000000 +0000
4+++ doc/example-config/Makefile.in 4+++ doc/example-config/Makefile.in
 5@@ -280,7 +280,7 @@ top_srcdir = @top_srcdir@
 6 SUBDIRS = conf.d
 7 pkgsysconfdir = $(sysconfdir)/dovecot
 8 nodist_pkgsysconf_DATA = README
 9-exampledir = $(docdir)/example-config
 10+exampledir = $(datadir)/examples/dovecot
 11 example_DATA = \
 12 dovecot.conf \
 13 dovecot-db.conf.ext \
5@@ -623,8 +623,7 @@ info: info-recursive 14@@ -623,8 +623,7 @@ info: info-recursive
6  15
7 info-am: 16 info-am:
8  17
9-install-data-am: install-data-local install-exampleDATA \ 18-install-data-am: install-data-local install-exampleDATA \
10- install-nodist_pkgsysconfDATA 19- install-nodist_pkgsysconfDATA
11+install-data-am: install-data-local install-exampleDATA 20+install-data-am: install-data-local install-exampleDATA
12  21
13 install-dvi: install-dvi-recursive 22 install-dvi: install-dvi-recursive
14  23
File Added: pkgsrc/mail/dovecot2/patches/patch-af
$NetBSD: patch-af,v 1.3 2010/11/09 15:51:48 ghen Exp $

--- doc/example-config/conf.d/Makefile.in.orig	2010-11-04 14:32:20.000000000 +0000
+++ doc/example-config/conf.d/Makefile.in
@@ -237,7 +237,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 pkgsysconfdir = $(sysconfdir)/dovecot
-exampledir = $(docdir)/example-config/conf.d
+exampledir = $(datadir)/examples/dovecot/conf.d
 example_DATA = \
 	auth-checkpassword.conf.ext \
 	auth-deny.conf.ext \