[23279] trunk/dports/kde/koffice
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 28 01:31:50 PDT 2007
Revision: 23279
http://trac.macosforge.org/projects/macports/changeset/23279
Author: takanori at macports.org
Date: 2007-03-28 01:31:50 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Version 1.6.2
Modified Paths:
--------------
trunk/dports/kde/koffice/Portfile
trunk/dports/kde/koffice/files/CompileScript.sh
trunk/dports/kde/koffice/files/InstallScript.sh
Added Paths:
-----------
trunk/dports/kde/koffice/files/koffice-panther.patch.bz2
trunk/dports/kde/koffice/files/koffice-tiger.patch.bz2
Modified: trunk/dports/kde/koffice/Portfile
===================================================================
--- trunk/dports/kde/koffice/Portfile 2007-03-28 08:31:29 UTC (rev 23278)
+++ trunk/dports/kde/koffice/Portfile 2007-03-28 08:31:50 UTC (rev 23279)
@@ -1,11 +1,10 @@
# $Id$
-#Synced with Fink, Version 1.6.0-1021
+#Synced with Fink, Version 1.6.2-12
PortSystem 1.0
name koffice
-version 1.6.0
-revision 1
+version 1.6.2
set kdeadmin kde-admindir-429
categories kde
maintainers nomaintainer at macports.org
@@ -14,23 +13,18 @@
long_description ${description}
platforms darwin
homepage http://www.koffice.org/
-master_sites kde:stable/${name}-${version}/src/:koffice160 \
+master_sites kde:stable/${name}-${version}/src/:koffice162 \
http://ranger.users.finkproject.org/distfiles/:admin \
http://ranger.befunk.com/fink/:admin \
http://astrange.ithinksw.net/~astrange/ranger-fink/:admin \
- http://www.southofheaven.net/befunk/:admin \
- http://www.opendarwin.org/~takanori/mirror/${name}/${version}_0/:patch \
- kde:security_patches/:security
-# opendarwin::koffice160
+ http://www.southofheaven.net/befunk/:admin
+# kde:security_patches/:security
+# opendarwin::koffice162
# opendarwin::admin
use_bzip2 yes
distname ${name}-${version}
-set distpatch ${name}-${version}_0-tiger.patch
-distfiles ${distname}.tar.bz2:koffice160 \
- ${distpatch}:patch \
- ${kdeadmin}.tar.bz2:admin \
- post-koffice-1.6.0.diff:security \
- koffce-xpdf-CVE-2007-0104.diff:security
+distfiles ${distname}.tar.bz2:koffice162 \
+ ${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
port:unsermake
depends_lib port:kdebase3 \
@@ -43,26 +37,19 @@
# port:python24 can't be found. looking for .so
# port:postgresql8 can't be found. looking for .so
-checksums ${distname}.tar.bz2 md5 e669cf19b2e1c7db7029c0772c527c0d \
- ${kdeadmin}.tar.bz2 md5 73186bf0bdabf96c9f7d559de56d3772 \
- ${name}-${version}_0-panther.patch md5 adbb064e50d02af7f2eebbba51b5c907 \
- ${name}-${version}_0-tiger.patch md5 9f9e5b1c557d5e8da45c5f5f43daa90f \
- post-koffice-1.6.0.diff md5 20dff20ccd2e184f1874aa60d85f4380 \
- koffce-xpdf-CVE-2007-0104.diff md5 dc28881c39f11c040f8c942e4af238d1
+checksums ${distname}.tar.bz2 md5 74ef62a5f8f766fe8192d5b7d65a3928 \
+ ${kdeadmin}.tar.bz2 md5 73186bf0bdabf96c9f7d559de56d3772
extract.only ${distname}.tar.bz2
post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
-patchfiles
+patchfiles koffice-tiger.patch.bz2
patch {
cd ${worksrcpath}
- system "sed -e 's, at FINKPREFIX@,${prefix},g' ${distpath}/${distpatch} | patch -p1"
foreach file $patchfiles {
- system "sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+ system "bzip2 -dc ${filespath}/${file} | sed -e 's, at FINKPREFIX@,${prefix},g' | patch -p1"
}
system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
- system "patch -p0 < ${distpath}/post-koffice-1.6.0.diff"
- system "patch -p0 < ${distpath}/koffce-xpdf-CVE-2007-0104.diff"
}
post-patch {
reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
@@ -96,11 +83,10 @@
}
platform darwin 7 {
- distfiles-delete ${distpatch}:patch
- set distpatch ${name}-${version}_0-panther.patch
- distfiles-append ${distpatch}:patch
+ patchfiles-delete koffice-tiger.patch.bz2
+ patchfiles-append koffice-panther.patch.bz2
post-patch {
-# if {[variant_isset with-ruby]} {
+# if {[variant_isset with_ruby]} {
system "perl -pi -e \"s|-bundle|-bundle -bundle_loader /usr/lib/crt1.o|g\" ${worksrcpath}/admin/libtool.m4.in"
# }
}
Modified: trunk/dports/kde/koffice/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/koffice/files/CompileScript.sh 2007-03-28 08:31:29 UTC (rev 23278)
+++ trunk/dports/kde/koffice/files/CompileScript.sh 2007-03-28 08:31:50 UTC (rev 23279)
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
@@ -18,4 +18,5 @@
find . -name \*.h | xargs touch
MAKEFLAGS="-j1" ./build-helper.sh make-drivers %N %v %r unsermake $UNSERMAKEFLAGS kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.la kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.la
- ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS
+ MAKEFLAGS="-j1" ./build-helper.sh make-ksqlite %N %v %r unsermake $UNSERMAKEFLAGS kexi/3rdparty/kexisql3/src/ksqlite
+ ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS
Modified: trunk/dports/kde/koffice/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/koffice/files/InstallScript.sh 2007-03-28 08:31:29 UTC (rev 23278)
+++ trunk/dports/kde/koffice/files/InstallScript.sh 2007-03-28 08:31:50 UTC (rev 23279)
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
Added: trunk/dports/kde/koffice/files/koffice-panther.patch.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/dports/kde/koffice/files/koffice-panther.patch.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/dports/kde/koffice/files/koffice-tiger.patch.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/dports/kde/koffice/files/koffice-tiger.patch.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070328/08c381c0/attachment.html
More information about the macports-changes
mailing list