10 files changed, 154 insertions, 112 deletions

diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index f187a6b074ed..5610060996ac 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	web2ldap
-PORTVERSION=	0.10.4
+PORTVERSION=	0.15.9
 CATEGORIES=	www
 MASTER_SITES=	http://www.web2ldap.de/download/ \
 		http://www.tricknology.org/ports/
 
-MAINTAINER=	oddbjorn@tricknology.org
+MAINTAINER=	bsam@ipt.ru
 COMMENT=	Python-based WWW gateway to LDAP servers
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_ldap.so:${PORTSDIR}/net/py-ldap2
@@ -21,10 +21,8 @@ USE_PYTHON=	yes
 
 do-install:
 	@${MKDIR} ${PREFIX}/${PORTNAME}
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/contrib/occonf2ldapoc-esj.py.orig
 	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/fcgi/web2ldap.py.orig
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/occonf2ldapoc.py.orig
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/pickleasn1cfg.py.orig
+	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/scgi/web2ldap.py.orig
 	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/web2ldap/web2ldapcnf/standalone.py.orig
 	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/mime.types.orig
 	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/compile.py.orig
diff --git a/www/web2ldap/distinfo b/www/web2ldap/distinfo
index 0a64c8801e2d..cab3d2be8585 100644
--- a/www/web2ldap/distinfo
+++ b/www/web2ldap/distinfo
@@ -1,2 +1,2 @@
-MD5 (web2ldap-0.10.4.tar.gz) = 1c9f866e79bb224e20521912ff712a78
-SIZE (web2ldap-0.10.4.tar.gz) = 154165
+MD5 (web2ldap-0.15.9.tar.gz) = 9f18ed4472428185eb081df008070181
+SIZE (web2ldap-0.15.9.tar.gz) = 228767
diff --git a/www/web2ldap/files/patch-ab b/www/web2ldap/files/patch-ab
deleted file mode 100644
index 49d059ae5700..000000000000
--- a/www/web2ldap/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-*** contrib/occonf2ldapoc-esj.py.orig	Wed Mar 20 15:54:51 2002
---- contrib/occonf2ldapoc-esj.py	Wed Mar 20 15:55:02 2002
-***************
-*** 1,4 ****
-! #!/usr/bin/python
-  
-  import sys,string,fileinput,re,getopt
-  
---- 1,4 ----
-! #!/usr/local/bin/python
-  
-  import sys,string,fileinput,re,getopt
-  
diff --git a/www/web2ldap/files/patch-ad b/www/web2ldap/files/patch-ad
index 0638a946621d..fd6a7a798a4f 100644
--- a/www/web2ldap/files/patch-ad
+++ b/www/web2ldap/files/patch-ad
@@ -1,13 +1,19 @@
-*** sbin/compile.py.orig	Wed Mar 20 15:58:16 2002
---- sbin/compile.py	Wed Mar 20 15:58:46 2002
+*** sbin/compile.py.orig	Tue May 13 15:46:59 2003
+--- sbin/compile.py	Thu Feb 24 15:04:30 2005
 ***************
-*** 1,4 ****
+*** 4,10 ****
+  $Id: compile.py,v 1.3 2003/05/13 11:46:59 michael Exp $
+  """
+  
 ! #!/usr/bin/python
   
-  import compileall
+  import sys,compileall
+  
+--- 4,10 ----
+  $Id: compile.py,v 1.3 2003/05/13 11:46:59 michael Exp $
+  """
   
---- 1,4 ----
 ! #!/usr/local/bin/python
   
-  import compileall
+  import sys,compileall
   
