Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/mail/dovecot/Attic/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/mail/dovecot/Attic/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.12
retrieving revision 1.64
diff -u -p -r1.12 -r1.64
--- pkgsrc/mail/dovecot/Attic/Makefile	2004/01/01 03:38:33	1.12
+++ pkgsrc/mail/dovecot/Attic/Makefile	2006/08/09 11:26:36	1.64
@@ -1,85 +1,60 @@
-# $NetBSD: Makefile,v 1.12 2004/01/01 03:38:33 salo Exp $
-#
+# $NetBSD: Makefile,v 1.64 2006/08/09 11:26:36 abs Exp $
 
-DISTNAME=		dovecot-0.99.10.4
+DISTNAME=		dovecot-1.0.rc6
+PKGREVISION=		1
+PKGNAME=		${DISTNAME:S/.rc/rc/}
 CATEGORIES=		mail
-MASTER_SITES=		http://dovecot.fi/
+MASTER_SITES=		http://www.dovecot.org/releases/
 
-PATCH_SITES=		http://www.roughtrade.net/dovecot/
-PATCHFILES=		dovecot-crammd5-0.99.10.2.diff
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=		tom@replic8.net
-HOMEPAGE=		http://dovecot.fi/
+MAINTAINER=		ghen@NetBSD.org
+HOMEPAGE=		http://www.dovecot.org/
 COMMENT=		Secure IMAP and POP3 server
 
-USE_BUILDLINK2=		YES
-USE_LIBTOOL=		YES
-USE_PKGINSTALL= 	YES
-GNU_CONFIGURE=		YES
-
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--localstatedir=/var
-CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS}
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--with-ssldir=${SSLDIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
+RCD_SCRIPTS=		dovecot
+
+DOVECOT_USER?=		dovecot
+DOVECOT_GROUP?=		dovecot
+PKG_GROUPS=		${DOVECOT_GROUP}
+PKG_USERS=		${DOVECOT_USER}:${DOVECOT_GROUP}
+
+PKG_GECOS.${DOVECOT_USER}=	Dovecot IMAP/POP3 user
+
+EGDIR=			${PREFIX}/share/examples/dovecot
+CONF_FILES=		${EGDIR}/dovecot.conf.default ${PKG_SYSCONFDIR}/dovecot.conf
+
+INSTALLATION_DIRS=	libexec/dovecot sbin share/doc/dovecot		\
+			share/examples/dovecot
 
-BUILD_DEFS+=		DOVECOT_USE_GNUTLS DOVECOT_USE_PGSQL	\
-			USE_INET6 USE_OPENLDAP USE_SASL2
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	dovecot-example.conf
+SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_STAGE.paths=	pre-configure
 
-.if !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-ssl=gnutls
-.include "../../security/gnutls/buildlink2.mk"
-.else
-CONFIGURE_ARGS+=        --enable-ssl=openssl
-.include "../../security/openssl/buildlink2.mk"
-.endif
-
-.if !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-pgsql
-CPPFLAGS=		-I${BUILDLINK_DIR}/include/pgsql
-.include "../../databases/postgresql-lib/buildlink2.mk"
-.endif
-
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-.if !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-ldap
-.include "../../databases/openldap/buildlink2.mk"
-.endif
-
-.if defined(USE_SASL2) && !empty(USE_SASL2:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-cyrus-sasl2
-.include "../../security/cyrus-sasl2/buildlink2.mk"
-.endif
-
-RCD_SCRIPTS=	dovecot
-
-DOVECOT_USER?=	dovecot
-DOVECOT_GROUP?=	dovecot
-PKG_GROUPS=	${DOVECOT_GROUP}
-PKG_USERS=	${DOVECOT_USER}:${DOVECOT_GROUP}::Dovecot\\ IMAP/POP3\\ user
-
-EGDIR=		${PREFIX}/share/examples/dovecot
-CONF_FILES=	${EGDIR}/dovecot.conf.default ${PKG_SYSCONFDIR}/dovecot.conf
-
-post-configure:
-	@cd ${WRKSRC} &&						\
-	(								\
-		${MV} dovecot-example.conf dovecot-example.conf.orig;	\
-		${SED} ${FILES_SUBST_SED} dovecot-example.conf.orig >	\
-			dovecot-example.conf;				\
-	)
+post-build:
+	${SED} "s|/etc/ssl/|${SSLDIR}/|" ${WRKSRC}/dovecot-example.conf \
+						> ${WRKDIR}/dovecot-example.conf
+	${SED} "s|/etc/ssl|${SSLDIR}|" ${WRKSRC}/doc/mkcert.sh \
+						> ${WRKDIR}/mkcert.sh
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/dovecot-example.conf	\
+	${INSTALL_DATA} ${WRKDIR}/dovecot-example.conf	\
 		${EGDIR}/dovecot.conf.default
 	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-* ${EGDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${EGDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/mkcert.sh ${EGDIR}
 
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"