From oddbjorn@tricknology.org  Thu Jan 11 15:21:33 2001
Return-Path: <oddbjorn@tricknology.org>
Received: from mail46.fg.online.no (mail46-s.fg.online.no [148.122.161.46])
	by hub.freebsd.org (Postfix) with ESMTP id 8A0A637B402
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Jan 2001 15:21:32 -0800 (PST)
Received: from tricknology.org (ti21a63-0144.dialup.online.no [130.67.199.144])
	by mail46.fg.online.no (8.9.3/8.9.3) with ESMTP id AAA18635
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 Jan 2001 00:21:23 +0100 (MET)
Received: (from oddbjorn@localhost)
	by tricknology.org (8.11.1/8.9.3) id f0BNLKA96112;
	Fri, 12 Jan 2001 00:21:20 +0100 (CET)
	(envelope-from oddbjorn)
Message-Id: <200101112321.f0BNLKA96112@tricknology.org>
Date: Fri, 12 Jan 2001 00:21:20 +0100 (CET)
From: Oddbjorn Steffensen <oddbjorn@tricknology.org>
Reply-To: oddbjorn@tricknology.org
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: www/web2ldap to 0.8.1
X-Send-Pr-Version: 3.2

>Number:         24260
>Category:       ports
>Synopsis:       Update port: www/web2ldap to 0.8.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 11 15:30:01 PST 2001
>Closed-Date:    Fri Jan 12 08:43:25 PST 2001
>Last-Modified:  Fri Jan 12 08:43:54 PST 2001
>Originator:     Oddbjorn Steffensen
>Release:        FreeBSD 4.2-STABLE i386
>Organization:
Funkjazztical Tricknology
>Environment:

	N/A

>Description:

	Updated version to 0.8.1; changed required python version from 1.5.2 to 2.0.

>How-To-Repeat:

	N/A

>Fix:

diff -urN /usr/ports/www/web2ldap/Makefile web2ldap/Makefile
--- /usr/ports/www/web2ldap/Makefile	Thu Nov 16 22:42:36 2000
+++ web2ldap/Makefile	Fri Jan 12 00:16:01 2001
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=      web2ldap
-PORTVERSION=   0.7.9
+PORTVERSION=   0.8.1
 CATEGORIES=    www
-MASTER_SITES=  http://sites.inka.de/ms/python/web2ldap/download/ \
+MASTER_SITES=  http://www.web2ldap.de/download/ \
                http://www.tricknolgy.org/ports/
 
 MAINTAINER=    oddbjorn@tricknology.org
@@ -17,7 +17,7 @@
 
 NO_BUILD=      yes
 USE_PYTHON=    yes
-PYTHON_VERSION= python1.5
+PYTHON_VERSION= python2.0
 
 do-install:
 	@${MKDIR} ${PREFIX}/${PORTNAME}
@@ -27,6 +27,7 @@
 	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/mime.types.orig
 	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/web2ldap/web2ldapcnf/misc.py.orig
 	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/web2ldap/web2ldapcnf/standalone.py.orig
+	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/web2ldap/web2ldapcnf/hosts.py.orig
 	@${LOCALBASE}/bin/python ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/compile.py
 	@${CP} -r ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ ${PREFIX}/${PORTNAME}
 	@if [ -w /var/log ]; then ${MKDIR} /var/log/web2ldap; fi
diff -urN /usr/ports/www/web2ldap/distinfo web2ldap/distinfo
--- /usr/ports/www/web2ldap/distinfo	Sun Aug  6 16:50:56 2000
+++ web2ldap/distinfo	Sat Dec 23 01:33:06 2000
@@ -1 +1 @@
-MD5 (web2ldap-0.7.9.tar.gz) = 5b7bd53636a35172bcbe49d036f625c6
+MD5 (web2ldap-0.8.1.tar.gz) = 9334b813448011990ec13001a693ce08
diff -urN /usr/ports/www/web2ldap/files/patch-aa web2ldap/files/patch-aa
--- /usr/ports/www/web2ldap/files/patch-aa	Tue Aug  1 16:48:20 2000
+++ web2ldap/files/patch-aa	Thu Jan 11 23:36:10 2001
@@ -1,32 +1,86 @@
-*** cgi-bin/web2ldap.py.orig	Sat Jul 22 02:23:06 2000
---- cgi-bin/web2ldap.py	Sat Jul 22 02:23:30 2000
+*** /dev/null	Sat Jul 22 02:21:51 2000
+--- etc/mime.types	Sat Jul 22 02:24:24 2000
 ***************
-*** 1,4 ****
-! #!/usr/bin/python
-  
-  ########################################################################
-  # web2ldap
---- 1,4 ----
-! #!/usr/local/bin/python
-  
-  ########################################################################
-  # web2ldap
-***************
-*** 12,19 ****
-  if os.environ.has_key('GATEWAY_INTERFACE'):
-  
-    if os.name == 'posix':
-!     # For finding web2ldapcnf.py in /etc/web2ldap on Unix systems
-!     sys.path.append('/etc/web2ldap')
-    else:
-      # For finding web2ldapcnf.py in system dirs on Windows systems
-      for i in ['SystemRoot','windir']:
---- 12,19 ----
-  if os.environ.has_key('GATEWAY_INTERFACE'):
-  
-    if os.name == 'posix':
-!     # For finding web2ldapcnf.py in /usr/local/web2ldap/etc/web2ldap on FreeBSD systems
-!     sys.path.append('/usr/local/web2ldap/etc/web2ldap')
-    else:
-      # For finding web2ldapcnf.py in system dirs on Windows systems
-      for i in ['SystemRoot','windir']:
+*** 0 ****
+--- 1,81 ----
++ #
++ # sample mime.types
++ #
++ 
++ application/andrew-inset	ez
++ application/excel		xls
++ application/octet-stream	bin
++ application/oda			oda
++ application/pdf			pdf
++ application/pgp			pgp
++ application/postscript		ps PS eps
++ application/rtf			rtf
++ application/x-arj-compressed	arj
++ application/x-bcpio		bcpio
++ application/x-chess-pgn		pgn
++ application/x-cpio		cpio
++ application/x-csh		csh
++ application/x-debian-package	deb
++ application/x-msdos-program	com exe bat
++ application/x-dvi		dvi
++ application/x-gtar		gtar
++ application/x-gunzip		gz
++ application/x-hdf		hdf
++ application/x-latex		latex
++ application/x-mif		mif
++ application/x-netcdf		cdf nc
++ application/x-perl		pl pm
++ application/x-rar-compressed	rar
++ application/x-sh		sh
++ application/x-shar		shar
++ application/x-sv4cpio		sv4cpio
++ application/x-sv4crc		sv4crc
++ application/x-tar		tar
++ application/x-tar-gz		tgz tar.gz
++ application/x-tcl		tcl
++ application/x-tex		tex
++ application/x-texinfo		texi texinfo
++ application/x-troff		t tr roff
++ application/x-troff-man		man
++ application/x-troff-me		me
++ application/x-troff-ms		ms
++ application/x-ustar		ustar
++ application/x-wais-source	src
++ application/x-zip-compressed	zip
++ 
++ audio/basic			snd
++ audio/midi			mid midi
++ audio/ulaw			au
++ audio/x-aiff			aif aifc aiff
++ audio/x-wav			wav
++ 
++ image/gif			gif
++ image/ief			ief
++ image/jpeg			jpe jpeg jpg
++ image/png			png
++ image/tiff			tif tiff
++ image/x-cmu-raster		ras
++ image/x-portable-anymap		pnm
++ image/x-portable-bitmap		pbm
++ image/x-portable-graymap	pgm
++ image/x-portable-pixmap		ppm
++ image/x-rgb			rgb
++ image/x-xbitmap			xbm
++ image/x-xpixmap			xpm
++ image/x-xwindowdump		xwd
++ 
++ text/html			html htm
++ text/plain			asc txt
++ text/richtext			rtx
++ text/tab-separated-values	tsv
++ text/x-setext			etx
++ 
++ video/dl			dl
++ video/fli			fli
++ video/gl			gl
++ video/mpeg			mp2 mpe mpeg mpg
++ video/quicktime			mov qt
++ video/x-msvideo			avi
++ video/x-sgi-movie		movie
++ 
++ x-world/x-vrml			vrm vrml wrl
diff -urN /usr/ports/www/web2ldap/files/patch-ab web2ldap/files/patch-ab
--- /usr/ports/www/web2ldap/files/patch-ab	Tue Aug  1 16:48:20 2000
+++ web2ldap/files/patch-ab	Thu Jan 11 23:53:16 2001
@@ -1,86 +1,62 @@
-*** /dev/null	Sat Jul 22 02:21:51 2000
---- etc/mime.types	Sat Jul 22 02:24:24 2000
+*** etc/web2ldap/web2ldapcnf/hosts.py.orig	Thu Jan 11 23:52:07 2001
+--- etc/web2ldap/web2ldapcnf/hosts.py	Thu Jan 11 23:52:42 2001
 ***************