diff --git a/www/web2ldap/files/patch-ae b/www/web2ldap/files/patch-ae
deleted file mode 100644
index 696bb98bac68..000000000000
--- a/www/web2ldap/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-*** sbin/occonf2ldapoc.py.orig	Wed Mar 20 15:58:24 2002
---- sbin/occonf2ldapoc.py	Wed Mar 20 15:58:49 2002
-***************
-*** 1,4 ****
-! #!/usr/bin/python
-  
-  import sys,string,fileinput
-  
---- 1,4 ----
-! #!/usr/local/bin/python
-  
-  import sys,string,fileinput
-  
diff --git a/www/web2ldap/files/patch-af b/www/web2ldap/files/patch-af
deleted file mode 100644
index 3437bbb8233a..000000000000
--- a/www/web2ldap/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-*** sbin/pickleasn1cfg.py.orig	Wed Mar 20 15:58:31 2002
---- sbin/pickleasn1cfg.py	Wed Mar 20 15:58:52 2002
-***************
-*** 1,4 ****
-! #!/usr/bin/python
-  
-  import sys
-  
---- 1,4 ----
-! #!/usr/local/bin/python
-  
-  import sys
-  
diff --git a/www/web2ldap/files/patch-ag b/www/web2ldap/files/patch-ag
index c515ff20a920..4f7011c82a99 100644
--- a/www/web2ldap/files/patch-ag
+++ b/www/web2ldap/files/patch-ag
@@ -2,12 +2,12 @@
 --- sbin/web2ldap.py	Wed Mar 20 16:00:47 2002
 ***************
 *** 1,4 ****
-! #!/usr/bin/python
+! #!/usr/bin/python -OO
   
   """
   sbin/web2ldap.py - startscript for running as stand-alone HTTP server
 --- 1,4 ----
-! #!/usr/local/bin/python
+! #!/usr/local/bin/python -OO
   
   """
   sbin/web2ldap.py - startscript for running as stand-alone HTTP server
diff --git a/www/web2ldap/files/patch-ah b/www/web2ldap/files/patch-ah
index a5e6818c39e1..c7fd4eaee491 100644
--- a/www/web2ldap/files/patch-ah
+++ b/www/web2ldap/files/patch-ah
@@ -1,19 +1,15 @@
-*** etc/web2ldap/web2ldapcnf/standalone.py.orig	Wed Mar 20 16:02:37 2002
---- etc/web2ldap/web2ldapcnf/standalone.py	Wed Mar 20 16:03:08 2002
+*** etc/web2ldap/web2ldapcnf/standalone.py.orig	Sat Jun  5 12:03:35 2004
+--- etc/web2ldap/web2ldapcnf/standalone.py	Thu Feb 24 19:57:00 2005
 ***************
-*** 48,54 ****
+*** 65,69 ****
   document_root = os.path.join(web2ldapcnf.web2ldap_dir,'htdocs')
   
   # Path name of mime.types file
 ! mime_types = '/etc/mime.types'
   
-  # Listing of directory content (0=disabled, 1=enabled)
-  dir_listing_allowed = 0
---- 48,54 ----
+--- 65,69 ----
   document_root = os.path.join(web2ldapcnf.web2ldap_dir,'htdocs')
   
   # Path name of mime.types file
 ! mime_types = '/usr/local/web2ldap/etc/mime.types'
   
