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.25
diff -u -p -r1.12 -r1.25
--- pkgsrc/mail/dovecot/Attic/Makefile	2004/01/01 03:38:33	1.12
+++ pkgsrc/mail/dovecot/Attic/Makefile	2004/08/01 05:17:19	1.25
@@ -1,46 +1,55 @@
-# $NetBSD: Makefile,v 1.12 2004/01/01 03:38:33 salo Exp $
-#
+# $NetBSD: Makefile,v 1.25 2004/08/01 05:17:19 schmonz Exp $
 
-DISTNAME=		dovecot-0.99.10.4
+DISTNAME=		dovecot-0.99.10.9
 CATEGORIES=		mail
-MASTER_SITES=		http://dovecot.fi/
+MASTER_SITES=		http://www.dovecot.org/releases/
 
+.if 0
 PATCH_SITES=		http://www.roughtrade.net/dovecot/
-PATCHFILES=		dovecot-crammd5-0.99.10.2.diff
+PATCHFILES=		dovecot-crammd5-0.99.10.7.diff
 PATCH_DIST_STRIP=	-p1
+.endif
 
 MAINTAINER=		tom@replic8.net
-HOMEPAGE=		http://dovecot.fi/
+HOMEPAGE=		http://www.dovecot.org/
 COMMENT=		Secure IMAP and POP3 server
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		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+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS}
 
+# Avoid an ICE in gcc2 on sparc64
+CONFIGURE_ENV+=		F77=${FALSE}
+
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=		DOVECOT_USE_GNUTLS DOVECOT_USE_PGSQL	\
-			USE_INET6 USE_OPENLDAP USE_SASL2
+BUILD_DEFS+=		DOVECOT_USE_GNUTLS DOVECOT_USE_MYSQL \
+			DOVECOT_USE_PGSQL USE_INET6 USE_OPENLDAP USE_SASL2
 
 .if !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=	--enable-ssl=gnutls
-.include "../../security/gnutls/buildlink2.mk"
+.  include "../../security/gnutls/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=        --enable-ssl=openssl
-.include "../../security/openssl/buildlink2.mk"
+.  include "../../security/openssl/buildlink3.mk"
+.endif
+
+.if !empty(DOVECOT_USE_MYSQL:M[Yy][Ee][SS])
+CONFIGURE_ARGS+=	--with-mysql
+.  include "../../databases/mysql4-client/buildlink3.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"
+.  include "../../mk/pgsql.buildlink3.mk"
 .endif
 
 .if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
@@ -49,12 +58,12 @@ CONFIGURE_ARGS+=	--enable-ipv6
 
 .if !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=	--with-ldap
-.include "../../databases/openldap/buildlink2.mk"
+.  include "../../databases/openldap/buildlink3.mk"
 .endif
 
 .if defined(USE_SASL2) && !empty(USE_SASL2:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=	--with-cyrus-sasl2
-.include "../../security/cyrus-sasl2/buildlink2.mk"
+.  include "../../security/cyrus-sasl2/buildlink3.mk"
 .endif
 
 RCD_SCRIPTS=	dovecot
@@ -67,13 +76,14 @@ PKG_USERS=	${DOVECOT_USER}:${DOVECOT_GRO
 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
+
 post-configure:
-	@cd ${WRKSRC} &&						\
-	(								\
-		${MV} dovecot-example.conf dovecot-example.conf.orig;	\
-		${SED} ${FILES_SUBST_SED} dovecot-example.conf.orig >	\
-			dovecot-example.conf;				\
-	)
+	@cd ${WRKSRC};							\
+	for i in dovecot-example.conf; do				\
+		${SED} ${FILES_SUBST_SED} $$i > $$i.new;		\
+		${MV} -f $$i.new $$i;					\
+	done
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}