From vsevolod@highsecure.ru  Tue Jul 19 13:27:33 2005
Return-Path: <vsevolod@highsecure.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6706A16A41F
	for <freebsd-gnats-submit@freebsd.org>; Tue, 19 Jul 2005 13:27:33 +0000 (GMT)
	(envelope-from vsevolod@highsecure.ru)
Received: from waterwall.inec.ru (waterwall.inec.ru [213.148.3.225])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D096043D45
	for <freebsd-gnats-submit@freebsd.org>; Tue, 19 Jul 2005 13:27:32 +0000 (GMT)
	(envelope-from vsevolod@highsecure.ru)
Received: from waterwall.inec.ru (root@localhost)
  by waterwall.inec.ru (8.13.1/8.12.6) with SMTP id j6JDSbrC058564
    for <freebsd-gnats-submit@freebsd.org>; Tue, 19 Jul 2005 17:28:37 +0400 (MSD)
Received: from core (postbox.inec.ru [213.148.3.226])
  by waterwall.inec.ru (8.13.1/8.12.6) with ESMTP id j6JDSbWr058559
    for <FreeBSD-gnats-submit@freebsd.org>; Tue, 19 Jul 2005 17:28:37 +0400 (MSD)
Received: from [213.219.249.64] (helo=spray.anyhost.ru)
	by core with esmtp (Exim 4.51 (FreeBSD))
	id 1Dus7T-0007Rv-JX
	for FreeBSD-gnats-submit@freebsd.org; Tue, 19 Jul 2005 17:26:47 +0400
Received: from cebka by spray.anyhost.ru with local (Exim 4.51 (FreeBSD))
	id 1Dus8A-0001D2-4G
	for FreeBSD-gnats-submit@freebsd.org; Tue, 19 Jul 2005 17:27:30 +0400
Message-Id: <E1Dus8A-0001D2-4G@spray.anyhost.ru>
Date: Tue, 19 Jul 2005 17:27:30 +0400
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Sender: Vsevolod Stakhov <vsevolod@highsecure.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: net/py-zsi to 1.7
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         83721
>Category:       ports
>Synopsis:       Update port: net/py-zsi to 1.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 19 13:30:13 GMT 2005
>Closed-Date:    Tue Jul 19 19:35:44 GMT 2005
>Last-Modified:  Tue Jul 19 19:35:44 GMT 2005
>Originator:     Vsevolod Stakhov
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
>Description:
Update to 1.7
Removed legacy pkg-req file.
Removed PYXML dependency as xml extension is in base python distribution since
2.0 and python 2.0 is required.

Removed files:
- pkg-req
>How-To-Repeat:
>Fix:

--- py24-zsi-1.7,1.patch begins here ---
diff -ruN --exclude=CVS py-zsi.orig/Makefile py-zsi/Makefile
--- py-zsi.orig/Makefile	Tue Jul 19 17:02:45 2005
+++ py-zsi/Makefile	Tue Jul 19 17:21:05 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zsi
-PORTVERSION=	1.5.0
+PORTVERSION=	1.7
 PORTEPOCH=	1
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -17,14 +17,9 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A pure Python module that provides an implementation of SOAP 1.1
 
-RUN_DEPENDS=	${PYXML}
-
-USE_PYTHON=	yes
+USE_PYTHON=	2.0+
 USE_PYDISTUTILS=	yes
 
-pre-install:
-	@ ${SH} ${PKGREQ} INSTALL
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
@@ -33,7 +28,7 @@
 .endfor
 .for subdir in interop samples test
 	@ ${MKDIR} ${EXAMPLESDIR}/${subdir}
-	@ ${INSTALL_DATA} ${WRKSRC}/${subdir}/* ${EXAMPLESDIR}/${subdir}
+	@ ${CP} -rp ${WRKSRC}/${subdir}/* ${EXAMPLESDIR}/${subdir}
 .endfor
 .endif
 
diff -ruN --exclude=CVS py-zsi.orig/distinfo py-zsi/distinfo
--- py-zsi.orig/distinfo	Tue Jul 19 17:02:45 2005
+++ py-zsi/distinfo	Tue Jul 19 17:08:26 2005
@@ -1,2 +1,2 @@
-MD5 (ZSI-1.5.0.tar.gz) = 6a6790b9e004f2b7172385bc4f182fb6
-SIZE (ZSI-1.5.0.tar.gz) = 365962
+MD5 (ZSI-1.7.tar.gz) = b7f817444ec302ba0015f62146b3349c
+SIZE (ZSI-1.7.tar.gz) = 414611
diff -ruN --exclude=CVS py-zsi.orig/pkg-plist py-zsi/pkg-plist
--- py-zsi.orig/pkg-plist	Tue Jul 19 17:02:45 2005
+++ py-zsi/pkg-plist	Tue Jul 19 17:19:03 2005
@@ -1,4 +1,17 @@
-bin/wsdl2py
+bin/wsdl2dispatch.py
+bin/wsdl2py.py
+%%PYTHON_SITELIBDIR%%/ZSI/ServiceContainer.py
+%%PYTHON_SITELIBDIR%%/ZSI/ServiceContainer.pyc
+%%PYTHON_SITELIBDIR%%/ZSI/ServiceContainer.pyo
+%%PYTHON_SITELIBDIR%%/ZSI/wstools/Namespaces.py
+%%PYTHON_SITELIBDIR%%/ZSI/wstools/Namespaces.pyc
+%%PYTHON_SITELIBDIR%%/ZSI/wstools/Namespaces.pyo
+%%PYTHON_SITELIBDIR%%/ZSI/wstools/c14n.py
+%%PYTHON_SITELIBDIR%%/ZSI/wstools/c14n.pyc
+%%PYTHON_SITELIBDIR%%/ZSI/wstools/c14n.pyo
+%%PYTHON_SITELIBDIR%%/ZSI/wstools/logging.py
+%%PYTHON_SITELIBDIR%%/ZSI/wstools/logging.pyc
+%%PYTHON_SITELIBDIR%%/ZSI/wstools/logging.pyo
 %%PYTHON_SITELIBDIR%%/ZSI/ServiceProxy.py
 %%PYTHON_SITELIBDIR%%/ZSI/ServiceProxy.pyc
 %%PYTHON_SITELIBDIR%%/ZSI/ServiceProxy.pyo
@@ -122,7 +135,26 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/test/test_zsi_net.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/test/tests_bad.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/test/tests_good.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/samples/Echo/Echo.wsdl
+%%PORTDOCS%%%%EXAMPLESDIR%%/samples/Echo/EchoClient.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/samples/Echo/EchoServer.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/samples/Echo/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/ServiceTest.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/runTests.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_AmazonWebService.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_FreeDBService.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_GlobalWeather_gw.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_GlobalWeather_si.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_TerraService.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_ThreatService.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_XMethodsQuery.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_ZipCodeResolver.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_compile.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_wsdl2py.py
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/test/wsdl2py
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/test
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/samples/Echo
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/samples
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff -ruN --exclude=CVS py-zsi.orig/pkg-req py-zsi/pkg-req
--- py-zsi.orig/pkg-req	Tue Jul 19 17:02:45 2005
+++ py-zsi/pkg-req	Thu Jan  1 03:00:00 1970
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-PATH=$PATH:/usr/local/bin
-
-if [ "x$1" = "xINSTALL" -o "x$2" = "xINSTALL" ]; then
-  PYTHON_GT=`python -c 'import string, sys; \
-                        print string.split(sys.version)[0] >= "2.0" and 1'`
-  if [ "x${PYTHON_GT}" = "x1" ]; then
-    exit 0
-  else
-    echo "-----------------------------------------------------------"
-    echo "ZSI requires Python version 2.0 or greater -"
-    echo "  please update your Python installation before proceeding."
-    echo "-----------------------------------------------------------"
-    exit 1
-  fi
-fi
--- py24-zsi-1.7,1.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue Jul 19 19:32:52 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=83721 
>Unformatted:
