[20203] trunk/dports/kde/koffice
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 27 11:31:35 PDT 2006
Revision: 20203
http://trac.macosforge.org/projects/macports/changeset/20203
Author: takanori at macports.org
Date: 2006-10-27 11:31:35 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
Version 1.5.2.
Modified Paths:
--------------
trunk/dports/kde/koffice/Portfile
trunk/dports/kde/koffice/files/CompileScript.sh
trunk/dports/kde/koffice/files/InstallScript.sh
Removed Paths:
-------------
trunk/dports/kde/koffice/files/dp01.patch
Modified: trunk/dports/kde/koffice/Portfile
===================================================================
--- trunk/dports/kde/koffice/Portfile 2006-10-27 18:31:23 UTC (rev 20202)
+++ trunk/dports/kde/koffice/Portfile 2006-10-27 18:31:35 UTC (rev 20203)
@@ -1,24 +1,29 @@
# $Id$
-#Synced with Fink, Version 1.5.1-1021
+#Synced with Fink, Version 1.5.2-1023
PortSystem 1.0
name koffice
-version 1.5.1
-set kdeadmin kde-admindir-full-3.5.2-2
+version 1.5.2
+set kdeadmin kde-admindir-252
categories kde
maintainers ben at macports.org takanori at macports.org
description KDE office suite. \
- NB KDE sound does not work.
+ NB KDE sound does not work.
+long_description ${description}
platforms darwin
-master_sites kde:stable/${name}-${version}/src \
- http://ranger.befunk.com/fink/:admin \
+homepage http://www.koffice.org/
+master_sites opendarwin::koffice152 \
+ opendarwin::admin \
http://www.opendarwin.org/~takanori/mirror/${name}/${version}_${revision}/:patch
-extract.suffix .tar.bz2
+# kde:stable/${name}-${version}/src
+# http://ranger.befunk.com/fink/:admin
use_bzip2 yes
distname ${name}-${version}
set distpatch ${name}-${version}_${revision}-tiger.patch
-distfiles ${distname}.tar.bz2 ${kdeadmin}.tar.bz2:admin ${distpatch}:patch
+distfiles ${distname}.tar.bz2:koffice152 \
+ ${distpatch}:patch \
+ ${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
port:unsermake
depends_lib port:kdebase3 \
@@ -31,34 +36,30 @@
# port:python24 \ can't be found. looking for .so
# port:postgresql8 \ can't be found. looking for .so
-checksums ${distname}.tar.bz2 md5 50897bd5dfd4eba8a0d78a02003a6ec9 \
- ${kdeadmin}.tar.bz2 md5 b2afdafba2c416555105667c17046e32 \
- ${name}-${version}_${revision}-panther.patch md5 4d368326b6c3302e717d5d42104ddbf1 \
- ${name}-${version}_${revision}-tiger.patch md5 06740e27241092328bfbbe2168ca37cf
+checksums ${distname}.tar.bz2 md5 cbe9deeb7c811a6bb5a954989b25c1f2 \
+ ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e \
+ ${name}-${version}_${revision}-panther.patch md5 a2cd086e3d5706304399b43ef9e50780 \
+ ${name}-${version}_${revision}-tiger.patch md5 4f567e63591b3c3cb04d972f5e589247
-extract.only ${distname}.tar.bz2
-post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
+extract.only ${distname}.tar.bz2
+post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
-patchfiles dp01.patch
+patchfiles
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' ${portpath}/${filesdir}/${file} | patch -p1"
+ system "sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | 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/*"
}
-post-patch {
- reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
- reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
+post-patch {
+ reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
- reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
- foreach file [glob ${worksrcpath}/admin/*] {
- reinplace "s|-O2|-Os|g" $file
- reinplace "s|doc/HTML|doc/kde|g" $file
- reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
- }
+ reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
+ reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
foreach file {CompileScript.sh InstallScript.sh} {
- file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
+ file copy ${filespath}/${file} ${worksrcpath}
reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
@@ -70,7 +71,7 @@
}
}
-configure.args --enable-mysql --with-distribution='DarwinPorts/Mac OS X' --without-arts
+configure.args --enable-mysql --with-distribution='MacPorts/Mac OS X' --without-arts
# (libpqxx is missing.)
# --enable-pgsql --with-pgsqlincdir=${prefix}/include/pgsql8 --with-pgsqllibdir=${prefix}/lib/pgsql8 --with-pqxx-includes=${prefix}/include --with-pqxx-libraries=${prefix}/lib
@@ -78,7 +79,7 @@
build { system "cd ${worksrcpath} && ./CompileScript.sh" }
destroot { system "cd ${worksrcpath} && ./InstallScript.sh" }
-post-destroot {
+post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING COPYING.LIB INSTALL README ${destroot}${prefix}/share/doc/${name}
}
@@ -87,22 +88,9 @@
distfiles-delete ${distpatch}:patch
set distpatch ${name}-${version}_${revision}-panther.patch
distfiles-append ${distpatch}:patch
- post-patch {
-# if {[variant_isset with-ruby]} {
- system "perl -pi -e \"s|-bundle|-bundle -bundle_loader /usr/lib/crt1.o|g\" ${worksrcpath}/admin/libtool.m4.in"
-# }
+ post-patch {
+# if {[variant_isset with-ruby]} {
+ system "perl -pi -e \"s|-bundle|-bundle -bundle_loader /usr/lib/crt1.o|g\" ${worksrcpath}/admin/libtool.m4.in"
+# }
}
}
-
-#not tested on OSX 10.2.
-platform darwin 6 {
- depends_lib-append lib:libdl:dlcompat
- distfiles-delete ${distpatch}:patch
- set distpatch ${name}-${version}_${revision}-panther.patch
- distfiles-append ${distpatch}:patch
- post-patch {
-# 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 2006-10-27 18:31:23 UTC (rev 20202)
+++ trunk/dports/kde/koffice/files/CompileScript.sh 2006-10-27 18:31:35 UTC (rev 20203)
@@ -1,22 +1,21 @@
#!/bin/sh -e
- export HOME=/tmp
- export PREFIX="%p" UNSERMAKE=1
+ export PREFIX="%p" USE_UNSERMAKE=1
#fink
-# . ./environment-helper.sh
-# export lt_cv_sys_max_cmd_len=65536 ac_cv_prog_RUBY=%p/bin/ruby1.8
-# export CC=gcc CXX=g++ CONFIGURE_PARAMS=`echo $CONFIGURE_PARAMS | sed -e 's,--disable-dependency-tracking,,'`
-#darwinports
- . ./environment-helper.sh
- export lt_cv_sys_max_cmd_len=65536 ac_cv_prog_RUBY=%p/bin/ruby
- export CC=gcc CXX=g++ CONFIGURE_PARAMS=`echo $CONFIGURE_PARAMS | sed -e 's,--disable-dependency-tracking,,'`
+# . ./environment-helper.sh
+# export ac_cv_prog_RUBY=%p/bin/ruby1.8
+# export CONFIGURE_PARAMS=`echo $CONFIGURE_PARAMS | sed -e 's,--disable-dependency-tracking,,'`
+#macports
+ . ./environment-helper.sh
+ export ac_cv_prog_RUBY=%p/bin/ruby
+ export CONFIGURE_PARAMS=`echo $CONFIGURE_PARAMS | sed -e 's,--disable-dependency-tracking,,'`
- ./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
- ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
+ ./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
+ ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
- # why does this work??
- find . -name \*.h | xargs touch
+ # why does this work??
+ find . -name \*.h | xargs touch
- MAKEFLAGS="-j1" ./build-helper.sh make-drivers %N %v %r unsermake -p kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.la kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.la
- ./build-helper.sh make %N %v %r unsermake -p
+ 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
Modified: trunk/dports/kde/koffice/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/koffice/files/InstallScript.sh 2006-10-27 18:31:23 UTC (rev 20202)
+++ trunk/dports/kde/koffice/files/InstallScript.sh 2006-10-27 18:31:35 UTC (rev 20203)
@@ -1,10 +1,10 @@
#!/bin/sh -e
- export PREFIX="%p" UNSERMAKE=1
- . ./environment-helper.sh
+ export PREFIX="%p" USE_UNSERMAKE=1
+ . ./environment-helper.sh
- ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR="%d"
+ ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR="%d"
- mkdir -p %i/share/doc/installed-packages
- touch %i/share/doc/installed-packages/%N
- touch %i/share/doc/installed-packages/%N-base
+ mkdir -p %i/share/doc/installed-packages
+ touch %i/share/doc/installed-packages/%N
+ touch %i/share/doc/installed-packages/%N-base
Deleted: trunk/dports/kde/koffice/files/dp01.patch
===================================================================
--- trunk/dports/kde/koffice/files/dp01.patch 2006-10-27 18:31:23 UTC (rev 20202)
+++ trunk/dports/kde/koffice/files/dp01.patch 2006-10-27 18:31:35 UTC (rev 20203)
@@ -1,20 +0,0 @@
-*** koffice-1.5.1/karbon/Makefile.am~ Thu May 11 03:35:25 2006
---- koffice-1.5.1/karbon/Makefile.am Mon May 22 20:38:02 2006
-***************
-*** 30,36 ****
- $(LIBART_LIBS) \
- $(LIBFONTCONFIG_LIBS) \
- $(LIBMAGICK_LIBS) \
-! $(LIBFREETYPE_LIBS)
-
- libkarbonpart_la_SOURCES = karbon_factory_init.cc
- libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH)
---- 30,37 ----
- $(LIBART_LIBS) \
- $(LIBFONTCONFIG_LIBS) \
- $(LIBMAGICK_LIBS) \
-! $(LIBFREETYPE_LIBS) \
-! $(LIB_X11)
-
- libkarbonpart_la_SOURCES = karbon_factory_init.cc
- libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061027/b23c0f63/attachment.html
More information about the macports-changes
mailing list