-  # Listing of directory content (0=disabled, 1=enabled)
-  dir_listing_allowed = 0
diff --git a/www/web2ldap/files/patch-ai b/www/web2ldap/files/patch-ai
index 25d146a168e4..1051d6127234 100644
--- a/www/web2ldap/files/patch-ai
+++ b/www/web2ldap/files/patch-ai
@@ -1,11 +1,19 @@
---- etc/web2ldap/web2ldapcnf/standalone.py.orig	Fri Mar 22 12:58:51 2002
-+++ etc/web2ldap/web2ldapcnf/standalone.py	Fri Mar 22 12:59:10 2002
-@@ -11,7 +11,7 @@
- import os,web2ldapcnf
- 
- # User account name to setuid after being started as root
--run_username = 'wwwrun'
-+run_username = 'nobody'
- 
- # Contact mail address of the server admin when running stand-alone
- server_admin = 'admin@web2ldap.de'
+*** etc/web2ldap/web2ldapcnf/standalone.py.orig	Thu Feb 24 20:11:25 2005
+--- etc/web2ldap/web2ldapcnf/standalone.py	Thu Feb 24 20:12:36 2005
+***************
+*** 22,28 ****
+  access_allowed = ['127.0.0.0/255.0.0.0']
+  
+  # User account name to setuid after being started as root
+! run_username = 'web2ldap'
+  
+  # Contact mail address of the server admin when running stand-alone
+  server_admin = 'admin@web2ldap.de'
+--- 22,28 ----
+  access_allowed = ['127.0.0.0/255.0.0.0']
+  
+  # User account name to setuid after being started as root
+! run_username = 'nobody'
+  
+  # Contact mail address of the server admin when running stand-alone
+  server_admin = 'admin@web2ldap.de'
diff --git a/www/web2ldap/pkg-plist b/www/web2ldap/pkg-plist
index eafbcc5c434c..7ee7100ffd17 100644
--- a/www/web2ldap/pkg-plist
+++ b/www/web2ldap/pkg-plist
@@ -1,9 +1,30 @@
-web2ldap/htdocs/css/web2ldap_default.css
-web2ldap/htdocs/css/web2ldap_fixed.css
+web2ldap/AUTHORS
+web2ldap/INSTALL
+web2ldap/README
+web2ldap/cgi-bin/web2ldap.cgi
 web2ldap/htdocs/ssi/footer.html
 web2ldap/htdocs/ssi/head.html
 web2ldap/htdocs/ssi/navigation.html
+web2ldap/htdocs/ssi/changes_navigation.html
+web2ldap/htdocs/sidebars/mozilla-add-sidebar.html
+web2ldap/htdocs/sidebars/mozilla-sidebar.html
+web2ldap/htdocs/css/web2ldap/default.css
+web2ldap/htdocs/css/web2ldap/fixed.css
+web2ldap/htdocs/css/web2ldap/commandlink.css
+web2ldap/htdocs/css/web2ldap/print.css
+web2ldap/htdocs/changes.html
+web2ldap/htdocs/changes-0.10.html
+web2ldap/htdocs/changes-0.11.html
+web2ldap/htdocs/changes-0.12.html
+web2ldap/htdocs/changes-0.13.html
+web2ldap/htdocs/changes-0.14.html
+web2ldap/htdocs/changes-0.15.html
+web2ldap/htdocs/changes-0.7.html
+web2ldap/htdocs/changes-0.8.html
+web2ldap/htdocs/changes-0.9.html
+web2ldap/htdocs/changes-ancient.html
 web2ldap/htdocs/demo.html
+web2ldap/htdocs/docs.html
 web2ldap/htdocs/download.html
 web2ldap/htdocs/faq.html
 web2ldap/htdocs/features.html
@@ -11,42 +32,87 @@ web2ldap/htdocs/feedback.html
 web2ldap/htdocs/files.html
 web2ldap/htdocs/install.html
 web2ldap/htdocs/news.html
-web2ldap/htdocs/changes.html
 web2ldap/htdocs/roadmap.html
 web2ldap/htdocs/security.html
+web2ldap/htdocs/support.html
 web2ldap/htdocs/web2ldap.html
 web2ldap/htdocs/web2ldapcnf.html
 web2ldap/htdocs/web2ldapcnf_fastcgi.html
 web2ldap/htdocs/web2ldapcnf_hosts.html
 web2ldap/htdocs/web2ldapcnf_misc.html
+web2ldap/htdocs/web2ldapcnf_scgi.html
 web2ldap/htdocs/web2ldapcnf_standalone.html
 web2ldap/htdocs/related.html
 web2ldap/htdocs/compability.html
-web2ldap/contrib/occonf2ldapoc-esj.py
-web2ldap/contrib/occonf2ldapoc-esj.pyc
+web2ldap/etc/httpd/sample-mod_fastcgi.conf
+web2ldap/etc/httpd/sample-mod_scgi.conf
+web2ldap/etc/init.d/web2ldap
 web2ldap/etc/mime.types
