svn commit: r348727 - in head/sysutils/webmin: . files

[Jimmy Olgeni]

Author: olgeni
Date: Fri Mar 21 06:07:03 2014
New Revision: 348727
URL: http://svnweb.freebsd.org/changeset/ports/348727
QAT: https://qat.redports.org/buildarchive/r348727/

Log:
  Upgrade to version 1.680.

Modified:
  head/sysutils/webmin/Makefile
  head/sysutils/webmin/distinfo   (contents, props changed)
  head/sysutils/webmin/files/patch-software_freebsd-lib.pl
  head/sysutils/webmin/pkg-plist   (contents, props changed)

Modified: head/sysutils/webmin/Makefile
==============================================================================
--- head/sysutils/webmin/Makefile	Fri Mar 21 06:04:46 2014	(r348726)
+++ head/sysutils/webmin/Makefile	Fri Mar 21 06:07:03 2014	(r348727)
@@ -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-?

Modified: head/sysutils/webmin/distinfo
==============================================================================
--- head/sysutils/webmin/distinfo	Fri Mar 21 06:04:46 2014	(r348726)
+++ head/sysutils/webmin/distinfo	Fri Mar 21 06:07:03 2014	(r348727)
@@ -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

Modified: head/sysutils/webmin/files/patch-software_freebsd-lib.pl
==============================================================================
--- head/sysutils/webmin/files/patch-software_freebsd-lib.pl	Fri Mar 21 06:04:46 2014	(r348726)
+++ head/sysutils/webmin/files/patch-software_freebsd-lib.pl	Fri Mar 21 06:07:03 2014	(r348727)
@@ -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;
- }

Modified: head/sysutils/webmin/pkg-plist
==============================================================================
--- head/sysutils/webmin/pkg-plist	Fri Mar 21 06:04:46 2014	(r348726)
+++ head/sysutils/webmin/pkg-plist	Fri Mar 21 06:07:03 2014	(r348727)
@@ -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