Upgrade to version 1.170.

This commit is contained in:
Jimmy Olgeni 2004-11-14 15:44:39 +00:00
parent 3b1613d0ab
commit 491311ebcf
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=121572
16 changed files with 221 additions and 58 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= webmin
PORTVERSION= 1.160
PORTVERSION= 1.170
CATEGORIES= sysutils
MASTER_SITES= http://www.webmin.com/updates/ \
${MASTER_SITE_SOURCEFORGE}
@ -25,13 +25,7 @@ USE_PERL5= yes
USE_RC_SUBR= yes
USE_REINPLACE= yes
WEBMIN_MODULES= bind8-1.160-4.wbm.gz \
cluster-webmin-1.160-1.wbm.gz \
cron-1.160-1.wbm.gz \
file-1.160-2.wbm.gz \
postgresql-1.160-1.wbm.gz \
usermin-1.160-2.wbm.gz
WEBMIN_MODULES=
WEBMIN_THEMES=
post-extract:
@ -43,21 +37,18 @@ post-extract:
fi
post-patch:
@${CP} ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.0 \
${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.1
@${CP} ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.0 \
${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.2
@${CP} ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.0 \
${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
.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 \
usermin/config
.for file in config-freebsd apache/config-freebsd \
bind8/config-freebsd-2.1-2.2 \
dhcpd/config-freebsd frox/config-freebsd \
heartbeat/config-freebsd logrotate/config-freebsd \
majordomo/config mysql/config-freebsd \
postfix/config-freebsd postgresql/config-freebsd \
procmail/config-freebsd proftpd/config-freebsd \
samba/config-freebsd sentry/config-freebsd-4.10 \
sentry/config-freebsd-4.9 sentry/config-freebsd-5.0-\* \
spam/config-freebsd squid/config-freebsd \
stunnel/config usermin/config webalizer/config-freebsd \
wuftpd/config-freebsd xinetd/config-freebsd
@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
.endfor
@${REINPLACE_CMD} -e "s=%%PREFIX%%=${PREFIX}=" ${WRKSRC}/setup.sh

View file

@ -1,14 +1,2 @@
MD5 (webmin-1.160.tar.gz) = 9331501abdb0c0e582be97515aa252a8
SIZE (webmin-1.160.tar.gz) = 7518886
MD5 (bind8-1.160-4.wbm.gz) = 369cd83ff31faee1d57c07508239b3bd
SIZE (bind8-1.160-4.wbm.gz) = 240778
MD5 (cluster-webmin-1.160-1.wbm.gz) = cd11699c32f3d10136efbe368ad55107
SIZE (cluster-webmin-1.160-1.wbm.gz) = 38725
MD5 (cron-1.160-1.wbm.gz) = a75b8f2a40937df29d06031f0e5846a9
SIZE (cron-1.160-1.wbm.gz) = 60110
MD5 (file-1.160-2.wbm.gz) = 8dd15c858c80b06b8f8c79df5762a630
SIZE (file-1.160-2.wbm.gz) = 260088
MD5 (postgresql-1.160-1.wbm.gz) = b50854e3b83ad176981c5dc9b5fbb844
SIZE (postgresql-1.160-1.wbm.gz) = 128311
MD5 (usermin-1.160-2.wbm.gz) = 7eb14fbc767e3785ef3445927f2146ba
SIZE (usermin-1.160-2.wbm.gz) = 110366
MD5 (webmin-1.170.tar.gz) = 418a62c76b8ba4e0c9532e654167c49c
SIZE (webmin-1.170.tar.gz) = 7833477

View file

@ -1,9 +0,0 @@
--- 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

View file

@ -1,5 +1,8 @@
--- 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
$FreeBSD$
--- bind8/config-freebsd-2.1-2.2.orig
+++ bind8/config-freebsd-2.1-2.2
@@ -1,5 +1,5 @@
soa_style=0
-named_path=/usr/local/sbin/named

View file

@ -0,0 +1,12 @@
$FreeBSD$
--- frox/config-freebsd.orig
+++ frox/config-freebsd
@@ -1,3 +1,3 @@
-frox=/usr/local/sbin/frox
-frox_conf=/usr/local/etc/frox.conf
-alt_frox_conf=/usr/local/etc/frox.conf.sample
+frox=%%PREFIX%%/sbin/frox
+frox_conf=%%PREFIX%%/etc/frox.conf
+alt_frox_conf=%%PREFIX%%/etc/frox.conf.sample

View file

@ -0,0 +1,23 @@
$FreeBSD$
--- heartbeat/config-freebsd.orig
+++ heartbeat/config-freebsd
@@ -2,11 +2,11 @@
authkeys=
haresources=
resource_d=
-stop_cmd=/usr/local/etc/rc.d/heartbeat.sh stop
-start_cmd=/usr/local/etc/rc.d/heartbeat.sh start
+stop_cmd=%%PREFIX%%/etc/rc.d/heartbeat.sh stop
+start_cmd=%%PREFIX%%/etc/rc.d/heartbeat.sh start
pid_file=/var/run/heartbeat.pid
-ha_dir=/usr/local/etc/ha.d
-apply_cmd=/usr/local/etc/rc.d/heartbeat.sh reload
+ha_dir=%%PREFIX%%/etc/ha.d
+apply_cmd=%%PREFIX%%/etc/rc.d/heartbeat.sh reload
serials=/dev/cuaa*
-req_resource_cmd=/usr/local/lib/heartbeat/req_resource
-heartbeat=/usr/local/lib/heartbeat/heartbeat
+req_resource_cmd=%%PREFIX%%/lib/heartbeat/req_resource
+heartbeat=%%PREFIX%%/lib/heartbeat/heartbeat

View file

@ -0,0 +1,13 @@
$FreeBSD$
--- logrotate/config-freebsd.orig
+++ logrotate/config-freebsd
@@ -1,4 +1,4 @@
sort_mode=0
-logrotate_conf=/usr/local/etc/logrotate.conf
-sample_conf=/usr/local/etc/logrotate.conf.sample
-logrotate=/usr/local/sbin/logrotate
+logrotate_conf=%%PREFIX%%/etc/logrotate.conf
+sample_conf=%%PREFIX%%/etc/logrotate.conf.sample
+logrotate=%%PREFIX%%/sbin/logrotate

View file

@ -1,6 +1,9 @@
--- 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 @@
$FreeBSD$
--- postfix/config-freebsd.orig
+++ postfix/config-freebsd
@@ -1,15 +1,15 @@
-postfix_control_command=/usr/local/sbin/postfix
-postfix_config_command=/usr/local/sbin/postconf
-postfix_config_file=/usr/local/etc/postfix/main.cf
@ -11,4 +14,15 @@
+postfix_aliases_table_command=%%PREFIX%%/sbin/postalias
postfix_newaliases_command=/usr/bin/newaliases
-postfix_lookup_table_command=/usr/local/sbin/postmap
-postfix_queue_command=/usr/local/sbin/postqueue
+postfix_lookup_table_command=%%PREFIX%%/sbin/postmap
+postfix_queue_command=%%PREFIX%%/sbin/postqueue
max_records=200
perpage=20
mailq_dir=/var/spool/postfix
mailq_cmd=/usr/bin/mailq
-postcat_cmd=/usr/local/sbin/postcat
+postcat_cmd=%%PREFIX%%/sbin/postcat
sort_mode=0
fwd_mode=0
mailq_sort=0

View file

@ -1,6 +1,9 @@
--- 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 @@
$FreeBSD$
--- postgresql/config-freebsd.orig
+++ postgresql/config-freebsd
@@ -1,16 +1,16 @@
basedb=template1
pass=
-hba_conf=/usr/local/pgsql/data/pg_hba.conf
@ -18,3 +21,10 @@
-plib=/usr/local/lib
+plib=%%PREFIX%%/lib
nodbi=0
-dump_cmd=/usr/local/bin/pg_dump
-rstr_cmd=/usr/local/bin/pg_restore
+dump_cmd=%%PREFIX%%/bin/pg_dump
+rstr_cmd=%%PREFIX%%/bin/pg_restore
sameunix=0
access=*: *
blob_mode=0

View file

@ -0,0 +1,9 @@
$FreeBSD$
--- procmail/config-freebsd.orig
+++ procmail/config-freebsd
@@ -1,2 +1,2 @@
-procmailrc=/usr/local/etc/procmailrc
+procmailrc=%%PREFIX%%/etc/procmailrc
includes=0

View file

@ -1,9 +1,12 @@
--- 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 @@
$FreeBSD$
--- samba/config-freebsd.orig
+++ samba/config-freebsd
@@ -1,16 +1,16 @@
-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
dont_convert=-499 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
@ -22,3 +25,9 @@
-swat_path=/usr/local/sbin/swat
+swat_path=%%PREFIX%%/sbin/swat
sort_mode=0
-smbgroupedit=/usr/local/bin/smbgroupedit
-pdbedit=/usr/local/bin/pdbedit
-net=/usr/local/bin/net
+smbgroupedit=%%PREFIX%%/bin/smbgroupedit
+pdbedit=%%PREFIX%%/bin/pdbedit
+net=%%PREFIX%%/bin/net

View file

@ -0,0 +1,25 @@
$FreeBSD$
--- sentry/config-freebsd-4.10.orig
+++ sentry/config-freebsd-4.10
@@ -1,13 +1,13 @@
-portsentry=/usr/local/bin/portsentry
-portsentry_config=/usr/local/etc/portsentry/portsentry.conf
-portsentry_alt_config=/usr/local/etc/portsentry/portsentry.conf.default
+portsentry=%%PREFIX%%/bin/portsentry
+portsentry_config=%%PREFIX%%/etc/portsentry/portsentry.conf
+portsentry_alt_config=%%PREFIX%%/etc/portsentry/portsentry.conf.default
portsentry_umode=udp
portsentry_start=
portsentry_stop=
portsentry_pid=
portsentry_tmode=tcp
-hostsentry=/usr/local/abacus/hostsentry/hostsentry.py
-hostsentry_config=/usr/local/abacus/hostsentry/hostsentry.conf
+hostsentry=%%PREFIX%%/abacus/hostsentry/hostsentry.py
+hostsentry_config=%%PREFIX%%/abacus/hostsentry/hostsentry.conf
hostsentry_start=
hostsentry_stop=
-logcheck=/usr/local/etc/logcheck.sh
+logcheck=%%PREFIX%%/etc/logcheck.sh

View file

@ -0,0 +1,25 @@
$FreeBSD$
--- sentry/config-freebsd-4.9.orig
+++ sentry/config-freebsd-4.9
@@ -1,13 +1,13 @@
-portsentry=/usr/local/bin/portsentry
-portsentry_config=/usr/local/etc/portsentry/portsentry.conf
-portsentry_alt_config=/usr/local/etc/portsentry/portsentry.conf.default
+portsentry=%%PREFIX%%/bin/portsentry
+portsentry_config=%%PREFIX%%/etc/portsentry/portsentry.conf
+portsentry_alt_config=%%PREFIX%%/etc/portsentry/portsentry.conf.default
portsentry_umode=udp
portsentry_start=
portsentry_stop=
portsentry_pid=
portsentry_tmode=tcp
-hostsentry=/usr/local/abacus/hostsentry/hostsentry.py
-hostsentry_config=/usr/local/abacus/hostsentry/hostsentry.conf
+hostsentry=%%PREFIX%%/abacus/hostsentry/hostsentry.py
+hostsentry_config=%%PREFIX%%/abacus/hostsentry/hostsentry.conf
hostsentry_start=
hostsentry_stop=
-logcheck=/usr/local/etc/logcheck.sh
+logcheck=%%PREFIX%%/etc/logcheck.sh

View file

@ -0,0 +1,22 @@
--- sentry/config-freebsd-5.0-*.orig Sun Nov 14 16:15:53 2004
+++ sentry/config-freebsd-5.0-* Sun Nov 14 16:17:30 2004
@@ -1,13 +1,13 @@
-portsentry=/usr/local/bin/portsentry
-portsentry_config=/usr/local/etc/portsentry/portsentry.conf
-portsentry_alt_config=/usr/local/etc/portsentry/portsentry.conf.default
+portsentry=%%PREFIX%%/bin/portsentry
+portsentry_config=%%PREFIX%%/etc/portsentry/portsentry.conf
+portsentry_alt_config=%%PREFIX%%/etc/portsentry/portsentry.conf.default
portsentry_umode=udp
portsentry_start=
portsentry_stop=
portsentry_pid=
portsentry_tmode=tcp
-hostsentry=/usr/local/abacus/hostsentry/hostsentry.py
-hostsentry_config=/usr/local/abacus/hostsentry/hostsentry.conf
+hostsentry=%%PREFIX%%/abacus/hostsentry/hostsentry.py
+hostsentry_config=%%PREFIX%%/abacus/hostsentry/hostsentry.conf
hostsentry_start=
hostsentry_stop=
-logcheck=/usr/local/etc/logcheck.sh
+logcheck=%%PREFIX%%/etc/logcheck.sh

View file

@ -0,0 +1,14 @@
$FreeBSD$
--- spam/config-freebsd.orig
+++ spam/config-freebsd
@@ -1,6 +1,6 @@
-local_cf=/usr/local/etc/mail/spamassassin/local.cf
+local_cf=%%PREFIX%%/etc/mail/spamassassin/local.cf
spamassassin=spamassassin
-procmailrc=/usr/local/etc/procmailrc
+procmailrc=%%PREFIX%%/etc/procmailrc
warn_procmail=1
call_spam=1
processes=spamd amavisd

View file

@ -0,0 +1,14 @@
$FreeBSD$
--- webalizer/config-freebsd.orig
+++ webalizer/config-freebsd
@@ -1,5 +1,5 @@
-webalizer=/usr/local/bin/webalizer
-webalizer_conf=/usr/local/etc/webalizer.conf
-alt_conf=/usr/local/etc/webalizer.conf-dist
+webalizer=%%PREFIX%%/bin/webalizer
+webalizer_conf=%%PREFIX%%/etc/webalizer.conf
+alt_conf=%%PREFIX%%/etc/webalizer.conf-dist
auto=apache,squid
su_shell=0