diff options
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/webmin/Makefile | 4 | ||||
-rw-r--r-- | sysutils/webmin/PLIST | 3 | ||||
-rw-r--r-- | sysutils/webmin/distinfo | 3 | ||||
-rw-r--r-- | sysutils/webmin/wbm.mk | 6 |
4 files changed, 7 insertions, 9 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index dc0abb22e7e..a4af3cc6f76 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -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} ${PKG_SYSCONFDIR}/${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 diff --git a/sysutils/webmin/PLIST b/sysutils/webmin/PLIST index d7e7fb3ea3b..1d037ee6604 100644 --- a/sysutils/webmin/PLIST +++ b/sysutils/webmin/PLIST @@ -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 diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo index 2711a1a58ef..4b82210823e 100644 --- a/sysutils/webmin/distinfo +++ b/sysutils/webmin/distinfo @@ -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) = a6f8b4c80222b4f659ebe11754d5e5cf981abf5a SHA1 (patch-ax) = e7debde036d736f641229b2b604b2d77b03c7366 SHA1 (patch-ay) = 8f21939c04e71c0aa74660b93e03e0ff2b9e69d5 SHA1 (patch-az) = 770d55c85ca9de3f038cfbcf2a1134848ad000d0 -SHA1 (patch-update-from-repo_sh) = 75e862d2e3c070de85391526acf4de853ccb14d1 diff --git a/sysutils/webmin/wbm.mk b/sysutils/webmin/wbm.mk index 293c0d150dc..7824f8d81e5 100644 --- a/sysutils/webmin/wbm.mk +++ b/sysutils/webmin/wbm.mk @@ -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}:../../sysutils/webmin 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 |