diff options
Diffstat (limited to 'sysutils/webmin')
26 files changed, 39 insertions, 446 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index b9f04e406a96..791bf68ceaed 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -6,7 +6,7 @@ # PORTNAME= webmin -PORTVERSION= 1.550 +PORTVERSION= 1.560 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf \ @@ -26,9 +26,11 @@ USE_RC_SUBR= webmin.sh SUB_LIST= PERL5=${PERL} SUB_FILES= pkg-message -WEBMIN_MODULES= +WEBMIN_MODULES= backup-config-1.560-2.wbm.gz \ + init-1.560-2.wbm.gz post-extract: + @${RM} -f ${WRKSRC}/mount/freebsd-mounts-? @if [ "${WEBMIN_MODULES}" != "" ]; then \ for webmin_module in ${WEBMIN_MODULES}; do \ ${ECHO} "===> Unpacking updated module: $${webmin_module}"; \ @@ -37,32 +39,23 @@ post-extract: fi post-patch: -.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 - @${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/${file} -.endfor @${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/setup.sh - @${FIND} ${WRKSRC} -name "*.cgi" -print \ - | ${XARGS} ${REINPLACE_CMD} -e "s@#!/usr/local/bin/perl@#!${PERL}@" - @${FIND} ${WRKSRC} -name "*.cgi" -print \ - | ${XARGS} ${REINPLACE_CMD} -e "s@#!/usr/bin/perl@#!${PERL}@" - @${FIND} ${WRKSRC} -name "*.pl" -print \ - | ${XARGS} ${REINPLACE_CMD} -e "s@#!/usr/local/bin/perl@#!${PERL}@" - @${FIND} ${WRKSRC} -name "*.pl" -print \ - | ${XARGS} ${REINPLACE_CMD} -e "s@#!/usr/bin/perl@#!${PERL}@" - @${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} - @${FIND} ${WRKSRC} -name "*.bak" -print | ${XARGS} ${RM} - @${RM} ${WRKSRC}/mount/freebsd-mounts-? + + @${FIND} ${WRKSRC} -name config-freebsd\* \ + -exec ${REINPLACE_CMD} -e "s@/usr/local@${PREFIX}@g" {} \; \ + -exec ${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" {} \; + + @${FIND} ${WRKSRC} -name "*.cgi" -exec \ + ${REINPLACE_CMD} -e "s@#!/usr/local/bin/perl@#!${PERL}@" {} \; + @${FIND} ${WRKSRC} -name "*.cgi" -exec \ + ${REINPLACE_CMD} -e "s@#!/usr/bin/perl@#!${PERL}@" {} \; + @${FIND} ${WRKSRC} -name "*.pl" -exec \ + ${REINPLACE_CMD} -e "s@#!/usr/local/bin/perl@#!${PERL}@" {} \; + @${FIND} ${WRKSRC} -name "*.pl" -exec \ + ${REINPLACE_CMD} -e "s@#!/usr/bin/perl@#!${PERL}@" {} \; + + @${FIND} ${WRKSRC} -name "*.orig" -delete + @${FIND} ${WRKSRC} -name "*.bak" -delete do-build: @${CC} ${CFLAGS} -o ${WRKSRC}/mount/freebsd-mounts-7 ${WRKSRC}/mount/freebsd-mounts-7.c diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo index af8f44b89342..85cd1d51b410 100644 --- a/sysutils/webmin/distinfo +++ b/sysutils/webmin/distinfo @@ -1,2 +1,6 @@ -SHA256 (webmin-1.550.tar.gz) = c74eff17b35677fc8b6ea64304171265c31dd4bd346ebde40b93325490069b0e -SIZE (webmin-1.550.tar.gz) = 15102848 +SHA256 (webmin-1.560.tar.gz) = 4370abe32f04012328e2afa93e1c00fd1353963a34d8f644604f9e36d00b6e55 +SIZE (webmin-1.560.tar.gz) = 15152937 +SHA256 (backup-config-1.560-2.wbm.gz) = 42f4e9a4c513c74f10a7f83e06d72dbad54b503876e9fdae19787b7a45435332 +SIZE (backup-config-1.560-2.wbm.gz) = 55730 +SHA256 (init-1.560-2.wbm.gz) = 16309f37b4bb9eb2a8b27a3a7b242f4ebc6e86c98eb68c036351a54dbc5dcf76 +SIZE (init-1.560-2.wbm.gz) = 109481 diff --git a/sysutils/webmin/files/patch-aa b/sysutils/webmin/files/patch-aa index 0703b5ca8e91..e701419dce7e 100644 --- a/sysutils/webmin/files/patch-aa +++ b/sysutils/webmin/files/patch-aa @@ -3,19 +3,19 @@ $FreeBSD$ --- setup.sh.orig +++ setup.sh -@@ -16,9 +16,9 @@ +@@ -15,10 +15,7 @@ + srcdir=$wadir ver=`cat "$wadir/version"` - # Find temp directory +-# Find temp directory -if [ "$tempdir" = "" ]; then -+# if [ "$tempdir" = "" ]; then - tempdir=/tmp/.webmin +- tempdir=/tmp/.webmin -fi -+# fi ++tempdir=/tmp/.webmin if [ $? != "0" ]; then echo "ERROR: Cannot find the Webmin install directory"; -@@ -99,19 +99,7 @@ +@@ -95,19 +92,7 @@ echo "Unless you want to run multiple versions of Webmin at the same time" echo "you can just accept the defaults." echo "" @@ -36,7 +36,7 @@ $FreeBSD$ if [ ! -d $config_dir ]; then mkdir $config_dir; if [ $? != 0 ]; then -@@ -210,12 +198,12 @@ +@@ -207,12 +192,12 @@ fi # Ask for log directory @@ -51,7 +51,7 @@ $FreeBSD$ fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -243,7 +231,9 @@ +@@ -240,7 +225,9 @@ echo "Webmin is written entirely in Perl. Please enter the full path to the" echo "Perl 5 interpreter on your system." echo "" @@ -62,7 +62,7 @@ $FreeBSD$ perldef=/usr/bin/perl elif [ -x /usr/local/bin/perl ]; then perldef=/usr/local/bin/perl -@@ -442,22 +432,6 @@ +@@ -439,21 +426,6 @@ fi fi @@ -80,12 +80,11 @@ $FreeBSD$ - echo "Webmin does not support being started at boot time on your system." - fi - fi -- makeboot=$atboot - # Copy files to target directory echo "***********************************************************************" if [ "$wadir" != "$srcdir" ]; then -@@ -577,6 +551,7 @@ +@@ -575,6 +547,7 @@ fi fi @@ -93,7 +92,7 @@ $FreeBSD$ if [ "$noperlpath" = "" ]; then echo "Inserting path to perl into scripts.." (find "$wadir" -name '*.cgi' -print ; find "$wadir" -name '*.pl' -print) | $perl "$wadir/perlpath.pl" $perl - -@@ -587,7 +562,6 @@ +@@ -585,7 +558,6 @@ echo "Creating start and stop scripts.." rm -f $config_dir/stop $config_dir/start $config_dir/restart $config_dir/reload echo "#!/bin/sh" >>$config_dir/start @@ -101,7 +100,7 @@ $FreeBSD$ echo "trap '' 1" >>$config_dir/start echo "LANG=" >>$config_dir/start echo "export LANG" >>$config_dir/start -@@ -714,6 +688,7 @@ +@@ -733,6 +705,7 @@ echo passdelay=1 >> $config_dir/miniserv.conf fi @@ -109,7 +108,7 @@ $FreeBSD$ if [ "$nouninstall" = "" ]; then echo "Creating uninstall script $config_dir/uninstall.sh .." cat >$config_dir/uninstall.sh <<EOF -@@ -782,6 +757,7 @@ +@@ -822,6 +795,7 @@ . "$srcdir/setup-post.sh" fi diff --git a/sysutils/webmin/files/patch-apache::config-freebsd b/sysutils/webmin/files/patch-apache::config-freebsd deleted file mode 100644 index 0169467bd61a..000000000000 --- a/sysutils/webmin/files/patch-apache::config-freebsd +++ /dev/null @@ -1,24 +0,0 @@ - -$FreeBSD$ - ---- apache/config-freebsd.orig -+++ apache/config-freebsd -@@ -1,11 +1,11 @@ - show_list=0 --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%% -+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-2.2 b/sysutils/webmin/files/patch-bind8_config-freebsd-2.1-2.2 deleted file mode 100644 index e0f438550ad5..000000000000 --- a/sysutils/webmin/files/patch-bind8_config-freebsd-2.1-2.2 +++ /dev/null @@ -1,12 +0,0 @@ - -$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 -+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 deleted file mode 100644 index 5685880761f8..000000000000 --- a/sysutils/webmin/files/patch-config-freebsd +++ /dev/null @@ -1,9 +0,0 @@ ---- config-freebsd.orig Mon Jan 26 04:50:56 2004 -+++ config-freebsd Wed Jan 28 20:43:07 2004 -@@ -1,5 +1,5 @@ - find_pid_command=ps auxwwww | grep NAME | grep -v grep | awk '{ print $2 }' --path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin -+path=/bin:/usr/bin:/sbin:/usr/sbin:%%PREFIX%%/bin:%%PREFIX%%/sbin - ld_env=LD_LIBRARY_PATH - passwd_file=/etc/master.passwd - passwd_uindex=0 diff --git a/sysutils/webmin/files/patch-dhcpd::config-freebsd b/sysutils/webmin/files/patch-dhcpd::config-freebsd deleted file mode 100644 index 8f46f716c861..000000000000 --- a/sysutils/webmin/files/patch-dhcpd::config-freebsd +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-frox_config-freebsd b/sysutils/webmin/files/patch-frox_config-freebsd deleted file mode 100644 index be1a54a6f7e7..000000000000 --- a/sysutils/webmin/files/patch-frox_config-freebsd +++ /dev/null @@ -1,12 +0,0 @@ - -$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 diff --git a/sysutils/webmin/files/patch-heartbeat_config-freebsd b/sysutils/webmin/files/patch-heartbeat_config-freebsd deleted file mode 100644 index 38c5158140de..000000000000 --- a/sysutils/webmin/files/patch-heartbeat_config-freebsd +++ /dev/null @@ -1,23 +0,0 @@ - -$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 diff --git a/sysutils/webmin/files/patch-logrotate_config-freebsd b/sysutils/webmin/files/patch-logrotate_config-freebsd deleted file mode 100644 index eb0eb527875d..000000000000 --- a/sysutils/webmin/files/patch-logrotate_config-freebsd +++ /dev/null @@ -1,13 +0,0 @@ - -$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 diff --git a/sysutils/webmin/files/patch-majordomo::config b/sysutils/webmin/files/patch-majordomo::config deleted file mode 100644 index 7277dc403ca2..000000000000 --- a/sysutils/webmin/files/patch-majordomo::config +++ /dev/null @@ -1,9 +0,0 @@ ---- 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 deleted file mode 100644 index b11b774c3517..000000000000 --- a/sysutils/webmin/files/patch-mysql::config-freebsd +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- mysql/config-freebsd.orig -+++ mysql/config-freebsd -@@ -1,12 +1,12 @@ --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 --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=1 - nodbi=0 diff --git a/sysutils/webmin/files/patch-postfix::config-freebsd b/sysutils/webmin/files/patch-postfix::config-freebsd deleted file mode 100644 index fe64feae6aba..000000000000 --- a/sysutils/webmin/files/patch-postfix::config-freebsd +++ /dev/null @@ -1,39 +0,0 @@ - -$FreeBSD$ - ---- postfix/config-freebsd.orig -+++ postfix/config-freebsd -@@ -1,16 +1,16 @@ --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_queue_command=/usr/local/sbin/postqueue --postfix_super_command=/usr/local/sbin/postsuper -+postfix_lookup_table_command=%%PREFIX%%/sbin/postmap -+postfix_queue_command=%%PREFIX%%/sbin/postqueue -+postfix_super_command=%%PREFIX%%/sbin/postsuper - 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 -@@ -21,7 +21,7 @@ - top_buttons=1 - wrap_width=80 - index_check=1 --postfix_master=/usr/local/etc/postfix/master.cf -+postfix_master=%%PREFIX%%/etc/postfix/master.cf - columns=2 - show_cmts=0 - prefix_cmts=0 diff --git a/sysutils/webmin/files/patch-postgresql::config-freebsd b/sysutils/webmin/files/patch-postgresql::config-freebsd deleted file mode 100644 index 6d6a55cb744e..000000000000 --- a/sysutils/webmin/files/patch-postgresql::config-freebsd +++ /dev/null @@ -1,34 +0,0 @@ - -$FreeBSD$ - ---- postgresql/config-freebsd.orig -+++ postgresql/config-freebsd -@@ -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/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/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 - login=pgsql --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 diff --git a/sysutils/webmin/files/patch-procmail_config-freebsd b/sysutils/webmin/files/patch-procmail_config-freebsd deleted file mode 100644 index eae0e484f3a0..000000000000 --- a/sysutils/webmin/files/patch-procmail_config-freebsd +++ /dev/null @@ -1,9 +0,0 @@ - -$FreeBSD$ - ---- procmail/config-freebsd.orig -+++ procmail/config-freebsd -@@ -1,2 +1,2 @@ --procmailrc=/usr/local/etc/procmailrc -+procmailrc=%%PREFIX%%/etc/procmailrc - includes=0 diff --git a/sysutils/webmin/files/patch-proftpd::config-freebsd b/sysutils/webmin/files/patch-proftpd::config-freebsd deleted file mode 100644 index 6385277999f5..000000000000 --- a/sysutils/webmin/files/patch-proftpd::config-freebsd +++ /dev/null @@ -1,9 +0,0 @@ ---- 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 deleted file mode 100644 index 94dfc47d033b..000000000000 --- a/sysutils/webmin/files/patch-samba::config-freebsd +++ /dev/null @@ -1,33 +0,0 @@ - -$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=-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 - 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 --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 diff --git a/sysutils/webmin/files/patch-sentry_config-freebsd-4.10 b/sysutils/webmin/files/patch-sentry_config-freebsd-4.10 deleted file mode 100644 index 7fcb0a32e5d0..000000000000 --- a/sysutils/webmin/files/patch-sentry_config-freebsd-4.10 +++ /dev/null @@ -1,25 +0,0 @@ - -$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 diff --git a/sysutils/webmin/files/patch-sentry_config-freebsd-4.9 b/sysutils/webmin/files/patch-sentry_config-freebsd-4.9 deleted file mode 100644 index 69659dca47d9..000000000000 --- a/sysutils/webmin/files/patch-sentry_config-freebsd-4.9 +++ /dev/null @@ -1,25 +0,0 @@ - -$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 diff --git a/sysutils/webmin/files/patch-sentry_config-freebsd-5.0-x b/sysutils/webmin/files/patch-sentry_config-freebsd-5.0-x deleted file mode 100644 index b6c9085113fa..000000000000 --- a/sysutils/webmin/files/patch-sentry_config-freebsd-5.0-x +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 diff --git a/sysutils/webmin/files/patch-spam_config-freebsd b/sysutils/webmin/files/patch-spam_config-freebsd deleted file mode 100644 index 435de23ba4aa..000000000000 --- a/sysutils/webmin/files/patch-spam_config-freebsd +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- spam/config-freebsd.orig -+++ spam/config-freebsd -@@ -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 - call_spam=1 - processes=spamd amavisd diff --git a/sysutils/webmin/files/patch-squid::config-freebsd b/sysutils/webmin/files/patch-squid::config-freebsd deleted file mode 100644 index 37bca1d9a6ae..000000000000 --- a/sysutils/webmin/files/patch-squid::config-freebsd +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index 14fe2d29be07..000000000000 --- a/sysutils/webmin/files/patch-stunnel::config +++ /dev/null @@ -1,5 +0,0 @@ ---- 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-webalizer_config-freebsd b/sysutils/webmin/files/patch-webalizer_config-freebsd deleted file mode 100644 index 13fd935d561a..000000000000 --- a/sysutils/webmin/files/patch-webalizer_config-freebsd +++ /dev/null @@ -1,14 +0,0 @@ - -$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 diff --git a/sysutils/webmin/files/patch-wuftpd::config-freebsd b/sysutils/webmin/files/patch-wuftpd::config-freebsd deleted file mode 100644 index c9378fc36d4c..000000000000 --- a/sysutils/webmin/files/patch-wuftpd::config-freebsd +++ /dev/null @@ -1,9 +0,0 @@ ---- 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 deleted file mode 100644 index 9a45cc33d090..000000000000 --- a/sysutils/webmin/files/patch-xinetd::config-freebsd +++ /dev/null @@ -1,8 +0,0 @@ ---- 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 |