- Update to 1.1.8

- Update MASTER_SITES to include official mirrors
- Introduce two compile-time knobs:
- WITH_XINETD		Use xinetd instead of the default daemontools/ucspi-tcp
- WITHOUT_OPENSSL	Disable OpenSSL support (enabled by default)
- Install all sample configs into ${PREFIX}/etc/bincimap instead of
  ${EXAMPLESDIR}

PR:		52904
Submitted by:	Sergei Kolobov <sergei@kolobov.com>

5 files changed, 71 insertions, 73 deletions

diff --git a/mail/bincimap/Makefile b/mail/bincimap/Makefile
index bd53fbf56cd1..59138f1e8b02 100644
--- a/mail/bincimap/Makefile
+++ b/mail/bincimap/Makefile
@@ -5,51 +5,76 @@
 # $FreeBSD$
 #
 
+# The following compile-time options are available:
+#
+# WITH_XINETD		Use xinetd instead of the default daemontools/ucspi-tcp
+# WITHOUT_OPENSSL	Disable OpenSSL support (enabled by default)
+#
+
 PORTNAME=	bincimap
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.8
 CATEGORIES=	mail
-MASTER_SITES=	http://www.bincimap.org/dl/tarballs/
+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/
 
 MAINTAINER=	sergei@kolobov.com
 COMMENT=	Light-weight IMAP server for Maildir
 
+.if defined(WITH_XINETD)
+RUN_DEPENDS=	xinetd:${PORTSDIR}/security/xinetd
+PLIST_SUB+=	XINETD="" DJB="@comment "
+.else
+RUN_DEPENDS=	supervise:${PORTSDIR}/sysutils/daemontools \
+		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+PLIST_SUB+=	XINETD="@comment " DJB=""
+.endif
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GETOPT_LONG=	yes
-
-CONFDIR?=	${PREFIX}/etc/${PORTNAME}
-PLIST_SUB+=	CONFDIR="${CONFDIR:S,^${PREFIX}/,,}"
 
+CONFDIR=		${PREFIX}/etc/${PORTNAME}
 CONFIGURE_ARGS+=	--sysconfdir=${CONFDIR}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if defined(WITHOUT_OPENSSL)
 CONFIGURE_ARGS+=	--without-ssl
+PLIST_SUB+=		SSL="@comment "
 .else
 CONFIGURE_ARGS+=	--with-ssl
-USE_OPENSSL=	yes
+USE_OPENSSL=		yes
+PLIST_SUB+=		SSL=""
 .endif
 
 MAN1=		bincimap-up.1 bincimapd.1
 MAN5=		bincimap.conf.5
-DOCS=		AUTHORS ChangeLog README doc/bincimap*
+DOCS=		AUTHORS ChangeLog README doc/bincimap* \
+		doc/manual/bincimap-manual.ps
+EXAMPLES=	contrib/README contrib/authenticators/bincimap-auth-teapop.sh
 
 post-install:
 	@${MKDIR} ${CONFDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/bincimap.conf \
 		${CONFDIR}/bincimap.conf.sample
+.if defined(WITH_XINETD)
+	${INSTALL_DATA} ${WRKSRC}/conf/xinetd-bincimap ${CONFDIR}/imap.sample
+.if !defined(WITHOUT_OPENSSL)
+	${INSTALL_DATA} ${WRKSRC}/conf/xinetd-bincimaps ${CONFDIR}/imaps.sample
+.endif
+.else
+	@${MKDIR} ${CONFDIR}/imap.sample
+	${INSTALL_SCRIPT} ${WRKSRC}/service/run ${CONFDIR}/imap.sample
+	@${MKDIR} ${CONFDIR}/imap.sample/log
+	${INSTALL_SCRIPT} ${WRKSRC}/service/log/run ${CONFDIR}/imap.sample/log
+.if !defined(WITHOUT_OPENSSL)
+	@${MKDIR} ${CONFDIR}/imaps.sample
+	${INSTALL_SCRIPT} ${WRKSRC}/service/run-ssl ${CONFDIR}/imaps.sample/run
+	@${MKDIR} ${CONFDIR}/imaps.sample/log
+	${INSTALL_SCRIPT} ${WRKSRC}/service/log/run ${CONFDIR}/imaps.sample/log
+.endif
+.endif
 	@${MKDIR} ${EXAMPLESDIR}
-.for dir in xinetd supervise/imap/log supervise/imaps/log
-	@${MKDIR} ${EXAMPLESDIR}/${dir}
-.endfor
-	@cd ${WRKSRC}/conf && \
-	    ${INSTALL_DATA} xinetd-bincimap ${EXAMPLESDIR}/xinetd/imap && \
-	    ${INSTALL_DATA} xinetd-bincimaps ${EXAMPLESDIR}/xinetd/imaps
-	@cd ${WRKSRC}/service && \
-	    ${INSTALL_DATA} run ${EXAMPLESDIR}/supervise/imap && \
-	    ${INSTALL_DATA} log/run ${EXAMPLESDIR}/supervise/imap/log && \
-	    ${INSTALL_DATA} run-ssl ${EXAMPLESDIR}/supervise/imaps/run && \
-	    ${INSTALL_DATA} log/run ${EXAMPLESDIR}/supervise/imaps/log
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 	cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
 	cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN5} ${MANPREFIX}/man/man5
 .if !defined(NOPORTDOCS)
