Date: Thu, 10 Jan 2008 17:21:30 +0300 (MSK) From: Boris Samorodov <bsam@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/119531: [patch] devel/py-lxml: unbreak pointyhat package building for FreeBSD-5 Message-ID: <200801101421.m0AELUHe031260@bb.ipt.ru> Resent-Message-ID: <200801101430.m0AEU28x009038@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 119531
>Category: ports
>Synopsis: [patch] devel/py-lxml: unbreak pointyhat package building for FreeBSD-5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 10 14:30:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Boris Samorodov
>Release: FreeBSD 7.0-PRERELEASE i386
>Organization:
InPharmTech, Co.
>Environment:
System: FreeBSD bb.ipt.ru 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #3: Tue Jan 8 16:53:25 MSK 2008 root@bb.ipt.ru:/usr/obj/usr/src/sys/BB i386
>Description:
Currently the ports cluster cannot build packages for
this port for FreeBSD-5.
>How-To-Repeat:
>Fix:
Unbreak a package building for FreeBSD-5 (convert easy_install
support to bsd.python.mk).
Suggested by: nivit (via email)
--- py-lxml.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/py-lxml/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 6 Jan 2008 12:25:40 -0000 1.7
+++ Makefile 10 Jan 2008 14:15:41 -0000
@@ -17,13 +17,13 @@
MAINTAINER= gogo@cs.uni-sb.de
COMMENT= Pythonic binding for the libxml2 and libxslt libraries
-BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
USE_PYTHON= 2.4+
-USE_PYDISTUTILS= yes
-PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
+USE_PYDISTUTILS= easy_install
+PYEASYINSTALL_INSTALLARGS= -N ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}
+PYEASYINSTALL_UNINSTALLARGS= -q -m -N ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}
+PYEASYINSTALL_ARCHDEP= yes
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
@@ -33,13 +33,7 @@
TODO.txt \
README.txt
-EASY_INSTALL_CMD?= easy_install-${PYTHON_VER}
-
-PYLXML_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}-${OPSYS:L}-${OSRELEASE}-${ARCH}.egg
-
-PLIST_SUB+= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PYLXML_EGG=${PYLXML_EGG} \
- PYLXML_EGG_VER="${PORTNAME}==${PORTVERSION}"
+PYLXML_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}${PYEASYINSTALL_OSARCH}.egg
post-install:
.if !defined(NOPORTDOCS)
@@ -51,8 +45,4 @@
${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}/doc
.endif
-.include <bsd.port.pre.mk>
-
-OSRELEASE!= /usr/bin/uname -r
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/py-lxml/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist 6 Jun 2007 10:39:17 -0000 1.4
+++ pkg-plist 10 Jan 2008 14:15:41 -0000
@@ -1,34 +1,32 @@
-@unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%PYLXML_EGG_VER%%
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO/native_libs.txt
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/ElementInclude.py
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/ElementInclude.pyc
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/ElementInclude.pyo
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/_elementpath.py
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/_elementpath.pyc
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/_elementpath.pyo
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/etree.py
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/etree.pyc
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/etree.pyo
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/etree.so
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/objectify.py
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/objectify.pyc
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/objectify.pyo
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/objectify.so
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/sax.py
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/sax.pyc
-%%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml/sax.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/lxml
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYLXML_EGG%%
-@exec %%EASY_INSTALL_CMD%% -q -N -S %D/%%PYTHON_SITELIBDIR%% %%PYLXML_EGG_VER%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/ElementInclude.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/ElementInclude.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/ElementInclude.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/_elementpath.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/_elementpath.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/_elementpath.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/etree.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/etree.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/etree.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/etree.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/objectify.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/objectify.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/objectify.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/objectify.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/sax.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/sax.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml/sax.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lxml
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
%%PORTDOCS%%%%DOCSDIR%%/CREDITS.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENSES.txt
--- py-lxml.diff ends here ---
WBR
--
bsam
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801101421.m0AELUHe031260>