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.46.2.1 retrieving revision 1.72 diff -u -p -r1.46.2.1 -r1.72 --- pkgsrc/mail/dovecot/Attic/Makefile 2006/05/15 16:08:41 1.46.2.1 +++ pkgsrc/mail/dovecot/Attic/Makefile 2006/11/05 15:45:09 1.72 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.46.2.1 2006/05/15 16:08:41 salo Exp $ +# $NetBSD: Makefile,v 1.72 2006/11/05 15:45:09 ghen Exp $ -DISTNAME= dovecot-1.0.beta8 -PKGNAME= ${DISTNAME:S/.beta/beta/} +DISTNAME= dovecot-1.0.rc12 +PKGNAME= ${DISTNAME:S/.rc/rc/} CATEGORIES= mail MASTER_SITES= http://www.dovecot.org/releases/ @@ -13,10 +13,11 @@ PKG_INSTALLATION_TYPES= overwrite pkgvie 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=${SSLCERTS:Q} +CONFIGURE_ARGS+= --with-ssldir=${SSLDIR:Q} .include "../../mk/bsd.prefs.mk" .include "options.mk" @@ -26,7 +27,9 @@ 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} + +PKG_GECOS.${DOVECOT_USER}= Dovecot IMAP/POP3 user EGDIR= ${PREFIX}/share/examples/dovecot CONF_FILES= ${EGDIR}/dovecot.conf.default ${PKG_SYSCONFDIR}/dovecot.conf @@ -39,12 +42,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"