-web2ldap/etc/rc.d/web2ldap.sh
-web2ldap/etc/web2ldap/web2ldapcnf/standalone.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/samba.py
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/msperson.py
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/edirectory.py
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/exchange.py
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/posixaccount.py
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/activedirectory.py
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/__init__.py
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/entrust.py
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/samba.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/msperson.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/edirectory.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/exchange.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/posixaccount.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/activedirectory.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/__init__.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/plugins/entrust.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/standalone.py
 web2ldap/etc/web2ldap/web2ldapcnf/fastcgi.py
 web2ldap/etc/web2ldap/web2ldapcnf/hosts.py
 web2ldap/etc/web2ldap/web2ldapcnf/misc.py
-web2ldap/etc/web2ldap/web2ldapcnf/standalone.py
+web2ldap/etc/web2ldap/web2ldapcnf/scgi.py
+web2ldap/etc/web2ldap/web2ldapcnf/standalone.pyc
 web2ldap/etc/web2ldap/web2ldapcnf/__init__.pyc
 web2ldap/etc/web2ldap/web2ldapcnf/fastcgi.pyc
 web2ldap/etc/web2ldap/web2ldapcnf/hosts.pyc
 web2ldap/etc/web2ldap/web2ldapcnf/misc.pyc
+web2ldap/etc/web2ldap/web2ldapcnf/scgi.pyc
 web2ldap/etc/web2ldap/web2ldapcnf/__init__.py
-web2ldap/etc/web2ldap/ldapoc.py
+web2ldap/etc/web2ldap/templates/print_organization.html
+web2ldap/etc/web2ldap/templates/read_organization.html
+web2ldap/etc/web2ldap/templates/vcard_organization.txt
+web2ldap/etc/web2ldap/templates/add_company.ldif
+web2ldap/etc/web2ldap/templates/read_inetOrgPerson.html.de
+web2ldap/etc/web2ldap/templates/read_posixAccount.html
+web2ldap/etc/web2ldap/templates/searchform_Base.html.de
+web2ldap/etc/web2ldap/templates/read_musician.html.de
+web2ldap/etc/web2ldap/templates/add_user.ldif
+web2ldap/etc/web2ldap/templates/vcard_person.txt
+web2ldap/etc/web2ldap/templates/inputform_inetOrgPerson.html
+web2ldap/etc/web2ldap/templates/searchform_rfc2307.html
+web2ldap/etc/web2ldap/templates/add_group.ldif
+web2ldap/etc/web2ldap/templates/print_organizationalUnit.html
+web2ldap/etc/web2ldap/templates/read_inetOrgPerson.html
+web2ldap/etc/web2ldap/templates/login.html
+web2ldap/etc/web2ldap/templates/read_musician.html
+web2ldap/etc/web2ldap/templates/read_operationalattrs.html.de
+web2ldap/etc/web2ldap/templates/print_person.html
+web2ldap/etc/web2ldap/templates/searchform_Base.html
+web2ldap/etc/web2ldap/templates/inputform_msPerson.html
+web2ldap/etc/web2ldap/templates/read_operationalattrs.html
+web2ldap/etc/web2ldap/templates/add_orgunit.ldif
+web2ldap/etc/web2ldap/templates/add_msperson.ldif
+web2ldap/etc/web2ldap/templates/read_bankArrangement.html
+web2ldap/etc/web2ldap/templates/inputform_posixAccount.html
+web2ldap/etc/web2ldap/templates/add_person.ldif
 web2ldap/etc/web2ldap/ldapoidreg.py
-web2ldap/etc/web2ldap/ldapoc.pyc
 web2ldap/etc/web2ldap/ldapoidreg.pyc
