pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/py-setuptools The workaround for NetBSD-current'...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4786caeff9ac
branches:  trunk
changeset: 398700:4786caeff9ac
user:      abs <abs%pkgsrc.org@localhost>
date:      Sun Sep 06 23:35:59 2009 +0000

description:
The workaround for NetBSD-current's unzip(1) not appearing to look
for a zip header anywhere but byte offset 0 makes normal unzip
report an error after extraction, so add a '|| true' workaround to
the workaround... and a comment as to what is going on so the next
person poking here doesn't have quite such a wtf moment...
Fixes build on at least NetBSD 5.0

diffstat:

 devel/py-setuptools/Makefile |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 08e8110e6bd0 -r 4786caeff9ac devel/py-setuptools/Makefile
--- a/devel/py-setuptools/Makefile      Sun Sep 06 22:36:33 2009 +0000
+++ b/devel/py-setuptools/Makefile      Sun Sep 06 23:35:59 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/09/05 21:53:51 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2009/09/06 23:35:59 abs Exp $
 #
 
 EGG_VERSION=           0.6c9
@@ -32,9 +32,12 @@
 TARGET_NAME=   ${PREFIX}/${PYSITELIB}/${EGG_NAME}
 
 do-extract:
+       # Ugly workaround for NetBSD-current's unzip(1) not appearing to look for a zip
+       # header anywhere but byte offset 0. Unfortunately the workaround then makes
+       # normal unzip report an error after extraction, hence the '|| true'
        ${MKDIR} ${WRKSRC}
        dd if=${DISTDIR}/${DISTNAME} of=${WRKDIR}/tmp.zip skip=376 bs=1
-       ${TOOLS_CMD.unzip} -d ${WRKSRC} ${WRKDIR}/tmp.zip
+       ${TOOLS_CMD.unzip} -d ${WRKSRC} ${WRKDIR}/tmp.zip || true
 
 post-extract:
        chmod -R go-w ${WRKSRC}



Home | Main Index | Thread Index | Old Index