Attachment 137939 Details for Bug 183705 – file.diff

[patch] file.diff

file.diff (text/plain), 3.44 KB, created by Guido Falsi on 2013-11-05 23:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2013-11-05 23:20:01 UTC

Size: 3.44 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 332925)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	courier-imap
> PORTVERSION=	4.14
>+PORTREVISION=	1
> PORTEPOCH=	2
> CATEGORIES=	mail ipv6
> MASTER_SITES=	SF/courier/imap/${PORTVERSION}
>@@ -26,15 +27,15 @@
> MAKE_ENV:=	${CONFIGURE_ENV}
> 
> #
>-NO_STAGE=	yes
> # options available:
> #
> # WITH_SYSLOG_FACILITY:         The syslogfacility to use
> #
> 
>-OPTIONS_DEFINE=	FAM TRASHQUOTA GDBM IPV6
>+OPTIONS_DEFINE=	FAM TRASHQUOTA GDBM IPV6 GNUTLS
> FAM_DESC=	Fam support for IDLE command
> TRASHQUOTA_DESC=	Include deleted mails in the quota
>+GNUTLS_DESC=	Use GnuTLS instead of OpenSSL (Enables SNI)
> 
> .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt)
> .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt"
>@@ -56,6 +57,14 @@
> 		--with-locking-method=fcntl \
> 		COURIERAUTHCONFIG=${PREFIX}/bin/courierauthconfig
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MGNUTLS}
>+CONFIGURE_ARGS+=--with-gnutls
>+LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
>+USES+=		pkgconfig
>+.endif
>+
> .include <bsd.port.pre.mk>
> 
> .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
>@@ -69,7 +78,7 @@
> .if ${PORT_OPTIONS:MAUTH_USERDB}
> .if ${PORT_OPTIONS:MGDBM}
> CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB}
>-LIB_DEPENDS+=	gdbm.4:${PORTSDIR}/databases/gdbm
>+LIB_DEPENDS+=	libgdbm.so.4:${PORTSDIR}/databases/gdbm
> .else
> CONFIGURE_ARGS+=--with-db=db  --with-userdb=${USERDB}
> .endif
>@@ -89,11 +98,6 @@
> USE_FAM=	yes
> .endif
> 
>-MAN1=		couriertcpd.1 maildiracl.1 maildirkw.1 \
>-		maildirmake.1
>-
>-MAN8=		deliverquota.8 imapd.8 mkimapdcert.8 mkpop3dcert.8
>-
> EXTRA_DOCS=	AUTHORS INSTALL NEWS \
> 		libs/imap/ChangeLog \
> 		libs/imap/README \
>@@ -121,16 +125,15 @@
> 
> post-install:
> .for i in imapd pop3d
>-	${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${CONFDIR}/${i}.cnf.dist
>+	${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist
> .endfor
>-.if ${PORT_OPTIONS:MDOCS}
>-	@${MKDIR} ${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for a in ${EXTRA_DOCS}
>-	${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR}
> .endfor
>-.endif
> 
>-	cd ${WRKSRC} && ( ${GMAKE} install-configure ; cd - )
>+	cd ${WRKSRC} && ( ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} \
>+		install-configure ; cd - )
> 
> 	@${ECHO_MSG} "In case you use authpam, you should put the following lines"
> 	@${ECHO_MSG} "in your /etc/pam.d/imap"
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 332925)
>+++ pkg-descr	(working copy)
>@@ -16,4 +16,4 @@
>      * Virtual mailbox support.
>      * Pop3 daemon.
> 
>-WWW:	http://www.courier-mta.org/imap/
>+WWW: http://www.courier-mta.org/imap/
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 332925)
>+++ pkg-plist	(working copy)
>@@ -28,6 +28,14 @@
> %%LIBEXECDIR%%/makedatprog
> %%LIBEXECDIR%%/pop3d-ssl.rc
> %%LIBEXECDIR%%/pop3d.rc
>+man/man1/couriertcpd.1.gz
>+man/man1/maildiracl.1.gz
>+man/man1/maildirkw.1.gz
>+man/man1/maildirmake.1.gz
>+man/man8/deliverquota.8.gz
>+man/man8/imapd.8.gz
>+man/man8/mkimapdcert.8.gz
>+man/man8/mkpop3dcert.8.gz
> sbin/imaplogin
> sbin/mkimapdcert
> sbin/mkpop3dcert
>@@ -52,7 +60,6 @@
> @dirrmtry var
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrm share/courier-imap
>-@dirrmtry %%LIBEXECDIR%%/authlib
> @dirrm %%LIBEXECDIR%%
> @dirrm %%CONFDIR%%/shared
> @dirrm %%CONFDIR%%/shared.tmp

Actions: View | Diff

Attachments on bug 183705: 137939 | 137940