First step to support DragonFly. Bump revision.

13 files changed, 124 insertions, 4 deletions

diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index bda1f6995b7..3182917b6ce 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/05/19 17:14:53 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/06/04 14:44:13 joerg Exp $
 
 DISTNAME=	webmin-1.270-minimal
 PKGNAME=	${DISTNAME:S/-minimal$//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=webadmin/}
 
@@ -57,6 +57,13 @@ RCD_SCRIPTS=		webmin
 
 .include "../../security/openssl/buildlink3.mk"
 
+post-extract:
+	${CP} ${FILESDIR}/acl_config-dragonfly ${WRKSRC}/acl/config-dragonfly
+	${CP} ${FILESDIR}/init_config-dragonfly ${WRKSRC}/init/config-dragonfly
+	${CP} ${FILESDIR}/man_config-dragonfly ${WRKSRC}/man/config-dragonfly
+	${CP} ${FILESDIR}/proc_config-dragonfly ${WRKSRC}/proc//config-dragonfly
+
+
 do-configure:
 	${SED}	-e "s,@WEBMIN_EGDIR@,${WEBMIN_EGDIR},g"			\
 		-e "s,@WEBMIN_VARDIR@,${WEBMIN_VARDIR},g"		\
diff --git a/sysutils/webmin/PLIST b/sysutils/webmin/PLIST
index 4054818e6f7..5492d89bced 100644
--- a/sysutils/webmin/PLIST
+++ b/sysutils/webmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/05/16 04:01:28 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/06/04 14:44:13 joerg Exp $
 share/examples/rc.d/webmin
 share/examples/webmin/acl/config
 share/examples/webmin/config
@@ -97,6 +97,7 @@ share/webmin/acl/cert_issue_ie.cgi
 share/webmin/acl/cert_output.cgi
 share/webmin/acl/config
 share/webmin/acl/config-*-linux
+share/webmin/acl/config-dragonfly
 share/webmin/acl/config-freebsd
 share/webmin/acl/config-macos
 share/webmin/acl/config-netbsd
@@ -585,6 +586,7 @@ share/webmin/init/config-cobalt-linux-5.0-*
 share/webmin/init/config-coherent-linux
 share/webmin/init/config-corel-linux
 share/webmin/init/config-debian-linux
+share/webmin/init/config-dragonfly
 share/webmin/init/config-freebsd
 share/webmin/init/config-freebsd-5.0-*
 share/webmin/init/config-generic-linux
@@ -814,6 +816,7 @@ share/webmin/man/config-cobalt-linux
 share/webmin/man/config-coherent-linux
 share/webmin/man/config-corel-linux
 share/webmin/man/config-debian-linux
+share/webmin/man/config-dragonfly
 share/webmin/man/config-freebsd
 share/webmin/man/config-generic-linux
 share/webmin/man/config-gentoo-linux
@@ -942,6 +945,7 @@ share/webmin/proc/Util.java
 share/webmin/proc/acl_security.pl
 share/webmin/proc/config-*-linux
 share/webmin/proc/config-aix
+share/webmin/proc/config-dragonfly
 share/webmin/proc/config-freebsd
 share/webmin/proc/config-hpux
 share/webmin/proc/config-irix
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index eccc689f0f8..083f85084d0 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/06/04 14:08:36 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/06/04 14:44:13 joerg Exp $
 
 SHA1 (webmin-1.270-minimal.tar.gz) = 31fa4cf18205a0dac74e38290a03950450abae26
 RMD160 (webmin-1.270-minimal.tar.gz) = 94847d56eb9aebefc234178656dc53daa3af91c6
@@ -6,3 +6,9 @@ Size (webmin-1.270-minimal.tar.gz) = 1301974 bytes
 SHA1 (patch-aa) = c643cb0f568629288584902b942c792652cc366e
 SHA1 (patch-ab) = 5d91a836b0f1dd51feeda60db7c864c4e93d5c3c
 SHA1 (patch-ac) = 12c133cb1beefd2614f4caa15cc2b29cd1721efa
+SHA1 (patch-ad) = 339243d0fc904ea3affd7aa327352e065d057bbe
+SHA1 (patch-ae) = 34434aa603791f55a18005fd8a0cf2586aca0988
+SHA1 (patch-af) = 8d2c8d60d2c090050aa41f1762ae8375e3e313c4
+SHA1 (patch-ag) = 024c5ba807bb72007ece1ccaec0d3ddaf9ce00ba
+SHA1 (patch-ah) = 2fe613a0100fb7c9ceb3335bf93120703e01fd7b
+SHA1 (patch-ai) = d3c76a331e634f0c873a870fa31855a97ad68b5e
diff --git a/sysutils/webmin/files/acl_config-dragonfly b/sysutils/webmin/files/acl_config-dragonfly
new file mode 100644
index 00000000000..21f0f1d2cf2
--- /dev/null
+++ b/sysutils/webmin/files/acl_config-dragonfly
@@ -0,0 +1,4 @@
+ssleay=/usr/bin/openssl
+select=0
+order=0
+display=0
diff --git a/sysutils/webmin/files/init_config-dragonfly b/sysutils/webmin/files/init_config-dragonfly
new file mode 100644
index 00000000000..65b7c392f61
--- /dev/null
+++ b/sysutils/webmin/files/init_config-dragonfly
@@ -0,0 +1,10 @@
+reboot_command=shutdown -r now
+shutdown_command=shutdown -p now
+local_script=/etc/rc.local
+local_down=/etc/rc.shutdown
+status_check=0
+order=0
+sort_mode=0
+no_chkconfig=0
+rc_dir=/etc/rc.d
+rc_conf=/etc/rc.conf
diff --git a/sysutils/webmin/files/man_config-dragonfly b/sysutils/webmin/files/man_config-dragonfly
new file mode 100644
index 00000000000..a9b419b511c
--- /dev/null
+++ b/sysutils/webmin/files/man_config-dragonfly
@@ -0,0 +1,4 @@
+search_cmd=man -k PAGE
+man_dir=/usr/share/man
+man_cmd_sect=man SECTION PAGE
+man_cmd=man PAGE
diff --git a/sysutils/webmin/files/proc_config-dragonfly b/sysutils/webmin/files/proc_config-dragonfly
new file mode 100644
index 00000000000..b1527ce8ab8
--- /dev/null
+++ b/sysutils/webmin/files/proc_config-dragonfly
@@ -0,0 +1,5 @@
+default_mode=last
+ps_style=freebsd
+base_ppid=0
+cut_length=80
+trace_java=1
diff --git a/sysutils/webmin/patches/patch-ad b/sysutils/webmin/patches/patch-ad
new file mode 100644
index 00000000000..a310a308c09
--- /dev/null
+++ b/sysutils/webmin/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2006/06/04 14:44:14 joerg Exp $
+
+--- os_list.txt.orig	2006-06-04 14:15:28.000000000 +0000
++++ os_list.txt
+@@ -217,9 +217,8 @@ Caixa Magica			10.0	suse-linux	9.2	`cat 
+ # All FreeBSD versions
+ FreeBSD				$1	freebsd		$1	$uname =~ /FreeBSD.*?\s([0-9\.]+)/i
+ 
+-# FreeBSD clones
+-DragonFly BSD			1.0	freebsd		4.8	$uname =~ /DragonFly.*?\s1\.0A/i
+-DragonFly BSD			1.2	freebsd		4.10	$uname =~ /DragonFly.*?\s1\.2A/i
++# DragonFly
++DragonFly			$1	dragonfly	$1	$uname =~ /DragonFly.*?\s([0-9\.]+)/i
+ 
+ # All OpenBSD versions
+ OpenBSD				$1	openbsd		$1	$uname =~ /OpenBSD.*?\s([0-9\.]+)/i
diff --git a/sysutils/webmin/patches/patch-ae b/sysutils/webmin/patches/patch-ae
new file mode 100644
index 00000000000..323142fe8ce
--- /dev/null
+++ b/sysutils/webmin/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/06/04 14:44:14 joerg Exp $
+
+--- man/module.info.orig	2006-06-04 14:16:23.000000000 +0000
++++ man/module.info
+@@ -12,7 +12,7 @@ desc_zh_CN=使用手册
+ desc_pt=P醙inas do Manual
+ category=system
+ desc_tr=K齦avuz Sayfalar
+-os_support=solaris corel-linux debian-linux open-linux redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux turbo-linux freebsd openbsd cobalt-linux lfs-linux irix aix hpux macos netbsd msc-linux osf1 generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux
++os_support=solaris corel-linux debian-linux open-linux redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux turbo-linux freebsd openbsd cobalt-linux lfs-linux irix aix hpux macos netbsd msc-linux osf1 generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux dragonfly
+ desc=System Documentation
+ desc_es=P醙inas del Manual
+ desc_sv=Systemdokumentation
diff --git a/sysutils/webmin/patches/patch-af b/sysutils/webmin/patches/patch-af
new file mode 100644
index 00000000000..57a9e4d655e
--- /dev/null
+++ b/sysutils/webmin/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2006/06/04 14:44:14 joerg Exp $
+
+--- servers/servers-lib.pl.orig	2006-06-04 14:16:40.000000000 +0000
++++ servers/servers-lib.pl
+@@ -177,6 +177,7 @@ else {
+ 		  [ 'slackware', 'Slackware Linux', 'slackware-linux' ],
+ 		  [ 'linux', 'Linux', '.*-linux' ],
+ 		  [ 'freebsd', 'FreeBSD', 'freebsd' ],
++		  [ 'dragonfly', 'DragonFly', 'dragonfly' ],
+ 		  [ 'solaris', 'Solaris', 'solaris' ],
+ 		  [ 'hpux', 'HP/UX', 'hpux' ],
+ 		  [ 'sco', 'SCO', '(openserver|unixware)' ],
diff --git a/sysutils/webmin/patches/patch-ag b/sysutils/webmin/patches/patch-ag
new file mode 100644
index 00000000000..75eea72700a
--- /dev/null
+++ b/sysutils/webmin/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2006/06/04 14:44:14 joerg Exp $
+
+--- proc/module.info.orig	2006-06-04 14:17:15.000000000 +0000
++++ proc/module.info
+@@ -10,7 +10,7 @@ desc_zh_CN=进程管理器
+ desc_pt=Processos em Curso
+ category=system
+ desc_tr=莂lan S黵e鏻er
+-os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows
++os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows dragonfly
+ desc=Running Processes
+ desc_es=Procesos en curso
+ desc_sv=Processhanterare
diff --git a/sysutils/webmin/patches/patch-ah b/sysutils/webmin/patches/patch-ah
new file mode 100644
index 00000000000..c016ef6200b
--- /dev/null
+++ b/sysutils/webmin/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2006/06/04 14:44:14 joerg Exp $
+
+--- cron/module.info.orig	2006-06-04 14:19:59.000000000 +0000
++++ cron/module.info
+@@ -11,7 +11,7 @@ desc_pt=Tarefas Agendadas (Cron)
+ desc_zh_CN=Cron 任务调度
+ category=system
+ desc_tr=Zamanland齬齦m G鰎evler
+-os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux aix netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux windows
++os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux aix netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux windows dragonfly
+ desc=Scheduled Cron Jobs
+ desc_es=Tareas Planificadas (Cron)
+ desc_sv=Schemalagda cronjobb
diff --git a/sysutils/webmin/patches/patch-ai b/sysutils/webmin/patches/patch-ai
new file mode 100644
index 00000000000..bbdb3ab1a1d
--- /dev/null
+++ b/sysutils/webmin/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2006/06/04 14:44:14 joerg Exp $
+
+--- init/module.info.orig	2006-06-04 14:19:28.000000000 +0000
++++ init/module.info
+@@ -11,7 +11,7 @@ desc_zh_CN=引导和关机
+ desc_pt=Iniciar e Encerrar
+ category=system
+ desc_tr=A琮l ve Kapan
+-os_support=solaris coherent-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux slackware-linux freebsd unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux cobalt-linux osf1 irix aix macos netbsd msc-linux generic-linux trustix-linux gentoo-linux windows
++os_support=solaris coherent-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux slackware-linux freebsd unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux cobalt-linux osf1 irix aix macos netbsd msc-linux generic-linux trustix-linux gentoo-linux windows dragonfly
+ desc=Bootup and Shutdown
+ desc_es=Arranque y Parada
+ desc_sv=Start och avst鋘gning