From a2c2c928f17fd9002187a7c4e77261f60c85f03f Mon Sep 17 00:00:00 2001 From: Kris Kennaway Date: Wed, 13 Nov 2002 22:45:36 +0000 Subject: [PATCH] Use standard PORTDOCS in PLIST_SUB instead of rolling our own, and fix a syntax error in post-install target --- mail/dovecot-devel/Makefile | 8 +------- mail/dovecot-devel/pkg-plist | 12 ++++++------ mail/dovecot/Makefile | 8 +------- mail/dovecot/pkg-plist | 12 ++++++------ 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile index 121123c8b12f..6087982b2b12 100644 --- a/mail/dovecot-devel/Makefile +++ b/mail/dovecot-devel/Makefile @@ -17,12 +17,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-shadow --enable-ipv6 \ --localstatedir=/var/dovecot -.if !defined(NOPORTDOCS) -PLIST_SUB+= DOCS="" -.else -PLIST_SUB+= DOCS="@comment " -.endif - pre-build: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ ${WRKSRC}/dovecot-example.conf @@ -37,7 +31,7 @@ post-install: @${MKDIR} /var/dovecot/login @${CHOWN} imapd:imapd /var/dovecot @if [ ! -f ${PREFIX}/etc/rc.d/dovecot-imapd.sh ]; then \ - ${ECHO} "Installing dovecot-imapd.sh startup file."; + ${ECHO} "Installing dovecot-imapd.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dovecot-imapd.sh \ ${PREFIX}/etc/rc.d/dovecot-imapd.sh; \ fi diff --git a/mail/dovecot-devel/pkg-plist b/mail/dovecot-devel/pkg-plist index 69f03552bbbc..1323b7b443ac 100644 --- a/mail/dovecot-devel/pkg-plist +++ b/mail/dovecot-devel/pkg-plist @@ -4,10 +4,10 @@ lib/dovecot/imap lib/dovecot/imap-auth lib/dovecot/imap-login sbin/imap-master -%%DOCS%%share/doc/dovecot/auth.txt -%%DOCS%%share/doc/dovecot/design.txt -%%DOCS%%share/doc/dovecot/nfs.txt -%%DOCS%%share/doc/dovecot/index.txt -%%DOCS%%share/doc/dovecot/multiaccess.txt -%%DOCS%%@dirrm share/doc/dovecot +%%PORTDOCS%%share/doc/dovecot/auth.txt +%%PORTDOCS%%share/doc/dovecot/design.txt +%%PORTDOCS%%share/doc/dovecot/nfs.txt +%%PORTDOCS%%share/doc/dovecot/index.txt +%%PORTDOCS%%share/doc/dovecot/multiaccess.txt +%%PORTDOCS%%@dirrm share/doc/dovecot @dirrm lib/dovecot diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 121123c8b12f..6087982b2b12 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -17,12 +17,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-shadow --enable-ipv6 \ --localstatedir=/var/dovecot -.if !defined(NOPORTDOCS) -PLIST_SUB+= DOCS="" -.else -PLIST_SUB+= DOCS="@comment " -.endif - pre-build: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ ${WRKSRC}/dovecot-example.conf @@ -37,7 +31,7 @@ post-install: @${MKDIR} /var/dovecot/login @${CHOWN} imapd:imapd /var/dovecot @if [ ! -f ${PREFIX}/etc/rc.d/dovecot-imapd.sh ]; then \ - ${ECHO} "Installing dovecot-imapd.sh startup file."; + ${ECHO} "Installing dovecot-imapd.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dovecot-imapd.sh \ ${PREFIX}/etc/rc.d/dovecot-imapd.sh; \ fi diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist index 69f03552bbbc..1323b7b443ac 100644 --- a/mail/dovecot/pkg-plist +++ b/mail/dovecot/pkg-plist @@ -4,10 +4,10 @@ lib/dovecot/imap lib/dovecot/imap-auth lib/dovecot/imap-login sbin/imap-master -%%DOCS%%share/doc/dovecot/auth.txt -%%DOCS%%share/doc/dovecot/design.txt -%%DOCS%%share/doc/dovecot/nfs.txt -%%DOCS%%share/doc/dovecot/index.txt -%%DOCS%%share/doc/dovecot/multiaccess.txt -%%DOCS%%@dirrm share/doc/dovecot +%%PORTDOCS%%share/doc/dovecot/auth.txt +%%PORTDOCS%%share/doc/dovecot/design.txt +%%PORTDOCS%%share/doc/dovecot/nfs.txt +%%PORTDOCS%%share/doc/dovecot/index.txt +%%PORTDOCS%%share/doc/dovecot/multiaccess.txt +%%PORTDOCS%%@dirrm share/doc/dovecot @dirrm lib/dovecot