View | Details | Raw Unified | Return to bug 200981 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 200981