+web2ldap/etc/web2ldap/localschema.ldif
 web2ldap/fcgi/web2ldap.py
 web2ldap/fcgi/web2ldap.pyc
 web2ldap/pylib/mspki/x509v3.pyc
 web2ldap/pylib/mspki/asn1helper.py
 web2ldap/pylib/mspki/asn1types.py
 web2ldap/pylib/mspki/nsext.py
-web2ldap/pylib/mspki/rfc2459.py
+web2ldap/pylib/mspki/pkix.py
 web2ldap/pylib/mspki/utctime.py
 web2ldap/pylib/mspki/util.py
 web2ldap/pylib/mspki/vendorext.py
@@ -57,7 +123,7 @@ web2ldap/pylib/mspki/__init__.pyc
 web2ldap/pylib/mspki/asn1helper.pyc
 web2ldap/pylib/mspki/asn1types.pyc
 web2ldap/pylib/mspki/nsext.pyc
-web2ldap/pylib/mspki/rfc2459.pyc
+web2ldap/pylib/mspki/pkix.pyc
 web2ldap/pylib/mspki/utctime.pyc
 web2ldap/pylib/mspki/util.pyc
 web2ldap/pylib/mspki/vendorext.pyc
@@ -70,6 +136,12 @@ web2ldap/pylib/pisces/__init__.py
 web2ldap/pylib/pisces/asn1.py
 web2ldap/pylib/pisces/__init__.pyc
 web2ldap/pylib/pisces/asn1.pyc
+web2ldap/pylib/w2lapp/schema/syntaxes.py
+web2ldap/pylib/w2lapp/schema/viewer.py
+web2ldap/pylib/w2lapp/schema/__init__.py
+web2ldap/pylib/w2lapp/schema/syntaxes.pyc
+web2ldap/pylib/w2lapp/schema/viewer.pyc
+web2ldap/pylib/w2lapp/schema/__init__.pyc
 web2ldap/pylib/w2lapp/viewer.pyc
 web2ldap/pylib/w2lapp/add.py
 web2ldap/pylib/w2lapp/addmodifyform.py
@@ -92,6 +164,9 @@ web2ldap/pylib/w2lapp/rename.py
 web2ldap/pylib/w2lapp/search.py
 web2ldap/pylib/w2lapp/searchform.py
 web2ldap/pylib/w2lapp/viewer.py
+web2ldap/pylib/w2lapp/form.py
+web2ldap/pylib/w2lapp/srvrr.py
+web2ldap/pylib/w2lapp/session.py
 web2ldap/pylib/w2lapp/__init__.pyc
 web2ldap/pylib/w2lapp/add.pyc
 web2ldap/pylib/w2lapp/cnf.pyc
@@ -113,19 +188,23 @@ web2ldap/pylib/w2lapp/referral.pyc
 web2ldap/pylib/w2lapp/rename.pyc
 web2ldap/pylib/w2lapp/search.pyc
 web2ldap/pylib/w2lapp/searchform.pyc
+web2ldap/pylib/w2lapp/form.pyc
+web2ldap/pylib/w2lapp/srvrr.pyc
+web2ldap/pylib/w2lapp/session.pyc
 web2ldap/pylib/w2lapp/__init__.py
 web2ldap/pylib/ldaputil/__init__.py
 web2ldap/pylib/ldaputil/base.py
 web2ldap/pylib/ldaputil/passwd.py
+web2ldap/pylib/ldaputil/modlist2.py
 web2ldap/pylib/ldaputil/__init__.pyc
 web2ldap/pylib/ldaputil/base.pyc
 web2ldap/pylib/ldaputil/passwd.pyc
+web2ldap/pylib/ldaputil/modlist2.pyc
 web2ldap/pylib/msHTTPHandler.py
 web2ldap/pylib/msHTTPServer.py
 web2ldap/pylib/msbase.py
 web2ldap/pylib/msgzip.py
 web2ldap/pylib/utctime.py
