Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6373/main/finkinfo/web
Modified Files:
Tag: pangocairo-branch
apache2.info apache2.patch linkchecker.info tomcat4.info
tomcat4.patch tomcat5.info tomcat5.patch zope.info zope.patch
Log Message:
merged from HEAD (tagged as pangocairo-root-2)
Index: apache2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/apache2.info,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- apache2.info 21 Nov 2006 06:36:36 -0000 1.9
+++ apache2.info 20 Dec 2006 18:01:17 -0000 1.9.2.1
@@ -1,10 +1,10 @@
Package: apache2
Version: 2.0.58
-Revision: 14
+Revision: 16
###
Replaces: apache2, apache2-ssl
Provides: httpd
-BuildDepends: aprutil-dev, apr-dev (>= 0.9.12-1), cyrus-sasl2-dev (>=
2.1.15-22), db44-aes, expat (>= 1.95.6-2), openldap23-dev, libiconv-dev,
system-openssl-dev
+BuildDepends: aprutil-dev, apr-dev (>= 0.9.12-1), cyrus-sasl2-dev (>=
2.1.15-22), db44-aes, expat (>= 1.95.6-2), openldap23-dev, libiconv-dev,
system-openssl-dev, fink (>= 0.24.12)
Depends: %N-mpm-worker (= %v-%r) | %N-mpm-perchild (= %v-%r) | %N-mpm-prefork
(= %v-%r) | %N-mpm-leader (= %v-%r) | %N-mpm-threadpool (= %v-%r)
###
CustomMirror: <<
@@ -17,8 +17,10 @@
Source2: http://www.modssl.org/source/mod_ssl-2.8.26-1.3.35.tar.gz
Source2-MD5: c8eab590c6feb2eef800db29b0b22213
###
+PatchFile: %n.patch
+PatchFile-MD5: ff88baad783b399cbf688420190e9acb
PatchScript: <<
- sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1
+ sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
### increase dynamic module load limit
perl -pi -e 's,DYNAMIC_MODULE_LIMIT 64,DYNAMIC_MODULE_LIMIT 96,g'
include/httpd.h
### FIX LAYOUT
@@ -358,7 +360,7 @@
echo " conf file update prompt, or by updating your current
conf"
echo " conf files to reflect the changes."
echo ""
- echo -n "Do you want to continue [Y/n] ? ";
+ /bin/echo "Do you want to continue [Y/n] ? \c";
read CONTINUECHOICE
case $CONTINUECHOICE in
y|Y|'' ) ;;
Index: zope.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/zope.info,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- zope.info 31 Oct 2006 18:01:19 -0000 1.4
+++ zope.info 20 Dec 2006 18:01:18 -0000 1.4.2.1
@@ -1,11 +1,14 @@
Package: zope
Version: 2.6.3
-Revision: 1103
+Revision: 1104
+BuildDepends: fink (>= 0.24.12)
Depends: python24, daemonic
Source: http://www.zope.org/Products/Zope/%v/Zope-%v-src.tgz
Source-MD5: 904cf97757401fd353275d0807685460
+PatchFile: %n.patch
+PatchFile-MD5: 6a0255b2092d865a080fac6efbcd1e80
PatchScript: <<
- sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+ sed 's|@PREFIX@|%p|g' <%{PatchFile} | 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'
<<
#
Index: zope.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/zope.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- zope.patch 31 Oct 2006 18:01:19 -0000 1.2
+++ zope.patch 20 Dec 2006 18:01:18 -0000 1.2.2.1
@@ -325,7 +325,7 @@
+ test_zope
+ while [ $timeout -gt 0 -a ! $zope -eq 1 ]; do
+ sleep 1
-+ echo -n '.'
++ /bin/echo '.\c'
+ test_zope
+ timeout=`expr $timeout - 1`
+ done
@@ -372,7 +372,7 @@
+
+start)
+ test_zope
-+ echo -n "Starting Zope..."
++ /bin/echo "Starting Zope...\c"
+ if [ ! $zope -eq 1 ]; then
+ start_zope $@
+ if waitfor_zope; then
@@ -389,7 +389,7 @@
+ ;;
+
+stop)
-+ echo -n "Stopping Zope..."
++ /bin/echo "Stopping Zope...\c"
+ test_zope
+ if [ $zope -eq 0 ]; then
+ echo " done (Zope was not running)."
@@ -400,11 +400,11 @@
+ test_zope
+ if [ $zope -eq 1 ]; then
+ stop_zope
-+ #echo -n " [z2 process killed (pid $zope_pid)]"
++ #/bin/echo " [z2 process killed (pid $zope_pid)]\c"
+ else
+ if [ $zope -eq -1 ]; then
+ rm -f $zope_pidfile
-+ echo -n " [removed stale z2 pidfile (pid $zope_pid)]"
++ /bin/echo " [removed stale z2 pidfile (pid $zope_pid)]\c"
+ fi
+ fi
+ sleep 2
@@ -416,13 +416,13 @@
+restart)
+ test_zope
+ if [ ! $zope -eq 1 ]; then
-+ echo -n "Starting Zope..."
++ /bin/echo "Starting Zope...\c"
+ start_zope
+ waitfor_zope
+ echo " done."
+ else
+ if [ $zope -eq 1 ]; then
-+ echo -n "Restarting Zope..."
++ /bin/echo "Restarting Zope...\c"
+ stop_zope
+ sleep 3
+ start_zope $@
Index: tomcat4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/tomcat4.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- tomcat4.patch 30 Jun 2006 03:04:44 -0000 1.2
+++ tomcat4.patch 20 Dec 2006 18:01:18 -0000 1.2.2.1
@@ -21,7 +21,7 @@
+
+case "$1" in
+ start)
-+ echo -n "Starting Tomcat: "
++ /bin/echo "Starting Tomcat: \c"
+ $CATALINA_HOME/bin/catalina.sh start
>>@PREFIX@/var/tomcat4/logs/tomcat.log 2>&1
+ echo "ok"
+ ;;
Index: tomcat5.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/tomcat5.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- tomcat5.patch 30 Jun 2006 03:04:44 -0000 1.1
+++ tomcat5.patch 20 Dec 2006 18:01:18 -0000 1.1.2.1
@@ -21,7 +21,7 @@
+
+case "$1" in
+ start)
-+ echo -n "Starting Tomcat: "
++ /bin/echo "Starting Tomcat: \c"
+ $CATALINA_HOME/bin/catalina.sh start
>>@PREFIX@/var/tomcat5/logs/tomcat.log 2>&1
+ echo "ok"
+ ;;
Index: tomcat5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/tomcat5.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- tomcat5.info 1 Dec 2006 17:17:18 -0000 1.2
+++ tomcat5.info 20 Dec 2006 18:01:18 -0000 1.2.2.1
@@ -1,6 +1,6 @@
Package: tomcat5
Version: 5.5.20
-Revision: 1
+Revision: 2
Type: java(1.4)
CustomMirror: <<
@@ -16,8 +16,11 @@
Source2-MD5: e779d0694dad09b4adbe890eb04c5057
Source3: mirror:apache:tomcat/tomcat-5/v%v/bin/apache-tomcat-%v-compat.tar.gz
Source3-MD5: 9afe29117c5eca667d72bb847416153e
-PatchScript: sed -e 's:@PREFIX@:%p:g' < %a/%n.patch | patch -p1
+PatchFile: %n.patch
+PatchFile-MD5: 204eb678f6ee7601eaddd037ebfe87d5
+PatchScript: sed -e 's:@PREFIX@:%p:g' < %{PatchFile} | patch -p1
+BuildDepends: fink (>= 0.24.12)
Depends: system-java (>= 1.4-1)
ConfFiles: <<
%p/etc/%N/tomcat.conf
Index: apache2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/apache2.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- apache2.patch 23 Jun 2006 17:23:20 -0000 1.2
+++ apache2.patch 20 Dec 2006 18:01:17 -0000 1.2.2.1
@@ -8,10 +8,10 @@
+
+if [ -z $1 ]; then
+ echo "Which module would you like to disable?"
-+ echo -n "Your choices are: "
++ /bin/echo "Your choices are: \c"
+ ls $SYSCONFDIR/mods-enabled/*.load | \
+ sed -e "s,$SYSCONFDIR/mods-enabled/,,g" | sed -e 's/\.load$//g;' |
xargs echo
-+ echo -n "Module name? "
++ /bin/echo "Module name? \c"
+ read MODNAME
+else
+ MODNAME=$1
@@ -34,10 +34,10 @@
+
+if [ -z $1 ]; then
+ echo "Which site would you like to disable?"
-+ echo -n "Your choices are: "
++ /bin/echo "Your choices are: \c"
+ ls @FINKPREFIX@/etc/apache2/sites-enabled/* | \
+ sed -e "s,$SYSCONFDIR/sites-enabled/,,g" | xargs echo
-+ echo -n "Site name? "
++ /bin/echo "Site name? \c"
+ read SITENAME
+else
+ SITENAME=$1
@@ -67,10 +67,10 @@
+
+if [ -z $1 ]; then
+ echo "Which module would you like to enable?"
-+ echo -n "Your choices are: "
++ /bin/echo "Your choices are: \c"
+ ls @FINKPREFIX@/etc/apache2/mods-available/*.load | \
+ sed -e "s,$SYSCONFDIR/mods-available/,,g" | sed -e 's/\.load$//g;' |
xargs echo
-+ echo -n "Module name? "
++ /bin/echo "Module name? \c"
+ read MODNAME
+else
+ MODNAME=$1
@@ -112,10 +112,10 @@
+
+if [ -z $1 ]; then
+ echo "Which site would you like to enable?"
-+ echo -n "Your choices are: "
++ /bin/echo "Your choices are: \c"
+ ls $SYSCONFDIR/sites-available/* | \
+ sed -e "s,$SYSCONFDIR/sites-available/,,g" | xargs echo
-+ echo -n "Site name? "
++ /bin/echo "Site name? \c"
+ read SITENAME
+else
+ SITENAME=$1
Index: linkchecker.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/linkchecker.info,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- linkchecker.info 15 Dec 2006 20:56:01 -0000 1.5
+++ linkchecker.info 20 Dec 2006 18:01:17 -0000 1.5.2.1
@@ -36,7 +36,7 @@
/usr/bin/install -d %i/share/doc/%n
cp -r doc/* %i/share/doc/%n
<<
-DocFiles: ChangeLog TODO LICENSE
+DocFiles: COPYING ChangeLog INSTALL README TODO
ConfFiles: %p/share/%n/linkcheckerrc %p/share/%n/logging.conf
# Additional Info
Index: tomcat4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/tomcat4.info,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- tomcat4.info 1 Dec 2006 17:17:18 -0000 1.3
+++ tomcat4.info 20 Dec 2006 18:01:18 -0000 1.3.2.1
@@ -1,6 +1,6 @@
Package: tomcat4
Version: 4.1.34
-Revision: 1
+Revision: 2
Type: java(1.4)
CustomMirror: <<
@@ -12,8 +12,11 @@
<<
Source: mirror:apache:tomcat/tomcat-4/v%v/bin/apache-tomcat-%v-LE-jdk14.tar.gz
Source-MD5: f9ee64000d986907f24f5a9a254660d2
-PatchScript: sed -e 's:@PREFIX@:%p:g' < %a/%n.patch | patch -p1
+PatchFile: %n.patch
+PatchFile-MD5: 12c46f4f0f0bb5a258906b50c13443ac
+PatchScript: sed -e 's:@PREFIX@:%p:g' < %{PatchFile} | patch -p1
+BuildDepends: fink (>= 0.24.12)
Depends: system-java (>= 1.4-1)
ConfFiles: <<
%p/etc/%N/tomcat.conf
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
