summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/py-soappy/Makefile25
-rw-r--r--net/py-soappy/PLIST13
-rw-r--r--net/py-soappy/buildlink2.mk15
-rw-r--r--net/py-soappy/distinfo7
-rw-r--r--net/py-soappy/patches/patch-aa62
5 files changed, 35 insertions, 87 deletions
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index 053afab315c..31b7c2c8449 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -1,28 +1,23 @@
-# $NetBSD: Makefile,v 1.2 2002/10/24 22:33:22 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/19 11:51:08 drochner Exp $
#
-DISTNAME= SOAPpy097
-PKGNAME= ${PYPKGPREFIX}-SOAPpy-0.9.7
+DISTNAME= SOAPpy-0.9.8
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pywebsvcs/}
-EXTRACT_SUFX= .tgz
-MAINTAINER= packages@netbsd.org
+MAINTAINER= marc@informatik.uni-bremen.de
HOMEPAGE= http://pywebsvcs.sourceforge.net/
COMMENT= SOAP implementation
-NO_BUILD= #yes
-PY_PATCHPLIST= #yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK2= YES
-# XXX hack to get rid of RCS keywords in patch files
-post-extract:
- ${SED} 's@\$$\(Id:.*\)\$$@\1@g' <${WRKSRC}/SOAP.py \
- >${WRKSRC}/SOAP.py.tmp
- ${MV} ${WRKSRC}/SOAP.py.tmp ${WRKSRC}/SOAP.py
+PYDISTUTILSPKG= YES
+PY_PATCHPLIST= YES
-do-install:
- ${CP} ${WRKSRC}/SOAP.py ${PREFIX}/${PYSITELIB}
+post-install:
+ ${PYTHONBIN} -O ${PREFIX}/${PYLIB}/compileall.py \
+ ${PREFIX}/${PYSITELIB}/SOAPpy
.include "../../textproc/pyxml/buildlink2.mk"
.include "../../lang/python/extension.mk"
diff --git a/net/py-soappy/PLIST b/net/py-soappy/PLIST
index e51789425fe..ab1123ebfe7 100644
--- a/net/py-soappy/PLIST
+++ b/net/py-soappy/PLIST
@@ -1,2 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/01 17:21:39 drochner Exp $
-${PYSITELIB}/SOAP.py
+@comment $NetBSD: PLIST,v 1.2 2003/03/19 11:51:09 drochner Exp $
+${PYSITELIB}/SOAPpy/SOAP.py
+${PYSITELIB}/SOAPpy/SOAP.pyc
+${PYSITELIB}/SOAPpy/SOAP.pyo
+${PYSITELIB}/SOAPpy/XMLname.py
+${PYSITELIB}/SOAPpy/XMLname.pyc
+${PYSITELIB}/SOAPpy/XMLname.pyo
+${PYSITELIB}/SOAPpy/__init__.py
+${PYSITELIB}/SOAPpy/__init__.pyc
+${PYSITELIB}/SOAPpy/__init__.pyo
+@dirrm ${PYSITELIB}/SOAPpy
diff --git a/net/py-soappy/buildlink2.mk b/net/py-soappy/buildlink2.mk
index 88236d405ae..8c67c6d3933 100644
--- a/net/py-soappy/buildlink2.mk
+++ b/net/py-soappy/buildlink2.mk
@@ -1,7 +1,14 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/10/24 13:05:34 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/03/19 11:51:09 drochner Exp $
+
+.if !defined(SOAPPY_BUILDLINK2_MK)
+SOAPPY_BUILDLINK2_MK= # defined
.include "../../lang/python/pyversion.mk"
-BUILDLINK_PACKAGES+= pysoappy
-BUILDLINK_DEPENDS.pysoappy?= ${PYPKGPREFIX}-SOAPpy-*
-BUILDLINK_PKGSRCDIR.pysoappy?= ../../net/py-soappy
+BUILDLINK_PACKAGES+= SOAPpy
+BUILDLINK_DEPENDS.SOAPpy?= ${PYPKGPREFIX}-SOAPpy>=0.9.8
+BUILDLINK_PKGSRCDIR.SOAPpy?= ../../net/py-soappy
+
+.include "../../textproc/pyxml/buildlink2.mk"
+
+.endif # SOAPPY_BUILDLINK2_MK
diff --git a/net/py-soappy/distinfo b/net/py-soappy/distinfo
index 59ea1f7307e..327b787ce0b 100644
--- a/net/py-soappy/distinfo
+++ b/net/py-soappy/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/10/01 17:21:39 drochner Exp $
+$NetBSD: distinfo,v 1.2 2003/03/19 11:51:09 drochner Exp $
-SHA1 (SOAPpy097.tgz) = 52fa0abcd5086cd33c3b0cb480d2f8fd17869859
-Size (SOAPpy097.tgz) = 76598 bytes
-SHA1 (patch-aa) = c237cdc66fe182c47d2cea4f20404ee1163f08a0
+SHA1 (SOAPpy-0.9.8.tar.gz) = 8e60fa4437750c052da511b4357b7594c700a0c0
+Size (SOAPpy-0.9.8.tar.gz) = 80322 bytes
diff --git a/net/py-soappy/patches/patch-aa b/net/py-soappy/patches/patch-aa
deleted file mode 100644
index b5f48c58b76..00000000000
--- a/net/py-soappy/patches/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/01 17:21:39 drochner Exp $
-
---- SOAP.py.orig Tue Oct 1 18:52:15 2002
-+++ SOAP.py Tue Oct 1 18:53:25 2002
-@@ -71,6 +71,18 @@
- # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
- ################################################################################
-+#
-+# Additional changes:
-+# 0.9.7.3 - 4/18/2002 - Mark Pilgrim (f8dy@diveintomark.org)
-+# added dump_dict as alias for dump_dictionary for Python 2.2 compatibility
-+# 0.9.7.2 - 4/12/2002 - Mark Pilgrim (f8dy@diveintomark.org)
-+# fixed logic to unmarshal the value of "null" attributes ("true" or "1"
-+# means true, others false)
-+# 0.9.7.1 - 4/11/2002 - Mark Pilgrim (f8dy@diveintomark.org)
-+# added "dump_str" as alias for "dump_string" for Python 2.2 compatibility
-+# Between 2.1 and 2.2, type("").__name__ changed from "string" to "str"
-+################################################################################
-+
- import xml.sax
- import UserList
- import base64
-@@ -89,9 +101,9 @@
- try: from M2Crypto import SSL
- except: pass
-
--ident = 'Id: SOAP.py,v 1.1.1.1 2001/06/27 21:36:12 cullman Exp '
-+ident = 'Id: SOAP.py,v 1.3 2002/04/18 19:19:45 f8dy Exp '
-
--__version__ = "0.9.7"
-+__version__ = "0.9.7.3"
-
- # Platform hackery
-
-@@ -2097,7 +2109,9 @@
- null = attrs[(NS.XSI3, 'nil')]
- del attrs[(NS.XSI3, 'nil')]
-
-- null = int(null)
-+ #MAP 4/12/2002 - must also support "true"
-+ #null = int(null)
-+ null = (str(null).lower() in ['true', '1'])
-
- if null:
- if len(cur) or \
-@@ -3102,6 +3116,7 @@
- typed, ns_map, self.genroot(ns_map), id)
-
- dump_unicode = dump_string
-+ dump_str = dump_string # 4/12/2002 - MAP - for Python 2.2
-
- def dump_None(self, obj, tag, typed = 0, ns_map = {}):
- tag = tag or self.gentag()
-@@ -3214,6 +3229,7 @@
- self.dump(v, k, 1, ns_map)
-
- self.out += '</%s>\n' % tag
-+ dump_dict = dump_dictionary # 4/18/2002 - MAP - for Python 2.2
-
- def dump_instance(self, obj, tag, typed = 1, ns_map = {}):
- if not tag: