Update of /cvsroot/fink/experimental/asari
In directory sc8-pr-cvs17:/tmp/cvs-serv25733
Modified Files:
openoffice.org.finktree.sh openoffice.org.info.m4 qgis.patch
Log Message:
Hoged 3.
Index: openoffice.org.info.m4
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.info.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- openoffice.org.info.m4 10 May 2007 02:05:14 -0000 1.24
+++ openoffice.org.info.m4 11 May 2007 08:14:25 -0000 1.25
@@ -296,7 +296,8 @@
ifelse(eval((STR_EQ(MODE, [Normal]) && DEFINED([SNAPSHOT])) ||
STR_EQ(MODE, [DumpSnapshotMirrors])),
1, [divert(0)], [divert(-1)])dnl
-MIRROR(1, [Primary],
[ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/])
+MIRROR(1, [A], [http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/])
+MIRROR(1, [B], [ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/])
ifelse(MODE, [Normal], [divert(0)], [divert(-1)])dnl
[<<
Source: mirror:custom:]SOURCE[
Index: qgis.patch
===================================================================
RCS file: /cvsroot/fink/experimental/asari/qgis.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qgis.patch 11 May 2007 07:36:17 -0000 1.2
+++ qgis.patch 11 May 2007 08:14:25 -0000 1.3
@@ -1,5 +1,5 @@
--- configure.orig 2006-12-30 08:56:26.000000000 +0900
-+++ configure 2007-05-11 16:34:34.000000000 +0900
++++ configure 2007-05-11 17:10:49.000000000 +0900
@@ -19836,7 +19836,10 @@
# Test for the Windows version first because if if QTDIR is mounted via
# smbfs to an actual Windows installation, the /include/Qt is found
@@ -12,17 +12,7 @@
# Windows: $QTDIR/include/Qt/qglobal.h includes
$QTDIR/src/corelib/global/qglobal.h
QTINC=$QTDIR/include
QTVERTEST=$QTDIR/src/corelib/global/
-@@ -19853,8 +19856,7 @@
- QTINC=$QTDIR/lib/QtCore.framework/Headers
- QTVERTEST=$QTDIR/lib/QtCore.framework/Headers
- else
-- QTINC=$QTDIR/include
-- QTVERTEST=$QTDIR/include
-+ :
- fi
-
- # Figure out which version of Qt we are using
-@@ -19866,7 +19868,7 @@
+@@ -19866,7 +19869,7 @@
QT_MAJOR="${QT_VER:0:1}"
QT_MINOR="${QT_VER:1:1}"
case "${host}" in
@@ -31,7 +21,7 @@
QT4_3SUPPORTINC=$QTDIR/lib/Qt3Support.framework/Headers
QT4_COREINC=$QTDIR/lib/QtCore.framework/Headers
QT4_GUIINC=$QTDIR/lib/QtGui.framework/Headers
-@@ -20200,9 +20202,9 @@
+@@ -20200,9 +20203,9 @@
;;
*-darwin*)
# determin static or dynamic -- prefer dynamic
@@ -43,7 +33,7 @@
if test "x$QT_IS_STATIC" = x; then
QT_IS_STATIC="no"
{ { echo "$as_me:$LINENO: error: *** Couldn't find any Qt libraries
in $QTDIR/lib" >&5
-@@ -20232,13 +20234,9 @@
+@@ -20232,13 +20235,9 @@
QT_LIB="-lqte-mt"
QT_IS_MT="yes"
QT_IS_EMBEDDED="yes"
Index: openoffice.org.finktree.sh
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.finktree.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- openoffice.org.finktree.sh 19 Mar 2007 01:36:55 -0000 1.3
+++ openoffice.org.finktree.sh 11 May 2007 08:14:25 -0000 1.4
@@ -9,10 +9,10 @@
*) echo "Not in the fink tree" >&2; exit 2;;
esac
set -e -x
-for tree in 10.3 10.4-transitional 10.4; do
+for tree in 10.4; do
$M4 -B32768 -S200 -DTREE="[$tree]" "$INFOFILE" >
"../../dists/$tree/unstable/crypto/finkinfo/openoffice.org.info"
# $M4 -B32768 -S200 -DTREE="[$tree]" -DUSE_FIREFOX=1 "$INFOFILE" >
"../../dists/$tree/unstable/crypto/finkinfo/openoffice.org-firefox.info"
cp openoffice.org.patch
"../../dists/$tree/unstable/crypto/finkinfo/openoffice.org.patch"
- $M4 -B32768 -S200 -DTREE="[$tree]" -DUSE_CRYPTO=0 "$INFOFILE" >
"../../dists/$tree/unstable/main/finkinfo/x11/openoffice.org-nocrypto.info"
+# $M4 -B32768 -S200 -DTREE="[$tree]" -DUSE_CRYPTO=0 "$INFOFILE" >
"../../dists/$tree/unstable/main/finkinfo/x11/openoffice.org-nocrypto.info"
cp openoffice.org.patch
"../../dists/$tree/unstable/main/finkinfo/x11/openoffice.org.patch"
done
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