-web2ldap/pylib/dsml.pyc
 web2ldap/pylib/ipadr.pyc
 web2ldap/pylib/ldapdns.pyc
 web2ldap/pylib/ldapsession.pyc
@@ -133,54 +212,48 @@ web2ldap/pylib/msHTTPHandler.pyc
 web2ldap/pylib/msHTTPServer.pyc
 web2ldap/pylib/msbase.pyc
 web2ldap/pylib/msgzip.pyc
-web2ldap/pylib/dsml.py
 web2ldap/pylib/utctime.pyc
 web2ldap/pylib/ipadr.py
 web2ldap/pylib/ldapdns.py
 web2ldap/pylib/ldapsession.py
+web2ldap/pylib/t61_7.py
+web2ldap/pylib/t61_8.py
+web2ldap/pylib/mssignals.py
+web2ldap/pylib/t61_7.pyc
+web2ldap/pylib/t61_8.pyc
+web2ldap/pylib/mssignals.pyc
 web2ldap/sbin/web2ldap.pyc
-web2ldap/sbin/occonf2ldapoc.py
-web2ldap/sbin/pickleasn1cfg.py
 web2ldap/sbin/web2ldap.py
 web2ldap/sbin/compile.pyc
-web2ldap/sbin/occonf2ldapoc.pyc
-web2ldap/sbin/pickleasn1cfg.pyc
 web2ldap/sbin/compile.py
-web2ldap/templates/vcard_person.txt
-web2ldap/templates/print_organization.html
-web2ldap/templates/print_organizationalUnit.html
-web2ldap/templates/print_person.html
-web2ldap/templates/read_bankArrangement.html
-web2ldap/templates/read_bibtex.html
-web2ldap/templates/read_inetOrgPerson.html
-web2ldap/templates/read_musician.html
-web2ldap/templates/read_musician.html.de
-web2ldap/templates/read_operationalattrs.html
-web2ldap/templates/read_operationalattrs.html.de
-web2ldap/templates/read_organization.html
-web2ldap/templates/read_posixAccount.html
-web2ldap/templates/searchform_Base.html
-web2ldap/templates/searchform_Base.html.de
-web2ldap/templates/searchform_bibtex.html
-web2ldap/templates/searchform_rfc2307.html
-web2ldap/templates/print_bibtex.html
+web2ldap/sbin/checkinst.py
+web2ldap/sbin/checkinst.pyc
+web2ldap/scgi/web2ldap.py
+web2ldap/scgi/web2ldap.pyc
+web2ldap/web2ldap.spec
 @dirrm web2ldap/var/run
 @dirrm web2ldap/var/log
 @dirrm web2ldap/var
-@dirrm web2ldap/templates
+@dirrm web2ldap/scgi
 @dirrm web2ldap/sbin
+@dirrm web2ldap/pylib/w2lapp/schema
 @dirrm web2ldap/pylib/w2lapp
 @dirrm web2ldap/pylib/pisces
 @dirrm web2ldap/pylib/mspki
 @dirrm web2ldap/pylib/ldaputil
 @dirrm web2ldap/pylib
 @dirrm web2ldap/htdocs/ssi
+@dirrm web2ldap/htdocs/sidebars
+@dirrm web2ldap/htdocs/css/web2ldap
 @dirrm web2ldap/htdocs/css
 @dirrm web2ldap/htdocs
 @dirrm web2ldap/fcgi
+@dirrm web2ldap/etc/web2ldap/web2ldapcnf/plugins
 @dirrm web2ldap/etc/web2ldap/web2ldapcnf
+@dirrm web2ldap/etc/web2ldap/templates
 @dirrm web2ldap/etc/web2ldap
-@dirrm web2ldap/etc/rc.d
+@dirrm web2ldap/etc/init.d
+@dirrm web2ldap/etc/httpd
 @dirrm web2ldap/etc
-@dirrm web2ldap/contrib
+@dirrm web2ldap/cgi-bin
 @dirrm web2ldap