From 35a32ab5aafb815f309e203fc12b0611a9529a19 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@FreeBSD.org>
Date: Wed, 3 Jan 2001 15:44:16 +0000
Subject: Upgrade to 1.3.0

---
 mail/courier-imap/Makefile  | 11 +++++++----
 mail/courier-imap/distinfo  |  2 +-
 mail/courier-imap/pkg-plist | 13 +++++++------
 3 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'mail/courier-imap')

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 3cb3d61d556e..12d61c9eb667 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-imap
-PORTVERSION=	1.2.2
+PORTVERSION=	1.3.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -31,6 +31,8 @@ CFLAGS+=	-DNO_IDEA
 CONFIGURE_ARGS=	--without-authldap --with-authldaprc=filename \
 		--without-authpam --without-authshadow \
 		--without-authvchkpw --without-authcram \
+		--without-authmysql \
+		--sysconfdir=${PREFIX}/etc/courier-imap \
 		--with-userdb=${PREFIX}/etc/userdb \
 		--datadir=${PREFIX}/share/courier-imap \
 		--libexecdir=${PREFIX}/libexec/courier-imap \
@@ -58,12 +60,13 @@ EXTRA_DOCS=	README INSTALL AUTHORS imap/ChangeLog
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@perl -i -pe 's@(\$$.sysconfdir./\$$\$$p)@\1.dist@' \
-		${WRKSRC}/Makefile.in \
-		${WRKSRC}/imap/Makefile.in
+	@perl -i.nbm -pe 'm#^sysconf_DATA = imapd.dist# && s@[ip][mo][ap][p3]d.cnf@@g;' \
+		${WRKSRC}/Makefile.in
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/doc/courier-imap
+	@${INSTALL_DATA} ${WRKSRC}/imap/imapd.cnf ${PREFIX}/etc/courier-imap/imapd.cnf.dist
+	@${INSTALL_DATA} ${WRKSRC}/imap/pop3d.cnf ${PREFIX}/etc/courier-imap/pop3d.cnf.dist
 .for a in ${EXTRA_DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${a} ${PREFIX}/share/doc/courier-imap/
 .endfor
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index bebc8df48211..ab8ff3f6ac15 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1 +1 @@
-MD5 (courier-imap-1.2.2.tar.gz) = 5b4a6bc4be0d922570afe69eed58d9ff
+MD5 (courier-imap-1.3.0.tar.gz) = ee1c27d0da2222dfb6fd0c000b8c852e
diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist
index 6d64b09d9bc3..774fc29a6616 100644
--- a/mail/courier-imap/pkg-plist
+++ b/mail/courier-imap/pkg-plist
@@ -2,12 +2,12 @@
 bin/imapd
 bin/maildirmake
 bin/pop3d
-etc/imapd-ssl.config.dist
-etc/imapd.cnf.dist
-etc/imapd.config.dist
-etc/pop3d-ssl.config.dist
-etc/pop3d.cnf.dist
-etc/pop3d.config.dist
+etc/courier-imap/imapd-ssl.dist
+etc/courier-imap/imapd.cnf.dist
+etc/courier-imap/imapd.dist
+etc/courier-imap/pop3d-ssl.dist
+etc/courier-imap/pop3d.cnf.dist
+etc/courier-imap/pop3d.dist
 libexec/courier-imap/authlib/authcustom
 libexec/courier-imap/authlib/authpwd
 libexec/courier-imap/authlib/authuserdb
@@ -42,3 +42,4 @@ share/doc/courier-imap/README
 @dirrm share/courier-imap
 @dirrm libexec/courier-imap/authlib
 @dirrm libexec/courier-imap
+@dirrm etc/courier-imap
-- 
cgit v1.2.3