-*** 0 ****
---- 1,81 ----
-+ #
-+ # sample mime.types
-+ #
-+ 
-+ application/andrew-inset	ez
-+ application/excel		xls
-+ application/octet-stream	bin
-+ application/oda			oda
-+ application/pdf			pdf
-+ application/pgp			pgp
-+ application/postscript		ps PS eps
-+ application/rtf			rtf
-+ application/x-arj-compressed	arj
-+ application/x-bcpio		bcpio
-+ application/x-chess-pgn		pgn
-+ application/x-cpio		cpio
-+ application/x-csh		csh
-+ application/x-debian-package	deb
-+ application/x-msdos-program	com exe bat
-+ application/x-dvi		dvi
-+ application/x-gtar		gtar
-+ application/x-gunzip		gz
-+ application/x-hdf		hdf
-+ application/x-latex		latex
-+ application/x-mif		mif
-+ application/x-netcdf		cdf nc
-+ application/x-perl		pl pm
-+ application/x-rar-compressed	rar
-+ application/x-sh		sh
-+ application/x-shar		shar
-+ application/x-sv4cpio		sv4cpio
-+ application/x-sv4crc		sv4crc
-+ application/x-tar		tar
-+ application/x-tar-gz		tgz tar.gz
-+ application/x-tcl		tcl
-+ application/x-tex		tex
-+ application/x-texinfo		texi texinfo
-+ application/x-troff		t tr roff
-+ application/x-troff-man		man
-+ application/x-troff-me		me
-+ application/x-troff-ms		ms
-+ application/x-ustar		ustar
-+ application/x-wais-source	src
-+ application/x-zip-compressed	zip
-+ 
-+ audio/basic			snd
-+ audio/midi			mid midi
-+ audio/ulaw			au
-+ audio/x-aiff			aif aifc aiff
-+ audio/x-wav			wav
-+ 
-+ image/gif			gif
-+ image/ief			ief
-+ image/jpeg			jpe jpeg jpg
-+ image/png			png
-+ image/tiff			tif tiff
-+ image/x-cmu-raster		ras
-+ image/x-portable-anymap		pnm
-+ image/x-portable-bitmap		pbm
-+ image/x-portable-graymap	pgm
-+ image/x-portable-pixmap		ppm
-+ image/x-rgb			rgb
-+ image/x-xbitmap			xbm
-+ image/x-xpixmap			xpm
-+ image/x-xwindowdump		xwd
-+ 
-+ text/html			html htm
-+ text/plain			asc txt
-+ text/richtext			rtx
-+ text/tab-separated-values	tsv
-+ text/x-setext			etx
-+ 
-+ video/dl			dl
-+ video/fli			fli
-+ video/gl			gl
-+ video/mpeg			mp2 mpe mpeg mpg
-+ video/quicktime			mov qt
-+ video/x-msvideo			avi
-+ video/x-sgi-movie		movie
-+ 
-+ x-world/x-vrml			vrm vrml wrl
+*** 55,71 ****
+      # vCard template files
+      'vcard_template': {
+        # 'object class':'pathname of vCard template file'
+!       'person':'/usr/lib/web2ldap/templates/vcard_person.txt',
+      },
+      # HTML template files for printing table entries
+      'print_template': {
+        # 'object class':'pathname of printable HTML template file'
+!       'person':'/usr/lib/web2ldap/templates/print_person.html',
+!       'organization':'/usr/lib/web2ldap/templates/print_organization.html',
+!       'organizationalUnit':'/usr/lib/web2ldap/templates/print_organizationalUnit.html',
+      },
+      # HTML template file for Basic Search form
+!     'searchform_template': '/usr/lib/web2ldap/templates/searchform_Base.html',
+      # Attributes which should be present in attribute select list of advanced search form
+      'search_attrs':['cn','mail','o','ou','telephoneNumber','homePhone','description'],
+      # There are some situations where this client just wants to get the
+--- 55,71 ----
+      # vCard template files
+      'vcard_template': {
+        # 'object class':'pathname of vCard template file'
+!       'person':'/usr/local/web2ldap/templates/vcard_person.txt',
+      },
+      # HTML template files for printing table entries
+      'print_template': {
+        # 'object class':'pathname of printable HTML template file'
+!       'person':'/usr/local/web2ldap/templates/print_person.html',
+!       'organization':'/usr/local/web2ldap/templates/print_organization.html',
+!       'organizationalUnit':'/usr/local/web2ldap/templates/print_organizationalUnit.html',
+      },
+      # HTML template file for Basic Search form
+!     'searchform_template': '/usr/local/web2ldap/templates/searchform_Base.html',
+      # Attributes which should be present in attribute select list of advanced search form
+      'search_attrs':['cn','mail','o','ou','telephoneNumber','homePhone','description'],
+      # There are some situations where this client just wants to get the
+***************
+*** 113,122 ****
+      },
+      'read_template': {
+        # 'object class':'pathname of HTML template file'
+!       'person':'/usr/lib/web2ldap/templates/read_person.html',
+!       'posixAccount':'/usr/lib/web2ldap/templates/read_posixAccount.html',
+!       'bankArrangement':'/usr/lib/web2ldap/templates/read_bankArrangement.html',
+!       'musician':'/usr/lib/web2ldap/templates/read_musician.html',
+      }
+    },
+  
+--- 113,122 ----
+      },
+      'read_template': {
+        # 'object class':'pathname of HTML template file'
+!       'person':'/usr/local/web2ldap/templates/read_person.html',
+!       'posixAccount':'/usr/local/web2ldap/templates/read_posixAccount.html',
+!       'bankArrangement':'/usr/local/web2ldap/templates/read_bankArrangement.html',
+!       'musician':'/usr/local/web2ldap/templates/read_musician.html',
+      }
+    },
+  
diff -urN /usr/ports/www/web2ldap/files/patch-ac web2ldap/files/patch-ac
--- /usr/ports/www/web2ldap/files/patch-ac	Tue Aug  1 16:48:20 2000
+++ web2ldap/files/patch-ac	Thu Jan 11 23:39:15 2001
@@ -1,13 +1,19 @@
-*** sbin/compile.py.orig	Sat Jul 22 02:24:55 2000
---- sbin/compile.py	Sat Jul 22 02:25:07 2000
+*** etc/web2ldap/web2ldapcnf/misc.py.orig	Thu Jan 11 23:35:00 2001
+--- etc/web2ldap/web2ldapcnf/misc.py	Thu Jan 11 23:38:00 2001
 ***************
