From owner-svn-ports-head@freebsd.org Tue Aug 22 13:19:50 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C3F0DEAB3D; Tue, 22 Aug 2017 13:19:50 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 62D3F1849; Tue, 22 Aug 2017 13:19:50 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7MDJniu006195; Tue, 22 Aug 2017 13:19:49 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7MDJnnG006192; Tue, 22 Aug 2017 13:19:49 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201708221319.v7MDJnnG006192@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 22 Aug 2017 13:19:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448528 - in head/mail/courier-imap: . files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/mail/courier-imap: . files X-SVN-Commit-Revision: 448528 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Aug 2017 13:19:50 -0000 Author: madpilot Date: Tue Aug 22 13:19:49 2017 New Revision: 448528 URL: https://svnweb.freebsd.org/changeset/ports/448528 Log: - Update mail/courier-imap to 4.18.1 - Convert to USES=localbase - Convert to OPTION helpers (where safe) - Use a pkg-message in place of ECHO_MSG Added: head/mail/courier-imap/files/pkg-message.in (contents, props changed) Modified: head/mail/courier-imap/Makefile head/mail/courier-imap/distinfo Modified: head/mail/courier-imap/Makefile ============================================================================== --- head/mail/courier-imap/Makefile Tue Aug 22 13:07:26 2017 (r448527) +++ head/mail/courier-imap/Makefile Tue Aug 22 13:19:49 2017 (r448528) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= courier-imap -PORTVERSION= 4.18.0 +PORTVERSION= 4.18.1 PORTEPOCH= 2 CATEGORIES= mail ipv6 MASTER_SITES= SF/courier/imap/${PORTVERSION} @@ -15,18 +15,19 @@ RUN_DEPENDS= courierauthconfig:security/courier-authli ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool LIB_DEPENDS= libcourier-unicode.so:devel/courier-unicode -USES= gmake perl5 ssl tar:bzip2 +USES= gmake localbase:ldflags perl5 ssl tar:bzip2 GNU_CONFIGURE= yes USE_RC_SUBR= courier-imap-imapd courier-imap-imapd-ssl \ courier-imap-pop3d courier-imap-pop3d-ssl -CPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include -LDFLAGS+= -L${LOCALBASE}/lib -L${PREFIX}/lib CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash MAKE_ENV:= ${CONFIGURE_ENV} ALL_TARGET= all makeimapaccess makedat +SUB_FILES= pkg-message +SUB_LIST= CONFDIR=${CONFDIR} + # # options available: # @@ -59,14 +60,15 @@ CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --with-locking-method=fcntl \ COURIERAUTHCONFIG=${PREFIX}/bin/courierauthconfig -.include +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ + libgcrypt.so:security/libgcrypt +GNUTLS_CONFIGURE_WITH= gnutls +GNUTLS_USES= pkgconfig -.if ${PORT_OPTIONS:MGNUTLS} -CONFIGURE_ARGS+=--with-gnutls -LIB_DEPENDS+= libgnutls.so:security/gnutls -USES+= pkgconfig -.endif +IPV6_CONFIGURE_OFF= --without-ipv6 +TRASHQUOTA_CONFIGURE_ON=--with-trashquota + .include .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) @@ -86,19 +88,6 @@ CONFIGURE_ARGS+=--with-db=db --with-userdb=${USERDB} .endif .endif -.if ! ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+=--without-ipv6 -.endif - -.if ${PORT_OPTIONS:MTRASHQUOTA} -CONFIGURE_ARGS+=--with-trashquota -.endif - -.if ${PORT_OPTIONS:MFAM} -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.endif - EXTRA_DOCS= AUTHORS INSTALL NEWS \ libs/imap/ChangeLog \ libs/imap/README \ @@ -109,11 +98,11 @@ EXTRA_DOCS= AUTHORS INSTALL NEWS \ libs/maildir/README.sharedfolders.txt \ libs/tcpd/README.couriertls \ -post-patch: -.if ! ${PORT_OPTIONS:MFAM} +post-patch-FAM-off: @${REINPLACE_CMD} -e 's|$$LIBFAM||g; s|HAVE_FAM|DO_NOT_HAVE_FAM|g' \ ${WRKSRC}/libs/maildir/configure -.endif + +post-patch: @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ ${WRKSRC}/libs/liblock/configure @${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \ @@ -132,18 +121,5 @@ post-install: .for a in ${EXTRA_DOCS} ${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR} .endfor - - @${ECHO_MSG} "In case you use authpam, you should put the following lines" - @${ECHO_MSG} "in your /etc/pam.d/imap" - @${ECHO_MSG} "auth required pam_unix.so try_first_pass" - @${ECHO_MSG} "account required pam_unix.so try_first_pass" - @${ECHO_MSG} "session required pam_permit.so" - - @${ECHO_MSG} "" - @${ECHO_MSG} "You will have to run ${DATADIR}/mkimapdcert to create" - @${ECHO_MSG} "a self-signed certificate if you want to use imapd-ssl." - @${ECHO_MSG} "And you will have to copy and edit the *.dist files to *" - @${ECHO_MSG} "in ${CONFDIR}." - @${ECHO_MSG} "" .include Modified: head/mail/courier-imap/distinfo ============================================================================== --- head/mail/courier-imap/distinfo Tue Aug 22 13:07:26 2017 (r448527) +++ head/mail/courier-imap/distinfo Tue Aug 22 13:19:49 2017 (r448528) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499031625 -SHA256 (courier-imap-4.18.0.tar.bz2) = fa8c2e3b71295c9fa124dfad350f688263ddf7f2b15709f2d44d0f9722de7c52 -SIZE (courier-imap-4.18.0.tar.bz2) = 3202389 +TIMESTAMP = 1503327728 +SHA256 (courier-imap-4.18.1.tar.bz2) = 371b95b29cf6aae3c5967cb92a52c018059950ffb46b540d187b29d57f2f9a0b +SIZE (courier-imap-4.18.1.tar.bz2) = 3203392 Added: head/mail/courier-imap/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/courier-imap/files/pkg-message.in Tue Aug 22 13:19:49 2017 (r448528) @@ -0,0 +1,11 @@ +In case you use authpam, you should put the following lines +in your /etc/pam.d/imap: + +auth required pam_unix.so try_first_pass +account required pam_unix.so try_first_pass +session required pam_permit.so + +You will have to run %%DATADIR%%/mkimapdcert to create +a self-signed certificate if you want to use imapd-ssl. +And you will have to copy and edit the *.dist files to * +in %%CONFDIR%%.