- Don't install garbage into DOCSDIR.

- Rework handling of conf files.

4 files changed, 21 insertions, 51 deletions

diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
index 42369e5a0800..4ad9290aa712 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.5.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
@@ -113,7 +113,6 @@ GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
-PORTEXAMPLES=	*
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
 
@@ -139,6 +138,9 @@ CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
 		Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \
 		Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve
 
+CONFS=		cmu-backend.conf cmu-frontend.conf normal.conf prefork.conf \
+		small.conf
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBDB}
@@ -200,6 +202,8 @@ post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 		${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
+		${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 		${STAGEDIR}${CYRUS_PREFIX}/bin/mkimap
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
@@ -223,18 +227,19 @@ post-install:
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
-		"! ( -name Makefile.dist -o -name Makefile -o -name .gitignore )"
+		"! ( -name Makefile.dist -o -name Makefile \
+		-o -name .gitignore -o -name htmlstrip.Po \
+		-o -name htmlstrip.c )"
 
-# there are already files in examplesdir at that point, so no
+# there are already files in EXAMPLESDIR at that point, so no
 # need to create it.
 post-install-EXAMPLES-on:
-	cd ${WRKSRC}/master/conf && ${COPYTREE_SHARE} . \
-		${STAGEDIR}${EXAMPLESDIR}
-
-post-install-EXAMPLES-off:
-	${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
+.for f in ${CONFS}
+.if ${f} != normal.conf
+	@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \
 		${STAGEDIR}${EXAMPLESDIR}
-	@${ECHO_CMD} ${EXAMPLESDIR}/imapd.conf >> ${TMPPLIST}
-	@${ECHO_CMD} ${EXAMPLESDIR}/normal.conf >> ${TMPPLIST}
+	@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
+.endif
+.endfor
 
 .include <bsd.port.mk>
diff --git a/mail/cyrus-imapd25/files/pkg-deinstall.in b/mail/cyrus-imapd25/files/pkg-deinstall.in
index e0dd1b8bb7fc..37d610a2fdbe 100644
--- a/mail/cyrus-imapd25/files/pkg-deinstall.in
+++ b/mail/cyrus-imapd25/files/pkg-deinstall.in
@@ -1,29 +1,13 @@
 #!/bin/sh
 #
-#	$FreeBSD$
-#
+# $FreeBSD$
 # Created by: hetzels@westbend.net
 
 #set -vx
 
 PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
 CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
 
-checkfile() {
-	diff -bBqw $1 $2 >/dev/null 2>&1
-	case $? in
-		0)	# config file exists, but is the same
-			rm $1
-			;;
-		1)	# config file exists and differs
-			;;
-		*)	# no config file exists
-			;;
-	esac
-}
-
 #
 # Modify the 'cyrus' user created from the cyrus-sasl port
 #
@@ -49,9 +33,6 @@ modify_cyrus_user() {
 
 case $2 in
 	DEINSTALL)
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
 		;;
 	POST-DEINSTALL)
 		modify_cyrus_user
diff --git a/mail/cyrus-imapd25/files/pkg-install.in b/mail/cyrus-imapd25/files/pkg-install.in
index 684745f23b01..8ca4da0a84ac 100644
--- a/mail/cyrus-imapd25/files/pkg-install.in
+++ b/mail/cyrus-imapd25/files/pkg-install.in
@@ -1,10 +1,11 @@
 #!/bin/sh
+#
+# $FreeBSD$
 
 #set -vx
 
 PKG_BATCH=${BATCH:=NO}
 PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
 CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
 
 #
@@ -24,31 +25,12 @@ modify_cyrus_user() {
 	fi
 }
 
-
-checkfile() {
-	diff -bBqw $1 $2 >/dev/null 2>&1
-	case $? in
-		0)	# config file exists, but is the same
-			;;
-		1)	# config file exists and differs
-			echo "** Make sure $1 is in sync with this version";
-			echo "   of the port.  See $1.dist for details.";
-			;;
-		*)	# no config file exists, copy it
-			install -c -m 644 $2 $1
-			;;
-	esac
-}
-
 case $2 in
 	PRE-INSTALL)
 		;;
 
 	POST-INSTALL)
 		modify_cyrus_user
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
 		if grep 'sieve' /etc/services; then
 			echo
 		else
diff --git a/mail/cyrus-imapd25/pkg-plist b/mail/cyrus-imapd25/pkg-plist
index 858a1752812d..92ba3a9badc8 100644
--- a/mail/cyrus-imapd25/pkg-plist
+++ b/mail/cyrus-imapd25/pkg-plist
@@ -137,3 +137,5 @@ lib/libcyrus_sieve.so.0.0.0
 libdata/pkgconfig/libcyrus.pc
 libdata/pkgconfig/libcyrus_min.pc
 libdata/pkgconfig/libcyrus_sieve.pc
+@sample %%EXAMPLESDIR%%/imapd.conf etc/imapd.conf
+@sample %%EXAMPLESDIR%%/normal.conf etc/cyrus.conf