-*** 1,4 ****
-! #!/usr/bin/python
+*** 4,10 ****
+  """
   
-  import compileall
+  # A list with directories containing additional Python modules
+! pylibdirs = ['/usr/lib/web2ldap/pylib']
   
---- 1,4 ----
-! #!/usr/local/bin/python
+  ########################################################################
+  # HTTP-Options
+--- 4,10 ----
+  """
   
-  import compileall
+  # A list with directories containing additional Python modules
+! pylibdirs = ['/usr/local/web2ldap/pylib']
   
+  ########################################################################
+  # HTTP-Options
diff -urN /usr/ports/www/web2ldap/files/patch-ad web2ldap/files/patch-ad
--- /usr/ports/www/web2ldap/files/patch-ad	Tue Aug  1 16:48:20 2000
+++ web2ldap/files/patch-ad	Fri Jan 12 00:13:22 2001
@@ -1,32 +1,42 @@
-*** sbin/web2ldap.py.orig	Sat Jul 22 02:24:59 2000
---- sbin/web2ldap.py	Sat Jul 22 02:25:26 2000
+*** etc/web2ldap/web2ldapcnf/standalone.py.orig	Wed Dec 20 15:09:50 2000
+--- etc/web2ldap/web2ldapcnf/standalone.py	Fri Jan 12 00:12:39 2001
 ***************
