Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Jan 2016 17:28:08 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r406519 - in head: . mail mail/bincimap mail/bincimap/files
Message-ID:  <201601171728.u0HHS8HC002048@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Sun Jan 17 17:28:08 2016
New Revision: 406519
URL: https://svnweb.freebsd.org/changeset/ports/406519

Log:
  - Resurrect `mail/bincimap' port (project was moved to SF.net from the
    abandoned http://www.bincimap.org/ website)
  - Distfile is .tar.gz now instead of original .tar.bz2, but the contents
    is identical (no changes whatsoever)
  - Clean up and modernize the port: convert to OPTIONS, define LICENSE,
    get rid of CONFDIR in favor of ETCDIR, allow to build with GCC 4.7+,
    use @sample in pkg-plist, kill bogus EOL whitespace in pkg-descr, etc.

Added:
  head/mail/bincimap/
     - copied from r278682, head/mail/bincimap/
  head/mail/bincimap/files/patch-src_convert.h   (contents, props changed)
  head/mail/bincimap/files/patch-src_tools.cc   (contents, props changed)
Modified:
  head/MOVED
  head/mail/Makefile
  head/mail/bincimap/Makefile   (contents, props changed)
  head/mail/bincimap/distinfo   (contents, props changed)
  head/mail/bincimap/pkg-descr   (contents, props changed)
  head/mail/bincimap/pkg-plist   (contents, props changed)

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Jan 17 16:52:11 2016	(r406518)
+++ head/MOVED	Sun Jan 17 17:28:08 2016	(r406519)
@@ -2337,7 +2337,6 @@ korean/linuxdoc-sgml||2011-08-01|Has exp
 korean/mod_url||2011-08-01|Has expired: Looks like abandonware, no more public distfiles
 korean/nh2ps||2011-08-01|Has expired: Looks like abandonware, no more public distfiles
 korean/pinetreefonts||2011-08-01|Has expired: No more public distfile
-mail/bincimap||2011-08-01|Has expired: No more public distfile
 mail/cmail||2011-08-01|Has expired: No more public distfile
 math/qgfe||2011-08-01|Has expired: Looks like abandonware, no more public distfiles
 misc/ewipe||2011-08-01|Has expired: Looks like abandonware, no more public distfiles

Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile	Sun Jan 17 16:52:11 2016	(r406518)
+++ head/mail/Makefile	Sun Jan 17 17:28:08 2016	(r406519)
@@ -33,6 +33,7 @@
     SUBDIR += bayespam
     SUBDIR += bbmail
     SUBDIR += biabam
+    SUBDIR += bincimap
     SUBDIR += bmf
     SUBDIR += bogofilter
     SUBDIR += bogofilter-sqlite
@@ -363,8 +364,8 @@
     SUBDIR += p5-Mail-CheckUser
     SUBDIR += p5-Mail-ClamAV
     SUBDIR += p5-Mail-DKIM
-    SUBDIR += p5-Mail-DeliveryStatus-BounceParser
     SUBDIR += p5-Mail-DMARC
+    SUBDIR += p5-Mail-DeliveryStatus-BounceParser
     SUBDIR += p5-Mail-DomainKeys
     SUBDIR += p5-Mail-Ezmlm
     SUBDIR += p5-Mail-Field-Received

Modified: head/mail/bincimap/Makefile
==============================================================================
--- head/mail/bincimap/Makefile	Mon Aug  1 05:21:10 2011	(r278682)
+++ head/mail/bincimap/Makefile	Sun Jan 17 17:28:08 2016	(r406519)
@@ -1,67 +1,55 @@
-# New ports collection makefile for:	bincimap
-# Date created:		27 Mar 2003
-# Whom:			Sergei Kolobov <sergei@kolobov.com>
-#
+# Created by: Sergei Kolobov <sergei@kolobov.com>
 # $FreeBSD$
-#
-
-# The following compile-time options are available:
-#
-# WITHOUT_OPENSSL	Disable OpenSSL support (enabled by default)
-#
 
 PORTNAME=	bincimap
 PORTVERSION=	1.2.13
 PORTREVISION=	2
 CATEGORIES=	mail
-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
+MASTER_SITES=	SF/${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION}final
 
-DEPRECATED=	No more public distfile
-EXPIRATION_DATE=	2011-08-01
-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Light-weight IMAP server for Maildir
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 RUN_DEPENDS=	checkpassword-pam:${PORTSDIR}/security/checkpassword-pam \
 		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
 
 USE_RC_SUBR=	bincimapd
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${CONFDIR}
-CONFDIR=	${PREFIX}/etc/${PORTNAME}
+CONFIGURE_ARGS=	--sysconfdir=${ETCDIR}
 
-.if defined(WITHOUT_OPENSSL)
-CONFIGURE_ARGS+=	--without-ssl
-.else
-CONFIGURE_ARGS+=	--with-ssl
-USE_OPENSSL=		yes
-.endif
-
-MAN1=		bincimap-up.1 bincimapd.1
-MAN5=		bincimap.conf.5
 DOCS=		AUTHORS ChangeLog README doc/bincimap* \
 		doc/manual/bincimap-manual.ps
 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
 
+OPTIONS_DEFINE=	DOCS EXAMPLES OPENSSL
+OPTIONS_DEFAULT=	OPENSSL
+
+OPENSSL_USE=	OPENSSL=yes
+OPENSSL_CONFIGURE_OFF=	--without-ssl
+
 post-install:
-	@${MKDIR} ${CONFDIR}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/bincimap.conf \
-		${CONFDIR}/bincimap.conf.sample
-	@${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)
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+		${STAGEDIR}${ETCDIR}/bincimap.conf.sample
+	cd ${WRKSRC}/man && ${INSTALL_MAN} bincimap-up.1 bincimapd.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/bincimap.conf.5 \
+		${STAGEDIR}${MANPREFIX}/man/man5
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${CONTRIB} \
+		${STAGEDIR}${EXAMPLESDIR}/contrib
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/mail/bincimap/distinfo
==============================================================================
--- head/mail/bincimap/distinfo	Mon Aug  1 05:21:10 2011	(r278682)
+++ head/mail/bincimap/distinfo	Sun Jan 17 17:28:08 2016	(r406519)
@@ -1,2 +1,2 @@
-SHA256 (bincimap-1.2.13final.tar.bz2) = 152368a1674a521a2006b8a27ff36c4db1b8bb0cf766ab1a0ada02698fae4528
-SIZE (bincimap-1.2.13final.tar.bz2) = 416152
+SHA256 (bincimap-1.2.13final.tar.gz) = 5ad2cc45da86e1e32f230f10e733a045f51197fdb54043df7c3a385caf2fc6f5
+SIZE (bincimap-1.2.13final.tar.gz) = 511059

Added: head/mail/bincimap/files/patch-src_convert.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/bincimap/files/patch-src_convert.h	Sun Jan 17 17:28:08 2016	(r406519)
@@ -0,0 +1,11 @@
+--- src/convert.h.orig	2005-02-08 20:30:22 UTC
++++ src/convert.h
+@@ -43,6 +43,8 @@
+ #include <iostream>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <sys/stat.h>
+ 
+ #include "address.h"

Added: head/mail/bincimap/files/patch-src_tools.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/bincimap/files/patch-src_tools.cc	Sun Jan 17 17:28:08 2016	(r406519)
@@ -0,0 +1,11 @@
+--- src/tools.cc.orig	2005-01-08 10:20:48 UTC
++++ src/tools.cc
+@@ -35,6 +35,8 @@
+ #include <config.h>
+ #endif
+ #include <errno.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "tools.h"
+ 

Modified: head/mail/bincimap/pkg-descr
==============================================================================
--- head/mail/bincimap/pkg-descr	Mon Aug  1 05:21:10 2011	(r278682)
+++ head/mail/bincimap/pkg-descr	Sun Jan 17 17:28:08 2016	(r406519)
@@ -1,7 +1,7 @@
-Binc IMAP is a GPL licensed IMAP4rev1 server for Maildir, written in C++. 
+Binc IMAP is a GPL licensed IMAP4rev1 server for Maildir, written in C++.
 It strives to be stable, fast, flexible, and RFC compliant.
 
 For those familiar with qmail-pop3d, this IMAP server will be the natural
-choice. It is invoked similarily and uses checkpassword to authenticate. 
+choice.  It is invoked similarly and uses checkpassword to authenticate.
 
-WWW:	http://www.bincimap.org/
+WWW: https://sourceforge.net/projects/bincimap/

Modified: head/mail/bincimap/pkg-plist
==============================================================================
--- head/mail/bincimap/pkg-plist	Mon Aug  1 05:21:10 2011	(r278682)
+++ head/mail/bincimap/pkg-plist	Sun Jan 17 17:28:08 2016	(r406519)
@@ -1,8 +1,9 @@
-@comment $FreeBSD$
 bin/bincimapd
 bin/bincimap-up
-etc/bincimap/bincimap.conf.sample
-@dirrmtry etc/bincimap
+@sample etc/bincimap/bincimap.conf.sample
+man/man1/bincimap-up.1.gz
+man/man1/bincimapd.1.gz
+man/man5/bincimap.conf.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -12,14 +13,11 @@ etc/bincimap/bincimap.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/bincimap-manual.ps
 %%PORTDOCS%%%%DOCSDIR%%/bincimap-tech.html
 %%PORTDOCS%%%%DOCSDIR%%/bincimap.css
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%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%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/bincimap-auth-teapop.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bincimap.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checkpassword.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toimapdir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tomaildir++
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xinetd-bincimap
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xinetd-bincimaps



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601171728.u0HHS8HC002048>