diff --git a/mail/bincimap/distinfo b/mail/bincimap/distinfo
index 353459c53b1b..9e18656a7a46 100644
--- a/mail/bincimap/distinfo
+++ b/mail/bincimap/distinfo
@@ -1 +1 @@
-MD5 (bincimap-1.1.5.tar.bz2) = 0e38137c96b0143390df9992a7ded054
+MD5 (bincimap-1.1.8.tar.bz2) = 5182a966c19101594e93014d9e4e9b96
diff --git a/mail/bincimap/files/patch-Makefile.in b/mail/bincimap/files/patch-Makefile.in
new file mode 100644
index 000000000000..e3e0c5500f51
--- /dev/null
+++ b/mail/bincimap/files/patch-Makefile.in
@@ -0,0 +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@
+ 
+ #--------------------------------------------------------------------------
+-SUBDIRS = conf contrib doc man service src
++SUBDIRS = man src
+ 
+ #--------------------------------------------------------------------------
+ EXTRA_DIST = bincimap.spec config.h COPYING.OpenSSL config.h.in
diff --git a/mail/bincimap/files/patch-src::util::convert.h b/mail/bincimap/files/patch-src::util::convert.h
deleted file mode 100644
index 4168ff7e6701..000000000000
--- a/mail/bincimap/files/patch-src::util::convert.h
+++ /dev/null
@@ -1,39 +0,0 @@
-replace switch statement in inline function with if/then/else; fixes compiler
-failure on alpha: ``relocation truncated to fit: GPREL32 *UND*''
-
-diff -u -r1.4 convert.h
---- src/util/convert.h	8 Apr 2003 16:46:28 -0000	1.4
-+++ src/util/convert.h	9 Apr 2003 08:02:54 -0000
-@@ -269,6 +269,7 @@
-   {
-     std::string regex = "^";
-     for (std::string::const_iterator i = s_in.begin(); i != s_in.end(); ++i) {
-+      /*
-       switch (*i) {
-       case '.': 
-       case '[': case ']': 
-@@ -291,6 +292,24 @@
-       default: 
- 	regex += *i;
- 	break;
-+      }
-+      */
-+      if (*i == '.' || *i == '[' || *i == ']' || *i == '{' || *i == '}' ||
-+	  *i == '(' || *i == ')' || *i == '^' || *i == '$' || *i == '?' ||
-+	  *i == '+' || *i == '\\') {
-+	regex += "\\";
-+	regex += *i;
-+      }
-+      else if (*i == '*') {
-+	regex += ".*?";
-+      }
-+      else if (*i == '%') {
-+	regex += "[^\\";
-+	regex += delimiter;
-+	regex += "]*?";
-+      }
-+      else {
-+	regex += *i;
-       }
-     }
-     
diff --git a/mail/bincimap/pkg-plist b/mail/bincimap/pkg-plist
index e32efa24dac4..d01e2abaf225 100644
--- a/mail/bincimap/pkg-plist
+++ b/mail/bincimap/pkg-plist
@@ -1,26 +1,27 @@
 bin/bincimapd
 bin/bincimap-up
-%%CONFDIR%%/bincimap.conf.sample
-@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true
+etc/bincimap/bincimap.conf.sample
+%%XINETD%%etc/bincimap/imap.sample
+%%XINETD%%%%SSL%%etc/bincimap/imaps.sample
+%%DJB%%etc/bincimap/imap.sample/run
+%%DJB%%etc/bincimap/imap.sample/log/run
+%%DJB%%@dirrm etc/bincimap/imap.sample/log
+%%DJB%%@dirrm etc/bincimap/imap.sample
+%%DJB%%%%SSL%%etc/bincimap/imaps.sample/run
+%%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
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/bincimap-faq.html
 %%PORTDOCS%%%%DOCSDIR%%/bincimap-goals.html
 %%PORTDOCS%%%%DOCSDIR%%/bincimap-imapdir.html
+%%PORTDOCS%%%%DOCSDIR%%/bincimap-manual.ps
 %%PORTDOCS%%%%DOCSDIR%%/bincimap-tech.html
 %%PORTDOCS%%%%DOCSDIR%%/bincimap.css
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/xinetd/imap
-%%EXAMPLESDIR%%/xinetd/imaps
-@dirrm %%EXAMPLESDIR%%/xinetd
-%%EXAMPLESDIR%%/supervise/imap/run
-%%EXAMPLESDIR%%/supervise/imap/log/run
-@dirrm %%EXAMPLESDIR%%/supervise/imap/log
-@dirrm %%EXAMPLESDIR%%/supervise/imap
-%%EXAMPLESDIR%%/supervise/imaps/run
-%%EXAMPLESDIR%%/supervise/imaps/log/run
-@dirrm %%EXAMPLESDIR%%/supervise/imaps/log
-@dirrm %%EXAMPLESDIR%%/supervise/imaps
-@dirrm %%EXAMPLESDIR%%/supervise
+%%EXAMPLESDIR%%/README
+%%EXAMPLESDIR%%/bincimap-auth-teapop.sh
 @dirrm %%EXAMPLESDIR%%