-*** 1,4 ****
-! #!/usr/bin/python
+*** 6,12 ****
+  """
   
-  ########################################################################
-  # web2ldap
---- 1,4 ----
-! #!/usr/local/bin/python
+  # User account name to setuid after being started as root
+! run_username = 'wwwrun'
   
-  ########################################################################
-  # web2ldap
+  # Contact mail address of the server admin when running stand-alone
+  server_admin = 'admin@web2ldap.de'
+--- 6,12 ----
+  """
+  
+  # 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'
 ***************
-*** 10,17 ****
-  import sys,os
+*** 36,45 ****
+  debug_log = '/var/log/web2ldap/debug_log'
+  
+  # Where static documents reside
+! document_root = '/usr/lib/web2ldap/htdocs/'
+  
+  # Path name of mime.types file
+! mime_types = '/etc/mime.types'
   
-  if os.name == 'posix':
-!   # For finding web2ldapcnf.py in /etc/web2ldap on Unix systems
-!   sys.path.append('/etc/web2ldap')
-  else:
-    # For finding web2ldapcnf.py in system dirs on Windows systems
-    for i in ['SystemRoot','windir']:
---- 10,17 ----
-  import sys,os
-  
-  if os.name == 'posix':
-!   # For finding web2ldapcnf.py in /usr/local/web2ldap/etc/web2ldap on FreeBSD systems
-!   sys.path.append('/usr/local/web2ldap/etc/web2ldap')
-  else:
-    # For finding web2ldapcnf.py in system dirs on Windows systems
-    for i in ['SystemRoot','windir']:
+  ########################################################################
+  # SSL-options for running as stand-alone web server
+--- 36,45 ----
+  debug_log = '/var/log/web2ldap/debug_log'
+  
+  # Where static documents reside
+! document_root = '/usr/local/web2ldap/htdocs/'
+  
+  # Path name of mime.types file
+! mime_types = '/usr/local/web2ldap/etc/mime.types'
+  
+  ########################################################################
+  # SSL-options for running as stand-alone web server
diff -urN /usr/ports/www/web2ldap/files/patch-ae web2ldap/files/patch-ae
--- /usr/ports/www/web2ldap/files/patch-ae	Tue Aug  1 16:48:20 2000
+++ web2ldap/files/patch-ae	Thu Jan 11 23:47:35 2001
@@ -1,19 +1,13 @@
-*** etc/web2ldap/web2ldapcnf/misc.py.orig	Sat Jul 22 02:26:08 2000
---- etc/web2ldap/web2ldapcnf/misc.py	Sat Jul 22 02:26:48 2000
+*** sbin/compile.py.orig	Thu Jan 11 23:46:13 2001
+--- sbin/compile.py	Thu Jan 11 23:46:30 2001
 ***************
-*** 4,10 ****
-  ########################################################################
+*** 1,4 ****
+! #!/usr/bin/python
   
-  # A list with directories containing additional Python modules
-! pylibdirs = ['/usr/lib/web2ldap/pylib']
+  import compileall
   
-  ########################################################################
-  # HTTP-Options
---- 4,10 ----
-  ########################################################################
+--- 1,4 ----
+! #!/usr/local/bin/python2.0
   
-  # A list with directories containing additional Python modules
-! pylibdirs = ['/usr/local/web2ldap/pylib']
+  import compileall
   
-  ########################################################################
-  # HTTP-Options
diff -urN /usr/ports/www/web2ldap/files/patch-af web2ldap/files/patch-af
--- /usr/ports/www/web2ldap/files/patch-af	Tue Aug  1 16:48:20 2000
+++ web2ldap/files/patch-af	Thu Jan 11 23:47:47 2001
@@ -1,25 +1,30 @@
-*** etc/web2ldap/web2ldapcnf/standalone.py.orig	Sat Jul 22 02:26:12 2000
---- etc/web2ldap/web2ldapcnf/standalone.py	Sat Jul 22 02:27:10 2000
+*** sbin/web2ldap.py.orig	Thu Jan 11 23:46:19 2001
+--- sbin/web2ldap.py	Thu Jan 11 23:47:16 2001
 ***************
-*** 13,22 ****
-  error_log = '/var/log/web2ldap/error_log'
+*** 1,4 ****
+! #!/usr/bin/python
   
-  # Where static documents reside
-! document_root = '/usr/lib/web2ldap/htdocs/'
+  ########################################################################
+  # web2ldap -  web-based LDAP Client, see http://www.web2ldap.de
+--- 1,4 ----
+! #!/usr/local/bin/python2.0
   
-  # Path name of mime.types file
-! mime_types = '/etc/mime.types'
-  
-  # Contact mail address of the server admin when running stand-alone
-  server_admin = 'admin@web2ldap.de'
---- 13,22 ----
-  error_log = '/var/log/web2ldap/error_log'
-  
-  # Where static documents reside
-! document_root = '/usr/local/web2ldap/htdocs/'
-  
-  # Path name of mime.types file
-! mime_types = '/usr/local/web2ldap/etc/mime.types'
+  ########################################################################
+  # web2ldap -  web-based LDAP Client, see http://www.web2ldap.de
+***************
+*** 13,19 ****
   
-  # Contact mail address of the server admin when running stand-alone
-  server_admin = 'admin@web2ldap.de'
+  if os.name == 'posix':
+    # For finding web2ldapcnf.py in /etc/web2ldap on Unix systems
+!   sys.path.insert(0,'/etc/web2ldap')
+  else:
+    # For finding web2ldapcnf.py in system dirs on Windows systems
+    for i in ['SystemRoot','windir']:
+--- 13,19 ----
+  
+  if os.name == 'posix':
+    # For finding web2ldapcnf.py in /etc/web2ldap on Unix systems
+!   sys.path.insert(0,'/usr/local/web2ldap/etc/web2ldap')
+  else:
+    # For finding web2ldapcnf.py in system dirs on Windows systems
+    for i in ['SystemRoot','windir']:
diff -urN /usr/ports/www/web2ldap/files/patch-ag web2ldap/files/patch-ag
--- /usr/ports/www/web2ldap/files/patch-ag	Thu Jan  1 01:00:00 1970
+++ web2ldap/files/patch-ag	Thu Jan 11 23:56:38 2001
@@ -0,0 +1,30 @@
+*** cgi-bin/web2ldap.py.orig	Thu Jan 11 23:55:56 2001
+--- cgi-bin/web2ldap.py	Thu Jan 11 23:56:20 2001
+***************
+*** 1,4 ****
+! #!/usr/bin/python
+  
+  ########################################################################
+  # web2ldap -  web-based LDAP Client, see http://www.web2ldap.de
+--- 1,4 ----
+! #!/usr/local/bin/python2.0
+  
+  ########################################################################
+  # web2ldap -  web-based LDAP Client, see http://www.web2ldap.de
+***************
+*** 15,21 ****
+  
+    if os.name == 'posix':
+      # For finding web2ldapcnf.py in /etc/web2ldap on Unix systems
+!     sys.path.insert(0,'/etc/web2ldap')
+    else:
+      # For finding web2ldapcnf.py in system dirs on Windows systems
+      for i in ['SystemRoot','windir']:
+--- 15,21 ----
+  
+    if os.name == 'posix':
+      # For finding web2ldapcnf.py in /etc/web2ldap on Unix systems
+!     sys.path.insert(0,'/usr/local/web2ldap/etc/web2ldap')
+    else:
+      # For finding web2ldapcnf.py in system dirs on Windows systems
+      for i in ['SystemRoot','windir']:
diff -urN /usr/ports/www/web2ldap/pkg-comment web2ldap/pkg-comment
--- /usr/ports/www/web2ldap/pkg-comment	Tue Aug  1 16:48:21 2000
+++ web2ldap/pkg-comment	Fri Jan 12 00:16:46 2001
@@ -1 +1 @@
-Python-based WWW gateway to LDAP server
+Python-based WWW gateway to LDAP servers
diff -urN /usr/ports/www/web2ldap/pkg-plist web2ldap/pkg-plist
--- /usr/ports/www/web2ldap/pkg-plist	Wed Aug  2 10:26:24 2000
+++ web2ldap/pkg-plist	Thu Jan 11 23:43:52 2001
@@ -1,5 +1,7 @@
 web2ldap/cgi-bin/web2ldap.py
 web2ldap/cgi-bin/web2ldap.pyc
