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.3
retrieving revision 1.35
diff -u -p -r1.3 -r1.35
--- pkgsrc/mail/dovecot/Attic/Makefile	2003/06/19 16:11:11	1.3
+++ pkgsrc/mail/dovecot/Attic/Makefile	2005/02/14 08:56:34	1.35
@@ -1,56 +1,27 @@
-# $NetBSD: Makefile,v 1.3 2003/06/19 16:11:11 salo Exp $
-#
+# $NetBSD: Makefile,v 1.35 2005/02/14 08:56:34 xtraeme Exp $
 
-DISTNAME=	dovecot-0.99.10-test14
-PKGNAME=	${DISTNAME:S/-test/beta/}
-CATEGORIES=	mail
-MASTER_SITES=	http://dovecot.procontrol.fi/	\
-		http://dovecot.procontrol.fi/test/
-
-MAINTAINER=	tom@replic8.net
-HOMEPAGE=	http://dovecot.procontrol.fi/
-COMMENT=	Secure IMAP and POP3 server
-
-USE_BUILDLINK2=	YES
-USE_LIBTOOL=	YES
-USE_PKGINSTALL= YES
-GNU_CONFIGURE=	YES
-
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+DISTNAME=		dovecot-0.99.14
+CATEGORIES=		mail
+MASTER_SITES=		http://www.dovecot.org/releases/
+
+MAINTAINER=		xtraeme@NetBSD.org
+HOMEPAGE=		http://www.dovecot.org/
+COMMENT=		Secure IMAP and POP3 server
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+WRKSRC=			${WRKDIR}/${DISTNAME:S/.1$//}
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
+USE_PKGINSTALL= 	yes
+GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--localstatedir=/var
-CONFIGURE_ARGS+=	--with-ssldir=/etc/openssl
-
-DOVECOT_USE_GNUTLS?=	NO
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS}
 
-.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
-
-DOVECOT_USE_LDAP?=	NO
-
-.if !empty(DOVECOT_USE_LDAP:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-ldap
-.include "../../databases/openldap/buildlink2.mk"
-.endif
-
-DOVECOT_USE_PGSQL?=	NO
-
-.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])
-BUILD_DEFS+=		USE_INET6
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 RCD_SCRIPTS=	dovecot
 
@@ -62,13 +33,15 @@ 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}