4 files changed, 16 insertions, 34 deletions

diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index f9237fe3fcab..a0db77467ea2 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	webmin
-PORTVERSION=	1.170
-PORTREVISION=	6
+PORTVERSION=	1.180
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/updates/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -26,14 +25,7 @@ USE_PERL5=	yes
 USE_RC_SUBR=    yes
 USE_REINPLACE=	yes
 
-WEBMIN_MODULES=	bandwidth-1.170-1.wbm.gz \
-		file-1.170-6.wbm.gz \
-		hpuxexports-1.170-5.wbm.gz \
-		quota-1.170-1.wbm.gz \
-		sendmail-1.170-1.wbm.gz \
-		sshd-1.170-2.wbm.gz \
-		status-1.170-1.wbm.gz \
-		xinetd-1.170-2.wbm.gz
+WEBMIN_MODULES=	sendmail-1.180-1.wbm.gz
 WEBMIN_THEMES=
 
 post-extract:
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index f9da0dd749e8..4c484258a93f 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,18 +1,4 @@
-MD5 (webmin-1.170.tar.gz) = 418a62c76b8ba4e0c9532e654167c49c
-SIZE (webmin-1.170.tar.gz) = 7833477
-MD5 (bandwidth-1.170-1.wbm.gz) = bc32af20b754a96722443937197d6ce3
-SIZE (bandwidth-1.170-1.wbm.gz) = 12789
-MD5 (file-1.170-6.wbm.gz) = 6cc5c5683fa74b35e73dd83f77e88e49
-SIZE (file-1.170-6.wbm.gz) = 274630
-MD5 (hpuxexports-1.170-5.wbm.gz) = d7e315784471deb1c19131c9ad10ec8c
-SIZE (hpuxexports-1.170-5.wbm.gz) = 36612
-MD5 (quota-1.170-1.wbm.gz) = de5f4b61a1226dd77f0e85d85661d85b
-SIZE (quota-1.170-1.wbm.gz) = 112208
-MD5 (sendmail-1.170-1.wbm.gz) = 43094379da25fcfab307a886735d23ca
-SIZE (sendmail-1.170-1.wbm.gz) = 272048
-MD5 (sshd-1.170-2.wbm.gz) = 5d8665a08f83a307080a701b0a7a11de
-SIZE (sshd-1.170-2.wbm.gz) = 63061
-MD5 (status-1.170-1.wbm.gz) = eb437cda535bb6c054a5e12946fbd80b
-SIZE (status-1.170-1.wbm.gz) = 57516
-MD5 (xinetd-1.170-2.wbm.gz) = f934301b920b7c4799610dc637a2e691
-SIZE (xinetd-1.170-2.wbm.gz) = 32911
+MD5 (webmin-1.180.tar.gz) = a10d24172df7951afac404e9c440f565
+SIZE (webmin-1.180.tar.gz) = 7461807
+MD5 (sendmail-1.180-1.wbm.gz) = a02e08a2ae7cc5999685b8088d1fa54b
+SIZE (sendmail-1.180-1.wbm.gz) = 272496
diff --git a/sysutils/webmin/files/patch-mysql::config-freebsd b/sysutils/webmin/files/patch-mysql::config-freebsd
index 9cc8675ffb40..b11b774c3517 100644
--- a/sysutils/webmin/files/patch-mysql::config-freebsd
+++ b/sysutils/webmin/files/patch-mysql::config-freebsd
@@ -1,8 +1,11 @@
---- mysql/config-freebsd.orig	Sat Mar 16 06:56:20 2002
-+++ mysql/config-freebsd	Sat Mar 16 06:56:35 2002
+
+$FreeBSD$
+
+--- mysql/config-freebsd.orig
++++ mysql/config-freebsd
 @@ -1,12 +1,12 @@
--start_cmd=/usr/local/bin/safe_mysqld &
-+start_cmd=%%PREFIX%%/bin/safe_mysqld &
+-start_cmd=(/usr/local/bin/safe_mysqld || /usr/local/bin/mysqld_safe) &
++start_cmd=(%%PREFIX%%/bin/safe_mysqld || %%PREFIX%%/bin/mysqld_safe) &
  perpage=25
 -mysql=/usr/local/bin/mysql
 -mysqldump=/usr/local/bin/mysqldump
@@ -18,5 +21,5 @@
 +mysql_libs=%%PREFIX%%/lib/mysql
 +mysqladmin=%%PREFIX%%/bin/mysqladmin
  style=0
- add_mode=0
+ add_mode=1
  nodbi=0
diff --git a/sysutils/webmin/files/patch-spam_config-freebsd b/sysutils/webmin/files/patch-spam_config-freebsd
index 7a8769011fca..435de23ba4aa 100644
--- a/sysutils/webmin/files/patch-spam_config-freebsd
+++ b/sysutils/webmin/files/patch-spam_config-freebsd
@@ -3,10 +3,11 @@ $FreeBSD$
 
 --- spam/config-freebsd.orig
 +++ spam/config-freebsd
-@@ -1,6 +1,6 @@
+@@ -1,7 +1,7 @@
 -local_cf=/usr/local/etc/mail/spamassassin/local.cf
 +local_cf=%%PREFIX%%/etc/mail/spamassassin/local.cf
  spamassassin=spamassassin
+ sa_learn=sa-learn
 -procmailrc=/usr/local/etc/procmailrc
 +procmailrc=%%PREFIX%%/etc/procmailrc
  warn_procmail=1