Attachment 157961 Details for Bug 200981 – Update patch

[patch] Update patch

opensmtpd-devel.diff (text/plain), 3.48 KB, created by Andrey Fesenko on 2015-06-21 23:16:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Fesenko

Created: 2015-06-21 23:16:41 UTC

Size: 3.48 KB

patch

obsolete

>diff -r 64b10ae2b13d -r 0fb9584cefda mail/opensmtpd-devel/Makefile
>--- a/mail/opensmtpd-devel/Makefile	Sat Jun 20 06:13:22 2015 +0300
>+++ b/mail/opensmtpd-devel/Makefile	Mon Jun 22 02:03:29 2015 +0300
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/mail/opensmtpd-devel/Makefile 382567 2015-03-29 05:17:43Z ashish $
> 
> PORTNAME=	opensmtpd
>-PORTVERSION=	201502012312
>-PORTREVISION=	2
>+PORTVERSION=	201506112227
> PORTEPOCH=	1
> CATEGORIES=	mail
> MASTER_SITES=	http://www.opensmtpd.org/archives/ \
>@@ -19,13 +18,14 @@
> 
> LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
> 
>-OPTIONS_DEFINE=	CA_BUNDLE LIBASR MAILERCONF
>+OPTIONS_DEFINE=	CA_BUNDLE LIBASR MAILERCONF TABLE-DB
> 
>-OPTIONS_DEFAULT=	CA_BUNDLE PAM
>+OPTIONS_DEFAULT=	CA_BUNDLE PAM TABLE-DB
> 
> CA_BUNDLE_DESC=	Install CA bundle for OpenSSL
>-LIBASR_DESC=	Use stable version of libasr
>+LIBASR_DESC=		Use stable version of libasr
> MAILERCONF_DESC=	Activate OpenSMTPD in mailer.conf(5)
>+TABLE-DB_DESC=		Install makemap and newaliases
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/ \
>@@ -50,6 +50,8 @@
> USE_OPENSSL=		yes
> WITH_OPENSSL_PORT=	yes
> 
>+TABLE-DB_CONFIGURE_ON=	--enable-table-db
>+
> post-deinstall:
> 		@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-DEINSTALL
> 
>diff -r 64b10ae2b13d -r 0fb9584cefda mail/opensmtpd-devel/distinfo
>--- a/mail/opensmtpd-devel/distinfo	Sat Jun 20 06:13:22 2015 +0300
>+++ b/mail/opensmtpd-devel/distinfo	Mon Jun 22 02:03:29 2015 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (opensmtpd-201502012312p1.tar.gz) = e35b30861ac65c280b6c705bda9dad0f82eb846a1064e46bb18b4a3a1c78c2df
>-SIZE (opensmtpd-201502012312p1.tar.gz) = 764585
>+SHA256 (opensmtpd-201506112227p1.tar.gz) = f938796d2655f554e695adff6a3f3bbc4b1326912327b98acc7e29f705b9cf63
>+SIZE (opensmtpd-201506112227p1.tar.gz) = 706259
>diff -r 64b10ae2b13d -r 0fb9584cefda mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in
>--- a/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in	Sat Jun 20 06:13:22 2015 +0300
>+++ b/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in	Mon Jun 22 02:03:29 2015 +0300
>@@ -1,6 +1,6 @@
>---- mk/smtpd/Makefile.in.orig
>-+++ mk/smtpd/Makefile.in
>-@@ -1796,11 +1796,7 @@
>+--- mk/smtpd/Makefile.in.orig	2015-06-20 04:17:57.656811000 +0000
>++++ mk/smtpd/Makefile.in	2015-06-20 04:19:53.711103000 +0000
>+@@ -1366,11 +1366,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP
>  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
>  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
>  
>@@ -9,7 +9,7 @@
> -	else									\
> -		echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \
> -	fi
>-+	$(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf.sample
>++	$(INSTALL) -m 644 smtpd.conf.out	$(DESTDIR)$(sysconfdir)/smtpd.conf.sample
>  
>  	$(INSTALL) -m 644 aliases.5.out		$(DESTDIR)$(mandir)/$(mansubdir)5/aliases.5
>  	$(INSTALL) -m 644 forward.5.out		$(DESTDIR)$(mandir)/$(mansubdir)5/forward.5
>diff -r 64b10ae2b13d -r 0fb9584cefda mail/opensmtpd-devel/pkg-plist
>--- a/mail/opensmtpd-devel/pkg-plist	Sat Jun 20 06:13:22 2015 +0300
>+++ b/mail/opensmtpd-devel/pkg-plist	Mon Jun 22 02:03:29 2015 +0300
>@@ -1,13 +1,13 @@
> etc/mail/smtpd.conf.sample
> libexec/opensmtpd/mail.local
>-libexec/opensmtpd/makemap
>+%%TABLE-DB%%libexec/opensmtpd/makemap
> libexec/opensmtpd/encrypt
> sbin/smtpctl
> sbin/smtpd
>-man/man8/newaliases.8.gz
>+%%TABLE-DB%%man/man8/newaliases.8.gz
> man/man8/sendmail.8.gz
> man/man8/smtpd.8.gz
>-man/man8/makemap.8.gz
>+%%TABLE-DB%%man/man8/makemap.8.gz
> man/man8/smtpctl.8.gz
> man/man5/table.5.gz
> man/man5/smtpd.conf.5.gz

Actions: View | Diff

Attachments on bug 200981: 157893 | 157894 | 157961 | 157962