Attachment #218297 for bug #249860

Lines 3-8 Link Here

(-)fetchmail/Makefile (+1 lines)
3		3
4	PORTNAME?= fetchmail	4	PORTNAME?= fetchmail
5	DISTVERSION= 6.4.12	5	DISTVERSION= 6.4.12
		6	PORTREVISION?= 1
6	CATEGORIES= mail	7	CATEGORIES= mail
7	# The next line is inherited by the fetchmailconf slave port,	8	# The next line is inherited by the fetchmailconf slave port,
8	# do NOT replace fetchmail by ${PORTNAME}	9	# do NOT replace fetchmail by ${PORTNAME}




		eval fetchmail_polling_interval="\${fetchmail_${user}_polling_interval:-${fetchmail_polling_interval}}"
		fetchmail_flags="-f ${fetchmail_config} \
				--pidfile ${pidfile} \
				-d ${fetchmail_polling_interval} \
				${fetchmail_logging_facility}"
		# if no polling interval in config file, use value from rc.conf
		if [ "$(fetchmail -f ${fetchmail_config} --configdump | fgrep poll_interval | cut -d: -f2)" = "0," ] ; then
			fetchmail_flags="${fetchmail_flags} -d ${fetchmail_polling_interval}"
		fi
	else
		echo "$0: extra argument ignored"
	fi
else
	uid=`id -u`
	if [ "x${fetchmail_users}" != "x" -a "x$1" != "x" -a "$uid" = "0" ]; then
		# root mode: multiple user profiles are handled by recursive
		# calls of this script
		for user in ${fetchmail_users}; do

Lines 1-6 Link Here

(-)fetchmailconf/Makefile (+1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= fetchmailconf	3	PORTNAME= fetchmailconf
		4	PORTREVISION= 0
4	DISTNAME= fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}	5	DISTNAME= fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
5	# NOTE: MASTER_SITES in ../fetchmail must NOT use the $PORTNAME variable,	6	# NOTE: MASTER_SITES in ../fetchmail must NOT use the $PORTNAME variable,
6	# else _this_ port (fetchmailconf) becomes unfetchable	7	# else _this_ port (fetchmailconf) becomes unfetchable

Return to bug 249860

Lines 107-120 Link Here

(-)fetchmail/files/fetchmail.in (-5 / +8 lines)
107	eval fetchmail_polling_interval="\${fetchmail_${user}_polling_interval:-${fetchmail_polling_interval}}"	107	eval fetchmail_polling_interval="\${fetchmail_${user}_polling_interval:-${fetchmail_polling_interval}}"
108	fetchmail_flags="-f ${fetchmail_config} \	108	fetchmail_flags="-f ${fetchmail_config} \
109	--pidfile ${pidfile} \	109	--pidfile ${pidfile} \
110	-d ${fetchmail_polling_interval} \
111	${fetchmail_logging_facility}"	110	${fetchmail_logging_facility}"
112	else	111	# if no polling interval in config file, use value from rc.conf
113	echo "$0: extra argument ignored"	112	if [ "$(fetchmail -f ${fetchmail_config} --configdump \| fgrep poll_interval \| cut -d: -f2)" = "0," ] ; then
114	fi	113	fetchmail_flags="${fetchmail_flags} -d ${fetchmail_polling_interval}"
		114	fi
		115	else
		116	echo "$0: extra argument ignored"
		117	fi
115	else	118	else
116	uid=`id -u`	119	uid=`id -u`
117	if [ "x${fetchmail_users}" != "x" -a "x$1" != "x" -a "$uid" = "0" ]; then	120	if [ "x${fetchmail_users}" != "x" -a "x$1" != "x" -a "$uid" = "0" ]; then
118	# root mode: multiple user profiles are handled by recursive	121	# root mode: multiple user profiles are handled by recursive
119	# calls of this script	122	# calls of this script
120	for user in ${fetchmail_users}; do	123	for user in ${fetchmail_users}; do