Attachment #134670 for bug #179364

View | Details | Raw Unified | Return to bug 179364
Collapse All | Expand All

Lines 6-12 Link Here

(-)Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= opensmtpd	8	PORTNAME= opensmtpd
9	PORTVERSION= 5.3.2	9	PORTVERSION= 5.3.3
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= mail	11	CATEGORIES= mail
12	MASTER_SITES= http://www.opensmtpd.org/archives/ \	12	MASTER_SITES= http://www.opensmtpd.org/archives/ \
Lines 45-51 Link Here
45	USE_OPENSSL= yes	45	USE_OPENSSL= yes
46		46
47	.if ${PORT_OPTIONS:MPAM}	47	.if ${PORT_OPTIONS:MPAM}
48	CONFIGURE_ARGS+= --with-pam	48	CONFIGURE_ARGS+= --with-pam --sysconfdir=${LOCALBASE}/etc/mail/
49	.endif	49	.endif
50		50
51	# FreeBSD 7.3 and earlier need to use OpenSSL from ports	51	# FreeBSD 7.3 and earlier need to use OpenSSL from ports

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (opensmtpd-5.3.2p1.tar.gz) = 512a80333d267a3cecf858b5106200a386e96894907e18e105b69cbd27699a08	1	SHA256 (opensmtpd-5.3.3p1.tar.gz) = 34f0e208e6fdde5c5c25bb11f468436c4d6148a8b640c32117869cad140b823c
2	SIZE (opensmtpd-5.3.2p1.tar.gz) = 345468	2	SIZE (opensmtpd-5.3.3p1.tar.gz) = 343733





$FreeBSD$

--- smtpd/Makefile.am.orig
+++ smtpd/Makefile.am
@@ -97,7 +97,7 @@
 CFLAGS+=		-D_GNU_SOURCE
 CPPFLAGS=		-I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
 
-PATHS=			-DSMTPD_CONFDIR=\"$(sysconfdir)\" \
+PATHS=			-DSMTPD_CONFDIR=\"$(sysconfdir)/mail\" \
 			-DPATH_SMTPCTL=\"$(sbindir)/smtpctl\" \
 			-DPATH_MAILLOCAL=\"$(libexecdir)/mail.local\"
 
@@ -116,7 +116,7 @@
 			../contrib/lib/libc/asr/asr_private.h			\
 			$(CONFIGFILES_IN) $(MANPAGES_IN)
 
-PATHSUBS=		-e 's|/etc/mail/|$(sysconfdir)/|g'			\
+PATHSUBS=		-e 's|/etc/mail/|$(sysconfdir)/mail/|g'			\
 			-e 's|/usr/libexec|$(libexecdir)|g'			\
 			-e 's|/var/run/smtpd.sock|$(sockdir)/smtpd.sock|g'
 
@@ -142,16 +142,12 @@
 # smtpd.conf
 # newaliases makemap
 install-exec-hook: $(CONFIGFILES) $(MANPAGES)
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/mail
 	$(MKDIR_P) $(DESTDIR)$(bindir)
 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
 
-	@if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then			\
-		$(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \
-	else									\
-		echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \
-	fi
+	$(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/mail/smtpd.conf.sample
 
 	ln -f $(DESTDIR)$(sbindir)/smtpctl$(EXEEXT)				\
 		$(DESTDIR)$(bindir)/mailq$(EXEEXT);

Return to bug 179364

Lines 1-42 Link Here

(-)files/patch-smtpd_Makefile.am (-42 lines)
1
2	$FreeBSD$
3
4	--- smtpd/Makefile.am.orig
5	+++ smtpd/Makefile.am
6	@@ -97,7 +97,7 @@
7	CFLAGS+= -D_GNU_SOURCE
8	CPPFLAGS= -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
9
10	-PATHS= -DSMTPD_CONFDIR=\"$(sysconfdir)\" \
11	+PATHS= -DSMTPD_CONFDIR=\"$(sysconfdir)/mail\" \
12	-DPATH_SMTPCTL=\"$(sbindir)/smtpctl\" \
13	-DPATH_MAILLOCAL=\"$(libexecdir)/mail.local\"
14
15	@@ -116,7 +116,7 @@
16	../contrib/lib/libc/asr/asr_private.h \
17	$(CONFIGFILES_IN) $(MANPAGES_IN)
18
19	-PATHSUBS= -e 's\|/etc/mail/\|$(sysconfdir)/\|g' \
20	+PATHSUBS= -e 's\|/etc/mail/\|$(sysconfdir)/mail/\|g' \
21	-e 's\|/usr/libexec\|$(libexecdir)\|g' \
22	-e 's\|/var/run/smtpd.sock\|$(sockdir)/smtpd.sock\|g'
23
24	@@ -142,16 +142,12 @@
25	# smtpd.conf
26	# newaliases makemap
27	install-exec-hook: $(CONFIGFILES) $(MANPAGES)
28	- $(MKDIR_P) $(DESTDIR)$(sysconfdir)
29	+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/mail
30	$(MKDIR_P) $(DESTDIR)$(bindir)
31	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
32	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
33
34	- @if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then \
35	- $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \
36	- else \
37	- echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \
38	- fi
39	+ $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/mail/smtpd.conf.sample
40
41	ln -f $(DESTDIR)$(sbindir)/smtpctl$(EXEEXT) \
42	$(DESTDIR)$(bindir)/mailq$(EXEEXT);