pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2006Q3]: pkgsrc Pullup ticket 1896 - requested by joerg
details: https://anonhg.NetBSD.org/pkgsrc/rev/de472c2f9aba
branches: pkgsrc-2006Q3
changeset: 519198:de472c2f9aba
user: ghen <ghen%pkgsrc.org@localhost>
date: Thu Nov 23 09:41:31 2006 +0000
description:
Pullup ticket 1896 - requested by joerg
install fix for py24-setuptools
- pkgsrc/devel/py24-setuptools/DEINSTALL 1.1
- pkgsrc/devel/py24-setuptools/INSTALL 1.1
- pkgsrc/devel/py24-setuptools/Makefile 1.4
- pkgsrc/devel/py24-setuptools/PLIST 1.3
- pkgsrc/devel/py24-setuptools/files/manage-eggs.py 1.1
- pkgsrc/www/py-django/DEINSTALL 1.1
- pkgsrc/www/py-django/INSTALL 1.1
- pkgsrc/www/py-django/Makefile 1.3
- pkgsrc/www/py-flup/DEINSTALL 1.1
- pkgsrc/www/py-flup/INSTALL 1.1
- pkgsrc/www/py-flup/Makefile 1.3
Module Name: pkgsrc
Committed By: joerg
Date: Fri Nov 3 13:56:46 UTC 2006
Modified Files:
pkgsrc/devel/py24-setuptools: Makefile PLIST
Added Files:
pkgsrc/devel/py24-setuptools: DEINSTALL INSTALL
pkgsrc/devel/py24-setuptools/files: manage-eggs.py
Log Message:
easy-install.pth is a volatile file as installed eggs are registered in
it for sys.path handling. Create a default version on install time and
remove it when done. Also install a small script which allows registering
and unregistering of eggs installed via packages. Bump revision.
---
Module Name: pkgsrc
Committed By: joerg
Date: Fri Nov 3 14:13:57 UTC 2006
Modified Files:
pkgsrc/www/py-flup: Makefile
Added Files:
pkgsrc/www/py-flup: DEINSTALL INSTALL
Log Message:
Require newer py24-setuptools and register/unregister egg.
---
Module Name: pkgsrc
Committed By: joerg
Date: Fri Nov 3 14:14:18 UTC 2006
Modified Files:
pkgsrc/www/py-django: Makefile
Log Message:
Require newer py24-setuptools and register/unregister egg.
---
Module Name: pkgsrc
Committed By: joerg
Date: Fri Nov 3 14:14:52 UTC 2006
Added Files:
pkgsrc/www/py-django: DEINSTALL INSTALL
Log Message:
Forgotten files: register/unregister egg.
diffstat:
devel/py24-setuptools/DEINSTALL | 10 ++++++++++
devel/py24-setuptools/INSTALL | 14 ++++++++++++++
devel/py24-setuptools/Makefile | 19 +++++++++++++++----
devel/py24-setuptools/PLIST | 4 ++--
devel/py24-setuptools/files/manage-eggs.py | 20 ++++++++++++++++++++
www/py-django/DEINSTALL | 7 +++++++
www/py-django/INSTALL | 7 +++++++
www/py-django/Makefile | 8 ++++++--
www/py-flup/DEINSTALL | 7 +++++++
www/py-flup/INSTALL | 7 +++++++
www/py-flup/Makefile | 9 ++++++---
11 files changed, 101 insertions(+), 11 deletions(-)
diffs (220 lines):
diff -r f4c04e6679ba -r de472c2f9aba devel/py24-setuptools/DEINSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py24-setuptools/DEINSTALL Thu Nov 23 09:41:31 2006 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.2.2.2 2006/11/23 09:41:31 ghen Exp $
+#
+
+case $STAGE in
+DEINSTALL)
+ ${RM} @PYSITELIB@/easy-install.pth
+ ;;
+esac
diff -r f4c04e6679ba -r de472c2f9aba devel/py24-setuptools/INSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py24-setuptools/INSTALL Thu Nov 23 09:41:31 2006 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.2.2.2 2006/11/23 09:41:31 ghen Exp $
+#
+
+case $STAGE in
+POST-INSTALL)
+ cat > @PYSITELIB@/easy-install.pth << EOF
+import sys; sys.__plen = len(sys.path)
+./setuptools-0.6c1-py2.4.egg
+import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)
+EOF
+ ;;
+esac
diff -r f4c04e6679ba -r de472c2f9aba devel/py24-setuptools/Makefile
--- a/devel/py24-setuptools/Makefile Thu Nov 23 09:21:44 2006 +0000
+++ b/devel/py24-setuptools/Makefile Thu Nov 23 09:41:31 2006 +0000
@@ -1,31 +1,42 @@
-# $NetBSD: Makefile,v 1.3 2006/07/24 22:51:32 wiz Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2006/11/23 09:41:31 ghen Exp $
#
DISTNAME= setuptools-0.6c1-py2.4.egg
PKGNAME= py24-setuptools-0.6c1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://cheeseshop.python.org/packages/2.4/s/setuptools/
EXTRACT_SUFX= # empty
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= joerg%NetBSD.org@localhost
HOMEPAGE= http://peak.telecommunity.com/DevCenter/setuptools
COMMENT= New Python packaging system
WRKSRC= ${WRKDIR}
-NO_BUILD= yes
PYTHON_VERSIONS_ACCEPTED= 24
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} PYPKGPREFIX=${PYPKGPREFIX}
TMPSCRIPT= ${WRKSRC}
INSTCMD= import sys; \
sys.path.insert(0,"${DISTNAME}"); \
from setuptools.command.easy_install import main; \
main(["-s", "${TMPSCRIPT}", "${DISTNAME}"])
+CHECK_FILES_SKIP+= ${PREFIX}/${PYSITELIB}/easy-install.pth
+
+FILES_SUBST+= PYSITELIB=${PREFIX}/${PYSITELIB}
+
+do-build:
+ ${SED} -e 's,@PYTHON@,${PYTHONBIN},' \
+ -e 's,@PYPREFIX@,${PYPKGPREFIX},' \
+ -e 's,@PYSITELIB@,${PREFIX}/${PYSITELIB},' \
+ ${FILESDIR}/manage-eggs.py > ${WRKSRC}/manage-eggs.py
+
do-install:
cd ${WRKSRC} && ${PYTHONBIN} -c ${INSTCMD:Q}
${INSTALL_SCRIPT} ${TMPSCRIPT}/easy_install \
${PREFIX}/bin/easy_install${PYVERSSUFFIX}
+ ${INSTALL_SCRIPT} ${WRKSRC}/manage-eggs.py ${PREFIX}/bin/${PYPKGPREFIX}-manage-eggs
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f4c04e6679ba -r de472c2f9aba devel/py24-setuptools/PLIST
--- a/devel/py24-setuptools/PLIST Thu Nov 23 09:21:44 2006 +0000
+++ b/devel/py24-setuptools/PLIST Thu Nov 23 09:41:31 2006 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2006/07/24 22:51:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2006/11/23 09:41:31 ghen Exp $
bin/easy_install${PYVERSSUFFIX}
-${PYSITELIB}/easy-install.pth
+bin/${PYPKGPREFIX}-manage-eggs
${PYSITELIB}/setuptools-${PKGVERSION}-py2.4.egg/EGG-INFO/PKG-INFO
${PYSITELIB}/setuptools-${PKGVERSION}-py2.4.egg/EGG-INFO/SOURCES.txt
${PYSITELIB}/setuptools-${PKGVERSION}-py2.4.egg/EGG-INFO/dependency_links.txt
diff -r f4c04e6679ba -r de472c2f9aba devel/py24-setuptools/files/manage-eggs.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py24-setuptools/files/manage-eggs.py Thu Nov 23 09:41:31 2006 +0000
@@ -0,0 +1,20 @@
+#!@PYTHON@
+
+import sys
+
+from setuptools.command.easy_install import PthDistributions
+from pkg_resources import find_distributions
+
+usage = "@PYPREFIX@-manage-eggs [ register | unregister ] egg\n"
+
+if len(sys.argv) != 3 or sys.argv[1] not in ("register", "unregister"):
+ sys.stderr.write(usage)
+ sys.exit(1)
+
+pth = PthDistributions("@PYSITELIB@/easy-install.pth")
+distrib = find_distributions(sys.argv[2], True).next()
+if sys.argv[1] == "register":
+ pth.add(distrib)
+elif sys.argv[1] == "unregister":
+ pth.remove(distrib)
+pth.save()
diff -r f4c04e6679ba -r de472c2f9aba www/py-django/DEINSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/py-django/DEINSTALL Thu Nov 23 09:41:31 2006 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+case $STAGE in
+DEINSTALL)
+ @PY_MANAGE_EGGS@ unregister @DJANGOEGG@
+ ;;
+esac
diff -r f4c04e6679ba -r de472c2f9aba www/py-django/INSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/py-django/INSTALL Thu Nov 23 09:41:31 2006 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+case $STAGE in
+POST-INSTALL)
+ @PY_MANAGE_EGGS@ register @DJANGOEGG@
+ ;;
+esac
diff -r f4c04e6679ba -r de472c2f9aba www/py-django/Makefile
--- a/www/py-django/Makefile Thu Nov 23 09:21:44 2006 +0000
+++ b/www/py-django/Makefile Thu Nov 23 09:41:31 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/09/17 13:42:07 joerg Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2006/11/23 09:41:31 ghen Exp $
DISTNAME= Django-0.95
PKGNAME= ${PYPKGPREFIX}-django-0.95
+PKGREVISION= 1
CATEGORIES= www python
MASTER_SITES= http://media.djangoproject.com/releases/0.95/
@@ -14,9 +15,12 @@
PYTHON_VERSIONS_ACCEPTED= 24
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py24-setuptools
+DEPENDS+= ${PYPKGPREFIX}-setuptools>=0.6c1nb1:../../devel/py24-setuptools
DEPENDS+= ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup
+FILES_SUBST+= PY_MANAGE_EGGS=${PREFIX}/bin/${PYPKGPREFIX}-manage-eggs
+FILES_SUBST+= DJANGOEGG=${PREFIX}/${PYSITELIB}/Django-0.95-py2.4.egg
+
.include "options.mk"
post-extract:
diff -r f4c04e6679ba -r de472c2f9aba www/py-flup/DEINSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/py-flup/DEINSTALL Thu Nov 23 09:41:31 2006 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+case $STAGE in
+DEINSTALL)
+ @PY_MANAGE_EGGS@ unregister @FLUPEGG@
+ ;;
+esac
diff -r f4c04e6679ba -r de472c2f9aba www/py-flup/INSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/py-flup/INSTALL Thu Nov 23 09:41:31 2006 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+case $STAGE in
+POST-INSTALL)
+ @PY_MANAGE_EGGS@ register @FLUPEGG@
+ ;;
+esac
diff -r f4c04e6679ba -r de472c2f9aba www/py-flup/Makefile
--- a/www/py-flup/Makefile Thu Nov 23 09:21:44 2006 +0000
+++ b/www/py-flup/Makefile Thu Nov 23 09:41:31 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2006/09/06 10:59:30 joerg Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2006/11/23 09:41:31 ghen Exp $
#
DISTNAME= flup-r2030
PKGNAME= ${PYPKGPREFIX}-flup-2030
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www python
MASTER_SITES= http://www.saddi.com/software/flup/dist/
@@ -11,11 +11,14 @@
HOMEPAGE= http://www.saddi.com/software/flup/
COMMENT= WSGI support modules
-DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py24-setuptools
+DEPENDS+= ${PYPKGPREFIX}-setuptools>=0.6c1nb1:../../devel/py24-setuptools
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
PYTHON_VERSIONS_ACCEPTED= 24
+FILES_SUBST+= PY_MANAGE_EGGS=${PREFIX}/bin/${PYPKGPREFIX}-manage-eggs
+FILES_SUBST+= FLUPEGG=${PREFIX}/${PYSITELIB}/flup-0.5-py2.4.egg
+
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index