[MAINTAINER] mail/bincimap: update to 1.2.1

	- Update to 1.2.1 (see ChangeLog for list of changes)
	- Add distribution patch
	- Add Makefile target for creating SSL certificates for the port

PR:		ports/56550
Submitted by:	Sergei Kolobov <sergei@kolobov.com>

4 files changed, 29 insertions, 12 deletions

diff --git a/mail/bincimap/Makefile b/mail/bincimap/Makefile
index 59138f1e8b02..a8cbe994c5cb 100644
--- a/mail/bincimap/Makefile
+++ b/mail/bincimap/Makefile
@@ -12,11 +12,15 @@
 #
 
 PORTNAME=	bincimap
-PORTVERSION=	1.1.8
+PORTVERSION=	1.2.1
 CATEGORIES=	mail
-MASTER_SITES=	http://www.bincimap.org/dl/tarballs/ \
-		http://www.bincimap.andreas.hanssen.name/dl/tarballs/ \
-		http://bincimap.argonsoft.de/www.bincimap.org/dl/tarballs/
+MASTER_SITES=	http://www.bincimap.org/%SUBDIR%/ \
+		http://www.bincimap.andreas.hanssen.name/%SUBDIR%/ \
+		http://bincimap.argonsoft.de/www.bincimap.org/%SUBDIR%/
+MASTER_SITE_SUBDIR=	dl/tarballs/1.2
+
+PATCH_SITES=	${MASTER_SITES:S!%SUBDIR%!${MASTER_SITE_SUBDIR}!}
+PATCHFILES=	bincimap-1.2.1-patch000-mimeparser
 
 MAINTAINER=	sergei@kolobov.com
 COMMENT=	Light-weight IMAP server for Maildir
@@ -81,5 +85,16 @@ post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
+.if !defined(WITHOUT_OPENSSL)
+	@${ECHO_MSG} "==========================================="
+	@${ECHO_MSG} "Type 'make cert' to create SSL certificates"
+	@${ECHO_MSG} "==========================================="
+.endif
+
+cert:
+# Generate sample CA and Binc IMAP certificates if we use SSL
+.if !defined(WITHOUT_OPENSSL)
+	@cd ${WRKSRC} && ${MAKE} cacert
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/bincimap/distinfo b/mail/bincimap/distinfo
index 9e18656a7a46..b921cd3298f3 100644
--- a/mail/bincimap/distinfo
+++ b/mail/bincimap/distinfo
@@ -1 +1,2 @@
-MD5 (bincimap-1.1.8.tar.bz2) = 5182a966c19101594e93014d9e4e9b96
+MD5 (bincimap-1.2.1.tar.bz2) = 2baf96957a74073b5b26ed9dec4dafb2
+MD5 (bincimap-1.2.1-patch000-mimeparser) = 57e70638620bf8220703693b55b84510
diff --git a/mail/bincimap/files/patch-Makefile.in b/mail/bincimap/files/patch-Makefile.in
index e3e0c5500f51..b55cb4389224 100644
--- a/mail/bincimap/files/patch-Makefile.in
+++ b/mail/bincimap/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Tue May 20 21:45:16 2003
-+++ Makefile.in	Wed May 21 03:03:40 2003
-@@ -96,7 +96,7 @@
- install_sh = @install_sh@
+--- Makefile.in.orig	Sun Sep  7 13:24:07 2003
++++ Makefile.in	Sun Sep  7 13:24:25 2003
+@@ -131,7 +131,7 @@
+ target_alias = @target_alias@
  
  #--------------------------------------------------------------------------
--SUBDIRS = conf contrib doc man service src
-+SUBDIRS = man src
+-SUBDIRS = conf contrib doc man service src tests
++SUBDIRS = contrib man src tests
  
  #--------------------------------------------------------------------------
  EXTRA_DIST = bincimap.spec config.h COPYING.OpenSSL config.h.in
diff --git a/mail/bincimap/pkg-plist b/mail/bincimap/pkg-plist
index d01e2abaf225..b1fc11bce4f5 100644
--- a/mail/bincimap/pkg-plist
+++ b/mail/bincimap/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/bincimapd
 bin/bincimap-up
 etc/bincimap/bincimap.conf.sample
@@ -11,7 +12,7 @@ etc/bincimap/bincimap.conf.sample
 %%DJB%%%%SSL%%etc/bincimap/imaps.sample/log/run
 %%DJB%%%%SSL%%@dirrm etc/bincimap/imaps.sample/log
 %%DJB%%%%SSL%%@dirrm etc/bincimap/imaps.sample
-@unexec %D/etc/bincimap 2>/dev/null || true
+@unexec rmdir %D/etc/bincimap 2>/dev/null || true
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README