CVS commit: pkgsrc/mail/fetchmail

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Wed Nov 10 19:24:53 UTC 2021

Modified Files:
        pkgsrc/mail/fetchmail: Makefile
        pkgsrc/mail/fetchmail/files: fetchmail.sh

Log Message:
fetchmail: let the RC script work unprivileged

This takes advantage of the introduction of the SYSCONFBASE variable.
Tested on NetBSD/amd64.

Bumps PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 pkgsrc/mail/fetchmail/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/fetchmail/files/fetchmail.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/fetchmail/Makefile
diff -u pkgsrc/mail/fetchmail/Makefile:1.199 pkgsrc/mail/fetchmail/Makefile:1.200
--- pkgsrc/mail/fetchmail/Makefile:1.199        Thu Oct 21 07:46:35 2021
+++ pkgsrc/mail/fetchmail/Makefile      Wed Nov 10 19:24:52 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.199 2021/10/21 07:46:35 wiz Exp $
+# $NetBSD: Makefile,v 1.200 2021/11/10 19:24:52 khorben Exp $
 
 # Note to updaters: mail/fetchmailconf reaches over here, make sure it builds.
 DISTNAME=      fetchmail-6.4.21
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fetchmail/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/mail/fetchmail/files/fetchmail.sh
diff -u pkgsrc/mail/fetchmail/files/fetchmail.sh:1.3 pkgsrc/mail/fetchmail/files/fetchmail.sh:1.4
--- pkgsrc/mail/fetchmail/files/fetchmail.sh:1.3        Sun Mar 20 01:38:36 2011
+++ pkgsrc/mail/fetchmail/files/fetchmail.sh    Wed Nov 10 19:24:52 2021
@@ -1,12 +1,16 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: fetchmail.sh,v 1.3 2011/03/20 01:38:36 shattered Exp $
+# $NetBSD: fetchmail.sh,v 1.4 2021/11/10 19:24:52 khorben Exp $
 #
 # PROVIDE: fetchmail
 # REQUIRE: mail
+#
+# You will need to set some variables in @SYSCONFBASE@/rc.conf to start fetchmail:
+#
+# fetchmail=YES
 
-if [ -f /etc/rc.subr ]; then
-       . /etc/rc.subr
+if [ -f @SYSCONFBASE@/rc.subr ]; then
+       $_rc_subr_loaded . @SYSCONFBASE@/rc.subr
 fi
 
 name="fetchmail"
@@ -29,7 +33,7 @@ start_poll () 
        @ECHO@ '.'
 }
 
-if [ -f /etc/rc.subr ]; then
+if [ -f @SYSCONFBASE@/rc.subr ]; then
        load_rc_config $name
        run_rc_command "$1"
 else