Index: head/www/web2ldap/Makefile
===================================================================
--- head/www/web2ldap/Makefile	(revision 390015)
+++ head/www/web2ldap/Makefile	(revision 390016)
@@ -1,49 +1,54 @@
 # Created by: Oddbjorn Steffensen <oddbjorn@tricknology.org>
 # $FreeBSD$
 
 PORTNAME=	web2ldap
 PORTVERSION=	1.2.19
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.web2ldap.de/download/ \
 		http://www.sfr-fresh.com/unix/www/ \
 		LOCAL/bsam
 
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Python-based WWW gateway to LDAP servers
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap2>=2.4.0:${PORTSDIR}/net/py-ldap2 \
 		${PYTHON_SITELIBDIR}/pyweblib/__init__.py:${PORTSDIR}/www/pyweblib \
-		${PYTHON_SITELIBDIR}/ipaddr.py:${PORTSDIR}/devel/py-ipaddr \
+		${PYTHON_PKGNAMEPREFIX}ipaddr>0:${PORTSDIR}/devel/py-ipaddr \
 		${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
 OPTIONS_DEFINE=	DOCS
-USES=		cpe python
+USES=		cpe python:2 shebangfix
+SHEBANG_FILES=	sbin/*.py fcgi/*.py
 SUB_FILES=	pkg-message
 
 PORTDOCS=	*
 PORTDATA=	*
 PLIST_DIRS=	%%DATADIR%%/var/log %%DATADIR%%/var/run
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}/etc|g' \
+			  -e 's|nobody|web2ldap|g' \
 		${WRKSRC}/etc/web2ldap/web2ldapcnf/standalone.py
 	@${FIND} ${WRKSRC} -name '*.orig' -delete -o -name '*.bak' -delete
 
 do-build:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} ./sbin/compile.py)
 
 do-install:
 	@${ECHO_MSG} "==> Installing program files..."
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@(cd ${WRKSRC}; \
 		${FIND} * -type d | ${GREP} -vE "^htdocs" | ${CPIO} -p ${STAGEDIR}${DATADIR}; \
 		${FIND} * -type f | ${GREP} -vE "^htdocs" | ${CPIO} -pd ${STAGEDIR}${DATADIR})
 
 post-install:
 	@${ECHO_MSG} "==> Installing document files..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}; \
 		${FIND} * -type d | ${GREP} "^htdocs" | ${CPIO} -p ${STAGEDIR}${DOCSDIR}; \
 		${FIND} * -type f | ${GREP} "^htdocs" | ${CPIO} -pd ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/www/web2ldap/files/patch-sbin__compile.py
===================================================================
--- head/www/web2ldap/files/patch-sbin__compile.py	(revision 390015)
+++ head/www/web2ldap/files/patch-sbin__compile.py	(nonexistent)
@@ -1,19 +0,0 @@
-*** sbin/compile.py.orig	Tue May 13 15:46:59 2003
---- sbin/compile.py	Thu Feb 24 15:04:30 2005
-***************
-*** 4,10 ****
-  $Id: compile.py,v 1.3 2003/05/13 11:46:59 michael Exp $
-  """
-  
-! #!/usr/bin/python
-  
-  import sys,compileall
-  
---- 4,10 ----
-  $Id: compile.py,v 1.3 2003/05/13 11:46:59 michael Exp $
-  """
-  
-! #!/usr/local/bin/python
-  
-  import sys,compileall
-  

Property changes on: head/www/web2ldap/files/patch-sbin__compile.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_1
===================================================================
--- head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_1	(revision 390015)
+++ head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_1	(nonexistent)
@@ -1,15 +0,0 @@
-*** 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
-***************
-*** 65,69 ****
-  document_root = os.path.join(web2ldapcnf.web2ldap_dir,'htdocs')
-  
-  # Path name of mime.types file
-! mime_types = '/etc/mime.types'
-  
---- 65,69 ----
-  document_root = os.path.join(web2ldapcnf.web2ldap_dir,'htdocs')
-  
-  # Path name of mime.types file
-! mime_types = '%%LOCALBASE%%/etc/mime.types'
-  

Property changes on: head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_1
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_2
===================================================================
--- head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_2	(revision 390015)
+++ head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_2	(nonexistent)
@@ -1,19 +0,0 @@
-*** 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'

Property changes on: head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_2
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/www/web2ldap/files/patch-fcgi__web2ldap.py
===================================================================
--- head/www/web2ldap/files/patch-fcgi__web2ldap.py	(revision 390015)
+++ head/www/web2ldap/files/patch-fcgi__web2ldap.py	(nonexistent)
@@ -1,13 +0,0 @@
-*** fcgi/web2ldap.py.orig	Wed Mar 20 15:57:19 2002
---- fcgi/web2ldap.py	Wed Mar 20 15:57:25 2002
-***************
-*** 1,4 ****
-! #!/usr/bin/python
-  
-  """
-  fcgi/web2ldap.py - stub script for running as FastCGI server
---- 1,4 ----
-! #!/usr/local/bin/python
-  
-  """
-  fcgi/web2ldap.py - stub script for running as FastCGI server

Property changes on: head/www/web2ldap/files/patch-fcgi__web2ldap.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/www/web2ldap/files/patch-sbin__web2ldap.py
===================================================================
--- head/www/web2ldap/files/patch-sbin__web2ldap.py	(revision 390015)
+++ head/www/web2ldap/files/patch-sbin__web2ldap.py	(nonexistent)
@@ -1,13 +0,0 @@
-*** sbin/web2ldap.py.orig	Wed Mar 20 15:58:37 2002
---- sbin/web2ldap.py	Wed Mar 20 16:00:47 2002
-***************
-*** 1,4 ****
-! #!/usr/bin/python -OO
-  
-  """
-  sbin/web2ldap.py - startscript for running as stand-alone HTTP server
---- 1,4 ----
-! #!/usr/local/bin/python -OO
-  
-  """
-  sbin/web2ldap.py - startscript for running as stand-alone HTTP server

Property changes on: head/www/web2ldap/files/patch-sbin__web2ldap.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property