diff options
author | olgeni <olgeni@FreeBSD.org> | 2014-03-21 14:07:03 +0800 |
---|---|---|
committer | olgeni <olgeni@FreeBSD.org> | 2014-03-21 14:07:03 +0800 |
commit | 0eaff7c67491ee22f89751ee53139ca9a1989bef (patch) | |
tree | 8fe94a74a35c357f8bfbf6089c2bbde729700763 /sysutils | |
parent | b1879b2641255c12ca5687accfc80cb9da79d60f (diff) | |
download | freebsd-ports-gnome-0eaff7c67491ee22f89751ee53139ca9a1989bef.tar.gz freebsd-ports-gnome-0eaff7c67491ee22f89751ee53139ca9a1989bef.tar.zst freebsd-ports-gnome-0eaff7c67491ee22f89751ee53139ca9a1989bef.zip |
Upgrade to version 1.680.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/webmin/Makefile | 5 | ||||
-rw-r--r-- | sysutils/webmin/distinfo | 6 | ||||
-rw-r--r-- | sysutils/webmin/files/patch-software_freebsd-lib.pl | 4 | ||||
-rw-r--r-- | sysutils/webmin/pkg-plist | 5 |
4 files changed, 11 insertions, 9 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index 2e1e9f8b82fc..0b305b1d7d67 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= webmin -PORTVERSION= 1.670 -PORTREVISION= 1 +PORTVERSION= 1.680 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf \ @@ -25,7 +24,7 @@ USE_RC_SUBR= webmin SUB_LIST= PERL5=${PERL} SUB_FILES= pkg-message -WEBMIN_MODULES= acl-1.670-2.wbm.gz +WEBMIN_MODULES= post-extract: @${RM} -f ${WRKSRC}/mount/freebsd-mounts-? diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo index 66bdab10825a..e983b134d024 100644 --- a/sysutils/webmin/distinfo +++ b/sysutils/webmin/distinfo @@ -1,4 +1,2 @@ -SHA256 (webmin-1.670.tar.gz) = 43e7dedef907bae7ed61dfcb33fa8f8e132cf0194fa46118afedebd6bc575969 -SIZE (webmin-1.670.tar.gz) = 22388491 -SHA256 (acl-1.670-2.wbm.gz) = a974e0d33ca3876ff97bf56e447f7da8361b74bd4de784766fd4773a9904a36b -SIZE (acl-1.670-2.wbm.gz) = 275245 +SHA256 (webmin-1.680.tar.gz) = c6205b6a9dfa1aa7179591bb9a82a9f321e775ed08710da8877d01c5bf9b8078 +SIZE (webmin-1.680.tar.gz) = 22418010 diff --git a/sysutils/webmin/files/patch-software_freebsd-lib.pl b/sysutils/webmin/files/patch-software_freebsd-lib.pl index ed75973191f0..b53b7c0643ff 100644 --- a/sysutils/webmin/files/patch-software_freebsd-lib.pl +++ b/sysutils/webmin/files/patch-software_freebsd-lib.pl @@ -9,6 +9,6 @@ $FreeBSD$ { -return 0 if (!-x "/usr/sbin/pkg"); +return 0 if (!-e "/var/db/pkg/local.sqlite"); - local @lines = &backquote_command("/usr/sbin/pkg info 2>/dev/null </dev/null"); + local @lines = split(/\n/, &backquote_command( + "/usr/sbin/pkg info 2>/dev/null </dev/null")); return @lines > 1 ? 1 : 0; - } diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist index 1f5799677984..7905068d056f 100644 --- a/sysutils/webmin/pkg-plist +++ b/sysutils/webmin/pkg-plist @@ -11414,6 +11414,7 @@ lib/webmin/mon/CHANGELOG lib/webmin/mon/README lib/webmin/mon/backup_config.pl lib/webmin/mon/config +lib/webmin/mon/config-Fedora-Linux lib/webmin/mon/config.info lib/webmin/mon/config.info.ca lib/webmin/mon/config.info.ca.UTF-8 @@ -18939,6 +18940,8 @@ lib/webmin/shorewall6/config.info.ms_MY lib/webmin/shorewall6/config.info.ms_MY.UTF-8 lib/webmin/shorewall6/config.info.nl lib/webmin/shorewall6/config.info.nl.UTF-8 +lib/webmin/shorewall6/config.info.no +lib/webmin/shorewall6/config.info.no.UTF-8 lib/webmin/shorewall6/defaultacl lib/webmin/shorewall6/delete.cgi lib/webmin/shorewall6/down.cgi @@ -18977,6 +18980,8 @@ lib/webmin/shorewall6/lang/en lib/webmin/shorewall6/lang/en.UTF-8 lib/webmin/shorewall6/lang/nl lib/webmin/shorewall6/lang/nl.UTF-8 +lib/webmin/shorewall6/lang/no +lib/webmin/shorewall6/lang/no.UTF-8 lib/webmin/shorewall6/list.cgi lib/webmin/shorewall6/log_parser.pl lib/webmin/shorewall6/manual_form.cgi |