aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorolgeni <olgeni@FreeBSD.org>2008-05-27 17:13:06 +0800
committerolgeni <olgeni@FreeBSD.org>2008-05-27 17:13:06 +0800
commit427b30bf3e2fdc68e7d5da0e04e282a2ae99aefd (patch)
tree7be0d878f8bda929727214b6e381539b94e6c1d8
parent6918c9f7698df26508fb997514621ee881650453 (diff)
downloadfreebsd-ports-gnome-427b30bf3e2fdc68e7d5da0e04e282a2ae99aefd.tar.gz
freebsd-ports-gnome-427b30bf3e2fdc68e7d5da0e04e282a2ae99aefd.tar.zst
freebsd-ports-gnome-427b30bf3e2fdc68e7d5da0e04e282a2ae99aefd.zip
Upgrade to version 1.420.
-rw-r--r--sysutils/webmin/Makefile3
-rw-r--r--sysutils/webmin/distinfo6
-rw-r--r--sysutils/webmin/files/patch-apache::config-freebsd11
-rw-r--r--sysutils/webmin/files/patch-postgresql::config-freebsd12
4 files changed, 18 insertions, 14 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 139612a4ec7b..d6fc36f019b8 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= webmin
-PORTVERSION= 1.410
-PORTREVISION= 1
+PORTVERSION= 1.420
CATEGORIES= sysutils
MASTER_SITES= http://download.webmin.com/updates/:up \
${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index 2034d669bbcf..2b2e8ba12df3 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,6 +1,6 @@
-MD5 (webmin-1.410.tar.gz) = c1231be7a73281959bebaee3c71b6897
-SHA256 (webmin-1.410.tar.gz) = 41a33dfc21096887a0b436d9d76d6deec50231e9ed2f308635ee9fba60bb368a
-SIZE (webmin-1.410.tar.gz) = 13439843
+MD5 (webmin-1.420.tar.gz) = 0b650023ad06dc88523f0e564d86fd3b
+SHA256 (webmin-1.420.tar.gz) = eaa0ebe4db6032baf63caf5084d29c3081a2c697a6bdaacb7844bc9fd65e2462
+SIZE (webmin-1.420.tar.gz) = 13573880
MD5 (bind8-1.410-6.wbm.gz) = af9c90c2bc725eb56a0d71ceb94b970c
SHA256 (bind8-1.410-6.wbm.gz) = bf8b2dcce838677634a4c515ef1f55c1b7ec27fb844385e3b0e3cc26da1c2f90
SIZE (bind8-1.410-6.wbm.gz) = 360146
diff --git a/sysutils/webmin/files/patch-apache::config-freebsd b/sysutils/webmin/files/patch-apache::config-freebsd
index 510b3f7d6318..0169467bd61a 100644
--- a/sysutils/webmin/files/patch-apache::config-freebsd
+++ b/sysutils/webmin/files/patch-apache::config-freebsd
@@ -1,15 +1,18 @@
---- apache/config-freebsd.orig Sat Mar 16 06:33:19 2002
-+++ apache/config-freebsd Sat Mar 16 06:33:52 2002
+
+$FreeBSD$
+
+--- apache/config-freebsd.orig
++++ apache/config-freebsd
@@ -1,11 +1,11 @@
show_list=0
--httpd_dir=/usr/local/etc/apache
+-httpd_dir=/usr/local
-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_dir=%%PREFIX%%
+httpd_path=%%PREFIX%%/sbin/httpd
+apachectl_path=%%PREFIX%%/sbin/apachectl
+httpd_conf=%%PREFIX%%/etc/apache/httpd.conf
diff --git a/sysutils/webmin/files/patch-postgresql::config-freebsd b/sysutils/webmin/files/patch-postgresql::config-freebsd
index 12058ad6b789..6d6a55cb744e 100644
--- a/sysutils/webmin/files/patch-postgresql::config-freebsd
+++ b/sysutils/webmin/files/patch-postgresql::config-freebsd
@@ -3,19 +3,21 @@ $FreeBSD$
--- postgresql/config-freebsd.orig
+++ postgresql/config-freebsd
-@@ -1,17 +1,17 @@
+@@ -1,18 +1,18 @@
basedb=template1
pass=
-hba_conf=/usr/local/pgsql/data/pg_hba.conf
-alt_hba_conf=/usr/local/share/postgresql/pg_hba.conf.sample
-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
+-stop_cmd=/usr/local/etc/rc.d/postgresql stop
+-start_cmd=/usr/local/etc/rc.d/postgresql start
+-setup_cmd=/usr/local/etc/rc.d/postgresql initdb
+hba_conf=%%PREFIX%%/pgsql/data/pg_hba.conf
+alt_hba_conf=%%PREFIX%%/share/postgresql/pg_hba.conf.sample
+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
++stop_cmd=%%PREFIX%%/etc/rc.d/postgresql stop
++start_cmd=%%PREFIX%%/etc/rc.d/postgresql start
++setup_cmd=%%PREFIX%%/etc/rc.d/postgresql initdb
perpage=25
-psql=/usr/local/bin/psql
+psql=%%PREFIX%%/bin/psql