- More proper fix to previous change; correct real python scripts' path.

- Change the order of including files in Makefile to use REPLACE_PYTHON
  properly.
- Remove shebang line from a library file which would never be executed
  directly.

3 files changed, 29 insertions, 15 deletions

diff --git a/www/zope3/Makefile b/www/zope3/Makefile
index a06f5df17c1..e9824260981 100644
--- a/www/zope3/Makefile
+++ b/www/zope3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/12/21 03:09:25 taca Exp $
+# $NetBSD: Makefile,v 1.18 2007/12/21 16:18:35 taca Exp $
 #
 
 DISTNAME=		Zope-3.3.1
@@ -13,27 +13,23 @@ COMMENT=		Zope 3 Application Server
 
 DEPENDS+=		${PYPKGPREFIX}-xml>=0.8.4:../../textproc/py-xml
 
-.include "Makefile.common"
-.include "../../mk/bsd.prefs.mk"
-
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-python ${PYTHONBIN} \
 			--prefix ${ZOPE3_DIR} \
 			--force
-CHECK_INTERPRETER_SKIP=	share/zope3/lib/python/twisted/internet/*.py \
-	share/zope3/lib/python/twisted/mail/test/*.py \
-	share/zope3/lib/python/twisted/trial/test/*.py \
-	share/zope3/lib/python/twisted/web/test/*.py \
-	share/zope3/lib/python/twisted/web2/test/*.py \
-	share/zope3/lib/python/zdaemon/*.py \
+REPLACE_PYTHON= \
+	Dependencies/twisted-Zope-3.3.1/twisted/mail/test/pop3testserver.py \
+	Dependencies/twisted-Zope-3.3.1/twisted/trial/test/scripttest.py \
+	Dependencies/twisted-Zope-3.3.1/twisted/web/test/test_cgi.py \
+	Dependencies/twisted-Zope-3.3.1/twisted/web/test/test_distrib.py \
+	Dependencies/twisted-Zope-3.3.1/twisted/web2/test/test_cgi.py \
+	Dependencies/zdaemon-Zope-3.3.1/zdaemon/zdctl.py \
+	Dependencies/zdaemon-Zope-3.3.1/zdaemon/zdrun.py
+CHECK_INTERPRETER_SKIP=	\
 	share/zope3/lib/python/zope/app/server/zopeskel/bin/*.in \
 	share/zope3/zopeskel/bin/*.in
 CHECK_PERMS_SKIP=	share/zope3/zopeskel/bin/*.in
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-6]*)
-EXTRACT_USING=		gtar
-.endif
-
 BUILD_DEFS+=		VARBASE
 BUILD_TARGET=		build
 
@@ -46,6 +42,12 @@ MESSAGE_SUBST+=		ZOPE3_USER=${ZOPE3_USER:Q} \
 			ZOPE3_GROUP=${ZOPE3_GROUP:Q} \
 			VARBASE=${VARBASE:Q}
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-6]*)
+EXTRACT_USING=		gtar
+.endif
+
 pre-install:
 	${FIND} ${WRKSRC} -name "*.orig" -type f -print | ${XARGS} ${RM} -f
 
@@ -58,5 +60,6 @@ post-install:
 		${ZOPE3_DOCDIR}
 	cd ${WRKSRC}/Zope/doc && ${PAX} -r -w *.txt ${ZOPE3_DOCDIR}
 
+.include "Makefile.common"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope3/distinfo b/www/zope3/distinfo
index 4b570117703..dced98d5801 100644
--- a/www/zope3/distinfo
+++ b/www/zope3/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/02/20 17:30:18 he Exp $
+$NetBSD: distinfo,v 1.6 2007/12/21 16:18:35 taca Exp $
 
 SHA1 (Zope-3.3.1.tgz) = 4576ac21c3415563d3b0b747e40963a762b63fce
 RMD160 (Zope-3.3.1.tgz) = 11bf3b8c899518a5965f21a4a372912a4bc1438d
 Size (Zope-3.3.1.tgz) = 6594248 bytes
 SHA1 (patch-aa) = 1e1a29f1519ee50861b513b5ff5254a76541a735
 SHA1 (patch-ab) = c4e098593a36998384fe70150456cae2a8b55c9e
+SHA1 (patch-ac) = cb89f361441e9caf7f2c16c01d4eb3273f4e4e47
diff --git a/www/zope3/patches/patch-ac b/www/zope3/patches/patch-ac
new file mode 100644
index 00000000000..103388aa3ca
--- /dev/null
+++ b/www/zope3/patches/patch-ac
@@ -0,0 +1,10 @@
+$NetBSD: patch-ac,v 1.5 2007/12/21 16:18:35 taca Exp $
+
+--- Dependencies/twisted-Zope-3.3.1/twisted/internet/glib2reactor.py.orig	2007-01-14 23:04:24.000000000 +0900
++++ Dependencies/twisted-Zope-3.3.1/twisted/internet/glib2reactor.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#
+ 
+ """
+ This module provides support for Twisted to interact with the glib mainloop.