+web2ldap/contrib/occonf2ldapoc-esj.py
+web2ldap/contrib/occonf2ldapoc-esj.pyc
 web2ldap/etc/mime.types
 web2ldap/etc/web2ldap/ldapoc.py
 web2ldap/etc/web2ldap/ldapoc.pyc
@@ -14,15 +16,21 @@
 web2ldap/etc/web2ldap/web2ldapcnf/standalone.py
 web2ldap/etc/web2ldap/web2ldapcnf/standalone.pyc
 web2ldap/htdocs/changes.html
+web2ldap/htdocs/css/dark.css
+web2ldap/htdocs/css/redandgreen.css
 web2ldap/htdocs/demo.html
 web2ldap/htdocs/download.html
 web2ldap/htdocs/features.html
 web2ldap/htdocs/feedback.html
 web2ldap/htdocs/files.html
 web2ldap/htdocs/install.html
+web2ldap/htdocs/news.html
 web2ldap/htdocs/related.html
 web2ldap/htdocs/roadmap.html
 web2ldap/htdocs/security.html
+web2ldap/htdocs/ssi/footer.html
+web2ldap/htdocs/ssi/head.html
+web2ldap/htdocs/ssi/navigation.html
 web2ldap/htdocs/web2ldap.html
 web2ldap/htdocs/web2ldapcnf.html
 web2ldap/mod_python/web2ldap.py
@@ -39,10 +47,14 @@
 web2ldap/pylib/charset.pyc
 web2ldap/pylib/dsml.py
 web2ldap/pylib/dsml.pyc
+web2ldap/pylib/httphelper.py
+web2ldap/pylib/httphelper.pyc
 web2ldap/pylib/ipadr.py
 web2ldap/pylib/ipadr.pyc
 web2ldap/pylib/ldapbase.py
 web2ldap/pylib/ldapbase.pyc
+web2ldap/pylib/ldapsession.py
+web2ldap/pylib/ldapsession.pyc
 web2ldap/pylib/ldif.py
 web2ldap/pylib/ldif.pyc
 web2ldap/pylib/msHTTPServer.py
@@ -51,14 +63,52 @@
 web2ldap/pylib/msbase.pyc
 web2ldap/pylib/msgzip.py
 web2ldap/pylib/msgzip.pyc
+web2ldap/pylib/mspki/__init__.py
+web2ldap/pylib/mspki/__init__.pyc
+web2ldap/pylib/mspki/asn1helper.py
+web2ldap/pylib/mspki/asn1helper.pyc
+web2ldap/pylib/mspki/asn1types.py
+web2ldap/pylib/mspki/asn1types.pyc
+web2ldap/pylib/mspki/entrustext.py
+web2ldap/pylib/mspki/entrustext.pyc
+web2ldap/pylib/mspki/nsext.py
+web2ldap/pylib/mspki/nsext.pyc
+web2ldap/pylib/mspki/rfc2459.py
+web2ldap/pylib/mspki/rfc2459.pyc
+web2ldap/pylib/mspki/utctime.py
+web2ldap/pylib/mspki/utctime.pyc
+web2ldap/pylib/mspki/util.py
+web2ldap/pylib/mspki/util.pyc
+web2ldap/pylib/mspki/vendorext.py
+web2ldap/pylib/mspki/vendorext.pyc
+web2ldap/pylib/mspki/x500.py
+web2ldap/pylib/mspki/x500.pyc
+web2ldap/pylib/mspki/x509.py
+web2ldap/pylib/mspki/x509.pyc
+web2ldap/pylib/mspki/x509v3.py
+web2ldap/pylib/mspki/x509v3.pyc
+web2ldap/pylib/pisces/LICENSE
+web2ldap/pylib/pisces/PATCHES
+web2ldap/pylib/pisces/__init__.py
+web2ldap/pylib/pisces/__init__.pyc
+web2ldap/pylib/pisces/asn1.py
+web2ldap/pylib/pisces/asn1.pyc
+web2ldap/pylib/utctime.py
+web2ldap/pylib/utctime.pyc
 web2ldap/pylib/w2ladd.py
 web2ldap/pylib/w2ladd.pyc
 web2ldap/pylib/w2laddmodifyform.py
 web2ldap/pylib/w2laddmodifyform.pyc
