CVS commit: pkgsrc/sysutils/webmin

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Mon Jun  1 23:07:27 UTC 2020

Modified Files:
        pkgsrc/sysutils/webmin: Makefile PLIST distinfo wbm.mk

Log Message:
(sysutils/webmin) regen, pkglint -F


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/sysutils/webmin/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/webmin/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/sysutils/webmin/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/webmin/wbm.mk

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

Modified files:

Index: pkgsrc/sysutils/webmin/Makefile
diff -u pkgsrc/sysutils/webmin/Makefile:1.51 pkgsrc/sysutils/webmin/Makefile:1.52
--- pkgsrc/sysutils/webmin/Makefile:1.51        Mon Jun  1 06:25:31 2020
+++ pkgsrc/sysutils/webmin/Makefile     Mon Jun  1 23:07:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2020/06/01 06:25:31 rillig Exp $
+# $NetBSD: Makefile,v 1.52 2020/06/01 23:07:27 mef Exp $
 
 .include "version.mk"
 
@@ -59,7 +59,7 @@ CONF_FILES_PERMS+=    ${WEBMIN_EGDIR}/${f} 
 .endfor
 RCD_SCRIPTS=           webmin
 
-REPLACE_PYTHON= webmin/acme_tiny.py
+REPLACE_PYTHON=        webmin/acme_tiny.py
 
 CHECK_INTERPRETER_SKIP+=       share/webmin/webmin-gentoo-init
 

Index: pkgsrc/sysutils/webmin/PLIST
diff -u pkgsrc/sysutils/webmin/PLIST:1.20 pkgsrc/sysutils/webmin/PLIST:1.21
--- pkgsrc/sysutils/webmin/PLIST:1.20   Mon Apr 27 15:16:45 2020
+++ pkgsrc/sysutils/webmin/PLIST        Mon Jun  1 23:07:27 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2020/04/27 15:16:45 mef Exp $
+@comment $NetBSD: PLIST,v 1.21 2020/06/01 23:07:27 mef Exp $
 share/examples/webmin/acl/config
 share/examples/webmin/config
 share/examples/webmin/cron/config
@@ -2266,7 +2266,6 @@ share/webmin/switch_user.cgi
 share/webmin/thirdparty.pl
 share/webmin/ui-lib.pl
 share/webmin/unauthenticated/filter_match.js
-share/webmin/update-from-repo.sh
 share/webmin/uptracker.cgi
 share/webmin/user_chooser.cgi
 share/webmin/version

Index: pkgsrc/sysutils/webmin/distinfo
diff -u pkgsrc/sysutils/webmin/distinfo:1.24 pkgsrc/sysutils/webmin/distinfo:1.25
--- pkgsrc/sysutils/webmin/distinfo:1.24        Mon Apr 27 15:33:30 2020
+++ pkgsrc/sysutils/webmin/distinfo     Mon Jun  1 23:07:27 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2020/04/27 15:33:30 mef Exp $
+$NetBSD: distinfo,v 1.25 2020/06/01 23:07:27 mef Exp $
 
 SHA1 (webmin-1.941.tar.gz) = 9103d027933ebc662ef76a56c07343ab5241efaa
 RMD160 (webmin-1.941.tar.gz) = 4bd1f28a7dc0338d97cf7a92e6844120d1d647bf
@@ -26,4 +26,3 @@ SHA1 (patch-aw) = a6f8b4c80222b4f659ebe1
 SHA1 (patch-ax) = e7debde036d736f641229b2b604b2d77b03c7366
 SHA1 (patch-ay) = 8f21939c04e71c0aa74660b93e03e0ff2b9e69d5
 SHA1 (patch-az) = 770d55c85ca9de3f038cfbcf2a1134848ad000d0
-SHA1 (patch-update-from-repo_sh) = 75e862d2e3c070de85391526acf4de853ccb14d1

Index: pkgsrc/sysutils/webmin/wbm.mk
diff -u pkgsrc/sysutils/webmin/wbm.mk:1.15 pkgsrc/sysutils/webmin/wbm.mk:1.16
--- pkgsrc/sysutils/webmin/wbm.mk:1.15  Mon Apr 27 15:16:45 2020
+++ pkgsrc/sysutils/webmin/wbm.mk       Mon Jun  1 23:07:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: wbm.mk,v 1.15 2020/04/27 15:16:45 mef Exp $
+# $NetBSD: wbm.mk,v 1.16 2020/06/01 23:07:27 mef Exp $
 #
 # Makefile fragment for Webmin modules
 #
@@ -48,8 +48,8 @@ DEPENDS+=     webmin>=${WBM_VERSION}:../../s
 DEPENDS+=      wbm-${m}>=${WBM_VERSION}:../../sysutils/wbm-${m}
 .endfor
 
-WEBMIN_DIR=    ${LOCALBASE}/share/webmin
-WEBMIN_EGDIR=  ${LOCALBASE}/share/examples/webmin
+WEBMIN_DIR=    ${PREFIX}/share/webmin
+WEBMIN_EGDIR=  ${PREFIX}/share/examples/webmin
 WEBMIN_VARDIR= ${VARBASE}/webmin
 WBM_DIR=       ${PREFIX}/share/webmin
 WBM_EGDIR=     ${PREFIX}/share/examples/webmin