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.61 retrieving revision 1.64 diff -u -p -r1.61 -r1.64 --- pkgsrc/mail/dovecot/Attic/Makefile 2006/08/02 21:16:43 1.61 +++ pkgsrc/mail/dovecot/Attic/Makefile 2006/08/09 11:26:36 1.64 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.61 2006/08/02 21:16:43 ghen Exp $ +# $NetBSD: Makefile,v 1.64 2006/08/09 11:26:36 abs Exp $ -DISTNAME= dovecot-1.0.rc4 -PKGNAME= ${DISTNAME:S/.rc/rc/} +DISTNAME= dovecot-1.0.rc6 PKGREVISION= 1 +PKGNAME= ${DISTNAME:S/.rc/rc/} CATEGORIES= mail MASTER_SITES= http://www.dovecot.org/releases/ @@ -18,7 +18,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} -CONFIGURE_ARGS+= --with-ssldir=${SSLCERTS:Q} +CONFIGURE_ARGS+= --with-ssldir=${SSLDIR:Q} .include "../../mk/bsd.prefs.mk" .include "options.mk" @@ -43,12 +43,18 @@ SUBST_FILES.paths= dovecot-example.conf SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' SUBST_STAGE.paths= pre-configure +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"