Attachment #52182 for bug #79094

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

Lines 6-12 Link Here

(-)./mail/qmail/Makefile (-152 / +51 lines)
6	#	6	#
7		7
8	PORTNAME= qmail	8	PORTNAME= qmail
9	PORTVERSION?= ${QMAIL_VERSION}	9	PORTVERSION?= ${QMAIL_VERSION}
10	PORTREVISION?= 3	10	PORTREVISION?= 3
11	CATEGORIES= mail	11	CATEGORIES= mail
12	MASTER_SITES+= http://cr.yp.to/software/ \	12	MASTER_SITES+= http://cr.yp.to/software/ \
Lines 16-21 Link Here
16	${MASTER_SITE_QMAIL}	16	${MASTER_SITE_QMAIL}
17	DISTNAME= ${PORTNAME}-${QMAIL_VERSION}	17	DISTNAME= ${PORTNAME}-${QMAIL_VERSION}
18		18
		19	MAINTAINER?= lioux@FreeBSD.org
		20	COMMENT?= A secure, reliable, efficient, simple, and fast MTA
		21
19	# qmail-* skeleton ports including this port may not want	22	# qmail-* skeleton ports including this port may not want
20	# its patches	23	# its patches
21	.if !defined(MAIN_QMAIL_PORT_DNS_PATCH_BARRIER)	24	.if !defined(MAIN_QMAIL_PORT_DNS_PATCH_BARRIER)
Lines 34-43 Link Here
34	PATCHFILES+= sendmail-flagf.patch:sendmail_flagf	37	PATCHFILES+= sendmail-flagf.patch:sendmail_flagf
35	.endif # MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER	38	.endif # MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER
36		39
37	PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:local,dns,ldap,mysql,smtp_auth_tls,tls/}	40	.if !defined(MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER)
38	PATCH_SITE_SUBDIR+= lioux/:local,dns,ldap,mysql,smtp_auth_tls,tls	41	# This patch changes qmail-remote to skip over MX servers that greet with
		42	# codes 400 to 499 and to bounce mail when any MX server that qmail tries
		43	# greets with a code 500 to 599.
		44	# Created by Matthias Andree
		45	PATCH_SITES+= http://www-dt.e-technik.uni-dortmund.de/~ma/qmail/:rfc2821
		46	PATCHFILES+= patch-qmail-1.03-rfc2821.diff:rfc2821
		47	.endif # MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER
39		48
40	MASTER_SITE_QMAIL+= \	49	PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:local,dns,ldap,mysql,smtp_auth_tls,tls/}
		50	PATCH_SITE_SUBDIR+= lioux/:local,dns,ldap,mysql,smtp_auth_tls,tls
		51
		52	MASTER_SITE_QMAIL+= \
41	http://qmail.geto.net/%SUBDIR%/ \	53	http://qmail.geto.net/%SUBDIR%/ \
42	http://qmail.palomine.net/%SUBDIR%/ \	54	http://qmail.palomine.net/%SUBDIR%/ \
43	http://qmail.mirrors.summersault.com/%SUBDIR%/ \	55	http://qmail.mirrors.summersault.com/%SUBDIR%/ \
Lines 114-120 Link Here
114	# MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER	126	# MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER
115	#	127	#
116	.if defined(WITH_QMAILQUEUE_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER)	128	.if defined(WITH_QMAILQUEUE_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER)
117	PATCHFILES+= qmailqueue-patch	129	PATCHFILES+= qmailqueue-patch
118	.endif # WITH_QMAILQUEUE_PATCH && !MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER	130	.endif # WITH_QMAILQUEUE_PATCH && !MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER
119	.if defined(WITH_BIG_TODO_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER)	131	.if defined(WITH_BIG_TODO_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER)
120	PATCHFILES+= big-todo.103.patch	132	PATCHFILES+= big-todo.103.patch
Lines 126-134 Link Here
126	PATCHFILES+= outgoingip.patch	138	PATCHFILES+= outgoingip.patch
127	.endif # WITH_OUTGOINGIP_PATCH && !MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER	139	.endif # WITH_OUTGOINGIP_PATCH && !MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER
128		140
129	MAINTAINER?= lioux@FreeBSD.org
130	COMMENT?= A secure, reliable, efficient, simple, and fast MTA
131
132	NO_PACKAGE= djb\'s packaging license does not allow non-standard\	141	NO_PACKAGE= djb\'s packaging license does not allow non-standard\
133	qmail binary distributions	142	qmail binary distributions
134		143
Lines 143-159 Link Here
143	WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT?= 509	152	WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT?= 509
144	.endif # WITH_BIG_CONCURRENCY_PATCH && !MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER	153	.endif # WITH_BIG_CONCURRENCY_PATCH && !MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER
145		154
146	# Some configuration files we use for installing the port
147	MAILER_CONF_FILE?= /etc/mail/mailer.conf
148	MAKE_CONF_FILE?= /etc/make.conf
149	RC_CONF_FILE?= /etc/rc.conf
150	# Some programs we use when building/installing the port
151	FMT?= /usr/bin/fmt
152	HEAD?= /usr/bin/head
153	MAILQ?= /usr/bin/mailq
154	NEWALIASES?= /usr/bin/newaliases
155	SENDMAIL?= /usr/sbin/sendmail
156
157	ALL_TARGET+= default dot-qmail.5 qmail-control.5 qmail-getpw.8 \	155	ALL_TARGET+= default dot-qmail.5 qmail-control.5 qmail-getpw.8 \
158	qmail-limits.7 qmail-newmrh.8 qmail-newu.8 qmail-pw2u.8 \	156	qmail-limits.7 qmail-newmrh.8 qmail-newu.8 qmail-pw2u.8 \
159	qmail-send.8 qmail-start.8 qmail-users.5	157	qmail-send.8 qmail-start.8 qmail-users.5
Lines 193-205 Link Here
193	${WRKSRC}/PIC.relaygood ${WRKSRC}/PIC.rem2local	191	${WRKSRC}/PIC.relaygood ${WRKSRC}/PIC.rem2local
194		192
195	# More files normally installed with from hier.c	193	# More files normally installed with from hier.c
196	BOOTFILES= ${WRKSRC}/home ${WRKSRC}/home+df ${WRKSRC}/proc \	194	BOOTFILES= home home+df proc proc+df binm1 binm1+df \
197	${WRKSRC}/proc+df ${WRKSRC}/binm1 ${WRKSRC}/binm1+df \	195	binm2 binm2+df binm3 binm3+df
198	${WRKSRC}/binm2 ${WRKSRC}/binm2+df ${WRKSRC}/binm3 \
199	${WRKSRC}/binm3+df
200		196
201	# Supplied by Stuart Henderson <stuart@internationalschool.co.uk>	197	# Supplied by Stuart Henderson <stuart@internationalschool.co.uk>
202	BOOTFILES+= ${FILESDIR}/maildir	198	BOOTFILES+= maildir
		199
		200	SCRIPTS+= enable-qmail
203		201
204	CONFIGUREPROGS= ${WRKSRC}/install ${WRKSRC}/dnsfq ${WRKSRC}/hostname \	202	CONFIGUREPROGS= ${WRKSRC}/install ${WRKSRC}/dnsfq ${WRKSRC}/hostname \
205	${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr	203	${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr
Lines 213-218 Link Here
213		211
214	NO_MTREE= yes	212	NO_MTREE= yes
215	USE_PERL5_BUILD=yes	213	USE_PERL5_BUILD=yes
		214	USE_REINPLACE= yes
216		215
217	.if !defined(_PREMKINCLUDED)	216	.if !defined(_PREMKINCLUDED)
218	.include <bsd.port.pre.mk>	217	.include <bsd.port.pre.mk>
Lines 265-271 Link Here
265	@${ECHO_MSG} ""	264	@${ECHO_MSG} ""
266	.endif	265	.endif
267		266
268	post-patch: thereal-post-patch slaveport-post-patch post-post-patch	267	post-patch: slaveport-post-patch post-post-patch
269		268
270	# Yet anther ugly hack (used by qmail-* skeleton ports)	269	# Yet anther ugly hack (used by qmail-* skeleton ports)
271	# Permits them to define local targets without braking everything	270	# Permits them to define local targets without braking everything
Lines 275-281 Link Here
275	.endif	274	.endif
276		275
277	post-post-patch:	276	post-post-patch:
278	@${PERL} -pi -ne "s!/var/qmail!${PREFIX}!;s!/usr/local/!${LOCALBASE}/!" ${WRKSRC}/Makefile	277	@${SED} 's!%%PREFIX%%!${PREFIX}!g; \
		278	s!%%ECHO_CMD%%!${ECHO_CMD}!g' \
		279	${FILESDIR}/bootfiles.sed.in > \
		280	${WRKDIR}/bootfiles.sed
		281	.for i in ${BOOTFILES}
		282	@if [ -f ${WRKSRC}/${i}.sh ] ; \
		283	then \
		284	${SED} -f ${WRKDIR}/bootfiles.sed ${WRKSRC}/$i.sh > ${WRKDIR}/${i} ; \
		285	elif [ -f ${FILESDIR}/${i} ] ; \
		286	then \
		287	${SED} -f ${WRKDIR}/bootfiles.sed ${FILESDIR}/$i > ${WRKDIR}/${i} ; \
		288	fi
		289	.endfor
		290	@${MKDIR} ${WRKDIR}/scripts
		291	@${SED} "s!%%PREFIX%%!${PREFIX}!g; s!%%DOCDIR%%!${DOCDIR}!g" \
		292	${FILESDIR}/enable-qmail.in > \
		293	${WRKDIR}/scripts/enable-qmail
		294	@${SED} s!/var/qmail/!${PREFIX}/!g ${FILESDIR}/mailer.conf.sample > \
		295	${WRKDIR}/mailer.conf.sample
		296	@${REINPLACE_CMD} "s!/var/qmail!${PREFIX}!;s!/usr/local/!${LOCALBASE}/!" ${WRKSRC}/Makefile
279		297
280	# If you want to change the qmail users, they must be changed in both	298	# If you want to change the qmail users, they must be changed in both
281	# work/*/conf-users and pkg/INSTALL.	299	# work/*/conf-users and pkg/INSTALL.
Lines 325-461 Link Here
325	@${TOUCH} ${PREFIX}/alias/.qmail-${i}	343	@${TOUCH} ${PREFIX}/alias/.qmail-${i}
326	.endfor	344	.endfor
327	@# This is not part of qmail proper, hence the 2nd class citizenship	345	@# This is not part of qmail proper, hence the 2nd class citizenship
328	${INSTALL_SCRIPT} ${FILESDIR}/mkaliasdir ${PREFIX}/${DOCDIR}
329	.if !defined(WITH_PRESERVE_CONFIG_FILES)	346	.if !defined(WITH_PRESERVE_CONFIG_FILES)
330	@cd ${PREFIX}/configure ; ./config	347	@cd ${PREFIX}/configure ; ./config
331	.endif	348	.endif
332	@${MKDIR} ${LOCALBASE}/etc/rc.d	349	@${MKDIR} ${LOCALBASE}/etc/rc.d
333	@${LN} -sf ${PREFIX}/rc ${LOCALBASE}/etc/rc.d/qmail.sh	350	@${LN} -sf ${PREFIX}/rc ${LOCALBASE}/etc/rc.d/qmail.sh
334	@${ECHO}	351	@${ECHO_CMD}
335	@${SED} s!/var/qmail!${PREFIX}!g ${PKGMESSAGE} \| ${FMT}	352	@${SED} s!/var/qmail!${PREFIX}!g ${PKGMESSAGE} \| ${FMT}
336		353	@${ECHO_CMD}
337	# hack to allow slave ports to include bsd.port.pre.mk and then this file	354	@${MKDIR} ${PREFIX}/scripts
338	.if defined(_PREMKINCLUDED)	355	${INSTALL_SCRIPT} ${FILESDIR}/mkaliasdir ${PREFIX}/scripts
339	.include <bsd.port.post.mk>	356	.for script in ${SCRIPTS}
340	.else	357	@${INSTALL_SCRIPT} ${WRKDIR}/scripts/${script} ${PREFIX}/scripts
341	.include <bsd.port.mk>
342	.endif
343
344	# Ugh... ;-)
345	thereal-post-patch:
346	.for i in ${BOOTFILES}
347	@if [ -f ${i}.sh ] ; \
348	then \
349	${PERL} -p -ne 's!QMAIL/!${PREFIX}/!;s!^(exec)!case "\$$1" in\nstart)\n\t\1!;s!(qmail)$$!\1\&\n\texit 0\n\t;;\nstop)\n\texec killall qmail-send\n\t;;\n*)\n\t${ECHO_CMD} "Usage: `basename \$$0` {start\|stop}" >&2\n\texit 64\n\t;;\nesac!' $i.sh > ${WRKDIR}/${i:T} ; \
350	elif [ -f ${i} ] ; \
351	then \
352	${PERL} -p -ne 's!QMAIL/!${PREFIX}/!;s!^(exec)!case "\$$1" in\nstart)\n\t\1!;s!(qmail)$$!\1\&\n\texit 0\n\t;;\nstop)\n\texec killall qmail-send\n\t;;\n*)\n\t${ECHO_CMD} "Usage: `basename \$$0` {start\|stop}" >&2\n\texit 64\n\t;;\nesac!' $i > ${WRKDIR}/${i:T} ; \
353	fi
354	.endfor	358	.endfor
355	@${SED} s!/var/qmail/!${PREFIX}/!g ${FILESDIR}/mailer.conf.sample > \
356	${WRKDIR}/mailer.conf.sample
357
358	# Double Ugh... ;-)
359	${WRKDIR}/.thereal_disable_sendmail_done:
360	@if [ ! -d ${WRKDIR} ]; \
361	then \
362	${MKDIR} ${WRKDIR} ; \
363	fi
364
365	# I would like some input on the targets below. Only constructive ones
366	# please. :)
367	# based on shells/pdksh /etc/shells update PLIST.
368	thereal-disable-sendmail: ${WRKDIR}/.thereal_disable_sendmail_done ${RC_CONF_FILE}
369	@if [ -f ${RC_CONF_FILE} ]; \
370	then \
371	${CP} ${RC_CONF_FILE} ${RC_CONF_FILE}.bak && \
372	${GREP} -v sendmail_enable ${RC_CONF_FILE}.bak > \
373	${RC_CONF_FILE} && \
374	${TOUCH} ${WRKDIR}/.thereal_disable_sendmail_done ; \
375	else \
376	${ECHO_MSG} "===> ERROR: YOU DO NOT HAVE A VALID ${RC_CONF_FILE}" ; \
377	${ECHO_MSG} "===> FIX this and try again" ; \
378	${FALSE} ; \
379	fi
380
381	disable-sendmail: thereal-disable-sendmail
382	@${ECHO_MSG} "===> I hope you know what you are doing:"
383	@${ECHO_MSG} "===> You just told your system to not"
384	@${ECHO_MSG} "===> automaticaly start sendmail on your"
385	@${ECHO_MSG} "===> next startup."
386	@${ECHO_MSG} "===> (i.e., added sendmail_enable=\"NONE\" to rc.conf)"
387	@if [ -f ${RC_CONF_FILE} ]; \
388	then \
389	${ECHO_CMD} sendmail_enable=\"NONE\" >> ${RC_CONF_FILE} ; \
390	fi
391		359
392	enable-sendmail: thereal-disable-sendmail	360	.include <bsd.port.post.mk>
393	@${ECHO_MSG} "===> I hope you know what you are doing:"
394	@${ECHO_MSG} "===> You just told your system to"
395	@${ECHO_MSG} "===> automaticaly start sendmail on your"
396	@${ECHO_MSG} "===> next startup."
397	@${ECHO_MSG} "===> (i.e., removed sendmail_enable=\"NONE\" from rc.conf)"
398
399	enable-qmail: install disable-sendmail
400	@if [ -f ${MAILER_CONF_FILE} ]; \
401	then \
402	${CP} ${MAILER_CONF_FILE} ${MAILER_CONF_FILE}.bak && \
403	${CP} ${WRKDIR}/mailer.conf.sample ${MAILER_CONF_FILE} ; \
404	else \
405	${ECHO_MSG} "===> ERROR: YOU DO NOT HAVE A VALID ${MAILER_CONF_FILE}" ; \
406	${ECHO_MSG} "===> FIX this and try again" ; \
407	${ECHO_MSG} "===> or, do \"make force_enable_qmail\" if you are sure" ; \
408	${ECHO_MSG} "===> you want this port replacing some binaries" ; \
409	${ECHO_MSG} "===> IF THIS FEELS UNEASY, read ${PREFIX}/${DOCDIR}/REMOVE.sendmail and do it manually" ; \
410	${ECHO_MSG} "" ; \
411	${ECHO_MSG} "=======> VERY IMPORTANT <=======" ; \
412	${ECHO_MSG} "===> One side issue is that if you do replace them," ; \
413	${ECHO_MSG} "===> you really should consider ADDING \"NO_SENDMAIL=true\"" ; \
414	${ECHO_MSG} "===> to your ${MAKE_CONF_FILE} if you do \"make world\"." ; \
415	${ECHO_MSG} "===> Otherwise, \"make world\" will \"fix\" your sendmail" ; \
416	${ECHO_MSG} "===> installation breaking your qmail one." ; \
417	${ECHO_MSG} "===> Read the FreeBSD Handbook section on \"make world\"" ; \
418	${ECHO_MSG} "===> if you do not know what I am talking about." ; \
419	${ECHO_MSG} "===> Check http://www.FreeBSD.org/ for the most" ; \
420	${ECHO_MSG} "===> updated copy of the Handbook." ; \
421	fi
422	@${ECHO_MSG} "===> Do not forget to choose an appropriate qmail startup"
423	@${ECHO_MSG} "===> script. Go through ${PREFIX}/boot, choose one"
424	@${ECHO_MSG} "===> and copy the chosen script as ${PREFIX}/rc"
425	@${ECHO_MSG} "===> For example, \"cp ${PREFIX}/boot/proc+df ${PREFIX}/rc\""
426
427	# taken from mail/postfix idea
428	force-enable-qmail: install disable-sendmail
429	@${ECHO_MSG} "===> Replacing sendmail"
430	@if [ -e ${SENDMAIL} ]; then \
431	${MV} -f ${SENDMAIL} ${SENDMAIL}.OFF && \
432	${CHMOD} 0 ${SENDMAIL}.OFF; \
433	fi
434	@if [ -e ${PREFIX}/bin/sendmail ]; then \
435	${LN} -sf ${PREFIX}/bin/sendmail ${SENDMAIL}; \
436	fi
437	@${ECHO_MSG} "===> Replacing mailq"
438	@if [ -e ${MAILQ} ]; then \
439	${MV} -f ${MAILQ} ${MAILQ}.OFF && \
440	${CHMOD} 0 ${MAILQ}.OFF; \
441	fi
442	@if [ -e ${PREFIX}/bin/qmail-qread ]; then \
443	${LN} -sf ${PREFIX}/bin/qmail-qread ${MAILQ}; \
444	fi
445	@${ECHO_MSG} "===> Replacing newaliases"
446	@if [ -e ${NEWALIASES} ]; then \
447	${MV} -f ${NEWALIASES} ${NEWALIASES}.OFF && \
448	${CHMOD} 0 ${NEWALIASES}.OFF; \
449	fi
450	@if [ -e ${PREFIX}/bin/newaliases ]; then \
451	${LN} -sf ${PREFIX}/bin/newaliases ${NEWALIASES}; \
452	fi
453
454	# The users are instructed (in PORT_NOTES) to install ${QUEUE_DIR}/rc
455	# themselves. Each /var/qmail/ should have its own rc. On many machines,
456	# /usr/local/ is nfs mounted and /var/qmail/ is local. An individual
457	# machine may want/not-want qmail. Pity we can't add a dir to local_startup
458	# from here.
459
460	# Wouldn't hurt to provide an "enable_qmail" and "disable_sendmail" target
461	# that do 1) and 2) above and disable the existing sendmail, respectively.

Lines 20-22 Link Here

(-)./mail/qmail/distinfo (+2 lines)
20	SIZE (outgoingip.patch) = 6839	20	SIZE (outgoingip.patch) = 6839
21	MD5 (sendmail-flagf.patch) = 4e1f2d8315e7e2a5482798c9d19fac4d	21	MD5 (sendmail-flagf.patch) = 4e1f2d8315e7e2a5482798c9d19fac4d
22	SIZE (sendmail-flagf.patch) = 863	22	SIZE (sendmail-flagf.patch) = 863
		23	MD5 (patch-qmail-1.03-rfc2821.diff) = 1b85f233ab5b9d7ec1a8da1188bf10ef
		24	SIZE (patch-qmail-1.03-rfc2821.diff) = 2564




s!QMAIL/!%%PREFIX%%/!
s!^\(exec\)!case "\$1" in\
start)\
\	\1!
s!\(qmail\)$!\1\&\
\	exit 0\
\	;;\
stop)\
\	exec killall qmail-send\
\	;;\
*)\
\	%%ECHO_CMD%% "Usage: `basename \$0` {start|stop}" >\&2\
\	exit 64\
\	;;\
esac!




