Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Jun 2015 06:37:09 +0000 (UTC)
From:      Ruslan Makhmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r390016 - in head/www/web2ldap: . files
Message-ID:  <201506180637.t5I6b9N0012869@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rm
Date: Thu Jun 18 06:37:08 2015
New Revision: 390016
URL: https://svnweb.freebsd.org/changeset/ports/390016

Log:
  www/web2ldap: general cleanup
  
  - replace patches with USES=shebangs and REINPLACE_CMD
  - add LICENSE (GPLv2)
  - limit python version to 2.x, because 3.x is not supported
  - modernize dependency upon devel/py-ipaddr and bump PORTREVISION
    accordingly
  
  Approved by:	bsam (maintainer, by email)

Deleted:
  head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_1
  head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_2
  head/www/web2ldap/files/patch-fcgi__web2ldap.py
  head/www/web2ldap/files/patch-sbin__compile.py
  head/www/web2ldap/files/patch-sbin__web2ldap.py
Modified:
  head/www/web2ldap/Makefile

Modified: head/www/web2ldap/Makefile
==============================================================================
--- head/www/web2ldap/Makefile	Thu Jun 18 06:27:23 2015	(r390015)
+++ head/www/web2ldap/Makefile	Thu Jun 18 06:37:08 2015	(r390016)
@@ -3,6 +3,7 @@
 
 PORTNAME=	web2ldap
 PORTVERSION=	1.2.19
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.web2ldap.de/download/ \
 		http://www.sfr-fresh.com/unix/www/ \
@@ -11,13 +12,16 @@ MASTER_SITES=	http://www.web2ldap.de/dow
 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=	*
@@ -25,7 +29,8 @@ 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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506180637.t5I6b9N0012869>