Attachment 52818 Details for Bug 79974 – file.diff

[patch] file.diff

file.diff (text/plain), 5.04 KB, created by tkato432 on 2005-04-15 17:10:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-04-15 17:10:27 UTC

Size: 5.04 KB

patch

obsolete

>diff -urN /usr/ports/mail/esmtp/Makefile mail/esmtp/Makefile
>--- /usr/ports/mail/esmtp/Makefile	Tue Apr 12 14:07:48 2005
>+++ mail/esmtp/Makefile	Fri Apr 15 21:34:34 2005
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	esmtp
>-PORTVERSION=	0.5.0
>-PORTREVISION=	2
>+PORTVERSION=	0.5.1
> CATEGORIES=	mail
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -18,18 +17,21 @@
> LIB_DEPENDS=	esmtp.6:${PORTSDIR}/mail/libesmtp
> 
> USE_BZIP2=	yes
>-GNU_CONFIGURE=	yes
>-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>-USE_GETOPT_LONG=	yes
> USE_OPENSSL=	yes
>-USE_REINPLACE=	yes
> USE_BISON=	yes
>-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
>+USE_GETOPT_LONG=	yes
>+USE_REINPLACE=	yes
>+GNU_CONFIGURE=	yes
>+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
> 
>-DOC_FILES=	README
> MAN1=		esmtp.1
> MAN5=		esmtprc.5
>+PORTDOCS=	README
>+PLIST_FILES=	bin/esmtp etc/esmtprc.sample
>+
>+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|g' \
>@@ -41,20 +43,20 @@
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1
>-	${INSTALL_MAN} ${WRKSRC}/esmtprc.5 ${PREFIX}/man/man5
>+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
>+	${INSTALL_MAN} ${WRKSRC}/esmtprc.5 ${MANPREFIX}/man/man5
> 	${INSTALL_DATA} ${WRKSRC}/sample.esmtprc \
> 		${PREFIX}/etc/esmtprc.sample
>-	@${ECHO} "------------------------------------------------------------"
>-	@${ECHO} "Sample of configuration file placed at"
>-	@${ECHO} "${PREFIX}/etc/esmtprc.sample"
>-	@${ECHO} "------------------------------------------------------------"
>+	@${ECHO_MSG} "------------------------------------------------------------"
>+	@${ECHO_MSG} "Sample of configuration file placed at"
>+	@${ECHO_MSG} "${PREFIX}/etc/esmtprc.sample"
>+	@${ECHO_MSG} "------------------------------------------------------------"
> 
> post-install:
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-.for doc in ${DOC_FILES}
>-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
>+.for doc in ${PORTDOCS}
>+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
> .endfor
> .endif
> 
>diff -urN /usr/ports/mail/esmtp/distinfo mail/esmtp/distinfo
>--- /usr/ports/mail/esmtp/distinfo	Sat Jan 31 14:44:31 2004
>+++ mail/esmtp/distinfo	Sun Apr 10 10:02:37 2005
>@@ -1,2 +1,2 @@
>-MD5 (esmtp-0.5.0.tar.bz2) = b22933aa12167080959b42b025047639
>-SIZE (esmtp-0.5.0.tar.bz2) = 125494
>+MD5 (esmtp-0.5.1.tar.bz2) = 9f0b809e891a548910f099efc4315b02
>+SIZE (esmtp-0.5.1.tar.bz2) = 127355
>diff -urN /usr/ports/mail/esmtp/files/patch-esmtprc.5 mail/esmtp/files/patch-esmtprc.5
>--- /usr/ports/mail/esmtp/files/patch-esmtprc.5	Tue Jul 15 17:50:52 2003
>+++ mail/esmtp/files/patch-esmtprc.5	Sun Apr 10 10:04:24 2005
>@@ -1,11 +1,11 @@
>---- esmtprc.5.orig	Tue Jul 15 07:57:07 2003
>-+++ esmtprc.5	Tue Jul 15 07:58:05 2003
>-@@ -96,8 +96,8 @@
>- place a %T. The mail message's \fBFrom\fR address will be inserted where you
>+--- esmtprc.5.orig	Wed Feb 16 04:07:57 2005
>++++ esmtprc.5	Sun Apr 10 10:04:14 2005
>+@@ -137,8 +137,8 @@
>+ place a %T.  The mail message's \fBFrom\fR address will be inserted where you
>  place an %F.
>  
>--Some common MDAs are "/usr/bin/procmail -d %T",
>--"/usr/bin/deliver" and "/usr/lib/mail.local %T".
>+-Some common MDAs are "/usr/bin/procmail -d %T", "/usr/bin/deliver" and
>+-"/usr/lib/mail.local %T".
> +Some common MDAs are "/usr/local/bin/procmail -d %T"
> +and "/usr/libexec/mail.local %T".
>  
>diff -urN /usr/ports/mail/esmtp/files/patch-smtp.c mail/esmtp/files/patch-smtp.c
>--- /usr/ports/mail/esmtp/files/patch-smtp.c	Tue Jun 29 22:33:41 2004
>+++ mail/esmtp/files/patch-smtp.c	Thu Jan  1 09:00:00 1970
>@@ -1,33 +0,0 @@
>-
>-$FreeBSD: ports/mail/esmtp/files/patch-smtp.c,v 1.1 2004/06/29 13:33:41 krion Exp $
>-
>---- smtp.c.orig	Fri Nov  7 12:47:16 2003
>-+++ smtp.c	Tue Jun 29 15:27:29 2004
>-@@ -426,9 +426,14 @@
>- 		goto failure;
>- 
>- 	/* Do what's needed at application level to use authentication. */
>--	authctx = auth_create_context ();
>--	auth_set_mechanism_flags (authctx, AUTH_PLUGIN_PLAIN, 0);
>--	auth_set_interact_cb (authctx, authinteract, identity);
>-+	if(identity->user || identity->pass)
>-+	{
>-+		authctx = auth_create_context ();
>-+		auth_set_mechanism_flags (authctx, AUTH_PLUGIN_PLAIN, 0);
>-+		auth_set_interact_cb (authctx, authinteract, identity);
>-+	}
>-+	else
>-+		authctx = NULL;
>- 
>- 	/* Use our callback for X.509 certificate passwords.  If STARTTLS is not in
>- 	 * use or disabled in configure, the following is harmless.
>-@@ -560,7 +565,8 @@
>- 		fputc('\n', log_fp);
>- 
>- 	smtp_destroy_session (session);
>--	auth_destroy_context (authctx);
>-+	if(authctx)
>-+		auth_destroy_context (authctx);
>- 	auth_client_exit ();
>- 
>- 	return;
>diff -urN /usr/ports/mail/esmtp/pkg-plist mail/esmtp/pkg-plist
>--- /usr/ports/mail/esmtp/pkg-plist	Tue Jul 15 17:50:52 2003
>+++ mail/esmtp/pkg-plist	Thu Jan  1 09:00:00 1970
>@@ -1,4 +0,0 @@
>-bin/esmtp
>-etc/esmtprc.sample
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 79974: 52818