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.31
retrieving revision 1.42
diff -u -p -r1.31 -r1.42
--- pkgsrc/mail/dovecot/Attic/Makefile	2005/01/08 19:58:16	1.31
+++ pkgsrc/mail/dovecot/Attic/Makefile	2006/01/19 02:31:12	1.42
@@ -1,30 +1,23 @@
-# $NetBSD: Makefile,v 1.31 2005/01/08 19:58:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.42 2006/01/19 02:31:12 joerg Exp $
 
-DISTNAME=		dovecot-0.99.13
+DISTNAME=		dovecot-0.99.14
+PKGREVISION=		2
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/
 
-.if 0
-PATCH_SITES=		http://www.roughtrade.net/dovecot/
-PATCHFILES=		dovecot-crammd5-0.99.11.diff
-PATCH_DIST_STRIP=	-p1
-.endif
-
-MAINTAINER=		tom@replic8.net
+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=${VARBASE}
-CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS:Q}
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
@@ -34,7 +27,7 @@ RCD_SCRIPTS=	dovecot
 DOVECOT_USER?=	dovecot
 DOVECOT_GROUP?=	dovecot
 PKG_GROUPS=	${DOVECOT_GROUP}
-PKG_USERS=	${DOVECOT_USER}:${DOVECOT_GROUP}::Dovecot\\ IMAP/POP3\\ user
+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
@@ -42,12 +35,10 @@ CONF_FILES=	${EGDIR}/dovecot.conf.defaul
 INSTALLATION_DIRS=	libexec/dovecot sbin share/doc/dovecot		\
 			share/examples/dovecot
 
-post-configure:
-	@cd ${WRKSRC};							\
-	for i in dovecot-example.conf; do				\
-		${SED} ${FILES_SUBST_SED} $$i > $$i.new;		\
-		${MV} -f $$i.new $$i;					\
-	done
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	dovecot-example.conf
+SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_STAGE.paths=	post-patch
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}