Update port to version 0.950 (with "status", "sendmail" and

"cluster-software" module patches).

Make port LOCALBASE independent (ports/35945).

PR:		35945 (modified)
Submitted by:	Kazutoshi Kubota <tu7k-kbt@asahi-net.or.jp>

17 files changed, 210 insertions, 16 deletions

diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 4809c68aa0dd..a1f16954bc9f 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	webmin
-PORTVERSION=	0.94
+PORTVERSION=	0.950
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/webmin/updates/ \
 		http://www.webmin.com/webmin/download/
@@ -23,7 +23,8 @@ NO_BUILD=	yes
 USE_PERL5=	yes
 SCRIPTS_ENV+=	WRKDIR="${WRKDIR}"
 
-WEBMIN_MODULES=
+WEBMIN_MODULES=	status-0.950-1.wbm.gz sendmail-0.950-1.wbm.gz \
+		cluster-software-0.950-1.wbm.gz
 WEBMIN_THEMES=
 
 post-extract:
@@ -44,19 +45,14 @@ post-patch:
 		${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.3
 	@${CP} ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.0 \
 		${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.4
-	@${CP} ${WRKSRC}/postfix/config ${WRKSRC}/postfix/config.sed
-	@${SED}	-e "s@/usr/sbin/postfix@${LOCALBASE}/sbin/postfix@" \
-		-e "s@/usr/sbin/postconf@${LOCALBASE}/sbin/postconf@" \
-		-e "s@/etc/postfix/main.cf@${LOCALBASE}/etc/postfix/main.cf@" \
-		-e "s@/usr/sbin/postalias@${LOCALBASE}/sbin/postalias@" \
-		-e "s@/usr/sbin/postmap@${LOCALBASE}/sbin/postmap@" \
-		${WRKSRC}/postfix/config.sed > ${WRKSRC}/postfix/config
-	@${RM} ${WRKSRC}/postfix/config.sed
-
-	@${CP} ${WRKSRC}/dhcpd/config-freebsd ${WRKSRC}/dhcpd/config-freebsd.sed
-	@${SED}	-e "s@^dhcpd_conf=.*@dhcpd_conf=${LOCALBASE}/etc/dhcpd.conf@" \
-		${WRKSRC}/dhcpd/config-freebsd.sed > ${WRKSRC}/dhcpd/config-freebsd
-	@${RM} ${WRKSRC}/dhcpd/config-freebsd.sed
+.for file in	config-freebsd apache/config-freebsd bind8/config-freebsd-2.1 \
+		bind8/config-freebsd-2.2 dhcpd/config-freebsd majordomo/config \
+		mysql/config-freebsd postfix/config-freebsd \
+		postgresql/config-freebsd proftpd/config-freebsd \
+		samba/config-freebsd squid/config-freebsd stunnel/config \
+		wuftpd/config-freebsd xinetd/config-freebsd
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
+.endfor
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/webmin
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index dad8ea34c224..6cf7ff1a8112 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1 +1,4 @@
-MD5 (webmin-0.94.tar.gz) = 114c7ca2557c17faebb627a3de7acb97
+MD5 (webmin-0.950.tar.gz) = 3a575e2dc3b4f5436a5c3652288c52f0
+MD5 (status-0.950-1.wbm.gz) = 10d37b9174695b0945f7464904a101e1
+MD5 (sendmail-0.950-1.wbm.gz) = 1b5dd4eec246202b713590e64376ca7e
+MD5 (cluster-software-0.950-1.wbm.gz) = e5f12ba30ddeee95c41d2fc928d72f2f
diff --git a/sysutils/webmin/files/patch-apache::config-freebsd b/sysutils/webmin/files/patch-apache::config-freebsd
new file mode 100644
index 000000000000..510b3f7d6318
--- /dev/null
+++ b/sysutils/webmin/files/patch-apache::config-freebsd
@@ -0,0 +1,21 @@
+--- apache/config-freebsd.orig	Sat Mar 16 06:33:19 2002
++++ apache/config-freebsd	Sat Mar 16 06:33:52 2002
+@@ -1,11 +1,11 @@
+ show_list=0
+-httpd_dir=/usr/local/etc/apache
+-httpd_path=/usr/local/sbin/httpd
+-apachectl_path=/usr/local/sbin/apachectl
+-httpd_conf=/usr/local/etc/apache/httpd.conf
+-mime_types=/usr/local/etc/apache/mime.types
+-srm_conf=/usr/local/etc/apache/srm.conf
+-access_conf=/usr/local/etc/apache/access.conf
++httpd_dir=%%PREFIX%%/etc/apache
++httpd_path=%%PREFIX%%/sbin/httpd
++apachectl_path=%%PREFIX%%/sbin/apachectl
++httpd_conf=%%PREFIX%%/etc/apache/httpd.conf
++mime_types=%%PREFIX%%/etc/apache/mime.types
++srm_conf=%%PREFIX%%/etc/apache/srm.conf
++access_conf=%%PREFIX%%/etc/apache/access.conf
+ show_order=0
+ max_servers=100
+ test_config=1
diff --git a/sysutils/webmin/files/patch-bind8::config-freebsd-2.1 b/sysutils/webmin/files/patch-bind8::config-freebsd-2.1
new file mode 100644
index 000000000000..12754c970556
--- /dev/null
+++ b/sysutils/webmin/files/patch-bind8::config-freebsd-2.1
@@ -0,0 +1,9 @@
+--- bind8/config-freebsd-2.1.orig	Sat Mar 16 06:50:14 2002
++++ bind8/config-freebsd-2.1	Sat Mar 16 06:50:47 2002
+@@ -1,5 +1,5 @@
+ soa_style=0
+-named_path=/usr/local/sbin/named
++named_path=%%PREFIX%%/sbin/named
+ named_conf=/etc/named.conf
+ show_list=0
+ records_order=0
diff --git a/sysutils/webmin/files/patch-bind8::config-freebsd-2.2 b/sysutils/webmin/files/patch-bind8::config-freebsd-2.2
new file mode 100644
index 000000000000..dac2411cd3eb
--- /dev/null
+++ b/sysutils/webmin/files/patch-bind8::config-freebsd-2.2
@@ -0,0 +1,9 @@
+--- bind8/config-freebsd-2.2.orig	Sat Mar 16 06:50:24 2002
++++ bind8/config-freebsd-2.2	Sat Mar 16 06:50:47 2002
+@@ -1,5 +1,5 @@
+ soa_style=0
+-named_path=/usr/local/sbin/named
++named_path=%%PREFIX%%/sbin/named
+ named_conf=/etc/named.conf
+ show_list=0
+ records_order=0
diff --git a/sysutils/webmin/files/patch-config-freebsd b/sysutils/webmin/files/patch-config-freebsd
new file mode 100644
index 000000000000..5b48e4147a26
--- /dev/null
+++ b/sysutils/webmin/files/patch-config-freebsd
@@ -0,0 +1,7 @@
+--- config-freebsd.orig	Sat Mar 16 06:24:11 2002
++++ config-freebsd	Sat Mar 16 06:24:22 2002
+@@ -1,3 +1,3 @@
+ find_pid_command=ps auxwwww | grep NAME | grep -v grep | awk '{ print $2 }'
+-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
++path=/bin:/usr/bin:/sbin:/usr/sbin:%%PREFIX%%/bin
+ ld_env=LD_LIBRARY_PATH
diff --git a/sysutils/webmin/files/patch-dhcpd::config-freebsd b/sysutils/webmin/files/patch-dhcpd::config-freebsd
new file mode 100644
index 000000000000..8f46f716c861
--- /dev/null
+++ b/sysutils/webmin/files/patch-dhcpd::config-freebsd
@@ -0,0 +1,11 @@
+--- dhcpd/config-freebsd.orig	Sat Mar 16 06:39:08 2002
++++ dhcpd/config-freebsd	Sat Mar 16 06:39:24 2002
+@@ -1,6 +1,6 @@
+-dhcpd_conf=/usr/local/etc/dhcpd.conf
++dhcpd_conf=%%PREFIX%%/etc/dhcpd.conf
+ pid_file=/var/run/dhcpd.pid
+-dhcpd_path=/usr/local/sbin/dhcpd
++dhcpd_path=%%PREFIX%%/sbin/dhcpd
+ lease_file=/var/db/dhcpd.leases
+ lease_sort=0
+ dhcpd_nocols=5
diff --git a/sysutils/webmin/files/patch-majordomo::config b/sysutils/webmin/files/patch-majordomo::config
new file mode 100644
index 000000000000..7277dc403ca2
--- /dev/null
+++ b/sysutils/webmin/files/patch-majordomo::config
@@ -0,0 +1,9 @@
+--- majordomo/config.orig	Sat Mar 16 06:41:27 2002
++++ majordomo/config	Sat Mar 16 06:41:40 2002
+@@ -1,4 +1,4 @@
+-majordomo_cf=/usr/local/majordomo/majordomo.cf
+-program_dir=/usr/local/majordomo
++majordomo_cf=%%PREFIX%%/majordomo/majordomo.cf
++program_dir=%%PREFIX%%/majordomo
+ dynamic=0
+ sort_mode=0
diff --git a/sysutils/webmin/files/patch-mysql::config-freebsd b/sysutils/webmin/files/patch-mysql::config-freebsd
new file mode 100644
index 000000000000..9cc8675ffb40
--- /dev/null
+++ b/sysutils/webmin/files/patch-mysql::config-freebsd
@@ -0,0 +1,22 @@
+--- mysql/config-freebsd.orig	Sat Mar 16 06:56:20 2002
++++ mysql/config-freebsd	Sat Mar 16 06:56:35 2002
+@@ -1,12 +1,12 @@
+-start_cmd=/usr/local/bin/safe_mysqld &
++start_cmd=%%PREFIX%%/bin/safe_mysqld &
+ perpage=25
+-mysql=/usr/local/bin/mysql
+-mysqldump=/usr/local/bin/mysqldump
+-mysqlimport=/usr/local/bin/mysqlimport
+-mysqlshow=/usr/local/bin/mysqlshow
++mysql=%%PREFIX%%/bin/mysql
++mysqldump=%%PREFIX%%/bin/mysqldump
++mysqlimport=%%PREFIX%%/bin/mysqlimport
++mysqlshow=%%PREFIX%%/bin/mysqlshow
+ login=root
+-mysql_libs=/usr/local/lib/mysql
+-mysqladmin=/usr/local/bin/mysqladmin
++mysql_libs=%%PREFIX%%/lib/mysql
++mysqladmin=%%PREFIX%%/bin/mysqladmin
+ style=0
+ add_mode=0
+ nodbi=0
diff --git a/sysutils/webmin/files/patch-postfix::config-freebsd b/sysutils/webmin/files/patch-postfix::config-freebsd
new file mode 100644
index 000000000000..d13cebc6b839
--- /dev/null
+++ b/sysutils/webmin/files/patch-postfix::config-freebsd
@@ -0,0 +1,14 @@
+--- postfix/config-freebsd.orig	Sat Mar 16 07:07:19 2002
++++ postfix/config-freebsd	Sat Mar 16 07:07:56 2002
+@@ -1,6 +1,6 @@
+-postfix_control_command=/usr/local/sbin/postfix
+-postfix_config_command=/usr/local/sbin/postconf
+-postfix_config_file=/usr/local/etc/postfix/main.cf
+-postfix_aliases_table_command=/usr/local/sbin/postalias
++postfix_control_command=%%PREFIX%%/sbin/postfix
++postfix_config_command=%%PREFIX%%/sbin/postconf
++postfix_config_file=%%PREFIX%%/etc/postfix/main.cf
++postfix_aliases_table_command=%%PREFIX%%/sbin/postalias
+ postfix_newaliases_command=/usr/bin/newaliases
+-postfix_lookup_table_command=/usr/local/sbin/postmap
++postfix_lookup_table_command=%%PREFIX%%/sbin/postmap
diff --git a/sysutils/webmin/files/patch-postgresql::config-freebsd b/sysutils/webmin/files/patch-postgresql::config-freebsd
new file mode 100644
index 000000000000..f5ee971cd37a
--- /dev/null
+++ b/sysutils/webmin/files/patch-postgresql::config-freebsd
@@ -0,0 +1,20 @@
+--- postgresql/config-freebsd.orig	Sat Mar 16 07:14:55 2002
++++ postgresql/config-freebsd	Sat Mar 16 07:15:01 2002
+@@ -1,11 +1,11 @@
+ basedb=template1
+ pass=
+-hba_conf=/usr/local/pgsql/data/pg_hba.conf
+-pid_file=/usr/local/pgsql/data/postmaster.pid
+-stop_cmd=/usr/local/etc/rc.d/010.pgsql.sh stop
+-start_cmd=/usr/local/etc/rc.d/010.pgsql.sh start
++hba_conf=%%PREFIX%%/pgsql/data/pg_hba.conf
++pid_file=%%PREFIX%%/pgsql/data/postmaster.pid
++stop_cmd=%%PREFIX%%/etc/rc.d/010.pgsql.sh stop
++start_cmd=%%PREFIX%%/etc/rc.d/010.pgsql.sh start
+ perpage=25
+-psql=/usr/local/bin/psql
++psql=%%PREFIX%%/bin/psql
+ login=pgsql
+-plib=/usr/local/lib
++plib=%%PREFIX%%/lib
+ nodbi=0
diff --git a/sysutils/webmin/files/patch-proftpd::config-freebsd b/sysutils/webmin/files/patch-proftpd::config-freebsd
new file mode 100644
index 000000000000..6385277999f5
--- /dev/null
+++ b/sysutils/webmin/files/patch-proftpd::config-freebsd
@@ -0,0 +1,9 @@
+--- proftpd/config-freebsd.orig	Sat Mar 16 07:16:37 2002
++++ proftpd/config-freebsd	Sat Mar 16 07:16:38 2002
+@@ -1,4 +1,4 @@
+-proftpd_path=/usr/local/libexec/proftpd
+-proftpd_conf=/usr/local/etc/proftpd.conf
++proftpd_path=%%PREFIX%%/libexec/proftpd
++proftpd_conf=%%PREFIX%%/etc/proftpd.conf
+ pid_file=/var/run/proftpd.pid
+ ftpusers=/etc/ftpusers
diff --git a/sysutils/webmin/files/patch-samba::config-freebsd b/sysutils/webmin/files/patch-samba::config-freebsd
new file mode 100644
index 000000000000..41cc708ed58e
--- /dev/null
+++ b/sysutils/webmin/files/patch-samba::config-freebsd
@@ -0,0 +1,24 @@
+--- samba/config-freebsd.orig	Sat Mar 16 06:27:11 2002
++++ samba/config-freebsd	Sat Mar 16 06:28:18 2002
+@@ -1,13 +1,13 @@
+-alt_smb_conf=/usr/local/etc/smb.conf.default
++alt_smb_conf=%%PREFIX%%/etc/smb.conf.default
+ dont_convert=root toor daemon operator bin tty sys kmem adm lp smtp uucp nuucp listen nobody noaccess nobody4 pop lp mail postmaster news man ftp games smmsp mailnull bind xten gnats www pgsql mysql
+ list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
+-name_server=/usr/local/sbin/nmbd
++name_server=%%PREFIX%%/sbin/nmbd
+ run_from_inetd=0
+-samba_password_program=/usr/local/bin/smbpasswd
+-samba_server=/usr/local/sbin/smbd
+-samba_status_program=/usr/local/bin/smbstatus
+-smb_conf=/usr/local/etc/smb.conf
+-smb_passwd=/usr/local/private/smbpasswd
++samba_password_program=%%PREFIX%%/bin/smbpasswd
++samba_server=%%PREFIX%%/sbin/smbd
++samba_status_program=%%PREFIX%%/bin/smbstatus
++smb_conf=%%PREFIX%%/etc/smb.conf
++smb_passwd=%%PREFIX%%/private/smbpasswd
+ text_lists=0
+-swat_path=/usr/local/sbin/swat
++swat_path=%%PREFIX%%/sbin/swat
+ sort_mode=0
diff --git a/sysutils/webmin/files/patch-squid::config-freebsd b/sysutils/webmin/files/patch-squid::config-freebsd
new file mode 100644
index 000000000000..37bca1d9a6ae
--- /dev/null
+++ b/sysutils/webmin/files/patch-squid::config-freebsd
@@ -0,0 +1,18 @@
+--- squid/config-freebsd.orig	Sat Mar 16 06:35:56 2002
++++ squid/config-freebsd	Sat Mar 16 06:37:56 2002
+@@ -1,9 +1,9 @@
+-log_dir=/usr/local/squid/logs
+-squid_path=/usr/local/sbin/squid
+-cache_dir=/usr/local/squid/cache
+-squid_conf=/usr/local/etc/squid/squid.conf
+-pid_file=/usr/local/squid/logs/squid.pid
+-cachemgr_path=/usr/local/sbin/cachemgr.cgi
++log_dir=%%PREFIX%%/squid/logs
++squid_path=%%PREFIX%%/sbin/squid
++cache_dir=%%PREFIX%%/squid/cache
++squid_conf=%%PREFIX%%/etc/squid/squid.conf
++pid_file=%%PREFIX%%/squid/logs/squid.pid
++cachemgr_path=%%PREFIX%%/libexec/cachemgr.cgi
+ calamaris=calamaris
+ cal_max=50000
+ cal_args=-aw
diff --git a/sysutils/webmin/files/patch-stunnel::config b/sysutils/webmin/files/patch-stunnel::config
new file mode 100644
index 000000000000..14fe2d29be07
--- /dev/null
+++ b/sysutils/webmin/files/patch-stunnel::config
@@ -0,0 +1,5 @@
+--- stunnel/config.orig	Sat Mar 16 07:48:25 2002
++++ stunnel/config	Sat Mar 16 07:48:41 2002
+@@ -1 +1 @@
+-stunnel_path=/usr/local/sbin/stunnel
++stunnel_path=%%PREFIX%%/sbin/stunnel
diff --git a/sysutils/webmin/files/patch-wuftpd::config-freebsd b/sysutils/webmin/files/patch-wuftpd::config-freebsd
new file mode 100644
index 000000000000..c9378fc36d4c
--- /dev/null
+++ b/sysutils/webmin/files/patch-wuftpd::config-freebsd
@@ -0,0 +1,9 @@
+--- wuftpd/config-freebsd.orig	Sat Mar 16 06:42:57 2002
++++ wuftpd/config-freebsd	Sat Mar 16 06:43:10 2002
+@@ -1,5 +1,5 @@
+ ftpgroups=/etc/ftpgroups
+-ftpd_path=/usr/local/libexec/ftpd
++ftpd_path=%%PREFIX%%/libexec/ftpd
+ ftphosts=/etc/ftphosts
+ ftpconversions=/etc/ftpconversions
+ pid_file=/var/run/ftpd.pid
diff --git a/sysutils/webmin/files/patch-xinetd::config-freebsd b/sysutils/webmin/files/patch-xinetd::config-freebsd
new file mode 100644
index 000000000000..9a45cc33d090
--- /dev/null
+++ b/sysutils/webmin/files/patch-xinetd::config-freebsd
@@ -0,0 +1,8 @@
+--- xinetd/config-freebsd.orig	Sat Mar 16 07:51:04 2002
++++ xinetd/config-freebsd	Sat Mar 16 07:51:18 2002
+@@ -1,4 +1,4 @@
+ xinetd_conf=/etc/xinetd.conf
+ protocols_file=/etc/protocols
+ pid_file=/var/run/xinetd.pid
+-start_cmd=/usr/local/sbin/xinetd
++start_cmd=%%PREFIX%%/sbin/xinetd