- Update to 1.2.10

- Remove dependencies: bincimap can be used in multitude of configurations,
  supervise/tcpserver and xinetd are two of them, but not the only ones.
  For example, it can be used with inetd(8) in the base system, too. [1]
- Install configuration samples into EXAMPLESDIR

Requested by:	Paul-Andrew Joseph Miseiko <esoteric@teardrop.ca> [1]

3 files changed, 16 insertions, 53 deletions

diff --git a/mail/bincimap/Makefile b/mail/bincimap/Makefile
index c1c13b1..4900574 100644
--- a/mail/bincimap/Makefile
+++ b/mail/bincimap/Makefile
@@ -7,12 +7,11 @@
 
 # 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.2.9
+PORTVERSION=	1.2.10
 CATEGORIES=	mail
 MASTER_SITES=	http://www.bincimap.org/%SUBDIR%/ \
 		http://www.bincimap.andreas.hanssen.name/%SUBDIR%/ \
@@ -20,67 +19,37 @@ MASTER_SITES=	http://www.bincimap.org/%SUBDIR%/ \
 MASTER_SITE_SUBDIR=	dl/tarballs/1.2
 DISTNAME=	${PORTNAME}-${PORTVERSION}final
 
-PATCH_SITES=	${MASTER_SITES:S!%SUBDIR%!${MASTER_SITE_SUBDIR}!}
-#PATCHFILES=	bincimap-1.2.1-patch000-mimeparser
-
 MAINTAINER=	sergei@FreeBSD.org
 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
-
-CONFDIR=		${PREFIX}/etc/${PORTNAME}
-CONFIGURE_ARGS+=	--sysconfdir=${CONFDIR}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--sysconfdir=${CONFDIR}
+CONFDIR=	${PREFIX}/etc/${PORTNAME}
 
 .if defined(WITHOUT_OPENSSL)
 CONFIGURE_ARGS+=	--without-ssl
-PLIST_SUB+=		SSL="@comment "
 .else
 CONFIGURE_ARGS+=	--with-ssl
 USE_OPENSSL=		yes
-PLIST_SUB+=		SSL=""
 .endif
 
 MAN1=		bincimap-up.1 bincimapd.1
 MAN5=		bincimap.conf.5
 DOCS=		AUTHORS ChangeLog README doc/bincimap* \
 		doc/manual/bincimap-manual.ps
-EXAMPLES=	conf/checkpassword.pl conf/toimapdir conf/tomaildir++ \
-		contrib/README contrib/authenticators/bincimap-auth-teapop.sh
+EXAMPLES=	conf/bincimap.conf conf/checkpassword.pl conf/toimapdir \
+		conf/tomaildir++ conf/xinetd-bincimap conf/xinetd-bincimaps
+CONTRIB=	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}
+	@${MKDIR} ${EXAMPLESDIR}/contrib
 	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${CONTRIB} ${EXAMPLESDIR}/contrib
 	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 6ad92c7..467ce6d 100644
--- a/mail/bincimap/distinfo
+++ b/mail/bincimap/distinfo
@@ -1,2 +1,2 @@
-MD5 (bincimap-1.2.9final.tar.bz2) = 0fa92216715a540f5f405118cc92d994
-SIZE (bincimap-1.2.9final.tar.bz2) = 412006
+MD5 (bincimap-1.2.10final.tar.bz2) = c33f8ae5018c4d3166f52190c270cddc
+SIZE (bincimap-1.2.10final.tar.bz2) = 412289
diff --git a/mail/bincimap/pkg-plist b/mail/bincimap/pkg-plist
index f4d6a34..345aedd 100644
--- a/mail/bincimap/pkg-plist
+++ b/mail/bincimap/pkg-plist
@@ -2,16 +2,6 @@
 bin/bincimapd
 bin/bincimap-up
 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 rmdir %D/etc/bincimap 2>/dev/null || true
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -23,9 +13,13 @@ etc/bincimap/bincimap.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/bincimap-tech.html
 %%PORTDOCS%%%%DOCSDIR%%/bincimap.css
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/bincimap-auth-teapop.sh
+%%EXAMPLESDIR%%/contrib/README
+%%EXAMPLESDIR%%/contrib/bincimap-auth-teapop.sh
+%%EXAMPLESDIR%%/bincimap.conf
 %%EXAMPLESDIR%%/checkpassword.pl
 %%EXAMPLESDIR%%/toimapdir
 %%EXAMPLESDIR%%/tomaildir++
+%%EXAMPLESDIR%%/xinetd-bincimap
+%%EXAMPLESDIR%%/xinetd-bincimaps
+@dirrm %%EXAMPLESDIR%%/contrib
 @dirrm %%EXAMPLESDIR%%