Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21267/10.4/unstable/main/finkinfo/web
Modified Files:
zope.info zope.patch
Log Message:
update to modern python
clean for --build-as-nobody
fix python interp paths
safer file deletion
remove hardcoded /sw in docs
remove GCC field from this non-C++ package
Index: zope.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/zope.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- zope.info 22 Jun 2006 02:59:30 -0000 1.3
+++ zope.info 31 Oct 2006 18:01:19 -0000 1.4
@@ -1,20 +1,18 @@
Package: zope
Version: 2.6.3
-Revision: 1102
-#Conflicts: zope
-#Replaces: zope
-#Provides: zope
-#BuildDepends: db3 (>= 3.3.11-1027), libxml2, readline (>= 4.3-1028), gdbm,
expat
-Depends: python23 (>= 1:2.3.5-1124), daemonic
+Revision: 1103
+Depends: python24, daemonic
Source: http://www.zope.org/Products/Zope/%v/Zope-%v-src.tgz
Source-MD5: 904cf97757401fd353275d0807685460
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+PatchScript: <<
+ sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+ find . -type f | xargs perl -pi -e
's,/usr(/local|)/bin/python(\d+\.\d+)?,%p/bin/python2.4,g; s,/usr/bin/env
python(\d+\.\d+)?,%p/bin/python2.4,g'
+<<
#
#SetCPPFLAGS: -no-cpp-precomp
-GCC: 4.0
CompileScript: <<
- %p/bin/python2.3 wo_pcgi.py
- /usr/bin/find %b -name '*.pyc' |xargs -n1 /bin/rm
+ %p/bin/python2.4 wo_pcgi.py
+ /usr/bin/find . -name '*.pyc' -delete
<<
#
InstallScript: <<
@@ -35,7 +33,7 @@
/bin/cp -R -L utilities/* %i/lib/zope/utilities
install -d -m 755 %i/var/lib/zope
install -d -m 1775 %i/var/lib/zope/var
- install -c -owww -m 644 var/Data.fs.in %i/var/lib/zope/var
+ install -c -m 644 var/Data.fs.in %i/var/lib/zope/var
install -d -m 755 %i/sbin
ln -s ../lib/zope/z2.py %i/sbin/zope-z2
ln -s ../lib/zope/zpasswd.py %i/sbin/zope-zpasswd
@@ -82,9 +80,7 @@
# shut down zope
%p/sbin/zopectl stop
-dpkg --listfiles $PACKAGE |
- awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
- xargs rm -f >&2
+/usr/bin/find %p/lib/zope -name '*.pyc' -delete
# clean up
if [ $1 != "upgrade" ]; then
@@ -98,7 +94,7 @@
# modified for fink by Kilian Koepsell <[EMAIL PROTECTED]>
# byte-compile the python source files
-%p/bin/python2.3 %p/lib/python2.3/compileall.py %p/lib/zope
+%p/bin/python2.4 %p/lib/python2.4/compileall.py %p/lib/zope
# correct permissions and make the Zope instance owned by the www user
chown root:admin %p/var/lib/zope/var
@@ -141,12 +137,12 @@
<<
DescUsage: <<
The default web port for Zope is 8080. You can modify this port in the file
- /sw/etc/zope/zope.cnf.
+ %p/etc/zope/zope.cnf
The command line option '-P 9000', for example, will make 9080 the web server
port and 9021 the ftp port. See 'man zope-z2' for more details.
You can use the command zope-zpasswd to set the zope superuser password:
- zope-zpasswd /sw/var/lib/zope/access
+ zope-zpasswd %p/var/lib/zope/access
You can start/stop the server using the command
zopectl start/stop
Index: zope.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/zope.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- zope.patch 4 Feb 2006 17:23:32 -0000 1.1
+++ zope.patch 31 Oct 2006 18:01:19 -0000 1.2
@@ -1,8 +1,8 @@
-diff -ruN zope.orig/z2.py zope/z2.py
---- zope.orig/z2.py Thu Feb 27 07:53:08 2003
-+++ zope/z2.py Sat Jan 10 20:48:04 2004
+diff -ruN Zope-2.6.3-src.orig/z2.py Zope-2.6.3-src/z2.py
+--- Zope-2.6.3-src.orig/z2.py 2003-02-27 10:53:08.000000000 -0500
++++ Zope-2.6.3-src/z2.py 2006-10-31 12:12:07.000000000 -0500
@@ -1,3 +1,4 @@
-+#! @PREFIX@/bin/python2.3
++#! /usr/local/bin/python
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
@@ -249,80 +249,6 @@
+# if you want to add additional options uncomment the following line
+#ZOPEOPTS="-P 9000"
+
-diff -ruN zope.orig/zopectl.8 zope/zopectl.8
---- zope.orig/zopectl.8 Thu Jan 1 01:00:00 1970
-+++ zope/zopectl.8 Wed Apr 24 18:47:45 2002
-@@ -0,0 +1,61 @@
-+.TH zopectl 8
-+.SH NAME
-+zopectl \- A Zope ZServer control script
-+.SH SYNOPSIS
-+.B zopectl
-+[-I INSTANCE_HOME_DIRECTORY] \fI(start|stop|restart|force-reload|status)\fP
[...]
-+.SH DESCRIPTION
-+.B zopectl
-+is an utility to start, stop, restart and examine a Zope application.
-+It is a replacement for Zope's start and stop scripts.
-+.PP
-+.B NOTE:
-+If your Zope installation uses non-standard paths and/or if you want to
-+run multiple Zope instances, you can specify the INSTANCE_HOME environment
-+variable to the
-+.B zopectl
-+script by using the -I option.
-+.PP
-+The
-+.B zopectl
-+script returns a 0 exit value on success, and >0 if an error
-+occurs. For more details, view the comments in the script.
-+.
-+.SH OPTIONS
-+The \fIcommand\fP can be any one of the following options:
-+.TP 12
-+.BI start
-+Start the Zope zdaemon process. Gives an error if it is already running.
-+Additional parameters will be given to z2.py when it's started.
-+.TP
-+.BI stop
-+Stops the Zope zdaemon process. This is equivalent to the "Shutdown"
-+button in the Zope Control Panel.
-+.TP
-+.BI restart
-+Restarts the Zope process controlled by the zdaemon. This is equivalent
-+to the "Restart" button in the Zope Control Panel.
-+If the zdaemon is not running, it is started.
-+Note that this doesn't restart zdaemon! If you need to restart zdaemon
-+as well, use force-reload.
-+.TP
-+.BI force-reload
-+Restarts zdaemon as well.
-+.TP
-+.BI status
-+Displays the current status of the zdaemon and z2 processes.
-+.
-+.SH BUGS
-+The process handling is not completely robust. E.g. "zopectl restart"
-+and immediately "zopectl stop" will leave you with an single z2 process.
-+Handle with care and be patient.
-+.
-+.SH SEE ALSO
-+.BR zope-z2 (8)
-+.BR zope-zpasswd (8)
-+.
-+.SH AUTHOR
-+The zopectl script and this manual page were written by Gregor Hoffleit
-+<[EMAIL PROTECTED]> for the Debian project. Feel free to use, copy and
-+modify.
-+.
-diff -ruN zope.orig/zpasswd.py zope/zpasswd.py
---- zope.orig/zpasswd.py Wed Apr 24 18:49:18 2002
-+++ zope/zpasswd.py Thu Apr 25 03:00:11 2002
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#! @PREFIX@/bin/python2.3
- ##############################################################################
- #
- # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
diff -ruN zope.orig/zopectl zope/zopectl
--- zope.orig/zopectl Wed Dec 31 16:00:00 1969
+++ zope/zopectl Sun Jan 11 00:15:53 2004
@@ -522,3 +448,68 @@
+ ;;
+
+esac
+diff -ruN zope.orig/zopectl.8 zope/zopectl.8
+--- zope.orig/zopectl.8 Thu Jan 1 01:00:00 1970
++++ zope/zopectl.8 Wed Apr 24 18:47:45 2002
+@@ -0,0 +1,61 @@
++.TH zopectl 8
++.SH NAME
++zopectl \- A Zope ZServer control script
++.SH SYNOPSIS
++.B zopectl
++[-I INSTANCE_HOME_DIRECTORY] \fI(start|stop|restart|force-reload|status)\fP
[...]
++.SH DESCRIPTION
++.B zopectl
++is an utility to start, stop, restart and examine a Zope application.
++It is a replacement for Zope's start and stop scripts.
++.PP
++.B NOTE:
++If your Zope installation uses non-standard paths and/or if you want to
++run multiple Zope instances, you can specify the INSTANCE_HOME environment
++variable to the
++.B zopectl
++script by using the -I option.
++.PP
++The
++.B zopectl
++script returns a 0 exit value on success, and >0 if an error
++occurs. For more details, view the comments in the script.
++.
++.SH OPTIONS
++The \fIcommand\fP can be any one of the following options:
++.TP 12
++.BI start
++Start the Zope zdaemon process. Gives an error if it is already running.
++Additional parameters will be given to z2.py when it's started.
++.TP
++.BI stop
++Stops the Zope zdaemon process. This is equivalent to the "Shutdown"
++button in the Zope Control Panel.
++.TP
++.BI restart
++Restarts the Zope process controlled by the zdaemon. This is equivalent
++to the "Restart" button in the Zope Control Panel.
++If the zdaemon is not running, it is started.
++Note that this doesn't restart zdaemon! If you need to restart zdaemon
++as well, use force-reload.
++.TP
++.BI force-reload
++Restarts zdaemon as well.
++.TP
++.BI status
++Displays the current status of the zdaemon and z2 processes.
++.
++.SH BUGS
++The process handling is not completely robust. E.g. "zopectl restart"
++and immediately "zopectl stop" will leave you with an single z2 process.
++Handle with care and be patient.
++.
++.SH SEE ALSO
++.BR zope-z2 (8)
++.BR zope-zpasswd (8)
++.
++.SH AUTHOR
++The zopectl script and this manual page were written by Gregor Hoffleit
++<[EMAIL PROTECTED]> for the Debian project. Feel free to use, copy and
++modify.
++.
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