#!/bin/sh

disable_sendmail() {
	echo "===> I hope you know what you are doing:"
	echo "===> You just told your system to not"
	echo "===> automaticaly start sendmail on your"
	echo "===> next startup."
	echo "===> (i.e., added sendmail_enable=\"NONE\" to rc.conf)"

	if [ -f ${RC_CONF_FILE} ]; then
		echo sendmail_enable=\"NONE\" >> ${RC_CONF_FILE}
	fi
}

enable_qmail() {
	if [ -f ${MAILER_CONF_FILE} ]; then
		cp ${MAILER_CONF_FILE} ${MAILER_CONF_FILE}.bak && \
		cp %%PREFIX%%/%%DOCDIR%%/mailer.conf.sample ${MAILER_CONF_FILE}
	else
		echo "===> ERROR: YOU DO NOT HAVE A VALID ${MAILER_CONF_FILE}"
		echo "===> FIX this and try again"
		echo "===> or, run \"$0 --force\" if you are sure"
		echo "===> you want this port replacing some binaries"
		echo "===> IF THIS FEELS UNEASY, read %%PREFIX%%/%%DOCDIR%%/REMOVE.sendmail and do it manually"
		echo ""
		echo "=======> VERY IMPORTANT <======="
		echo "===> One side issue is that if you do replace them,"
		echo "===> you really should consider ADDING \"NO_SENDMAIL=true\""
		echo "===> to your /etc/make.conf if you do \"make world\"."
		echo "===> Otherwise, \"make world\" will \"fix\" your sendmail"
		echo "===> installation breaking your qmail one."
		echo "===> Read the FreeBSD Handbook section on \"make world\""
		echo "===> if you do not know what I am talking about."
		echo "===> Check http://www.FreeBSD.org/ for the most"
		echo "===> updated copy of the Handbook."
	fi
	echo "===> Do not forget to choose an appropriate qmail startup"
	echo "===> script. Go through %%PREFIX%%/boot, choose one"
	echo "===> and copy the chosen script as %%PREFIX%%/rc"
	echo "===> For example, \"cp %%PREFIX%%/boot/proc+df %%PREFIX%%/rc\""
}

# taken from mail/postfix idea
force_enable_qmail() {
	echo "===> Replacing sendmail"
	if [ -e ${SENDMAIL} ]; then
		mv -f ${SENDMAIL} ${SENDMAIL}.OFF && \
		chmod 0 ${SENDMAIL}.OFF
	fi
	if [ -e %%PREFIX%%/bin/sendmail ]; then
		ln -sf %%PREFIX%%/bin/sendmail ${SENDMAIL}
	fi

	echo "===> Replacing mailq"
	if [ -e ${MAILQ} ]; then
		mv -f ${MAILQ} ${MAILQ}.OFF && \
		chmod 0 ${MAILQ}.OFF
	fi
	if [ -e %%PREFIX%%/bin/qmail-qread ]; then
		ln -sf %%PREFIX%%/bin/qmail-qread ${MAILQ}
	fi

	echo "===> Replacing newaliases"
	if [ -e ${NEWALIASES} ]; then
		mv -f ${NEWALIASES} ${NEWALIASES}.OFF && \
		chmod 0 ${NEWALIASES}.OFF
	fi
	if [ -e %%PREFIX%%/bin/newaliases ]; then
		ln -sf %%PREFIX%%/bin/newaliases ${NEWALIASES}
	fi
}

# main
RC_CONF_FILE=/etc/rc.conf
MAILER_CONF_FILE=/etc/mail/mailer.conf
SENDMAIL=/usr/sbin/sendmail
MAILQ=/usr/bin/mailq
NEWALIASES=/usr/bin/newaliases

disable_sendmail

if [ "$1" = "--force"]; then
  force_enable_qmail
else
  enable_qmail
fi

Lines 15-20 Link Here

(-)./mail/qmail/pkg-install (-5 / +7 lines)
15	exit 0;	15	exit 0;
16	}	16	}
17		17
		18	$pw = "/usr/sbin/pw";
		19	$nonexistent = "/nonexistent";
18	@groups = ("qmail", "qnofiles");	20	@groups = ("qmail", "qnofiles");
19	%users = ('qmaild', "qnofiles", 'qmaill', "qnofiles", 'qmailp', "qnofiles",	21	%users = ('qmaild', "qnofiles", 'qmaill', "qnofiles", 'qmailp', "qnofiles",
20	'qmailq', "qmail", 'qmailr', "qmail", 'qmails', "qmail");	22	'qmailq', "qmail", 'qmailr', "qmail", 'qmails', "qmail");
Lines 33-39 Link Here
33	do checkrpw; # May exit	35	do checkrpw; # May exit
34		36
35	$x = "-g $gids{$group}";	37	$x = "-g $gids{$group}";
36	$result = system ("/usr/sbin/pw groupadd $group $x");	38	$result = system ("$pw groupadd $group $x");
37	if ($result) {	39	if ($result) {
38	die "Failed to add group $group as gid $gids{$group}\n";	40	die "Failed to add group $group as gid $gids{$group}\n";
39	}	41	}
Lines 44-50 Link Here
44	do checkrpw; # May exit	46	do checkrpw; # May exit
45		47
46	$x = "-u $uids{'alias'}";	48	$x = "-u $uids{'alias'}";
47	$result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/alias\" -s /nonexistent $x");	49	$result = system ("$pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/alias\" -s $nonexistent $x");
48	if ($result) {	50	if ($result) {
49	die "Failed to add user alias as uid $uids{'alias'}\n";	51	die "Failed to add user alias as uid $uids{'alias'}\n";
50	}	52	}
Lines 55-61 Link Here
55	do checkrpw; # May exit	57	do checkrpw; # May exit
56		58
57	$x = "-u $uids{$user}";	59	$x = "-u $uids{$user}";
58	$result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}\" -s /nonexistent $x");	60	$result = system ("$pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}\" -s $nonexistent $x");
59	if ($result) {	61	if ($result) {
60	die "Failed to add user $user as uid $uids{$user}\n";	62	die "Failed to add user $user as uid $uids{$user}\n";
61	}	63	}
Lines 84-90 Link Here
84	exit 0;	86	exit 0;
85		87
86	sub checkrpw {	88	sub checkrpw {
87	if (! -x "/usr/sbin/pw") {	89	if (! -x "$pw") {
88	print <<'EOM';	90	print <<'EOM';
89	This system looks like a pre-2.2 version of FreeBSD. We see that it	91	This system looks like a pre-2.2 version of FreeBSD. We see that it
90	is missing the "pw" utility. We need this utility. Please get and	92	is missing the "pw" utility. We need this utility. Please get and
Lines 93-99 Link Here
93	ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar.gz	95	ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar.gz
94		96
95	EOM	97	EOM
96	die "No /usr/sbin/pw";	98	die "No $pw";
97	}	99	}
98		100
99	if ($> != 0) {	101	if ($> != 0) {

Lines 7-16 Link Here

(-)./mail/qmail/pkg-message (-7 / +2 lines)
7	You should also add /var/qmail/man to your MANPATH (see manpath(1)	7	You should also add /var/qmail/man to your MANPATH (see manpath(1)
8	or login.conf(5)).	8	or login.conf(5)).
9		9
10	You can enable qmail as your default mailer:	10	You can enable qmail as your default mailer executing:
11		11	> /var/qmail/scripts/enable-qmail
12	# this will disable the default MTA
13	1) do "make disable-sendmail"
14
15	# enable qmail as your default MTA
16	2) do "make enable-qmail"




%%PORTDOCS%%%%DOCDIR%%/FAQ
%%PORTDOCS%%%%DOCDIR%%/UPGRADE
%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
%%PORTDOCS%%%%DOCDIR%%/INSTALL
%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
%%PORTDOCS%%%%DOCDIR%%/TEST.receive
%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
boot/home
boot/home+df
boot/proc
boot/proc+df
boot/binm1
boot/binm1+df
boot/binm2
boot/binm2+df
boot/binm3
boot/binm3+df

@group qmail
@mode 04711
@comment *** NOTE different owner

@owner
@mode 0700
bin/qmail-lspawn
bin/qmail-newmrh
bin/qmail-newu
bin/qmail-start
@mode 0711
bin/qmail-clean
bin/qmail-getpw
@mode 0711
bin/qmail-local
bin/qmail-popup
bin/qmail-pw2u
bin/qmail-remote
@mode 0711
bin/qmail-rspawn
@mode 0711
bin/qmail-clean
@mode 0711
bin/qmail-send
@mode 0711
bin/splogger
@mode 0700
bin/qmail-newu
@mode 0700
bin/qmail-newmrh
@mode 0711
bin/qmail-pw2u
@mode 0755
bin/qmail-inject
@mode 0755
bin/predate
@mode 0755
bin/bouncesaying
bin/condredirect
bin/datemail
bin/elq
bin/except
bin/forward
bin/maildir2mbox
bin/maildirmake
bin/maildirwatch
bin/mailsubj
bin/pinq
bin/predate
bin/preline
bin/qail
bin/qbiff
bin/qmail-inject
@mode 0755
bin/qmail-tcpto
@mode 0755
bin/qmail-tcpok
@mode 0755
bin/qmail-pop3d
@mode 0711
bin/qmail-popup
@mode 0755
bin/qmail-qmqpc
@mode 0755
bin/qmail-qmqpd
@mode 0755
bin/qmail-qmtpd
bin/qmail-qread
bin/qmail-qstat
bin/qmail-showctl
bin/qmail-smtpd
bin/qmail-tcpok
bin/qmail-tcpto
@mode 0755
bin/tcp-env
@mode 0755
bin/qreceipt
@mode 0755
bin/qsmhook
bin/sendmail
bin/tcp-env
@mode 0755
bin/forward
@mode 0755
bin/preline
@mode 0755
bin/condredirect
@mode 0755
bin/bouncesaying
@mode 0755
bin/except
@mode 0755
bin/maildirmake
@mode 0755
bin/maildir2mbox
@mode 0755
bin/maildirwatch
@mode 0755
bin/qail
@mode 0755
bin/elq
@mode 0755
bin/pinq

@group
@owner
@mode
boot/binm1
boot/binm1+df
boot/binm2
boot/binm2+df
boot/binm3
boot/binm3+df
boot/home
boot/home+df
boot/maildir
boot/proc
boot/proc+df
@comment This port installs the following manually (ie. not through qmail-hier)
configure/install
configure/config
configure/config-fast
configure/dnsfq
configure/hostname
configure/dnsip
configure/ipmeprint
configure/dnsptr
configure/hostname
configure/install
configure/ipmeprint
scripts/enable-qmail
scripts/mkaliasdir
%%PORTDOCS%%%%DOCDIR%%/BLURB
%%PORTDOCS%%%%DOCDIR%%/BLURB2
%%PORTDOCS%%%%DOCDIR%%/BLURB3
%%PORTDOCS%%%%DOCDIR%%/BLURB4
%%PORTDOCS%%%%DOCDIR%%/FAQ
%%PORTDOCS%%%%DOCDIR%%/INSTALL
%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
%%PORTDOCS%%%%DOCDIR%%/INTERNALS
%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
%%PORTDOCS%%%%DOCDIR%%/SECURITY
%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
%%PORTDOCS%%%%DOCDIR%%/TEST.receive
%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
%%PORTDOCS%%%%DOCDIR%%/UPGRADE
%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
boot/maildir
%%PORTDOCS%%@dirrm %%DOCDIR%%
@dirrm scripts
@dirrm configure
@dirrm boot
@dirrm bin

@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt





PATCH_SITES=	http://www.nrg4u.com/qmail/:ldap
PATCHFILES=	qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz:ldap
PATCH_DIST_STRIP+=	-p1

EXTRA_PATCHES+=	${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac

MAINTAINER=	lioux@FreeBSD.org
COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support

EXTRA_PATCHES+=	${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac
PATCH_DIST_STRIP+=	-p1

CONFLICTS=	nss-[0-9]* emboss-[0-9]* digest-[0-9]*

USE_OPENLDAP=	yes
USE_REINPLACE=	yes
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}2

.if !defined(WITHOUT_TLS)
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-with_tls
USE_OPENSSL=	yes
.endif # WITHOUT_TLS

# Patches from the main qmail port are not wanted
MAIN_QMAIL_PORT_DNS_PATCH_BARRIER=			yes
MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER=	yes
MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=		yes
MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER=			yes

LDAP_PATCH_DATE=	20020901

# Using default from master port, i.e., /var/qmail
PREFIX?=	${QMAIL_PORT_PREFIX}
#PREFIX=		/var/qmail-ldap

.if !defined(_PREMKINCLUDED)
.include <bsd.port.pre.mk>
.endif

# Local overrides
MASTERDIR=	${.CURDIR}/../qmail
PATCHDIR=	${.CURDIR}/files
PKGDIR_LOCAL=	${.CURDIR}
DESCR=		${PKGDIR_LOCAL}/pkg-descr
PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
PLIST=		${PKGDIR_LOCAL}/pkg-plist

QMAIL_TLS_PORT=	${.CURDIR}/../qmail-tls
QMAIL_PORT_PREFIX!=	cd ${MASTERDIR} && ${MAKE} -V PREFIX
QMAIL_PORT_PATCHDIR!=	cd ${MASTERDIR} && ${MAKE} -V PATCHDIR

DOCFILES+=	${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \
		${WRKSRC}/POPBEFORESMTP \

slaveport-post-patch: qmail-ldap-post-patch

qmail-ldap-post-patch:
	@${REINPLACE_CMD} "s|LDAPLIBS=-L/usr/local/lib|LDAPLIBS=-L${LOCALBASE}/lib|;s|LDAPINCLUDES=-I/usr/local/include|LDAPINCLUDES=-I${LOCALBASE}/include|" ${WRKSRC}/Makefile
.if !defined(WITHOUT_TLS)
	@${REINPLACE_CMD} "s|#TLSON=|TLSON=|; \
		s|#TLSINCLUDES=-I/usr/local/include|TLSINCLUDES=-I${OPENSSLBASE}/include|; \
		s|#TLSLIBS=-L/usr/local/lib|TLSLIBS=-L${OPENSSLBASE}/lib|; \
		s|#OPENSSLBIN=/usr/local/bin/openssl|OPENSSLBIN=${OPENSSLBASE}/bin/openssl|" \
			${WRKSRC}/Makefile
.endif # !WITHOUT_TLS
.if !defined(WITHOUT_LDAP_CLUSTER)
	@${REINPLACE_CMD} "s|#LDAPFLAGS=-DQLDAP_CLUSTER\s+-DEXTERNAL_TODO|LDAPFLAGS\+=-DQLDAP_CLUSTER -DEXTERNAL_TODO#|" ${WRKSRC}/Makefile
.endif # WITHOUT_LDAP_CLUSTER
.if !defined(WITHOUT_AUTOMAILDIRMAKE)
	@${REINPLACE_CMD} "s|#MDIRMAKE=-DAUTOMAILDIRMAKE|MDIRMAKE=-DAUTOMAILDIRMAKE|" ${WRKSRC}/Makefile
.endif # WITHOUT_AUTOMAILDIRMAKE
.if !defined(WITHOUT_AUTOHOMEDIRMAKE)
	@${REINPLACE_CMD} "s|#HDIRMAKE=-DAUTOHOMEDIRMAKE|HDIRMAKE=-DAUTOHOMEDIRMAKE|" ${WRKSRC}/Makefile
.endif # WITHOUT_AUTOHOMEDIRMAKE
.if defined(WITH_LDAP_DEBUG)
	@${REINPLACE_CMD} "s|#DEBUG=-DDEBUG|DEBUG=-DDEBUG|" ${WRKSRC}/Makefile
.endif # WITH_LDAP_DEBUG
.if defined(WITH_CLEARTEXTPASSWD)
	@${REINPLACE_CMD} "s|^#\s*-DCLEARTEXTPASSWD.*$$|LDAPFLAGS\+=-DCLEARTEXTPASSWD|" \
		${WRKSRC}/Makefile
.endif # WITH_CLEARTEXTPASSWD
.if defined(WITH_DASH_EXT)
	@${REINPLACE_CMD} "s|^# -DDASH_EXT.*$$|LDAPFLAGS\+=-DDASH_EXT|" \
		${WRKSRC}/Makefile
.endif # WITH_DASH_EXT



certificate-req:
	@cd ${QMAIL_TLS_PORT} && ${MAKE} $@ clean

# Local overrides
MASTERDIR=	${QMAIL_PORT}
PATCHDIR=	${.CURDIR}/files
PKGDIR_LOCAL=	${.CURDIR}
DESCR=		${PKGDIR_LOCAL}/pkg-descr
PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
PLIST=		${PKGDIR_LOCAL}/pkg-plist

PRE_MK_INCLUDED=	yes

.include "${MASTERDIR}/Makefile"




this is NOT our old stock qmail. And, /var/qmail/doc/ANTISPAM
for some antispam control measures.

You can enable qmail as your default mailer executing:
> /var/qmail/scripts/enable-qmail
# this will disable the default MTA
1) do "make disable-sendmail"

# enable qmail as your default MTA
2) do "make enable-qmail"

=====><=====





%%PORTDOCS%%%%DOCDIR%%/FAQ
%%PORTDOCS%%%%DOCDIR%%/UPGRADE
%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
%%PORTDOCS%%%%DOCDIR%%/INSTALL
%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
%%PORTDOCS%%%%DOCDIR%%/TEST.receive
%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
%%PORTDOCS%%%%DOCDIR%%/POPBEFORESMTP
%%PORTDOCS%%%%DOCDIR%%/QLDAPINSTALL
%%PORTDOCS%%%%DOCDIR%%/QLDAPNEWS
%%PORTDOCS%%%%DOCDIR%%/QLDAPTODO
%%PORTDOCS%%%%DOCDIR%%/QLDAPPICTURE
boot/home
boot/home+df
boot/proc
boot/proc+df
boot/binm1
boot/binm1+df
boot/binm2
boot/binm2+df
boot/binm3
boot/binm3+df

@group qmail
@mode 04711
@comment *** NOTE different owner

bin/qmail-queue
@owner
@mode 0700
bin/auth_pop
bin/auth_imap
bin/qmail-ldaplookup
bin/qmail-lspawn
bin/qmail-newmrh
bin/qmail-newu
bin/qmail-start
@mode 0711
bin/qmail-clean
bin/qmail-getpw
@mode 0711
bin/qmail-local
bin/qmail-popup
bin/qmail-pw2u
bin/qmail-remote
@mode 0711
bin/qmail-rspawn
@mode 0711
bin/qmail-clean
@mode 0711
bin/qmail-send
@mode 0711
bin/splogger
@mode 0700
bin/qmail-newu
@mode 0700
bin/qmail-newmrh
@mode 0711
bin/qmail-pw2u
@mode 0755
bin/qmail-inject
@mode 0755
bin/predate
@mode 0755
bin/bouncesaying
bin/condredirect
bin/datemail
@mode 0755
bin/digest
bin/elq
bin/except
bin/forward
bin/maildir2mbox
bin/maildirmake
bin/maildirwatch
bin/mailsubj
@mode 0755
bin/pbsadd
@mode 0755
bin/pbscheck
@mode 0755
bin/pbsdbd
bin/pinq
bin/predate
bin/preline
bin/qail
bin/qbiff
bin/qmail-inject
@mode 0755
bin/qmail-tcpto
@mode 0755
bin/qmail-tcpok
@mode 0755
bin/qmail-pop3d
@mode 0711
bin/qmail-popup
@mode 0755
bin/qmail-qmqpc
@mode 0755
bin/qmail-qmqpd
@mode 0755
bin/qmail-qmtpd
bin/qmail-qread
bin/qmail-qstat
bin/qmail-quotawarn
bin/qmail-reply
bin/qmail-showctl
bin/qmail-smtpd
bin/qmail-tcpok
bin/qmail-tcpto
bin/qmail-todo
@mode 0755
bin/sendmail
@mode 0755
bin/tcp-env
@mode 0755
bin/qreceipt
@mode 0755
bin/qsmhook
bin/sendmail
bin/tcp-env
@mode 0755
bin/forward
@mode 0755
bin/preline
@mode 0755
bin/condredirect
@mode 0755
bin/bouncesaying
@mode 0755
bin/except
@mode 0755
bin/maildirmake
@mode 0755
bin/maildir2mbox
@mode 0755
bin/maildirwatch
@mode 0755
bin/qail
@mode 0755
bin/elq
@mode 0755
bin/pinq
@mode 0755
bin/qmail-reply
@mode 0755
bin/qmail-quotawarn
@mode 0700
bin/auth_pop
@mode 0700
bin/auth_imap
@mode 0700
bin/qmail-ldaplookup

@group
@owner
@mode
boot/binm1
boot/binm1+df
boot/binm2
boot/binm2+df
boot/binm3
boot/binm3+df
boot/home
boot/home+df
boot/maildir
boot/proc
boot/proc+df
@comment This port installs the following manually (ie. not through qmail-hier)
configure/install
configure/config
configure/config-fast
configure/dnsfq
configure/hostname
configure/dnsip
configure/ipmeprint
configure/dnsptr
configure/hostname
configure/install
configure/ipmeprint
scripts/enable-qmail
scripts/mkaliasdir
%%PORTDOCS%%%%DOCDIR%%/BLURB
%%PORTDOCS%%%%DOCDIR%%/BLURB2
%%PORTDOCS%%%%DOCDIR%%/BLURB3
%%PORTDOCS%%%%DOCDIR%%/BLURB4
%%PORTDOCS%%%%DOCDIR%%/FAQ
%%PORTDOCS%%%%DOCDIR%%/INSTALL
%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
%%PORTDOCS%%%%DOCDIR%%/INTERNALS
%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
%%PORTDOCS%%%%DOCDIR%%/POPBEFORESMTP
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
%%PORTDOCS%%%%DOCDIR%%/QLDAPINSTALL
%%PORTDOCS%%%%DOCDIR%%/QLDAPNEWS
%%PORTDOCS%%%%DOCDIR%%/QLDAPTODO
%%PORTDOCS%%%%DOCDIR%%/QLDAPPICTURE
%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
%%PORTDOCS%%%%DOCDIR%%/SECURITY
%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
%%PORTDOCS%%%%DOCDIR%%/TEST.receive
%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
%%PORTDOCS%%%%DOCDIR%%/UPGRADE
%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
boot/maildir
%%PORTDOCS%%@dirrm %%DOCDIR%%
@dirrm scripts
@dirrm configure
@dirrm boot
@dirrm bin
@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt




COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH MySQL support

USE_MYSQL=	yes
USE_REINPLACE=	yes

# patches from the master port that brake this one are now allowed
MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER=	yes


# Using default from master port, i.e., /var/qmail
PREFIX?=	${QMAIL_PORT_PREFIX}
#PREFIX=		/var/qmail-mysql

.if !defined(_PREMKINCLUDED)
.include <bsd.port.pre.mk>
.endif

# Local overrides
MASTERDIR=	${.CURDIR}/../qmail
PKGDIR_LOCAL=	${.CURDIR}
DESCR=		${PKGDIR_LOCAL}/pkg-descr
PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message

QMAIL_PORT_PREFIX!=	cd ${MASTERDIR} && ${MAKE} -V PREFIX

# Yet anther ugly hack (works due to code inside the main qmail port)
slaveport-post-patch: qmail-mysql-post-patch

qmail-mysql-post-patch:
	@${REINPLACE_CMD} \
		 's|/opt/mysql|${LOCALBASE}|' \
			${WRKSRC}/Makefile

# Local overrides
MASTERDIR=	${QMAIL_PORT}
PKGDIR_LOCAL=	${.CURDIR}
DESCR=		${PKGDIR_LOCAL}/pkg-descr
PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message

PRE_MK_INCLUDED=	yes

.include "${MASTERDIR}/Makefile"

Lines 10-19 Link Here

(-)./mail/qmail-mysql/pkg-message (-7 / +2 lines)
10	Do not forget to read http://iain.cx/unix/qmail/mysql.php. After all,	10	Do not forget to read http://iain.cx/unix/qmail/mysql.php. After all,
11	this is NOT our old stock qmail.	11	this is NOT our old stock qmail.
12		12
13	You can enable qmail as your default mailer:	13	You can enable qmail as your default mailer executing:
14		14	> /var/qmail/scripts/enable-qmail
15	# this will disable the default MTA
16	1) do "make disable-sendmail"
17
18	# enable qmail as your default MTA
19	2) do "make enable-qmail"




ONLY_FOR_ARCHS=	i386

USE_OPENSSL=	YES
USE_REINPLACE=	yes

# Patches from the main qmail port are not wanted
MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=	yes
MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER=		yes

SMTP_AUTH-TLS_PATCH_DATE=	20020519

# Using default from master port, i.e., /var/qmail
PREFIX?=	${QMAIL_PORT_PREFIX}
#PREFIX=		/var/qmail-smtp_auth+tls

.if !defined(_PREMKINCLUDED)
.include <bsd.port.pre.mk>
.endif


CFLAGS+=	-DDEBUG
.endif # WITH_TLS_DEBUG

# Local overrides
MASTERDIR=	${.CURDIR}/../qmail
PKGDIR_LOCAL=	${.CURDIR}
DESCR=		${PKGDIR_LOCAL}/pkg-descr
PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
PLIST=		${PKGDIR_LOCAL}/pkg-plist

QMAIL_PORT_PREFIX!=	cd ${MASTERDIR} && ${MAKE} -V PREFIX

DOCFILES+=	${WRKDIR}/SMTP_AUTH+TLS.readme \
		${WRKSRC}/README.auth

	@${HEAD} -6 ${DISTDIR}/qmail-1.03-starttls-smtp-auth.patch \
		| ${TAIL} -5 \
		> ${WRKDIR}/SMTP_AUTH+TLS.readme
	@${REINPLACE_CMD} "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile

# Primary Ugh... ;-)
# idea stolen from www/apache13-ssl, a target written by adam@algroup.co.uk

	else \
		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
	fi

# Local overrides
MASTERDIR=	${QMAIL_PORT}
PKGDIR_LOCAL=	${.CURDIR}
DESCR=		${PKGDIR_LOCAL}/pkg-descr
PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
PLIST=		${PKGDIR_LOCAL}/pkg-plist

.include "${MASTERDIR}/Makefile"




%%PORTDOCS%%%%DOCDIR%%/FAQ
%%PORTDOCS%%%%DOCDIR%%/UPGRADE
%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
%%PORTDOCS%%%%DOCDIR%%/INSTALL
%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
%%PORTDOCS%%%%DOCDIR%%/TEST.receive
%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
%%PORTDOCS%%%%DOCDIR%%/README.auth
%%PORTDOCS%%%%DOCDIR%%/SMTP_AUTH+TLS.readme
boot/home
boot/home+df
boot/proc
boot/proc+df
boot/binm1
boot/binm1+df
boot/binm2
boot/binm2+df
boot/binm3
boot/binm3+df

@group qmail
@mode 04711
@comment *** NOTE different owner

@owner
@mode 0700
bin/qmail-lspawn
bin/qmail-newmrh
bin/qmail-newu
bin/qmail-start
@mode 0711
bin/qmail-clean
bin/qmail-getpw
@mode 0711
bin/qmail-local
bin/qmail-popup
bin/qmail-pw2u
bin/qmail-remote
@mode 0711
bin/qmail-rspawn
@mode 0711
bin/qmail-clean
@mode 0711
bin/qmail-send
@mode 0711
bin/splogger
@mode 0700
bin/qmail-newu
@mode 0700
bin/qmail-newmrh
@mode 0711
bin/qmail-pw2u
@mode 0755
bin/qmail-inject
@mode 0755
bin/predate
@mode 0755
bin/bouncesaying
bin/condredirect
bin/datemail
bin/elq
bin/except
bin/forward
bin/maildir2mbox
bin/maildirmake
bin/maildirwatch
bin/mailsubj
bin/pinq
bin/predate
bin/preline
bin/qail
bin/qbiff
bin/qmail-inject
@mode 0755
bin/qmail-tcpto
@mode 0755
bin/qmail-tcpok
@mode 0755
bin/qmail-pop3d
@mode 0711
bin/qmail-popup
@mode 0755
bin/qmail-qmqpc
@mode 0755
bin/qmail-qmqpd
@mode 0755
bin/qmail-qmtpd
bin/qmail-qread
bin/qmail-qstat
bin/qmail-showctl
bin/qmail-smtpd
bin/qmail-tcpok
bin/qmail-tcpto
@mode 0755
bin/tcp-env
@mode 0755
bin/qreceipt
@mode 0755
bin/qsmhook
bin/sendmail
bin/tcp-env
@mode 0755
bin/forward
@mode 0755
bin/preline
@mode 0755
bin/condredirect
@mode 0755
bin/bouncesaying
@mode 0755
bin/except
@mode 0755
bin/maildirmake
@mode 0755
bin/maildir2mbox
@mode 0755
bin/maildirwatch
@mode 0755
bin/qail
@mode 0755
bin/elq
@mode 0755
bin/pinq

@group
@owner
@mode
boot/binm1
boot/binm1+df
boot/binm2
boot/binm2+df
boot/binm3
boot/binm3+df
boot/home
boot/home+df
boot/maildir
boot/proc
boot/proc+df
@comment This port installs the following manually (ie. not through qmail-hier)
configure/install
configure/config
configure/config-fast
configure/dnsfq
configure/hostname
configure/dnsip
configure/ipmeprint
configure/dnsptr
configure/hostname
configure/install
configure/ipmeprint
scripts/enable-qmail
scripts/mkaliasdir
%%PORTDOCS%%%%DOCDIR%%/BLURB
%%PORTDOCS%%%%DOCDIR%%/BLURB2
%%PORTDOCS%%%%DOCDIR%%/BLURB3
%%PORTDOCS%%%%DOCDIR%%/BLURB4
%%PORTDOCS%%%%DOCDIR%%/FAQ
%%PORTDOCS%%%%DOCDIR%%/INSTALL
%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
%%PORTDOCS%%%%DOCDIR%%/INTERNALS
%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
%%PORTDOCS%%%%DOCDIR%%/README.auth
%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
%%PORTDOCS%%%%DOCDIR%%/SECURITY
%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
%%PORTDOCS%%%%DOCDIR%%/SMTP_AUTH+TLS.readme
%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
%%PORTDOCS%%%%DOCDIR%%/TEST.receive
%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
%%PORTDOCS%%%%DOCDIR%%/UPGRADE
%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
boot/maildir
%%PORTDOCS%%@dirrm %%DOCDIR%%
@dirrm scripts
@dirrm configure
@dirrm boot
@dirrm bin

@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt

Lines 16-21 Link Here

(-)./mail/qmail-spamcontrol/Makefile (-15 / +10 lines)
16	MAINTAINER= renato@galle.com.br	16	MAINTAINER= renato@galle.com.br
17	COMMENT= Qmail MTA with SpamControl patches	17	COMMENT= Qmail MTA with SpamControl patches
18		18
		19	EXTRA_PATCHES+= ${QMAIL_PORT_PATCHDIR}/patch-aa ${QMAIL_PORT_PATCHDIR}/patch-ab \
		20	${QMAIL_PORT_PATCHDIR}/patch-ac
		21
19	# Distfiles	22	# Distfiles
20	QMAIL_DIST= ${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX}	23	QMAIL_DIST= ${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX}
21	SPAMCONTROL_DIST= spamcontrol-${SPAMCONTROL_VERSION}_tgz.bin	24	SPAMCONTROL_DIST= spamcontrol-${SPAMCONTROL_VERSION}_tgz.bin
Lines 33-46 Link Here
33	MOREIPME "Additional control files moreipme & notipme" off \	36	MOREIPME "Additional control files moreipme & notipme" off \
34	BIGTODO "Bruce Guenter's BigToDo patch" off	37	BIGTODO "Bruce Guenter's BigToDo patch" off
35		38
36	.if !defined(PRE_MK_INCLUDED)	39	.if !defined(_PREMKINCLUDED)
37	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
38	.endif	41	.endif
39		42
		43	MASTERDIR= ${.CURDIR}/../qmail
		44	PATCHDIR= ${.CURDIR}/files
40	# Using default from master port, i.e., /var/qmail	45	# Using default from master port, i.e., /var/qmail
41	QMAIL_PORT= ${PORTSDIR}/mail/qmail	46	QMAIL_PORT_PREFIX!= cd ${MASTERDIR} && ${MAKE} -V PREFIX
42	QMAIL_PORT_PREFIX!= cd ${QMAIL_PORT} && ${MAKE} -V PREFIX	47	QMAIL_PORT_PATCHDIR!= cd ${MASTERDIR} && ${MAKE} -V PATCHDIR
43	MASTERDIR= ${QMAIL_PORT}
44		48
45	# Block some patches because SpamControl contain the same patches inside	49	# Block some patches because SpamControl contain the same patches inside
46	MAIN_QMAIL_PORT_DNS_PATCH_BARRIER= yes	50	MAIN_QMAIL_PORT_DNS_PATCH_BARRIER= yes
Lines 49-54 Link Here
49	MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER= yes	53	MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER= yes
50	MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes	54	MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes
51	MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER= yes	55	MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER= yes
		56	MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER= yes
52		57
53	ALL_TARGET+= ${EXTRA_MAN8}	58	ALL_TARGET+= ${EXTRA_MAN8}
54		59
Lines 75-81 Link Here
75	${WRKDIR}/doc/badmailfrom ${WRKDIR}/doc/badmimetypes \	80	${WRKDIR}/doc/badmailfrom ${WRKDIR}/doc/badmimetypes \
76	${WRKDIR}/doc/badrcptto ${WRKDIR}/doc/conf-spamcontrol \	81	${WRKDIR}/doc/badrcptto ${WRKDIR}/doc/conf-spamcontrol \
77	${WRKDIR}/doc/install_spamcontrol.sh ${WRKDIR}/doc/tarpitcount	82	${WRKDIR}/doc/install_spamcontrol.sh ${WRKDIR}/doc/tarpitcount
78	SCRIPTS= qmail-alias2recipients qmail-pwd2recipients \	83	SCRIPTS+= qmail-alias2recipients qmail-pwd2recipients \
79	qmail-users2recipients qmail-vpopmail2recipients	84	qmail-users2recipients qmail-vpopmail2recipients
80		85
81	# Fill SELECTED_OPTIONS with options to write conf-spamcontrol	86	# Fill SELECTED_OPTIONS with options to write conf-spamcontrol
Lines 136-145 Link Here
136	post-extract:	141	post-extract:
137	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${SPAMCONTROL_DIST}	142	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${SPAMCONTROL_DIST}
138		143
139	slaveport-post-patch:
140	@cd ${WRKSRC} && \
141	${PATCH} -s < ${.CURDIR}/files/patch-qmail-smtpd.c.patch
142
143	pre-configure:	144	pre-configure:
144	@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail	145	@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail
145	@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \	146	@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \
Lines 148-158 Link Here
148	@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol	149	@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
149	.endfor	150	.endfor
150	@cd ${WRKSRC} && ./install_spamcontrol.sh	151	@cd ${WRKSRC} && ./install_spamcontrol.sh
151
152	post-install:
153	@${MKDIR} ${PREFIX}/scripts
154	.for script in ${SCRIPTS}
155	@${INSTALL_SCRIPT} ${WRKDIR}/scripts/${script} ${PREFIX}/scripts
156	.endfor
157		152
158	.include "${MASTERDIR}/Makefile"	153	.include "${MASTERDIR}/Makefile"

Lines 16-21 Link Here

(-)./mail/qmail-spamcontrol/pkg-plist (-3 / +4 lines)
16	bin/qmail-clean	16	bin/qmail-clean
17	bin/qmail-getpw	17	bin/qmail-getpw
18	bin/qmail-local	18	bin/qmail-local
		19	bin/qmail-popup
19	bin/qmail-pw2u	20	bin/qmail-pw2u
20	bin/qmail-remote	21	bin/qmail-remote
21	bin/qmail-rspawn	22	bin/qmail-rspawn
Lines 39-45 Link Here
39	bin/qbiff	40	bin/qbiff
40	bin/qmail-inject	41	bin/qmail-inject
41	bin/qmail-pop3d	42	bin/qmail-pop3d
42	bin/qmail-popup
43	bin/qmail-qmqpc	43	bin/qmail-qmqpc
44	bin/qmail-qmqpd	44	bin/qmail-qmqpd
45	bin/qmail-qmtpd	45	bin/qmail-qmtpd
Lines 76-81 Link Here
76	configure/hostname	76	configure/hostname
77	configure/install	77	configure/install
78	configure/ipmeprint	78	configure/ipmeprint
		79	scripts/enable-qmail
		80	scripts/mkaliasdir
79	scripts/qmail-alias2recipients	81	scripts/qmail-alias2recipients
80	scripts/qmail-pwd2recipients	82	scripts/qmail-pwd2recipients
81	scripts/qmail-users2recipients	83	scripts/qmail-users2recipients
Lines 142-148 Link Here
142	%%PORTDOCS%%%%DOCDIR%%/conf-spamcontrol	144	%%PORTDOCS%%%%DOCDIR%%/conf-spamcontrol
143	%%PORTDOCS%%%%DOCDIR%%/install_spamcontrol.sh	145	%%PORTDOCS%%%%DOCDIR%%/install_spamcontrol.sh
144	%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample	146	%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
145	%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
146	%%PORTDOCS%%%%DOCDIR%%/tarpitcount	147	%%PORTDOCS%%%%DOCDIR%%/tarpitcount
147	%%PORTDOCS%%@dirrm %%DOCDIR%%	148	%%PORTDOCS%%@dirrm %%DOCDIR%%
148	@dirrm scripts	149	@dirrm scripts
Lines 151-154 Link Here
151	@dirrm bin	152	@dirrm bin
152	@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." \| /usr/bin/fmt	153	@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." \| /usr/bin/fmt
153	@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." \| /usr/bin/fmt	154	@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." \| /usr/bin/fmt
154	@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. Go to mail/qmail portsdir and do a 'make enable-sendmail'" \| /usr/bin/fmt	155	@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" \| /usr/bin/fmt




COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support

USE_OPENSSL=	YES
USE_REINPLACE=	yes

# Patches from the main qmail port are not wanted
MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=	yes
MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER=		yes

TLS_PATCH_DATE=	20020825

# Using default from master port, i.e., /var/qmail
PREFIX?=	${QMAIL_PORT_PREFIX}
#PREFIX=		/var/qmail-tls

.if !defined(_PREMKINCLUDED)
.include <bsd.port.pre.mk>
.endif


CFLAGS+=	-DDEBUG
.endif # WITH_TLS_DEBUG

# Local overrides
MASTERDIR=	${.CURDIR}/../qmail
PKGDIR_LOCAL=	${.CURDIR}
DESCR=		${PKGDIR_LOCAL}/pkg-descr
PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
PLIST=		${PKGDIR_LOCAL}/pkg-plist

QMAIL_PORT_PREFIX!=	cd ${MASTERDIR} && ${MAKE} -V PREFIX

DOCFILES+=	${WRKDIR}/TLS.readme



qmail-tls-post-patch:
	@${HEAD} -74 ${DISTDIR}/tls.patch > ${WRKDIR}/TLS.readme
	@${REINPLACE_CMD} "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile

# Primary Ugh... ;-)
# idea stolen from www/apache13-ssl, a target written by adam@algroup.co.uk

	else \
		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
	fi

# Local overrides
MASTERDIR=	${QMAIL_PORT}
PKGDIR_LOCAL=	${.CURDIR}
DESCR=		${PKGDIR_LOCAL}/pkg-descr
PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
PLIST=		${PKGDIR_LOCAL}/pkg-plist

.include "${MASTERDIR}/Makefile"




%%PORTDOCS%%%%DOCDIR%%/FAQ
%%PORTDOCS%%%%DOCDIR%%/UPGRADE
%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
%%PORTDOCS%%%%DOCDIR%%/INSTALL
%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
%%PORTDOCS%%%%DOCDIR%%/TEST.receive
%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
%%PORTDOCS%%%%DOCDIR%%/TLS.readme
boot/home
boot/home+df
boot/proc
boot/proc+df
boot/binm1
boot/binm1+df
boot/binm2
boot/binm2+df
boot/binm3
boot/binm3+df

@group qmail
@mode 04711
@comment *** NOTE different owner

@owner
@mode 0700
bin/qmail-lspawn
bin/qmail-newmrh
bin/qmail-newu
bin/qmail-start
@mode 0711
bin/qmail-clean
bin/qmail-getpw
@mode 0711
bin/qmail-local
bin/qmail-popup
bin/qmail-pw2u
bin/qmail-remote
@mode 0711
bin/qmail-rspawn
@mode 0711
bin/qmail-clean
@mode 0711
bin/qmail-send
@mode 0711
bin/splogger
@mode 0700
bin/qmail-newu
@mode 0700
bin/qmail-newmrh
@mode 0711
bin/qmail-pw2u
@mode 0755
bin/qmail-inject
@mode 0755
bin/predate
@mode 0755
bin/bouncesaying
bin/condredirect
bin/datemail
bin/elq
bin/except
bin/forward
bin/maildir2mbox
bin/maildirmake
bin/maildirwatch
bin/mailsubj
bin/pinq
bin/predate
bin/preline
bin/qail
bin/qbiff
bin/qmail-inject
@mode 0755
bin/qmail-tcpto
@mode 0755
bin/qmail-tcpok
@mode 0755
bin/qmail-pop3d
@mode 0711
bin/qmail-popup
@mode 0755
bin/qmail-qmqpc
@mode 0755
bin/qmail-qmqpd
@mode 0755
bin/qmail-qmtpd
bin/qmail-qread
bin/qmail-qstat
bin/qmail-showctl
bin/qmail-smtpd
bin/qmail-tcpok
bin/qmail-tcpto
@mode 0755
bin/tcp-env
@mode 0755
bin/qreceipt
@mode 0755
bin/qsmhook
bin/sendmail
bin/tcp-env
@mode 0755
bin/forward
@mode 0755
bin/preline
@mode 0755
bin/condredirect
@mode 0755
bin/bouncesaying
@mode 0755
bin/except
@mode 0755
bin/maildirmake
@mode 0755
bin/maildir2mbox
@mode 0755
bin/maildirwatch
@mode 0755
bin/qail
@mode 0755
bin/elq
@mode 0755
bin/pinq

@group
@owner
@mode
boot/binm1
boot/binm1+df
boot/binm2
boot/binm2+df
boot/binm3
boot/binm3+df
boot/home
boot/home+df
boot/maildir
boot/proc
boot/proc+df
@comment This port installs the following manually (ie. not through qmail-hier)
configure/install
configure/config
configure/config-fast
configure/dnsfq
configure/hostname
configure/dnsip
configure/ipmeprint
configure/dnsptr
configure/hostname
configure/install
configure/ipmeprint
scripts/enable-qmail
scripts/mkaliasdir
%%PORTDOCS%%%%DOCDIR%%/BLURB
%%PORTDOCS%%%%DOCDIR%%/BLURB2
%%PORTDOCS%%%%DOCDIR%%/BLURB3
%%PORTDOCS%%%%DOCDIR%%/BLURB4
%%PORTDOCS%%%%DOCDIR%%/FAQ
%%PORTDOCS%%%%DOCDIR%%/INSTALL
%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
%%PORTDOCS%%%%DOCDIR%%/INTERNALS
%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
%%PORTDOCS%%%%DOCDIR%%/SECURITY
%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
%%PORTDOCS%%%%DOCDIR%%/TEST.receive
%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
%%PORTDOCS%%%%DOCDIR%%/TLS.readme
%%PORTDOCS%%%%DOCDIR%%/UPGRADE
%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
boot/maildir
%%PORTDOCS%%@dirrm %%DOCDIR%%
@dirrm scripts
@dirrm configure
@dirrm boot
@dirrm bin

@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt

Return to bug 79094

Line 0 Link Here

(-)./mail/qmail/files/bootfiles.sed.in (+15 lines)
	1	s!QMAIL/!%%PREFIX%%/!
	2	s!^\(exec\)!case "\$1" in\
	3	start)\
	4	\ \1!
	5	s!\(qmail\)$!\1\&\
	6	\ exit 0\
	7	\ ;;\
	8	stop)\
	9	\ exec killall qmail-send\
	10	\ ;;\
	11	*)\
	12	\ %%ECHO_CMD%% "Usage: `basename \$0` {start\|stop}" >\&2\
	13	\ exit 64\
	14	\ ;;\
	15	esac!

Line 0 Link Here

(-)./mail/qmail/files/enable-qmail.in (+86 lines)
		1	#!/bin/sh
		2
		3	disable_sendmail() {
		4	echo "===> I hope you know what you are doing:"
		5	echo "===> You just told your system to not"
		6	echo "===> automaticaly start sendmail on your"
		7	echo "===> next startup."
		8	echo "===> (i.e., added sendmail_enable=\"NONE\" to rc.conf)"
		9
		10	if [ -f ${RC_CONF_FILE} ]; then
		11	echo sendmail_enable=\"NONE\" >> ${RC_CONF_FILE}
		12	fi
		13	}
		14
		15	enable_qmail() {
		16	if [ -f ${MAILER_CONF_FILE} ]; then
		17	cp ${MAILER_CONF_FILE} ${MAILER_CONF_FILE}.bak && \
		18	cp %%PREFIX%%/%%DOCDIR%%/mailer.conf.sample ${MAILER_CONF_FILE}
		19	else
		20	echo "===> ERROR: YOU DO NOT HAVE A VALID ${MAILER_CONF_FILE}"
		21	echo "===> FIX this and try again"
		22	echo "===> or, run \"$0 --force\" if you are sure"
		23	echo "===> you want this port replacing some binaries"
		24	echo "===> IF THIS FEELS UNEASY, read %%PREFIX%%/%%DOCDIR%%/REMOVE.sendmail and do it manually"
		25	echo ""
		26	echo "=======> VERY IMPORTANT <======="
		27	echo "===> One side issue is that if you do replace them,"
		28	echo "===> you really should consider ADDING \"NO_SENDMAIL=true\""
		29	echo "===> to your /etc/make.conf if you do \"make world\"."
		30	echo "===> Otherwise, \"make world\" will \"fix\" your sendmail"
		31	echo "===> installation breaking your qmail one."
		32	echo "===> Read the FreeBSD Handbook section on \"make world\""
		33	echo "===> if you do not know what I am talking about."
		34	echo "===> Check http://www.FreeBSD.org/ for the most"
		35	echo "===> updated copy of the Handbook."
		36	fi
		37	echo "===> Do not forget to choose an appropriate qmail startup"
		38	echo "===> script. Go through %%PREFIX%%/boot, choose one"
		39	echo "===> and copy the chosen script as %%PREFIX%%/rc"
		40	echo "===> For example, \"cp %%PREFIX%%/boot/proc+df %%PREFIX%%/rc\""
		41	}
		42
		43	# taken from mail/postfix idea
		44	force_enable_qmail() {
		45	echo "===> Replacing sendmail"
		46	if [ -e ${SENDMAIL} ]; then
		47	mv -f ${SENDMAIL} ${SENDMAIL}.OFF && \
		48	chmod 0 ${SENDMAIL}.OFF
		49	fi
		50	if [ -e %%PREFIX%%/bin/sendmail ]; then
		51	ln -sf %%PREFIX%%/bin/sendmail ${SENDMAIL}
		52	fi
		53
		54	echo "===> Replacing mailq"
		55	if [ -e ${MAILQ} ]; then
		56	mv -f ${MAILQ} ${MAILQ}.OFF && \
		57	chmod 0 ${MAILQ}.OFF
		58	fi
		59	if [ -e %%PREFIX%%/bin/qmail-qread ]; then
		60	ln -sf %%PREFIX%%/bin/qmail-qread ${MAILQ}
		61	fi
		62
		63	echo "===> Replacing newaliases"
		64	if [ -e ${NEWALIASES} ]; then
65	mv -f ${NEWALIASES} ${NEWALIASES}.OFF && \
66	chmod 0 ${NEWALIASES}.OFF
67	fi
68	if [ -e %%PREFIX%%/bin/newaliases ]; then
69	ln -sf %%PREFIX%%/bin/newaliases ${NEWALIASES}
70	fi
71	}
72
73	# main
74	RC_CONF_FILE=/etc/rc.conf
75	MAILER_CONF_FILE=/etc/mail/mailer.conf
76	SENDMAIL=/usr/sbin/sendmail
77	MAILQ=/usr/bin/mailq
78	NEWALIASES=/usr/bin/newaliases
79
80	disable_sendmail
81
82	if [ "$1" = "--force"]; then
83	force_enable_qmail
84	else
85	enable_qmail
86	fi

Lines 1-37 Link Here

(-)./mail/qmail/pkg-plist (-111 / +69 lines)
1	%%PORTDOCS%%%%DOCDIR%%/FAQ
2	%%PORTDOCS%%%%DOCDIR%%/UPGRADE
3	%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
4	%%PORTDOCS%%%%DOCDIR%%/INSTALL
5	%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
6	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
7	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
8	%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
9	%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
10	%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
11	%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
12	%%PORTDOCS%%%%DOCDIR%%/TEST.receive
13	%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
14	%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
15	%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
16	%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
17	%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
18	%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
19	%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
20	%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
21	%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
22	%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
23	%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
24	boot/home
25	boot/home+df
26	boot/proc
27	boot/proc+df
28	boot/binm1
29	boot/binm1+df
30	boot/binm2
31	boot/binm2+df
32	boot/binm3
33	boot/binm3+df
34
35	@group qmail	1	@group qmail
36	@mode 04711	2	@mode 04711
37	@comment *** NOTE different owner	3	@comment *** NOTE different owner
Lines 40-161 Link Here
40	@owner	6	@owner
41	@mode 0700	7	@mode 0700
42	bin/qmail-lspawn	8	bin/qmail-lspawn
43	@mode 0700	9	bin/qmail-newmrh
		10	bin/qmail-newu
44	bin/qmail-start	11	bin/qmail-start
45	@mode 0711	12	@mode 0711
		13	bin/qmail-clean
46	bin/qmail-getpw	14	bin/qmail-getpw
47	@mode 0711
48	bin/qmail-local	15	bin/qmail-local
49	@mode 0711	16	bin/qmail-popup
		17	bin/qmail-pw2u
50	bin/qmail-remote	18	bin/qmail-remote
51	@mode 0711
52	bin/qmail-rspawn	19	bin/qmail-rspawn
53	@mode 0711
54	bin/qmail-clean
55	@mode 0711
56	bin/qmail-send	20	bin/qmail-send
57	@mode 0711
58	bin/splogger	21	bin/splogger
59	@mode 0700
60	bin/qmail-newu
61	@mode 0700
62	bin/qmail-newmrh
63	@mode 0711
64	bin/qmail-pw2u
65	@mode 0755
66	bin/qmail-inject
67	@mode 0755
68	bin/predate
69	@mode 0755	22	@mode 0755
		23	bin/bouncesaying
		24	bin/condredirect
70	bin/datemail	25	bin/datemail
71	@mode 0755	26	bin/elq
		27	bin/except
		28	bin/forward
		29	bin/maildir2mbox
		30	bin/maildirmake
		31	bin/maildirwatch
72	bin/mailsubj	32	bin/mailsubj
73	@mode 0755	33	bin/pinq
74	bin/qmail-showctl	34	bin/predate
75	@mode 0755	35	bin/preline
76	bin/qmail-qread	36	bin/qail
77	@mode 0755	37	bin/qbiff
78	bin/qmail-qstat	38	bin/qmail-inject
79	@mode 0755
80	bin/qmail-tcpto
81	@mode 0755
82	bin/qmail-tcpok
83	@mode 0755
84	bin/qmail-pop3d	39	bin/qmail-pop3d
85	@mode 0711
86	bin/qmail-popup
87	@mode 0755
88	bin/qmail-qmqpc	40	bin/qmail-qmqpc
89	@mode 0755
90	bin/qmail-qmqpd	41	bin/qmail-qmqpd
91	@mode 0755
92	bin/qmail-qmtpd	42	bin/qmail-qmtpd
93	@mode 0755	43	bin/qmail-qread
		44	bin/qmail-qstat
		45	bin/qmail-showctl
94	bin/qmail-smtpd	46	bin/qmail-smtpd
95	@mode 0755	47	bin/qmail-tcpok
96	bin/sendmail	48	bin/qmail-tcpto
97	@mode 0755
98	bin/tcp-env
99	@mode 0755
100	bin/qreceipt	49	bin/qreceipt
101	@mode 0755
102	bin/qsmhook	50	bin/qsmhook
103	@mode 0755	51	bin/sendmail
104	bin/qbiff	52	bin/tcp-env
105	@mode 0755
106	bin/forward
107	@mode 0755
108	bin/preline
109	@mode 0755
110	bin/condredirect
111	@mode 0755
112	bin/bouncesaying
113	@mode 0755
114	bin/except
115	@mode 0755
116	bin/maildirmake
117	@mode 0755
118	bin/maildir2mbox
119	@mode 0755
120	bin/maildirwatch
121	@mode 0755
122	bin/qail
123	@mode 0755
124	bin/elq
125	@mode 0755
126	bin/pinq
127
128	@group	53	@group
129	@owner	54	@owner
130	@mode	55	@mode
131		56	boot/binm1
		57	boot/binm1+df
		58	boot/binm2
		59	boot/binm2+df
		60	boot/binm3
		61	boot/binm3+df
		62	boot/home
		63	boot/home+df
		64	boot/maildir
		65	boot/proc
		66	boot/proc+df
132	@comment This port installs the following manually (ie. not through qmail-hier)	67	@comment This port installs the following manually (ie. not through qmail-hier)
133	configure/install
134	configure/config	68	configure/config
135	configure/config-fast	69	configure/config-fast
136	configure/dnsfq	70	configure/dnsfq
137	configure/hostname
138	configure/dnsip	71	configure/dnsip
139	configure/ipmeprint
140	configure/dnsptr	72	configure/dnsptr
		73	configure/hostname
		74	configure/install
		75	configure/ipmeprint
		76	scripts/enable-qmail
		77	scripts/mkaliasdir
141	%%PORTDOCS%%%%DOCDIR%%/BLURB	78	%%PORTDOCS%%%%DOCDIR%%/BLURB
142	%%PORTDOCS%%%%DOCDIR%%/BLURB2	79	%%PORTDOCS%%%%DOCDIR%%/BLURB2
143	%%PORTDOCS%%%%DOCDIR%%/BLURB3	80	%%PORTDOCS%%%%DOCDIR%%/BLURB3
144	%%PORTDOCS%%%%DOCDIR%%/BLURB4	81	%%PORTDOCS%%%%DOCDIR%%/BLURB4
		82	%%PORTDOCS%%%%DOCDIR%%/FAQ
		83	%%PORTDOCS%%%%DOCDIR%%/INSTALL
		84	%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
		85	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
		86	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
		87	%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
		88	%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
		89	%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
145	%%PORTDOCS%%%%DOCDIR%%/INTERNALS	90	%%PORTDOCS%%%%DOCDIR%%/INTERNALS
146	%%PORTDOCS%%%%DOCDIR%%/SECURITY	91	%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
147	%%PORTDOCS%%%%DOCDIR%%/THOUGHTS	92	%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
		93	%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
		94	%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
		95	%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
		96	%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
		97	%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
		98	%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
		99	%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
148	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES	100	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
149	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE	101	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
		102	%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
		103	%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
		104	%%PORTDOCS%%%%DOCDIR%%/SECURITY
		105	%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
150	%%PORTDOCS%%%%DOCDIR%%/SYSDEPS	106	%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
		107	%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
		108	%%PORTDOCS%%%%DOCDIR%%/TEST.receive
		109	%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
		110	%%PORTDOCS%%%%DOCDIR%%/UPGRADE
151	%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample	111	%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
152	%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
153	boot/maildir
154	%%PORTDOCS%%@dirrm %%DOCDIR%%	112	%%PORTDOCS%%@dirrm %%DOCDIR%%
		113	@dirrm scripts
155	@dirrm configure	114	@dirrm configure
156	@dirrm boot	115	@dirrm boot
157	@dirrm bin	116	@dirrm bin
158
159	@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." \| /usr/bin/fmt	117	@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." \| /usr/bin/fmt
160	@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." \| /usr/bin/fmt	118	@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." \| /usr/bin/fmt
161	@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. Go to mail/qmail portsdir and do a 'make enable-sendmail'" \| /usr/bin/fmt	119	@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" \| /usr/bin/fmt

Lines 13-55 Link Here

(-)./mail/qmail-ldap/Makefile (-31 / +28 lines)
13		13
14	PATCH_SITES= http://www.nrg4u.com/qmail/:ldap	14	PATCH_SITES= http://www.nrg4u.com/qmail/:ldap
15	PATCHFILES= qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz:ldap	15	PATCHFILES= qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz:ldap
16	PATCH_DIST_STRIP+= -p1
17
18	EXTRA_PATCHES+= ${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac
19		16
20	MAINTAINER= lioux@FreeBSD.org	17	MAINTAINER= lioux@FreeBSD.org
21	COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support	18	COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support
22		19
23	CONFLICTS= nss-* emboss-* digest-*	20	EXTRA_PATCHES+= ${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac
		21	PATCH_DIST_STRIP+= -p1
		22
		23	CONFLICTS= nss-[0-9]* emboss-[0-9]* digest-[0-9]*
24		24
25	USE_OPENLDAP= yes	25	USE_OPENLDAP= yes
		26	USE_REINPLACE= yes
26	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}2	27	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}2
27		28
28	.if !defined(WITHOUT_TLS)	29	.if !defined(WITHOUT_TLS)
29	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-with_tls	30	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-with_tls
30	USE_OPENSSL= yes	31	USE_OPENSSL= yes
31	.endif # WITHOUT_TLS	32	.endif # WITHOUT_TLS
32		33
33	# Patches from the main qmail port are not wanted	34	# Patches from the main qmail port are not wanted
34	MAIN_QMAIL_PORT_DNS_PATCH_BARRIER= yes	35	MAIN_QMAIL_PORT_DNS_PATCH_BARRIER= yes
35	MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER= yes	36	MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER= yes
36	MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes	37	MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes
		38	MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER= yes
37		39
38	LDAP_PATCH_DATE= 20020901	40	LDAP_PATCH_DATE= 20020901
39		41
40	# Using default from master port, i.e., /var/qmail	42	# Using default from master port, i.e., /var/qmail
41	PREFIX?= ${QMAIL_PORT_PREFIX}	43	PREFIX?= ${QMAIL_PORT_PREFIX}
42	#PREFIX= /var/qmail-ldap
43		44
44	.if !defined(PRE_MK_INCLUDED)	45	.if !defined(_PREMKINCLUDED)
45	.include <bsd.port.pre.mk>	46	.include <bsd.port.pre.mk>
46	.endif	47	.endif
47		48
48	#QMAIL_PORT= ${PORTSDIR}/mail/qmail	49	# Local overrides
49	QMAIL_PORT= ${.CURDIR}/../qmail	50	MASTERDIR= ${.CURDIR}/../qmail
		51	PATCHDIR= ${.CURDIR}/files
		52	PKGDIR_LOCAL= ${.CURDIR}
		53	DESCR= ${PKGDIR_LOCAL}/pkg-descr
		54	PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
		55	PLIST= ${PKGDIR_LOCAL}/pkg-plist
		56
50	QMAIL_TLS_PORT= ${.CURDIR}/../qmail-tls	57	QMAIL_TLS_PORT= ${.CURDIR}/../qmail-tls
51	QMAIL_PORT_PREFIX!= cd ${QMAIL_PORT} && ${MAKE} -V PREFIX	58	QMAIL_PORT_PREFIX!= cd ${MASTERDIR} && ${MAKE} -V PREFIX
52	QMAIL_PORT_PATCHDIR!= cd ${QMAIL_PORT} && ${MAKE} -V PATCHDIR	59	QMAIL_PORT_PATCHDIR!= cd ${MASTERDIR} && ${MAKE} -V PATCHDIR
53		60
54	DOCFILES+= ${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \	61	DOCFILES+= ${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \
55	${WRKSRC}/POPBEFORESMTP \	62	${WRKSRC}/POPBEFORESMTP \
Lines 71-102 Link Here
71	slaveport-post-patch: qmail-ldap-post-patch	78	slaveport-post-patch: qmail-ldap-post-patch
72		79
73	qmail-ldap-post-patch:	80	qmail-ldap-post-patch:
74	@${PERL} -pi -ne "s\|LDAPLIBS=-L/usr/local/lib\|LDAPLIBS=-L${LOCALBASE}/lib\|;s\|LDAPINCLUDES=-I/usr/local/include\|LDAPINCLUDES=-I${LOCALBASE}/include\|" ${WRKSRC}/Makefile	81	@${REINPLACE_CMD} "s\|LDAPLIBS=-L/usr/local/lib\|LDAPLIBS=-L${LOCALBASE}/lib\|;s\|LDAPINCLUDES=-I/usr/local/include\|LDAPINCLUDES=-I${LOCALBASE}/include\|" ${WRKSRC}/Makefile
75	.if !defined(WITHOUT_TLS)	82	.if !defined(WITHOUT_TLS)
76	@${PERL} -pi -ne "s\|#TLSON=\|TLSON=\|; \	83	@${REINPLACE_CMD} "s\|#TLSON=\|TLSON=\|; \
77	s\|#TLSINCLUDES=-I/usr/local/include\|TLSINCLUDES=-I${OPENSSLBASE}/include\|; \	84	s\|#TLSINCLUDES=-I/usr/local/include\|TLSINCLUDES=-I${OPENSSLBASE}/include\|; \
78	s\|#TLSLIBS=-L/usr/local/lib\|TLSLIBS=-L${OPENSSLBASE}/lib\|; \	85	s\|#TLSLIBS=-L/usr/local/lib\|TLSLIBS=-L${OPENSSLBASE}/lib\|; \
79	s\|#OPENSSLBIN=/usr/local/bin/openssl\|OPENSSLBIN=${OPENSSLBASE}/bin/openssl\|" \	86	s\|#OPENSSLBIN=/usr/local/bin/openssl\|OPENSSLBIN=${OPENSSLBASE}/bin/openssl\|" \
80	${WRKSRC}/Makefile	87	${WRKSRC}/Makefile
81	.endif # !WITHOUT_TLS	88	.endif # !WITHOUT_TLS
82	.if !defined(WITHOUT_LDAP_CLUSTER)	89	.if !defined(WITHOUT_LDAP_CLUSTER)
83	@${PERL} -pi -ne "s\|#LDAPFLAGS=-DQLDAP_CLUSTER\s+-DEXTERNAL_TODO\|LDAPFLAGS\+=-DQLDAP_CLUSTER -DEXTERNAL_TODO#\|" ${WRKSRC}/Makefile	90	@${REINPLACE_CMD} "s\|#LDAPFLAGS=-DQLDAP_CLUSTER\s+-DEXTERNAL_TODO\|LDAPFLAGS\+=-DQLDAP_CLUSTER -DEXTERNAL_TODO#\|" ${WRKSRC}/Makefile
84	.endif # WITHOUT_LDAP_CLUSTER	91	.endif # WITHOUT_LDAP_CLUSTER
85	.if !defined(WITHOUT_AUTOMAILDIRMAKE)	92	.if !defined(WITHOUT_AUTOMAILDIRMAKE)
86	@${PERL} -pi -ne "s\|#MDIRMAKE=-DAUTOMAILDIRMAKE\|MDIRMAKE=-DAUTOMAILDIRMAKE\|" ${WRKSRC}/Makefile	93	@${REINPLACE_CMD} "s\|#MDIRMAKE=-DAUTOMAILDIRMAKE\|MDIRMAKE=-DAUTOMAILDIRMAKE\|" ${WRKSRC}/Makefile
87	.endif # WITHOUT_AUTOMAILDIRMAKE	94	.endif # WITHOUT_AUTOMAILDIRMAKE
88	.if !defined(WITHOUT_AUTOHOMEDIRMAKE)	95	.if !defined(WITHOUT_AUTOHOMEDIRMAKE)
89	@${PERL} -pi -ne "s\|#HDIRMAKE=-DAUTOHOMEDIRMAKE\|HDIRMAKE=-DAUTOHOMEDIRMAKE\|" ${WRKSRC}/Makefile	96	@${REINPLACE_CMD} "s\|#HDIRMAKE=-DAUTOHOMEDIRMAKE\|HDIRMAKE=-DAUTOHOMEDIRMAKE\|" ${WRKSRC}/Makefile
90	.endif # WITHOUT_AUTOHOMEDIRMAKE	97	.endif # WITHOUT_AUTOHOMEDIRMAKE
91	.if defined(WITH_LDAP_DEBUG)	98	.if defined(WITH_LDAP_DEBUG)
92	@${PERL} -pi -ne "s\|#DEBUG=-DDEBUG\|DEBUG=-DDEBUG\|" ${WRKSRC}/Makefile	99	@${REINPLACE_CMD} "s\|#DEBUG=-DDEBUG\|DEBUG=-DDEBUG\|" ${WRKSRC}/Makefile
93	.endif # WITH_LDAP_DEBUG	100	.endif # WITH_LDAP_DEBUG
94	.if defined(WITH_CLEARTEXTPASSWD)	101	.if defined(WITH_CLEARTEXTPASSWD)
95	@${PERL} -pi -ne "s\|^#\s-DCLEARTEXTPASSWD.$$\|LDAPFLAGS\+=-DCLEARTEXTPASSWD\|" \	102	@${REINPLACE_CMD} "s\|^#\s-DCLEARTEXTPASSWD.$$\|LDAPFLAGS\+=-DCLEARTEXTPASSWD\|" \
96	${WRKSRC}/Makefile	103	${WRKSRC}/Makefile
97	.endif # WITH_CLEARTEXTPASSWD	104	.endif # WITH_CLEARTEXTPASSWD
98	.if defined(WITH_DASH_EXT)	105	.if defined(WITH_DASH_EXT)
99	@${PERL} -pi -ne "s\|^# -DDASH_EXT.*$$\|LDAPFLAGS\+=-DDASH_EXT\|" \	106	@${REINPLACE_CMD} "s\|^# -DDASH_EXT.*$$\|LDAPFLAGS\+=-DDASH_EXT\|" \
100	${WRKSRC}/Makefile	107	${WRKSRC}/Makefile
101	.endif # WITH_DASH_EXT	108	.endif # WITH_DASH_EXT
102		109
Lines 105-119 Link Here
105		112
106	certificate-req:	113	certificate-req:
107	@cd ${QMAIL_TLS_PORT} && ${MAKE} $@ clean	114	@cd ${QMAIL_TLS_PORT} && ${MAKE} $@ clean
108
109	# Local overrides
110	MASTERDIR= ${QMAIL_PORT}
111	PATCHDIR= ${.CURDIR}/files
112	PKGDIR_LOCAL= ${.CURDIR}
113	DESCR= ${PKGDIR_LOCAL}/pkg-descr
114	PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
115	PLIST= ${PKGDIR_LOCAL}/pkg-plist
116
117	PRE_MK_INCLUDED= yes
118		115
119	.include "${MASTERDIR}/Makefile"	116	.include "${MASTERDIR}/Makefile"

Lines 11-23 Link Here

(-)./mail/qmail-ldap/pkg-message (-7 / +2 lines)
11	this is NOT our old stock qmail. And, /var/qmail/doc/ANTISPAM	11	this is NOT our old stock qmail. And, /var/qmail/doc/ANTISPAM
12	for some antispam control measures.	12	for some antispam control measures.
13		13
14	You can enable qmail as your default mailer:	14	You can enable qmail as your default mailer executing:
15		15	> /var/qmail/scripts/enable-qmail
16	# this will disable the default MTA
17	1) do "make disable-sendmail"
18
19	# enable qmail as your default MTA
20	2) do "make enable-qmail"
21		16
22	=====><=====	17	=====><=====
23		18

Lines 1-42 Link Here

(-)./mail/qmail-ldap/pkg-plist (-131 / +81 lines)
1	%%PORTDOCS%%%%DOCDIR%%/FAQ
2	%%PORTDOCS%%%%DOCDIR%%/UPGRADE
3	%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
4	%%PORTDOCS%%%%DOCDIR%%/INSTALL
5	%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
6	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
7	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
8	%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
9	%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
10	%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
11	%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
12	%%PORTDOCS%%%%DOCDIR%%/TEST.receive
13	%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
14	%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
15	%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
16	%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
17	%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
18	%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
19	%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
20	%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
21	%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
22	%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
23	%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
24	%%PORTDOCS%%%%DOCDIR%%/POPBEFORESMTP
25	%%PORTDOCS%%%%DOCDIR%%/QLDAPINSTALL
26	%%PORTDOCS%%%%DOCDIR%%/QLDAPNEWS
27	%%PORTDOCS%%%%DOCDIR%%/QLDAPTODO
28	%%PORTDOCS%%%%DOCDIR%%/QLDAPPICTURE
29	boot/home
30	boot/home+df
31	boot/proc
32	boot/proc+df
33	boot/binm1
34	boot/binm1+df
35	boot/binm2
36	boot/binm2+df
37	boot/binm3
38	boot/binm3+df
39
40	@group qmail	1	@group qmail
41	@mode 04711	2	@mode 04711
42	@comment *** NOTE different owner	3	@comment *** NOTE different owner
Lines 44-184 Link Here
44	bin/qmail-queue	5	bin/qmail-queue
45	@owner	6	@owner
46	@mode 0700	7	@mode 0700
		8	bin/auth_pop
		9	bin/auth_imap
		10	bin/qmail-ldaplookup
47	bin/qmail-lspawn	11	bin/qmail-lspawn
48	@mode 0700	12	bin/qmail-newmrh
		13	bin/qmail-newu
49	bin/qmail-start	14	bin/qmail-start
50	@mode 0711	15	@mode 0711
		16	bin/qmail-clean
51	bin/qmail-getpw	17	bin/qmail-getpw
52	@mode 0711
53	bin/qmail-local	18	bin/qmail-local
54	@mode 0711	19	bin/qmail-popup
		20	bin/qmail-pw2u
55	bin/qmail-remote	21	bin/qmail-remote
56	@mode 0711
57	bin/qmail-rspawn	22	bin/qmail-rspawn
58	@mode 0711
59	bin/qmail-clean
60	@mode 0711
61	bin/qmail-send	23	bin/qmail-send
62	@mode 0711
63	bin/splogger	24	bin/splogger
64	@mode 0700
65	bin/qmail-newu
66	@mode 0700
67	bin/qmail-newmrh
68	@mode 0711
69	bin/qmail-pw2u
70	@mode 0755
71	bin/qmail-inject
72	@mode 0755
73	bin/predate
74	@mode 0755	25	@mode 0755
		26	bin/bouncesaying
		27	bin/condredirect
75	bin/datemail	28	bin/datemail
76	@mode 0755
77	bin/digest	29	bin/digest
78	@mode 0755	30	bin/elq
		31	bin/except
		32	bin/forward
		33	bin/maildir2mbox
		34	bin/maildirmake
		35	bin/maildirwatch
79	bin/mailsubj	36	bin/mailsubj
80	@mode 0755
81	bin/pbsadd	37	bin/pbsadd
82	@mode 0755
83	bin/pbscheck	38	bin/pbscheck
84	@mode 0755
85	bin/pbsdbd	39	bin/pbsdbd
86	@mode 0755	40	bin/pinq
87	bin/qmail-showctl	41	bin/predate
88	@mode 0755	42	bin/preline
89	bin/qmail-qread	43	bin/qail
90	@mode 0755	44	bin/qbiff
91	bin/qmail-qstat	45	bin/qmail-inject
92	@mode 0755
93	bin/qmail-tcpto
94	@mode 0755
95	bin/qmail-tcpok
96	@mode 0755
97	bin/qmail-pop3d	46	bin/qmail-pop3d
98	@mode 0711
99	bin/qmail-popup
100	@mode 0755
101	bin/qmail-qmqpc	47	bin/qmail-qmqpc
102	@mode 0755
103	bin/qmail-qmqpd	48	bin/qmail-qmqpd
104	@mode 0755
105	bin/qmail-qmtpd	49	bin/qmail-qmtpd
106	@mode 0755	50	bin/qmail-qread
		51	bin/qmail-qstat
		52	bin/qmail-quotawarn
		53	bin/qmail-reply
		54	bin/qmail-showctl
107	bin/qmail-smtpd	55	bin/qmail-smtpd
108	@mode 0755	56	bin/qmail-tcpok
		57	bin/qmail-tcpto
109	bin/qmail-todo	58	bin/qmail-todo
110	@mode 0755
111	bin/sendmail
112	@mode 0755
113	bin/tcp-env
114	@mode 0755
115	bin/qreceipt	59	bin/qreceipt
116	@mode 0755
117	bin/qsmhook	60	bin/qsmhook
118	@mode 0755	61	bin/sendmail
119	bin/qbiff	62	bin/tcp-env
120	@mode 0755
121	bin/forward
122	@mode 0755
123	bin/preline
124	@mode 0755
125	bin/condredirect
126	@mode 0755
127	bin/bouncesaying
128	@mode 0755
129	bin/except
130	@mode 0755
131	bin/maildirmake
132	@mode 0755
133	bin/maildir2mbox
134	@mode 0755
135	bin/maildirwatch
136	@mode 0755
137	bin/qail
138	@mode 0755
139	bin/elq
140	@mode 0755
141	bin/pinq
142	@mode 0755
143	bin/qmail-reply
144	@mode 0755
145	bin/qmail-quotawarn
146	@mode 0700
147	bin/auth_pop
148	@mode 0700
149	bin/auth_imap
150	@mode 0700
151	bin/qmail-ldaplookup
152
153	@group	63	@group
154	@owner	64	@owner
155	@mode	65	@mode
156		66	boot/binm1
		67	boot/binm1+df
		68	boot/binm2
		69	boot/binm2+df
		70	boot/binm3
		71	boot/binm3+df
		72	boot/home
		73	boot/home+df
		74	boot/maildir
		75	boot/proc
		76	boot/proc+df
157	@comment This port installs the following manually (ie. not through qmail-hier)	77	@comment This port installs the following manually (ie. not through qmail-hier)
158	configure/install
159	configure/config	78	configure/config
160	configure/config-fast	79	configure/config-fast
161	configure/dnsfq	80	configure/dnsfq
162	configure/hostname
163	configure/dnsip	81	configure/dnsip
164	configure/ipmeprint
165	configure/dnsptr	82	configure/dnsptr
		83	configure/hostname
		84	configure/install
		85	configure/ipmeprint
		86	scripts/enable-qmail
		87	scripts/mkaliasdir
166	%%PORTDOCS%%%%DOCDIR%%/BLURB	88	%%PORTDOCS%%%%DOCDIR%%/BLURB
167	%%PORTDOCS%%%%DOCDIR%%/BLURB2	89	%%PORTDOCS%%%%DOCDIR%%/BLURB2
168	%%PORTDOCS%%%%DOCDIR%%/BLURB3	90	%%PORTDOCS%%%%DOCDIR%%/BLURB3
169	%%PORTDOCS%%%%DOCDIR%%/BLURB4	91	%%PORTDOCS%%%%DOCDIR%%/BLURB4
		92	%%PORTDOCS%%%%DOCDIR%%/FAQ
		93	%%PORTDOCS%%%%DOCDIR%%/INSTALL
		94	%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
		95	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
		96	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
		97	%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
		98	%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
		99	%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
170	%%PORTDOCS%%%%DOCDIR%%/INTERNALS	100	%%PORTDOCS%%%%DOCDIR%%/INTERNALS
171	%%PORTDOCS%%%%DOCDIR%%/SECURITY	101	%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
172	%%PORTDOCS%%%%DOCDIR%%/THOUGHTS	102	%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
		103	%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
		104	%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
		105	%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
		106	%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
		107	%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
		108	%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
		109	%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
		110	%%PORTDOCS%%%%DOCDIR%%/POPBEFORESMTP
173	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES	111	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
174	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE	112	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
		113	%%PORTDOCS%%%%DOCDIR%%/QLDAPINSTALL
		114	%%PORTDOCS%%%%DOCDIR%%/QLDAPNEWS
		115	%%PORTDOCS%%%%DOCDIR%%/QLDAPTODO
		116	%%PORTDOCS%%%%DOCDIR%%/QLDAPPICTURE
		117	%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
		118	%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
		119	%%PORTDOCS%%%%DOCDIR%%/SECURITY
		120	%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
175	%%PORTDOCS%%%%DOCDIR%%/SYSDEPS	121	%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
		122	%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
		123	%%PORTDOCS%%%%DOCDIR%%/TEST.receive
		124	%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
		125	%%PORTDOCS%%%%DOCDIR%%/UPGRADE
176	%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample	126	%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
177	%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
178	boot/maildir
179	%%PORTDOCS%%@dirrm %%DOCDIR%%	127	%%PORTDOCS%%@dirrm %%DOCDIR%%
		128	@dirrm scripts
180	@dirrm configure	129	@dirrm configure
181	@dirrm boot	130	@dirrm boot
182	@dirrm bin	131	@dirrm bin
183		132	@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." \| /usr/bin/fmt
184	@unexec echo "If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." \| /usr/bin/fmt	133	@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." \| /usr/bin/fmt
		134	@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" \| /usr/bin/fmt

Lines 18-23 Link Here

(-)./mail/qmail-mysql/Makefile (-14 / +10 lines)
18	COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH MySQL support	18	COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH MySQL support
19		19
20	USE_MYSQL= yes	20	USE_MYSQL= yes
		21	USE_REINPLACE= yes
21		22
22	# patches from the master port that brake this one are now allowed	23	# patches from the master port that brake this one are now allowed
23	MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER= yes	24	MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER= yes
Lines 26-55 Link Here
26		27
27	# Using default from master port, i.e., /var/qmail	28	# Using default from master port, i.e., /var/qmail
28	PREFIX?= ${QMAIL_PORT_PREFIX}	29	PREFIX?= ${QMAIL_PORT_PREFIX}
29	#PREFIX= /var/qmail-mysql
30		30
31	.if !defined(PRE_MK_INCLUDED)	31	.if !defined(_PREMKINCLUDED)
32	.include <bsd.port.pre.mk>	32	.include <bsd.port.pre.mk>
33	.endif	33	.endif
34		34
35	#QMAIL_PORT= ${PORTSDIR}/mail/qmail	35	# Local overrides
36	QMAIL_PORT= ${.CURDIR}/../qmail	36	MASTERDIR= ${.CURDIR}/../qmail
37	QMAIL_PORT_PREFIX!= cd ${QMAIL_PORT} && ${MAKE} -V PREFIX	37	PKGDIR_LOCAL= ${.CURDIR}
		38	DESCR= ${PKGDIR_LOCAL}/pkg-descr
		39	PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
		40
		41	QMAIL_PORT_PREFIX!= cd ${MASTERDIR} && ${MAKE} -V PREFIX
38		42
39	# Yet anther ugly hack (works due to code inside the main qmail port)	43	# Yet anther ugly hack (works due to code inside the main qmail port)
40	slaveport-post-patch: qmail-mysql-post-patch	44	slaveport-post-patch: qmail-mysql-post-patch
41		45
42	qmail-mysql-post-patch:	46	qmail-mysql-post-patch:
43	@${PERL} -pi -ne \	47	@${REINPLACE_CMD} \
44	's\|/opt/mysql\|${LOCALBASE}\|' \	48	's\|/opt/mysql\|${LOCALBASE}\|' \
45	${WRKSRC}/Makefile	49	${WRKSRC}/Makefile
46
47	# Local overrides
48	MASTERDIR= ${QMAIL_PORT}
49	PKGDIR_LOCAL= ${.CURDIR}
50	DESCR= ${PKGDIR_LOCAL}/pkg-descr
51	PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
52
53	PRE_MK_INCLUDED= yes
54		50
55	.include "${MASTERDIR}/Makefile"	51	.include "${MASTERDIR}/Makefile"

Lines 20-36 Link Here

(-)./mail/qmail-smtp_auth+tls/Makefile (-13 / +12 lines)
20	ONLY_FOR_ARCHS= i386	20	ONLY_FOR_ARCHS= i386
21		21
22	USE_OPENSSL= YES	22	USE_OPENSSL= YES
		23	USE_REINPLACE= yes
23		24
24	# Patches from the main qmail port are not wanted	25	# Patches from the main qmail port are not wanted
25	MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes	26	MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes
		27	MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER= yes
26		28
27	SMTP_AUTH-TLS_PATCH_DATE= 20020519	29	SMTP_AUTH-TLS_PATCH_DATE= 20020519
28		30
29	# Using default from master port, i.e., /var/qmail	31	# Using default from master port, i.e., /var/qmail
30	PREFIX?= ${QMAIL_PORT_PREFIX}	32	PREFIX?= ${QMAIL_PORT_PREFIX}
31	#PREFIX= /var/qmail-smtp_auth+tls
32		33
33	.if !defined(PRE_MK_INCLUDED)	34	.if !defined(_PREMKINCLUDED)
34	.include <bsd.port.pre.mk>	35	.include <bsd.port.pre.mk>
35	.endif	36	.endif
36		37
Lines 40-48 Link Here
40	CFLAGS+= -DDEBUG	41	CFLAGS+= -DDEBUG
41	.endif # WITH_TLS_DEBUG	42	.endif # WITH_TLS_DEBUG
42		43
43	#QMAIL_PORT= ${PORTSDIR}/mail/qmail	44	# Local overrides
44	QMAIL_PORT= ${.CURDIR}/../qmail	45	MASTERDIR= ${.CURDIR}/../qmail
45	QMAIL_PORT_PREFIX!= cd ${QMAIL_PORT} && ${MAKE} -V PREFIX	46	PKGDIR_LOCAL= ${.CURDIR}
		47	DESCR= ${PKGDIR_LOCAL}/pkg-descr
		48	PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
		49	PLIST= ${PKGDIR_LOCAL}/pkg-plist
		50
		51	QMAIL_PORT_PREFIX!= cd ${MASTERDIR} && ${MAKE} -V PREFIX
46		52
47	DOCFILES+= ${WRKDIR}/SMTP_AUTH+TLS.readme \	53	DOCFILES+= ${WRKDIR}/SMTP_AUTH+TLS.readme \
48	${WRKSRC}/README.auth	54	${WRKSRC}/README.auth
Lines 58-64 Link Here
58	@${HEAD} -6 ${DISTDIR}/qmail-1.03-starttls-smtp-auth.patch \	64	@${HEAD} -6 ${DISTDIR}/qmail-1.03-starttls-smtp-auth.patch \
59	\| ${TAIL} -5 \	65	\| ${TAIL} -5 \
60	> ${WRKDIR}/SMTP_AUTH+TLS.readme	66	> ${WRKDIR}/SMTP_AUTH+TLS.readme
61	@${PERL} -pi -ne "s\|/usr/local/ssl\|${OPENSSLBASE}\|" ${WRKSRC}/Makefile	67	@${REINPLACE_CMD} "s\|/usr/local/ssl\|${OPENSSLBASE}\|" ${WRKSRC}/Makefile
62		68
63	# Primary Ugh... ;-)	69	# Primary Ugh... ;-)
64	# idea stolen from www/apache13-ssl, a target written by adam@algroup.co.uk	70	# idea stolen from www/apache13-ssl, a target written by adam@algroup.co.uk
Lines 98-109 Link Here
98	else \	104	else \
99	${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \	105	${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
100	fi	106	fi
101
102	# Local overrides
103	MASTERDIR= ${QMAIL_PORT}
104	PKGDIR_LOCAL= ${.CURDIR}
105	DESCR= ${PKGDIR_LOCAL}/pkg-descr
106	PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
107	PLIST= ${PKGDIR_LOCAL}/pkg-plist
108		107
109	.include "${MASTERDIR}/Makefile"	108	.include "${MASTERDIR}/Makefile"

Lines 1-39 Link Here

(-)./mail/qmail-smtp_auth+tls/pkg-plist (-113 / +71 lines)
1	%%PORTDOCS%%%%DOCDIR%%/FAQ
2	%%PORTDOCS%%%%DOCDIR%%/UPGRADE
3	%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
4	%%PORTDOCS%%%%DOCDIR%%/INSTALL
5	%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
6	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
7	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
8	%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
9	%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
10	%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
11	%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
12	%%PORTDOCS%%%%DOCDIR%%/TEST.receive
13	%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
14	%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
15	%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
16	%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
17	%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
18	%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
19	%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
20	%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
21	%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
22	%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
23	%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
24	%%PORTDOCS%%%%DOCDIR%%/README.auth
25	%%PORTDOCS%%%%DOCDIR%%/SMTP_AUTH+TLS.readme
26	boot/home
27	boot/home+df
28	boot/proc
29	boot/proc+df
30	boot/binm1
31	boot/binm1+df
32	boot/binm2
33	boot/binm2+df
34	boot/binm3
35	boot/binm3+df
36
37	@group qmail	1	@group qmail
38	@mode 04711	2	@mode 04711
39	@comment *** NOTE different owner	3	@comment *** NOTE different owner
Lines 42-163 Link Here
42	@owner	6	@owner
43	@mode 0700	7	@mode 0700
44	bin/qmail-lspawn	8	bin/qmail-lspawn
45	@mode 0700	9	bin/qmail-newmrh
		10	bin/qmail-newu
46	bin/qmail-start	11	bin/qmail-start
47	@mode 0711	12	@mode 0711
		13	bin/qmail-clean
48	bin/qmail-getpw	14	bin/qmail-getpw
49	@mode 0711
50	bin/qmail-local	15	bin/qmail-local
51	@mode 0711	16	bin/qmail-popup
		17	bin/qmail-pw2u
52	bin/qmail-remote	18	bin/qmail-remote
53	@mode 0711
54	bin/qmail-rspawn	19	bin/qmail-rspawn
55	@mode 0711
56	bin/qmail-clean
57	@mode 0711
58	bin/qmail-send	20	bin/qmail-send
59	@mode 0711
60	bin/splogger	21	bin/splogger
61	@mode 0700
62	bin/qmail-newu
63	@mode 0700
64	bin/qmail-newmrh
65	@mode 0711
66	bin/qmail-pw2u
67	@mode 0755
68	bin/qmail-inject
69	@mode 0755
70	bin/predate
71	@mode 0755	22	@mode 0755
		23	bin/bouncesaying
		24	bin/condredirect
72	bin/datemail	25	bin/datemail
73	@mode 0755	26	bin/elq
		27	bin/except
		28	bin/forward
		29	bin/maildir2mbox
		30	bin/maildirmake
		31	bin/maildirwatch
74	bin/mailsubj	32	bin/mailsubj
75	@mode 0755	33	bin/pinq
76	bin/qmail-showctl	34	bin/predate
77	@mode 0755	35	bin/preline
78	bin/qmail-qread	36	bin/qail
79	@mode 0755	37	bin/qbiff
80	bin/qmail-qstat	38	bin/qmail-inject
81	@mode 0755
82	bin/qmail-tcpto
83	@mode 0755
84	bin/qmail-tcpok
85	@mode 0755
86	bin/qmail-pop3d	39	bin/qmail-pop3d
87	@mode 0711
88	bin/qmail-popup
89	@mode 0755
90	bin/qmail-qmqpc	40	bin/qmail-qmqpc
91	@mode 0755
92	bin/qmail-qmqpd	41	bin/qmail-qmqpd
93	@mode 0755
94	bin/qmail-qmtpd	42	bin/qmail-qmtpd
95	@mode 0755	43	bin/qmail-qread
		44	bin/qmail-qstat
		45	bin/qmail-showctl
96	bin/qmail-smtpd	46	bin/qmail-smtpd
97	@mode 0755	47	bin/qmail-tcpok
98	bin/sendmail	48	bin/qmail-tcpto
99	@mode 0755
100	bin/tcp-env
101	@mode 0755
102	bin/qreceipt	49	bin/qreceipt
103	@mode 0755
104	bin/qsmhook	50	bin/qsmhook
105	@mode 0755	51	bin/sendmail
106	bin/qbiff	52	bin/tcp-env
107	@mode 0755
108	bin/forward
109	@mode 0755
110	bin/preline
111	@mode 0755
112	bin/condredirect
113	@mode 0755
114	bin/bouncesaying
115	@mode 0755
116	bin/except
117	@mode 0755
118	bin/maildirmake
119	@mode 0755
120	bin/maildir2mbox
121	@mode 0755
122	bin/maildirwatch
123	@mode 0755
124	bin/qail
125	@mode 0755
126	bin/elq
127	@mode 0755
128	bin/pinq
129
130	@group	53	@group
131	@owner	54	@owner
132	@mode	55	@mode
133		56	boot/binm1
		57	boot/binm1+df
		58	boot/binm2
		59	boot/binm2+df
		60	boot/binm3
		61	boot/binm3+df
		62	boot/home
		63	boot/home+df
		64	boot/maildir
		65	boot/proc
		66	boot/proc+df
134	@comment This port installs the following manually (ie. not through qmail-hier)	67	@comment This port installs the following manually (ie. not through qmail-hier)
135	configure/install
136	configure/config	68	configure/config
137	configure/config-fast	69	configure/config-fast
138	configure/dnsfq	70	configure/dnsfq
139	configure/hostname
140	configure/dnsip	71	configure/dnsip
141	configure/ipmeprint
142	configure/dnsptr	72	configure/dnsptr
		73	configure/hostname
		74	configure/install
		75	configure/ipmeprint
		76	scripts/enable-qmail
		77	scripts/mkaliasdir
143	%%PORTDOCS%%%%DOCDIR%%/BLURB	78	%%PORTDOCS%%%%DOCDIR%%/BLURB
144	%%PORTDOCS%%%%DOCDIR%%/BLURB2	79	%%PORTDOCS%%%%DOCDIR%%/BLURB2
145	%%PORTDOCS%%%%DOCDIR%%/BLURB3	80	%%PORTDOCS%%%%DOCDIR%%/BLURB3
146	%%PORTDOCS%%%%DOCDIR%%/BLURB4	81	%%PORTDOCS%%%%DOCDIR%%/BLURB4
		82	%%PORTDOCS%%%%DOCDIR%%/FAQ
		83	%%PORTDOCS%%%%DOCDIR%%/INSTALL
		84	%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
		85	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
		86	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
		87	%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
		88	%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
		89	%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
147	%%PORTDOCS%%%%DOCDIR%%/INTERNALS	90	%%PORTDOCS%%%%DOCDIR%%/INTERNALS
148	%%PORTDOCS%%%%DOCDIR%%/SECURITY	91	%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
149	%%PORTDOCS%%%%DOCDIR%%/THOUGHTS	92	%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
		93	%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
		94	%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
		95	%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
		96	%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
		97	%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
		98	%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
		99	%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
150	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES	100	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
151	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE	101	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
		102	%%PORTDOCS%%%%DOCDIR%%/README.auth
		103	%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
		104	%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
		105	%%PORTDOCS%%%%DOCDIR%%/SECURITY
		106	%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
		107	%%PORTDOCS%%%%DOCDIR%%/SMTP_AUTH+TLS.readme
152	%%PORTDOCS%%%%DOCDIR%%/SYSDEPS	108	%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
		109	%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
		110	%%PORTDOCS%%%%DOCDIR%%/TEST.receive
		111	%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
		112	%%PORTDOCS%%%%DOCDIR%%/UPGRADE
153	%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample	113	%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
154	%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
155	boot/maildir
156	%%PORTDOCS%%@dirrm %%DOCDIR%%	114	%%PORTDOCS%%@dirrm %%DOCDIR%%
		115	@dirrm scripts
157	@dirrm configure	116	@dirrm configure
158	@dirrm boot	117	@dirrm boot
159	@dirrm bin	118	@dirrm bin
160
161	@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." \| /usr/bin/fmt	119	@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." \| /usr/bin/fmt
162	@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." \| /usr/bin/fmt	120	@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." \| /usr/bin/fmt
163	@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. Go to mail/qmail portsdir and do a 'make enable-sendmail'" \| /usr/bin/fmt	121	@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" \| /usr/bin/fmt

Lines 18-34 Link Here

(-)./mail/qmail-tls/Makefile (-13 / +12 lines)
18	COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support	18	COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support
19		19
20	USE_OPENSSL= YES	20	USE_OPENSSL= YES
		21	USE_REINPLACE= yes
21		22
22	# Patches from the main qmail port are not wanted	23	# Patches from the main qmail port are not wanted
23	MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes	24	MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes
		25	MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER= yes
24		26
25	TLS_PATCH_DATE= 20020825	27	TLS_PATCH_DATE= 20020825
26		28
27	# Using default from master port, i.e., /var/qmail	29	# Using default from master port, i.e., /var/qmail
28	PREFIX?= ${QMAIL_PORT_PREFIX}	30	PREFIX?= ${QMAIL_PORT_PREFIX}
29	#PREFIX= /var/qmail-tls
30		31
31	.if !defined(PRE_MK_INCLUDED)	32	.if !defined(_PREMKINCLUDED)
32	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
33	.endif	34	.endif
34		35
Lines 38-46 Link Here
38	CFLAGS+= -DDEBUG	39	CFLAGS+= -DDEBUG
39	.endif # WITH_TLS_DEBUG	40	.endif # WITH_TLS_DEBUG
40		41
41	#QMAIL_PORT= ${PORTSDIR}/mail/qmail	42	# Local overrides
42	QMAIL_PORT= ${.CURDIR}/../qmail	43	MASTERDIR= ${.CURDIR}/../qmail
43	QMAIL_PORT_PREFIX!= cd ${QMAIL_PORT} && ${MAKE} -V PREFIX	44	PKGDIR_LOCAL= ${.CURDIR}
		45	DESCR= ${PKGDIR_LOCAL}/pkg-descr
		46	PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
		47	PLIST= ${PKGDIR_LOCAL}/pkg-plist
		48
		49	QMAIL_PORT_PREFIX!= cd ${MASTERDIR} && ${MAKE} -V PREFIX
44		50
45	DOCFILES+= ${WRKDIR}/TLS.readme	51	DOCFILES+= ${WRKDIR}/TLS.readme
46		52
Lines 53-59 Link Here
53		59
54	qmail-tls-post-patch:	60	qmail-tls-post-patch:
55	@${HEAD} -74 ${DISTDIR}/tls.patch > ${WRKDIR}/TLS.readme	61	@${HEAD} -74 ${DISTDIR}/tls.patch > ${WRKDIR}/TLS.readme
56	@${PERL} -pi -ne "s\|/usr/local/ssl\|${OPENSSLBASE}\|" ${WRKSRC}/Makefile	62	@${REINPLACE_CMD} "s\|/usr/local/ssl\|${OPENSSLBASE}\|" ${WRKSRC}/Makefile
57		63
58	# Primary Ugh... ;-)	64	# Primary Ugh... ;-)
59	# idea stolen from www/apache13-ssl, a target written by adam@algroup.co.uk	65	# idea stolen from www/apache13-ssl, a target written by adam@algroup.co.uk
Lines 93-104 Link Here
93	else \	99	else \
94	${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \	100	${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
95	fi	101	fi
96
97	# Local overrides
98	MASTERDIR= ${QMAIL_PORT}
99	PKGDIR_LOCAL= ${.CURDIR}
100	DESCR= ${PKGDIR_LOCAL}/pkg-descr
101	PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
102	PLIST= ${PKGDIR_LOCAL}/pkg-plist
103		102
104	.include "${MASTERDIR}/Makefile"	103	.include "${MASTERDIR}/Makefile"

Lines 1-38 Link Here

(-)./mail/qmail-tls/pkg-plist (-112 / +70 lines)
1	%%PORTDOCS%%%%DOCDIR%%/FAQ
2	%%PORTDOCS%%%%DOCDIR%%/UPGRADE
3	%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
4	%%PORTDOCS%%%%DOCDIR%%/INSTALL
5	%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
6	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
7	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
8	%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
9	%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
10	%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
11	%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
12	%%PORTDOCS%%%%DOCDIR%%/TEST.receive
13	%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
14	%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
15	%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
16	%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
17	%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
18	%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
19	%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
20	%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
21	%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
22	%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
23	%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
24	%%PORTDOCS%%%%DOCDIR%%/TLS.readme
25	boot/home
26	boot/home+df
27	boot/proc
28	boot/proc+df
29	boot/binm1
30	boot/binm1+df
31	boot/binm2
32	boot/binm2+df
33	boot/binm3
34	boot/binm3+df
35
36	@group qmail	1	@group qmail
37	@mode 04711	2	@mode 04711
38	@comment *** NOTE different owner	3	@comment *** NOTE different owner
Lines 41-162 Link Here
41	@owner	6	@owner
42	@mode 0700	7	@mode 0700
43	bin/qmail-lspawn	8	bin/qmail-lspawn
44	@mode 0700	9	bin/qmail-newmrh
		10	bin/qmail-newu
45	bin/qmail-start	11	bin/qmail-start
46	@mode 0711	12	@mode 0711
		13	bin/qmail-clean
47	bin/qmail-getpw	14	bin/qmail-getpw
48	@mode 0711
49	bin/qmail-local	15	bin/qmail-local
50	@mode 0711	16	bin/qmail-popup
		17	bin/qmail-pw2u
51	bin/qmail-remote	18	bin/qmail-remote
52	@mode 0711
53	bin/qmail-rspawn	19	bin/qmail-rspawn
54	@mode 0711
55	bin/qmail-clean
56	@mode 0711
57	bin/qmail-send	20	bin/qmail-send
58	@mode 0711
59	bin/splogger	21	bin/splogger
60	@mode 0700
61	bin/qmail-newu
62	@mode 0700
63	bin/qmail-newmrh
64	@mode 0711
65	bin/qmail-pw2u
66	@mode 0755
67	bin/qmail-inject
68	@mode 0755
69	bin/predate
70	@mode 0755	22	@mode 0755
		23	bin/bouncesaying
		24	bin/condredirect
71	bin/datemail	25	bin/datemail
72	@mode 0755	26	bin/elq
		27	bin/except
		28	bin/forward
		29	bin/maildir2mbox
		30	bin/maildirmake
		31	bin/maildirwatch
73	bin/mailsubj	32	bin/mailsubj
74	@mode 0755	33	bin/pinq
75	bin/qmail-showctl	34	bin/predate
76	@mode 0755	35	bin/preline
77	bin/qmail-qread	36	bin/qail
78	@mode 0755	37	bin/qbiff
79	bin/qmail-qstat	38	bin/qmail-inject
80	@mode 0755
81	bin/qmail-tcpto
82	@mode 0755
83	bin/qmail-tcpok
84	@mode 0755
85	bin/qmail-pop3d	39	bin/qmail-pop3d
86	@mode 0711
87	bin/qmail-popup
88	@mode 0755
89	bin/qmail-qmqpc	40	bin/qmail-qmqpc
90	@mode 0755
91	bin/qmail-qmqpd	41	bin/qmail-qmqpd
92	@mode 0755
93	bin/qmail-qmtpd	42	bin/qmail-qmtpd
94	@mode 0755	43	bin/qmail-qread
		44	bin/qmail-qstat
		45	bin/qmail-showctl
95	bin/qmail-smtpd	46	bin/qmail-smtpd
96	@mode 0755	47	bin/qmail-tcpok
97	bin/sendmail	48	bin/qmail-tcpto
98	@mode 0755
99	bin/tcp-env
100	@mode 0755
101	bin/qreceipt	49	bin/qreceipt
102	@mode 0755
103	bin/qsmhook	50	bin/qsmhook
104	@mode 0755	51	bin/sendmail
105	bin/qbiff	52	bin/tcp-env
106	@mode 0755
107	bin/forward
108	@mode 0755
109	bin/preline
110	@mode 0755
111	bin/condredirect
112	@mode 0755
113	bin/bouncesaying
114	@mode 0755
115	bin/except
116	@mode 0755
117	bin/maildirmake
118	@mode 0755
119	bin/maildir2mbox
120	@mode 0755
121	bin/maildirwatch
122	@mode 0755
123	bin/qail
124	@mode 0755
125	bin/elq
126	@mode 0755
127	bin/pinq
128
129	@group	53	@group
130	@owner	54	@owner
131	@mode	55	@mode
132		56	boot/binm1
		57	boot/binm1+df
		58	boot/binm2
		59	boot/binm2+df
		60	boot/binm3
		61	boot/binm3+df
		62	boot/home
		63	boot/home+df
		64	boot/maildir
		65	boot/proc
		66	boot/proc+df
133	@comment This port installs the following manually (ie. not through qmail-hier)	67	@comment This port installs the following manually (ie. not through qmail-hier)
134	configure/install
135	configure/config	68	configure/config
136	configure/config-fast	69	configure/config-fast
137	configure/dnsfq	70	configure/dnsfq
138	configure/hostname
139	configure/dnsip	71	configure/dnsip
140	configure/ipmeprint
141	configure/dnsptr	72	configure/dnsptr
		73	configure/hostname
		74	configure/install
		75	configure/ipmeprint
		76	scripts/enable-qmail
		77	scripts/mkaliasdir
142	%%PORTDOCS%%%%DOCDIR%%/BLURB	78	%%PORTDOCS%%%%DOCDIR%%/BLURB
143	%%PORTDOCS%%%%DOCDIR%%/BLURB2	79	%%PORTDOCS%%%%DOCDIR%%/BLURB2
144	%%PORTDOCS%%%%DOCDIR%%/BLURB3	80	%%PORTDOCS%%%%DOCDIR%%/BLURB3
145	%%PORTDOCS%%%%DOCDIR%%/BLURB4	81	%%PORTDOCS%%%%DOCDIR%%/BLURB4
		82	%%PORTDOCS%%%%DOCDIR%%/FAQ
		83	%%PORTDOCS%%%%DOCDIR%%/INSTALL
		84	%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
		85	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
		86	%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
		87	%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
		88	%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
		89	%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
146	%%PORTDOCS%%%%DOCDIR%%/INTERNALS	90	%%PORTDOCS%%%%DOCDIR%%/INTERNALS
147	%%PORTDOCS%%%%DOCDIR%%/SECURITY	91	%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
148	%%PORTDOCS%%%%DOCDIR%%/THOUGHTS	92	%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
		93	%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
		94	%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
		95	%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
		96	%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
		97	%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
		98	%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
		99	%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
149	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES	100	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
150	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE	101	%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
		102	%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
		103	%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
		104	%%PORTDOCS%%%%DOCDIR%%/SECURITY
		105	%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
151	%%PORTDOCS%%%%DOCDIR%%/SYSDEPS	106	%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
		107	%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
		108	%%PORTDOCS%%%%DOCDIR%%/TEST.receive
		109	%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
		110	%%PORTDOCS%%%%DOCDIR%%/TLS.readme
		111	%%PORTDOCS%%%%DOCDIR%%/UPGRADE
152	%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample	112	%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
153	%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
154	boot/maildir
155	%%PORTDOCS%%@dirrm %%DOCDIR%%	113	%%PORTDOCS%%@dirrm %%DOCDIR%%
		114	@dirrm scripts
156	@dirrm configure	115	@dirrm configure
157	@dirrm boot	116	@dirrm boot
158	@dirrm bin	117	@dirrm bin
159
160	@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." \| /usr/bin/fmt	118	@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." \| /usr/bin/fmt
161	@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." \| /usr/bin/fmt	119	@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." \| /usr/bin/fmt
162	@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. Go to mail/qmail portsdir and do a 'make enable-sendmail'" \| /usr/bin/fmt	120	@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" \| /usr/bin/fmt