+web2ldap/pylib/w2lcnf.py
+web2ldap/pylib/w2lcnf.pyc
+web2ldap/pylib/w2lconnect.py
+web2ldap/pylib/w2lconnect.pyc
 web2ldap/pylib/w2lcore.py
 web2ldap/pylib/w2lcore.pyc
 web2ldap/pylib/w2ldelete.py
 web2ldap/pylib/w2ldelete.pyc
+web2ldap/pylib/w2lgui.py
+web2ldap/pylib/w2lgui.pyc
 web2ldap/pylib/w2lhandler.py
 web2ldap/pylib/w2lhandler.pyc
 web2ldap/pylib/w2llogin.py
@@ -71,33 +121,47 @@
 web2ldap/pylib/w2lpasswd.pyc
 web2ldap/pylib/w2lread.py
 web2ldap/pylib/w2lread.pyc
+web2ldap/pylib/w2lreferral.py
+web2ldap/pylib/w2lreferral.pyc
 web2ldap/pylib/w2lsearch.py
 web2ldap/pylib/w2lsearch.pyc
 web2ldap/pylib/w2lsearchform.py
 web2ldap/pylib/w2lsearchform.pyc
 web2ldap/pylib/w2lsecinfo.py
 web2ldap/pylib/w2lsecinfo.pyc
+web2ldap/pylib/w2lviewer.py
+web2ldap/pylib/w2lviewer.pyc
 web2ldap/sbin/compile.py
 web2ldap/sbin/compile.pyc
 web2ldap/sbin/occonf2ldapoc.py
 web2ldap/sbin/occonf2ldapoc.pyc
 web2ldap/sbin/web2ldap.py
 web2ldap/sbin/web2ldap.pyc
+web2ldap/templates/print_organization.html
+web2ldap/templates/print_organizationalUnit.html
+web2ldap/templates/print_person.html
 web2ldap/templates/read_bankArrangement.html
-web2ldap/templates/read_inetOrgPerson.html
 web2ldap/templates/read_musician.html
 web2ldap/templates/read_musician.html.de
+web2ldap/templates/read_person.html
 web2ldap/templates/read_posixAccount.html
 web2ldap/templates/searchform_Base.html
 web2ldap/templates/searchform_Base.html.de
 web2ldap/templates/searchform_rfc2307.html
+web2ldap/templates/vcard_person.txt
 @dirrm web2ldap/cgi-bin
-@dirrm web2ldap/css
+@dirrm web2ldap/contrib
 @dirrm web2ldap/etc/web2ldap/web2ldapcnf
 @dirrm web2ldap/etc/web2ldap
 @dirrm web2ldap/etc
+@dirrm web2ldap/htdocs/css
+@dirrm web2ldap/htdocs/doc
+@dirrm web2ldap/htdocs/ssi
 @dirrm web2ldap/htdocs
+@dirrm web2ldap/html
 @dirrm web2ldap/mod_python
+@dirrm web2ldap/pylib/mspki
+@dirrm web2ldap/pylib/pisces
 @dirrm web2ldap/pylib
 @dirrm web2ldap/sbin
 @dirrm web2ldap/templates

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: kevlo 
State-Changed-When: Fri Jan 12 08:43:25 PST 2001 
State-Changed-Why:  
Committed, thanks. 
BTW, I fixed pkg-plist. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=24260 
>Unformatted:
